@archivist-gg/dnd5e 0.3.11 → 0.3.17

package/dist/{chunk-2INMRR3Q.js → chunk-ONTGZR5T.js}

@@ -1,7 +1,36 @@
+import {
+  equipmentCategoryKey,
+  isCategoryGrant
+} from "./chunk-2LULMQTF.js";
+import {
+  TOOL_CATEGORIES,
+  backgroundToolPicks,
+  categoryWords,
+  classToolPicks,
+  expandToolPool,
+  toolCategoriesOf
+} from "./chunk-H5PTKYXL.js";
+import {
+  assembleEffectFeatures,
+  collectProficiencyEffectGrants
+} from "./chunk-TULQ4FFX.js";
+import {
+  ALL_LANGUAGES,
+  ALL_SKILL_SLUGS,
+  ALL_TOOLS
+} from "./chunk-KU3YLF6D.js";
+import {
+  featOfSite,
+  featPickSites,
+  isTargetChoice,
+  memberChoices,
+  poolMemberSites,
+  poolMemberSitesOf
+} from "./chunk-HTYMW5CH.js";
 import {
   resolveFeatureResources,
   resolveResourceIndex
-} from "./chunk-4ISR76DH.js";
+} from "./chunk-KSTV7J2U.js";
 import {
   attributeUnclassedSpell,
   effectiveSpellcastingAbility,
@@ -9,9 +38,22 @@ import {
   resolveSpellcasting
 } from "./chunk-DPUJDOKV.js";
 import {
+  convertibleLegacyAsi,
+  flattenAsiOrFeat,
+  resolveLegacyAsiFeat
+} from "./chunk-LBEXLN6I.js";
+import {
+  humanizeProficiency,
+  proficiencyLabel,
+  toProfSlug
+} from "./chunk-RLGQ5PZZ.js";
+import {
+  bindFeatureConsumers,
+  buildInfusionContext,
   resolveAllPools,
+  resolveOptionRows,
   strandedPicks
-} from "./chunk-O4SRD3J5.js";
+} from "./chunk-3VZZDKRA.js";
 import {
   countColumnsFor,
   readTableColumn
@@ -21,42 +63,28 @@ import {
 } from "./chunk-YHYTW5QA.js";
 import {
   collectAdditionalSpells
-} from "./chunk-3HX5VLWP.js";
+} from "./chunk-VRV3NNTA.js";
 import {
   isItemEntity,
   resolveEntityForEntry
-} from "./chunk-UBBKSYBY.js";
-import {
-  assembleEffectFeatures,
-  collectProficiencyEffectGrants
-} from "./chunk-CBEKVAX4.js";
-import {
-  ALL_LANGUAGES,
-  ALL_SKILL_SLUGS,
-  ALL_TOOLS
-} from "./chunk-KU3YLF6D.js";
-import {
-  humanizeProficiency,
-  proficiencyLabel,
-  toProfSlug
-} from "./chunk-RLGQ5PZZ.js";
-import {
-  warnOnce
-} from "./chunk-LVQLWRCU.js";
-import {
-  bareEntitySlug,
-  wikilinkTailSlug
-} from "./chunk-6X4KUDMU.js";
+} from "./chunk-LHZXYFBU.js";
 import {
   FEATURE_TYPE_FOR_CATEGORY,
   featProgressionCategory
 } from "./chunk-YBLDE5CG.js";
+import {
+  warnOnce
+} from "./chunk-LVQLWRCU.js";
 import {
   isValidMaxFormula
 } from "./chunk-EVMUJYUD.js";
+import {
+  bareEntitySlug,
+  wikilinkTailSlug
+} from "./chunk-ZCTUYGNV.js";
 import {
   mirrorSpellShapes
-} from "./chunk-XY6X2APM.js";
+} from "./chunk-7Q2VPKCD.js";
 import {
   ABILITY_KEYS
 } from "./chunk-WELIKLZF.js";
@@ -80,6 +108,7 @@ function collectProficiencyGrants(resolved) {
     for (const w of (_f = (_e = prof.weapons) == null ? void 0 : _e.fixed) != null ? _f : []) classWeaponFixed.push({ value: w, source });
     for (const w of (_h = (_g = prof.weapons) == null ? void 0 : _g.categories) != null ? _h : []) classWeaponCategories.push({ value: w, source });
     for (const t of (_j = (_i = prof.tools) == null ? void 0 : _i.fixed) != null ? _j : []) classToolFixed.push({ value: t, source });
+    for (const t of classToolPicks(c.entity).grants) classToolFixed.push({ value: t, source });
   }
   const raceSource = (_l = (_k = resolved.race) == null ? void 0 : _k.name) != null ? _l : UNKNOWN_SOURCE;
   const raceLangFixed = ((_o = (_n = (_m = resolved.race) == null ? void 0 : _m.languages) == null ? void 0 : _n.fixed) != null ? _o : []).map(
@@ -95,6 +124,7 @@ function collectProficiencyGrants(resolved) {
         for (const t of entry.items) bgToolFixed.push({ value: t, source });
       }
     }
+    for (const t of backgroundToolPicks(bg).grants) bgToolFixed.push({ value: t, source });
     for (const entry of (_r = bg.language_proficiencies) != null ? _r : []) {
       if (entry.kind === "fixed") {
         for (const l of entry.languages) bgLangFixed.push({ value: l, source });
@@ -164,25 +194,18 @@ function collectProficiencyGrants(resolved) {
   };
 }
 
-// src/pc/pc.asi-flatten.ts
-function flattenAsiOrFeat(choice) {
-  var _a;
-  if (choice.kind !== "select-inline" || choice.id !== "asi-or-feat") return choice;
-  const featBranches = choice.options.filter((o) => {
-    var _a2;
-    return ((_a2 = o.choices) != null ? _a2 : []).some((c) => c.kind === "select-entity" && c.entity_type === "feat");
-  });
-  if (featBranches.length !== 1) return choice;
-  const inner = (_a = featBranches[0].choices) != null ? _a : [];
-  if (inner.length !== 1) return choice;
-  const only = inner[0];
-  if (only.kind !== "select-entity" || only.entity_type !== "feat") return choice;
-  return only;
-}
-
 // src/pc/pc.decision-engine.ts
 var warnedDegradedEquipment = /* @__PURE__ */ new Set();
 var warnedAmbiguousBare = /* @__PURE__ */ new Set();
+var foldedTypeMemo = /* @__PURE__ */ new Map();
+function foldedType(s) {
+  let v = foldedTypeMemo.get(s);
+  if (v === void 0) {
+    v = categoryWords(s).join(" ");
+    foldedTypeMemo.set(s, v);
+  }
+  return v;
+}
 function matchesFilter(e, where, ownerBare) {
   var _a, _b, _c, _d, _e;
   const d = e.data;
@@ -191,6 +214,7 @@ function matchesFilter(e, where, ownerBare) {
   if (where.list && !((_a = d.classes) != null ? _a : []).includes(where.list)) return false;
   if (where.level !== void 0 && ((_b = d.level) != null ? _b : 0) !== where.level) return false;
   if (where.edition && d.edition !== where.edition) return false;
+  if (where.ritual && d.ritual !== true) return false;
   if (where.weapon_category) {
     const cat = ((_c = d.category) != null ? _c : "").toLowerCase();
     if (!cat.startsWith(`${where.weapon_category}-`) && cat !== where.weapon_category) return false;
@@ -198,6 +222,14 @@ function matchesFilter(e, where, ownerBare) {
   if (where.armor_category) {
     if (((_d = d.category) != null ? _d : "").toLowerCase() !== where.armor_category) return false;
   }
+  if (where.item_type) {
+    const t = foldedType(typeof d.type === "string" ? d.type : "");
+    if (!t || !where.item_type.some((x) => foldedType(x) === t)) return false;
+  }
+  if (where.mundane) {
+    const r = typeof d.rarity === "string" ? d.rarity.trim().toLowerCase() : "";
+    if (r && r !== "none" && r !== "mundane") return false;
+  }
   if (where.parent_class === "self") {
     if (!d.parent_class || wikilinkTailSlug(d.parent_class) !== ownerBare) return false;
   }
@@ -208,17 +240,94 @@ function matchesFilter(e, where, ownerBare) {
   return true;
 }
 var __matchesFilterForTest = matchesFilter;
+function parseEquipmentCategory(category) {
+  const tools = toolCategoriesOf(category);
+  if (tools) return { kind: "tool", tools };
+  const words = categoryWords(category).filter((w) => w !== "any");
+  const has = (w) => words.includes(w);
+  const only = (allowed) => words.every((w) => allowed.includes(w));
+  if (words.length === 1 && has("shield")) return { kind: "shield" };
+  if (has("armor") && only(["armor", "light", "medium", "heavy"]) && words.length <= 2) {
+    const armor = ["light", "medium", "heavy"].find((k) => has(k));
+    return { kind: "armor", armor };
+  }
+  if (has("weapon") && only(["weapon", "simple", "martial", "melee", "ranged"])) {
+    const klass = ["simple", "martial"].filter((k) => has(k));
+    const range = ["melee", "ranged"].filter((k) => has(k));
+    if (klass.length === 1 && range.length <= 1 && words.length === 2 + range.length) {
+      return { kind: "weapon", weapon: klass[0], range: range[0] };
+    }
+  }
+  return void 0;
+}
 function categoryToEntitySelect(category, id) {
-  const c = category.toLowerCase();
-  if (c === "shield") {
-    return { kind: "select-entity", id, label: "Choose a shield", count: 1, entity_type: "armor", where: { armor_category: "shield" } };
+  const spec = parseEquipmentCategory(category);
+  const pick = { kind: "select-entity", id, count: 1 };
+  switch (spec == null ? void 0 : spec.kind) {
+    case "shield":
+      return { ...pick, label: "Choose a shield", entity_type: "armor", where: { armor_category: "shield" } };
+    case "armor":
+      return spec.armor ? { ...pick, label: `Choose ${spec.armor} armor`, entity_type: "armor", where: { armor_category: spec.armor } } : { ...pick, label: "Choose armor", entity_type: "armor" };
+    case "weapon":
+      return {
+        ...pick,
+        label: `Choose a ${spec.weapon}${spec.range ? ` ${spec.range}` : ""} weapon`,
+        entity_type: "weapon",
+        where: { weapon_category: spec.weapon }
+      };
+    case "tool":
+      return {
+        ...pick,
+        label: `Choose ${spec.tools.map((t) => TOOL_CATEGORIES[t].label).join(" or ")}`,
+        entity_type: "item",
+        where: { item_type: spec.tools.map((t) => TOOL_CATEGORIES[t].itemType), mundane: true }
+      };
+    default:
+      warnOnce(
+        `equipment-category:${category}`,
+        `Archivist: starting-equipment category "${category}" is not a known item category; its pick offers no options.`
+      );
+      return { ...pick, label: `Choose a ${category.replace(/[-_]+/g, " ")}`, entity_type: "item", from: [] };
   }
-  if (c.includes("armor")) {
-    const klass = c.includes("light") ? "light" : c.includes("medium") ? "medium" : c.includes("heavy") ? "heavy" : null;
-    return klass ? { kind: "select-entity", id, label: `Choose ${klass} armor`, count: 1, entity_type: "armor", where: { armor_category: klass } } : { kind: "select-entity", id, label: "Choose armor", count: 1, entity_type: "armor" };
+}
+var __categoryToEntitySelectForTest = categoryToEntitySelect;
+function equipmentDecisions(entries, ownerSlug) {
+  const out = [];
+  let degraded = false;
+  (entries != null ? entries : []).forEach((eq, i) => {
+    var _a;
+    if ((eq == null ? void 0 : eq.kind) !== "choice") return;
+    const options = (_a = eq.options) != null ? _a : [];
+    out.push({
+      kind: "select-inline",
+      id: `equipment-${i}`,
+      label: "Starting Equipment",
+      count: 1,
+      options: options.map((opt, j) => {
+        var _a2;
+        const label = typeof opt === "string" ? opt : (_a2 = opt == null ? void 0 : opt.label) != null ? _a2 : "";
+        const wellFormed = !!opt && typeof opt === "object" && Array.isArray(opt.grants);
+        if (!wellFormed) degraded = true;
+        const grants = wellFormed ? opt.grants : [];
+        return {
+          value: `option-${j}`,
+          label,
+          choices: grants.flatMap((g, k) => isCategoryGrant(g) ? [categoryToEntitySelect(g.category, equipmentCategoryKey(i, j, k))] : [])
+        };
+      })
+    });
+  });
+  if (degraded && !warnedDegradedEquipment.has(ownerSlug)) {
+    warnedDegradedEquipment.add(ownerSlug);
+    console.warn(
+      `[archivist] Starting equipment for "${ownerSlug}" is in an outdated/unstructured format; its nested picks and seeding are skipped. Re-sync the compendium (delete _compendium.md and reload) to fix.`
+    );
   }
-  const wc = c.includes("martial") ? "martial" : "simple";
-  return { kind: "select-entity", id, label: `Choose a ${c.replace(/-/g, " ")}`, count: 1, entity_type: "weapon", where: { weapon_category: wc } };
+  return out;
+}
+function authoredProficiencyPool(choice) {
+  if (!choice.from) return void 0;
+  return choice.domain === "tool" ? expandToolPool(choice.from) : choice.from;
 }
 function enumerateOptions(choice, ctx, ownerBare) {
   var _a, _b;
@@ -260,7 +369,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] : choice.domain === "language" ? [...ALL_LANGUAGES] : choice.domain === "tool" ? [...ALL_TOOLS] : [];
+      const pool = (_a = authoredProficiencyPool(choice)) != null ? _a : choice.domain === "skill" ? [...ALL_SKILL_SLUGS] : choice.domain === "language" ? [...ALL_LANGUAGES] : choice.domain === "tool" ? [...ALL_TOOLS] : [];
       return pool.map((v) => ({ value: v, label: humanizeProficiency(v) }));
     }
     case "ability-points": {
@@ -284,6 +393,12 @@ function requiredCount(choice) {
   if (choice.kind === "select-proficiency") return choice.count;
   return (_a = choice.count) != null ? _a : 1;
 }
+function capAtCount(choice, value) {
+  const folds = choice.kind === "select-proficiency" || choice.kind === "select-entity" && choice.entity_type === "weapon" && choice.id !== "weapon-mastery";
+  if (!folds || !Array.isArray(value)) return value;
+  const n = requiredCount(choice);
+  return value.length > n ? value.slice(0, n) : value;
+}
 function statusOf(choice, selected, satisfied) {
   const n = selectionCount(choice, selected);
   const need = requiredCount(choice);
@@ -317,7 +432,7 @@ function buildItem(inputChoice, source, level, featureName, readValue, ctx, owne
   const keyPrefix = (_a = opts == null ? void 0 : opts.keyPrefix) != null ? _a : "";
   const expandFeatChildren = (_b = opts == null ? void 0 : opts.expandFeatChildren) != null ? _b : true;
   const key = keyPrefix + choice.id;
-  const raw = readValue(key);
+  const raw = capAtCount(choice, readValue(key));
   const preExclusionOptions = enumerateOptions(choice, ctx, ownerBare);
   let options = preExclusionOptions;
   const mine = new Set(
@@ -422,8 +537,13 @@ function visitProficiencyChoices(resolved, visit) {
   const originRead = (ns) => (id) => oc[`${ns}:${id}`];
   const stripRef = (ref) => ref.replace(/^\[\[/, "").replace(/\]\]$/, "");
   const featBySlug = new Map(((_b = resolved.feats) != null ? _b : []).map((f) => [f.slug, f]));
-  resolved.classes.forEach((c, i) => {
+  const memberSites = poolMemberSitesOf(resolved);
+  const featSites = featPickSites(resolved.classes, memberSites, (ci) => {
     var _a2, _b2, _c2, _d;
+    return (_d = (_c2 = (_b2 = (_a2 = resolved.classes) == null ? void 0 : _a2[ci]) == null ? void 0 : _b2.entity) == null ? void 0 : _c2.slug) != null ? _d : null;
+  });
+  resolved.classes.forEach((c, i) => {
+    var _a2, _b2, _c2, _d, _e;
     if (!c.entity) return;
     const entity = c.entity;
     const readAt = (lvl) => (id) => {
@@ -440,6 +560,7 @@ function visitProficiencyChoices(resolved, visit) {
       }, readAt(1)("skills"));
     }
     if (i === 0) walk(entity.choices, readAt(1));
+    if (i === 0) walk(classToolPicks(entity).decisions, readAt(1));
     for (const rf of resolved.features) {
       if (rf.source.kind !== "class" && rf.source.kind !== "subclass") continue;
       const belongs = rf.source.kind === "class" ? rf.source.slug === entity.slug : c.subclass != null && rf.source.slug === c.subclass.slug;
@@ -447,14 +568,13 @@ function visitProficiencyChoices(resolved, visit) {
       for (const copy of (_c2 = rf.foldedFrom) != null ? _c2 : []) walk(copy.choices, readAt(copy.level));
       walk(rf.feature.choices, readAt(rf.source.level));
     }
-    for (const atLevel of Object.values((_d = c.choices) != null ? _d : {})) {
-      const block = atLevel;
-      const featRef = block == null ? void 0 : block.feat;
-      if (!block || typeof featRef !== "string") continue;
-      const feat = featBySlug.get(stripRef(featRef));
+    for (const site of featSites) {
+      if (site.classIndex !== i) continue;
+      const feat = (_e = featBySlug.get(stripRef(site.slug))) != null ? _e : featOfSite(site, (_d = resolved.feats) != null ? _d : []);
       if (!feat) continue;
-      walk(feat.choices, (id) => block[`feat:${id}`]);
+      walk(feat.choices, site.read);
     }
+    for (const site of memberSites) if (site.classIndex === i) walk(site.choices, site.read);
   });
   if (resolved.race) {
     walk(resolved.race.choices, originRead("race"));
@@ -462,6 +582,7 @@ function visitProficiencyChoices(resolved, visit) {
   }
   if (resolved.background) {
     walk(resolved.background.choices, originRead("background"));
+    walk(backgroundToolPicks(resolved.background).decisions, originRead("background"));
     if (resolved.background.feature) {
       const feature = resolved.background.feature;
       walk(feature.choices, originRead("background"));
@@ -476,7 +597,8 @@ var filterToPool = (vals, pool) => pool ? vals.map((v) => matchPool(v, pool)).fi
 function collectChosenProficiencies(resolved) {
   const out = { skills: [], expertise: [], languages: [], tools: [], weapons: [], saves: [] };
   const isAbility = (v) => ABILITY_KEYS.includes(v);
-  visitProficiencyChoices(resolved, (choice, selected) => {
+  visitProficiencyChoices(resolved, (choice, stored) => {
+    const selected = capAtCount(choice, stored);
     const vals = Array.isArray(selected) ? selected : typeof selected === "string" ? [selected] : [];
     if (choice.kind === "select-entity" && choice.entity_type === "weapon") {
       if (choice.id === "weapon-mastery") return;
@@ -487,7 +609,7 @@ function collectChosenProficiencies(resolved) {
       return;
     }
     if (choice.kind !== "select-proficiency") return;
-    const valid = filterToPool(vals, choice.from);
+    const valid = filterToPool(vals, authoredProficiencyPool(choice));
     if (choice.domain === "save") {
       for (const v of valid) if (isAbility(v) && !out.saves.includes(v)) out.saves.push(v);
       return;
@@ -589,7 +711,7 @@ function collectChosenAbilityPoints(resolved) {
   return out;
 }
 function buildDecisionLedger(resolved, ctx) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const eff = computeEffectiveProficiencies(resolved);
   const chosen = collectChosenProficiencies(resolved);
   const { features, activeBuffs } = assembleEffectFeatures(resolved);
@@ -614,7 +736,7 @@ function buildDecisionLedger(resolved, ctx) {
   };
   const classes = [];
   resolved.classes.forEach((c, classIndex) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n, _o, _p;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2, _k2, _l2, _m2, _n2, _o;
     if (!c.entity) return;
     const entity = c.entity;
     const ownerBare = bareEntitySlug(entity.slug);
@@ -629,6 +751,19 @@ function buildDecisionLedger(resolved, ctx) {
       var _a3;
       return (_a3 = c.choices[lvl]) == null ? void 0 : _a3[id];
     };
+    let legacyAsiFeat;
+    const legacyAsiReader = (choice, lvl) => {
+      const alloc = convertibleLegacyAsi(c.choices[lvl]);
+      if (!alloc) return null;
+      const flat = flattenAsiOrFeat(choice);
+      if (flat.kind !== "select-entity" || flat.entity_type !== "feat" || flat.from || flat.where) return null;
+      if (legacyAsiFeat === void 0) legacyAsiFeat = resolveLegacyAsiFeat(ctx.registry, entity);
+      const asi = legacyAsiFeat;
+      if (!asi) return null;
+      const raw = readAt(lvl);
+      const childKey = `feat:${asi.childId}`;
+      return (id) => id === "feat" ? asi.slug : id === childKey ? alloc : raw(id);
+    };
     const featProgressions = [...(_a2 = entity.feat_progression) != null ? _a2 : [], ...(_c2 = (_b2 = c.subclass) == null ? void 0 : _b2.feat_progression) != null ? _c2 : []];
     const suppressedFeatureTypes = /* @__PURE__ */ new Set();
     for (const decl of [...(_d2 = entity.selection_pools) != null ? _d2 : [], ...(_f2 = (_e2 = c.subclass) == null ? void 0 : _e2.selection_pools) != null ? _f2 : []]) {
@@ -661,7 +796,7 @@ function buildDecisionLedger(resolved, ctx) {
       ));
     }
     if (classIndex === 0) {
-      for (const ch of (_i2 = entity.choices) != null ? _i2 : []) {
+      for (const ch of [...(_i2 = entity.choices) != null ? _i2 : [], ...classToolPicks(entity).decisions]) {
         push(1, buildItem(
           ch,
           { kind: "class", slug: entity.slug, level: 1 },
@@ -675,36 +810,7 @@ function buildDecisionLedger(resolved, ctx) {
       }
     }
     if (classIndex === 0) {
-      ((_j2 = entity.starting_equipment) != null ? _j2 : []).forEach((eq, i) => {
-        var _a3;
-        if (eq.kind !== "choice") return;
-        const options = (_a3 = eq.options) != null ? _a3 : [];
-        let degraded = false;
-        const ch = {
-          kind: "select-inline",
-          id: `equipment-${i}`,
-          label: "Starting Equipment",
-          count: 1,
-          options: options.map((opt, j) => {
-            var _a4;
-            const label = typeof opt === "string" ? opt : (_a4 = opt == null ? void 0 : opt.label) != null ? _a4 : "";
-            const grants = opt && typeof opt === "object" && Array.isArray(opt.grants) ? opt.grants : [];
-            if (typeof opt === "string" || !(opt && typeof opt === "object" && Array.isArray(opt.grants))) {
-              degraded = true;
-            }
-            return {
-              value: `option-${j}`,
-              label,
-              choices: grants.flatMap((g, k) => g && typeof g === "object" && "category" in g && g.category ? [categoryToEntitySelect(g.category, `equipment-${i}-opt-${j}-cat-${k}`)] : [])
-            };
-          })
-        };
-        if (degraded && !warnedDegradedEquipment.has(entity.slug)) {
-          warnedDegradedEquipment.add(entity.slug);
-          console.warn(
-            `[archivist] Starting equipment for "${entity.slug}" is in an outdated/unstructured format; its nested picks and seeding are skipped. Re-sync the compendium (delete _compendium.md and reload) to fix.`
-          );
-        }
+      for (const ch of equipmentDecisions(entity.starting_equipment, entity.slug)) {
         push(1, buildItem(
           ch,
           { kind: "class", slug: entity.slug, level: 1 },
@@ -715,7 +821,7 @@ function buildDecisionLedger(resolved, ctx) {
           ownerBare,
           effective
         ));
-      });
+      }
     }
     let sawAuthoredSubclass = false;
     const staged = [];
@@ -735,7 +841,7 @@ function buildDecisionLedger(resolved, ctx) {
         staged.push({ level: atLvl, item, rank: authoredRank(src.kind, atLvl, rf.feature), seq: staged.length });
       };
       const emitChoices = (list, atLvl, name, description) => {
-        var _a3;
+        var _a3, _b3;
         for (const ch of list) {
           if (ch.kind === "select-entity" && ch.entity_type === "subclass") {
             sawAuthoredSubclass = true;
@@ -753,7 +859,7 @@ function buildDecisionLedger(resolved, ctx) {
             src,
             atLvl,
             name,
-            readAt(atLvl),
+            (_b3 = legacyAsiReader(emitted, atLvl)) != null ? _b3 : readAt(atLvl),
             ctx,
             ownerBare,
             effective,
@@ -800,22 +906,22 @@ function buildDecisionLedger(resolved, ctx) {
         }
         emitChoices(list, copy.level, copy.name, copy.description);
       };
-      for (const copy of (_k2 = rf.foldedFrom) != null ? _k2 : []) emitCopy({ ...copy, prose: copy.description });
+      for (const copy of (_j2 = rf.foldedFrom) != null ? _j2 : []) emitCopy({ ...copy, prose: copy.description });
       emitCopy({
         level: lvl,
         name: rf.feature.name,
         description: rf.feature.description,
         // The card prose: the description, else the entries joined. `||`, not `??`, so an EMPTY description
         // falls through to the entries the way this branch's own guard always did.
-        prose: rf.feature.description || (((_l2 = rf.feature.entries) == null ? void 0 : _l2.length) ? rf.feature.entries.join("\n\n") : void 0),
+        prose: rf.feature.description || (((_k2 = rf.feature.entries) == null ? void 0 : _k2.length) ? rf.feature.entries.join("\n\n") : void 0),
         choices: rf.feature.choices
       });
     }
     staged.sort((a, b) => a.rank - b.rank || a.seq - b.seq);
     for (const s of staged) push(s.level, s.item);
-    const subclassLevel = (_m2 = entity.subclass_level) != null ? _m2 : null;
+    const subclassLevel = (_l2 = entity.subclass_level) != null ? _l2 : null;
     if (subclassLevel != null && subclassLevel <= c.level && !sawAuthoredSubclass) {
-      const featureName = (_n = entity.subclass_feature_name) != null ? _n : "Subclass";
+      const featureName = (_m2 = entity.subclass_feature_name) != null ? _m2 : "Subclass";
       const synthChoice = {
         kind: "select-entity",
         id: "subclass",
@@ -851,13 +957,46 @@ function buildDecisionLedger(resolved, ctx) {
         { kind: "class", slug: entity.slug, level: pool.anchorLevel },
         pool.anchorLevel,
         pool.label,
-        () => pool.selected.map((e) => e.slug),
+        () => pool.selected.map((e) => e.key),
         ctx,
         ownerBare,
         effective
       );
       item.pool = { id: pool.id, anchorLevel: pool.anchorLevel };
+      const repeatables = pool.available.filter((e) => e.entity.repeatable === true);
+      if (repeatables.length > 0) {
+        item.repeatable = repeatables.map((e) => {
+          var _a3, _b3;
+          return {
+            noteSlug: e.slug,
+            itemChoice: (_a3 = e.entity.item_choice) != null ? _a3 : "learn",
+            rows: resolveOptionRows(e.entity, ctx.registry, { edition: resolved.definition.edition, isEntityVisible: (_b3 = ctx.isEntityVisible) == null ? void 0 : _b3.bind(ctx) })
+          };
+        });
+      }
       for (const o of item.options) if (strandedSlugs.has(o.value)) o.stranded = true;
+      const memberChildren = [];
+      for (const entry of pool.selected) {
+        for (const ch of memberChoices(entry.entity)) {
+          const child = buildItem(
+            ch,
+            { kind: "class", slug: entity.slug, level: pool.anchorLevel },
+            pool.anchorLevel,
+            entry.entity.name,
+            readAt(pool.anchorLevel),
+            ctx,
+            ownerBare,
+            effective,
+            { keyPrefix: `${pool.id}:${entry.key}:` }
+          );
+          child.parentLabel = entry.entity.name;
+          memberChildren.push(child);
+        }
+      }
+      if (memberChildren.length) {
+        item.children = memberChildren;
+        if (item.status === "resolved" && memberChildren.some((c2) => c2.status !== "resolved")) item.status = "partial";
+      }
       push(pool.anchorLevel, item);
     }
     for (const entry of featProgressions) {
@@ -865,7 +1004,7 @@ function buildDecisionLedger(resolved, ctx) {
       if (!category) {
         warnOnce(
           `feat-progression-category:${entity.slug}:${entry.name}`,
-          `Archivist: feat_progression "${entry.name}" on "${entity.slug}" carries no category this engine maps (${((_o = entry.category) != null ? _o : []).join(", ")}); no decision is offered`
+          `Archivist: feat_progression "${entry.name}" on "${entity.slug}" carries no category this engine maps (${((_n2 = entry.category) != null ? _n2 : []).join(", ")}); no decision is offered`
         );
         continue;
       }
@@ -875,7 +1014,7 @@ function buildDecisionLedger(resolved, ctx) {
         const lvl = Number.parseInt(key, 10);
         if (!Number.isInteger(lvl) || String(lvl) !== key) continue;
         if (lvl > c.level) continue;
-        if (((_p = byLevel.get(lvl)) != null ? _p : []).some((i) => i.key === "feat")) {
+        if (((_o = byLevel.get(lvl)) != null ? _o : []).some((i) => i.key === "feat")) {
           warnOnce(
             `feat-progression-collision:${entity.slug}:${lvl}`,
             `Archivist: "${entry.name}" on "${entity.slug}" would add a second feat pick at level ${lvl}, where one already exists; skipping`
@@ -947,10 +1086,10 @@ function buildDecisionLedger(resolved, ctx) {
   if (resolved.background) {
     const bare = bareEntitySlug(resolved.background.slug);
     pushOrigin(
-      resolved.background.choices,
+      [...(_l = resolved.background.choices) != null ? _l : [], ...backgroundToolPicks(resolved.background).decisions],
       "background",
       { kind: "background", slug: resolved.background.slug },
-      (_l = resolved.background.name) != null ? _l : "Background",
+      (_m = resolved.background.name) != null ? _m : "Background",
       bare,
       resolved.background.description
     );
@@ -973,7 +1112,7 @@ function buildDecisionLedger(resolved, ctx) {
       if (originFeat) {
         const featSource = { kind: "feat", slug: originFeat.feat.slug };
         const featBare = bareEntitySlug(originFeat.feat.slug);
-        for (const ch of (_m = originFeat.feat.choices) != null ? _m : []) {
+        for (const ch of (_n = originFeat.feat.choices) != null ? _n : []) {
           origin.push(buildItem(
             ch,
             featSource,
@@ -988,6 +1127,18 @@ function buildDecisionLedger(resolved, ctx) {
         }
       }
     }
+    for (const ch of equipmentDecisions(resolved.background.equipment, resolved.background.slug)) {
+      origin.push(buildItem(
+        ch,
+        { kind: "background", slug: resolved.background.slug },
+        0,
+        "Starting Equipment",
+        originRead("background"),
+        ctx,
+        bare,
+        effective
+      ));
+    }
   }
   return { classes, origin };
 }
@@ -1014,7 +1165,10 @@ function resolveOriginFeat(entities, originFeatRef, ownerSlug) {
   const sameCompendiumTail = (s) => prefix ? feats.find((f) => f.slug.startsWith(`${prefix}_feat_`) && f.slug.endsWith(`_${s}`)) : void 0;
   const anyTail = (s) => feats.find((f) => f.slug.endsWith(`_${s}`));
   const tiers = [
-    () => feats.find((f) => f.slug === slug),
+    () => {
+      var _a2;
+      return (_a2 = feats.find((f) => f.slug === inner)) != null ? _a2 : feats.find((f) => f.slug === slug);
+    },
     // 1 exact slug
     () => byPath(inner),
     // 2 PATH
@@ -1050,7 +1204,7 @@ var PCResolver = class {
     return this.entities;
   }
   resolve(character) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     const warnings = [];
     const lookup = (rawRef, type) => {
       const slug = stripSlug(rawRef);
@@ -1071,14 +1225,19 @@ var PCResolver = class {
       subclass: lookup(c.subclass, "subclass"),
       choices: c.choices
     }));
+    const memberSites = poolMemberSites(classes, this.entities);
+    const classSlugOf = (i) => {
+      var _a2, _b2, _c2, _d2, _e2;
+      return (_e2 = (_b2 = (_a2 = classes[i]) == null ? void 0 : _a2.entity) == null ? void 0 : _b2.slug) != null ? _e2 : stripSlug((_d2 = (_c2 = character.class[i]) == null ? void 0 : _c2.name) != null ? _d2 : null);
+    };
+    const featSites = featPickSites(character.class, memberSites, classSlugOf);
     const feats = [];
     const featVia = /* @__PURE__ */ new Map();
-    for (const pick of collectFeatPicks(character)) {
-      const f = lookup(`[[${pick.slug}]]`, "feat");
+    for (const site of featSites) {
+      const f = lookup(`[[${site.slug}]]`, "feat");
       if (!f) continue;
-      feats.push(f);
-      const classSlug = (_e = (_b = (_a = classes[pick.classIndex]) == null ? void 0 : _a.entity) == null ? void 0 : _b.slug) != null ? _e : stripSlug((_d = (_c = character.class[pick.classIndex]) == null ? void 0 : _c.name) != null ? _d : null);
-      if (classSlug && pick.level !== null && !featVia.has(f.slug)) featVia.set(f.slug, { kind: "class", slug: classSlug, level: pick.level });
+      if (!feats.some((x) => x.slug === f.slug)) feats.push(f);
+      if (site.via && !featVia.has(f.slug)) featVia.set(f.slug, site.via);
     }
     const originFeat = (background == null ? void 0 : background.origin_feat) ? resolveOriginFeat(this.entities, background.origin_feat, background.slug) : null;
     const originFeatSlug = originFeat == null ? void 0 : originFeat.feat.slug;
@@ -1090,7 +1249,7 @@ var PCResolver = class {
     }
     const totalLevel = classes.reduce((sum, c) => sum + c.level, 0);
     const features = collectResolvedFeatures(race, classes, background, feats, featVia);
-    const extraFeatures = collectChosenGrantedFeatures(character, classes, this.entities, race, background);
+    const extraFeatures = collectChosenGrantedFeatures(character, classes, this.entities, race, background, memberSites);
     features.push(...extraFeatures);
     features.push(...collectAdditionalFeatures(character, this.entities, warnings));
     const casters = [];
@@ -1100,7 +1259,7 @@ var PCResolver = class {
       if (profile && classSlug != null) casters.push({ classSlug, spellList: profile.spellList });
     });
     const spells = [];
-    for (const raw of (_f = character.spells.known) != null ? _f : []) {
+    for (const raw of (_a = character.spells.known) != null ? _a : []) {
       const n = normalizeKnownSpell(raw);
       const reg = this.entities.getByTypeAndSlug("spell", n.slug);
       if (!reg) {
@@ -1108,34 +1267,45 @@ var PCResolver = class {
         continue;
       }
       const entity = mirrorSpellShapes(reg.data);
-      const isCantrip = ((_g = entity.level) != null ? _g : 0) === 0;
-      const classSlug = (_h = n.classSlug) != null ? _h : attributeUnclassedSpell(entity.classes, casters, this.entities);
-      const prep = isCantrip || n.alwaysPrepared ? true : (_i = n.preparedFlag) != null ? _i : false;
+      const isCantrip = ((_b = entity.level) != null ? _b : 0) === 0;
+      const classSlug = (_c = n.classSlug) != null ? _c : attributeUnclassedSpell(entity.classes, casters, this.entities);
+      const prep = isCantrip || n.alwaysPrepared ? true : (_d = n.preparedFlag) != null ? _d : false;
       spells.push({ entity, slug: n.slug, classSlug, source: n.source, prepared: prep, alwaysPrepared: n.alwaysPrepared, persisted: true });
     }
-    const oc = (_j = character.origin_choices) != null ? _j : {};
+    const oc = (_e = character.origin_choices) != null ? _e : {};
     if (originFeat) {
       const read = (childId) => oc[`background:feat:${childId}`];
       spells.push(...collectFeatGrantedSpells(originFeat.feat, read, this.entities, warnings));
     }
-    for (const entry of character.class) {
-      for (const atLevel of Object.values((_k = entry.choices) != null ? _k : {})) {
-        const featRef = atLevel.feat;
-        if (typeof featRef !== "string") continue;
-        const slug = stripSlug(featRef);
-        if (!slug) continue;
-        const reg = this.entities.getByTypeAndSlug("feat", slug);
-        if (!reg) continue;
-        const feat = reg.data;
-        const read = (childId) => atLevel[`feat:${childId}`];
-        spells.push(...collectFeatGrantedSpells(feat, read, this.entities, warnings));
+    for (const site of featSites) {
+      const reg = this.entities.getByTypeAndSlug("feat", site.slug);
+      if (!reg) continue;
+      const feat = reg.data;
+      spells.push(...collectFeatGrantedSpells(feat, site.read, this.entities, warnings));
+    }
+    for (const site of memberSites) {
+      const classSlug = stripSlug((_g = (_f = character.class[site.classIndex]) == null ? void 0 : _f.name) != null ? _g : null);
+      for (const ch of site.choices) {
+        if (ch.kind !== "select-entity" || ch.entity_type !== "spell" || isTargetChoice(ch)) continue;
+        const v = site.read(ch.id);
+        for (const ref of Array.isArray(v) ? v : typeof v === "string" ? [v] : []) {
+          const slug = typeof ref === "string" ? stripSlug(ref) : null;
+          if (!slug) continue;
+          const reg = this.entities.getByTypeAndSlug("spell", slug);
+          if (!reg) {
+            warnings.push(`Spell [[${slug}]] not found in compendium.`);
+            continue;
+          }
+          const entity = mirrorSpellShapes(reg.data);
+          spells.push({ entity, slug, classSlug, source: "class", prepared: true, alwaysPrepared: true });
+        }
       }
     }
-    const ownSpellcastingAbility = (_l = classes.map((c) => {
+    const ownSpellcastingAbility = (_h = classes.map((c) => {
       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 ? _l : null;
+    }).find((a) => a != null)) != null ? _h : null;
     spells.push(...collectItemGrantedSpells(character, ownSpellcastingAbility, this.entities, warnings));
     spells.push(...collectAdditionalSpells({
       race,
@@ -1186,6 +1356,9 @@ var PCResolver = class {
     };
     resolvedCharacter.pools = resolveAllPools(resolvedCharacter, this.entities, featureResources);
     resolvedCharacter.resources = resolveResourceIndex(resolvedCharacter);
+    resolvedCharacter.features = bindFeatureConsumers(resolvedCharacter.features, resolvedCharacter.resources, classes);
+    const infusions = buildInfusionContext(character, resolvedCharacter, this.entities);
+    if (infusions) resolvedCharacter.infusions = infusions;
     return { character: resolvedCharacter, warnings };
   }
 };
@@ -1204,16 +1377,9 @@ function collectChosenWeaponMasteries(character) {
 }
 function collectFeatPicks(character) {
   const picks = /* @__PURE__ */ new Map();
-  character.class.forEach((c, classIndex) => {
-    for (const [lvl, choiceBlock] of Object.entries(c.choices)) {
-      const feat = choiceBlock == null ? void 0 : choiceBlock.feat;
-      if (typeof feat === "string") {
-        const s = stripSlug(feat);
-        const level = /^\d+$/.test(lvl) ? Number(lvl) : null;
-        if (s && !picks.has(s)) picks.set(s, { slug: s, classIndex, level });
-      }
-    }
-  });
+  for (const site of featPickSites(character.class, [], () => null)) {
+    if (!picks.has(site.slug)) picks.set(site.slug, { slug: site.slug, classIndex: site.classIndex, level: site.level });
+  }
   return [...picks.values()];
 }
 function collectFeatGrantedSpells(feat, read, entities, warnings) {
@@ -1290,11 +1456,21 @@ function collectSpellPickSlugs(choices, read, out) {
     }
   }
 }
-function collectChosenGrantedFeatures(character, classes, registry, race = null, background = null) {
-  var _a, _b;
+function collectChosenGrantedFeatures(character, classes, registry, race = null, background = null, memberSites = []) {
+  var _a, _b, _c, _d;
   const out = [];
+  for (const site of memberSites) {
+    const classSlug = (_b = (_a = classes[site.classIndex]) == null ? void 0 : _a.entity) == null ? void 0 : _b.slug;
+    if (!classSlug) continue;
+    const at = {};
+    const grants = site.choices.filter((ch) => !isTargetChoice(ch));
+    for (const ch of grants) at[ch.id] = site.read(ch.id);
+    walkChoiceGrants(grants, at, (granted, suppress) => {
+      out.push({ feature: granted, source: { kind: "class", slug: classSlug, level: site.level }, ...suppress ? { renderSuppressed: true } : {} });
+    }, registry);
+  }
   classes.forEach((c, i) => {
-    var _a2, _b2, _c, _d;
+    var _a2, _b2, _c2, _d2;
     if (!c.entity) return;
     const entity = c.entity;
     const entry = character.class[i];
@@ -1303,7 +1479,7 @@ function collectChosenGrantedFeatures(character, classes, registry, race = null,
       const lvl = Number(lvlStr);
       if (!Number.isFinite(lvl) || lvl > entry.level) continue;
       const features = (_b2 = ((_a2 = entity.features_by_level) != null ? _a2 : {})[lvl]) != null ? _b2 : [];
-      const subFeatures = c.subclass ? (_d = ((_c = c.subclass.features_by_level) != null ? _c : {})[lvl]) != null ? _d : [] : [];
+      const subFeatures = c.subclass ? (_d2 = ((_c2 = c.subclass.features_by_level) != null ? _c2 : {})[lvl]) != null ? _d2 : [] : [];
       for (const feature of [...features, ...subFeatures]) {
         walkChoiceGrants(feature.choices, atLevel, (granted, suppress) => {
           out.push({
@@ -1315,7 +1491,7 @@ function collectChosenGrantedFeatures(character, classes, registry, race = null,
       }
     }
   });
-  const oc = (_a = character.origin_choices) != null ? _a : {};
+  const oc = (_c = character.origin_choices) != null ? _c : {};
   const originAt = (ns) => {
     const at = {};
     for (const [key, val] of Object.entries(oc)) {
@@ -1333,7 +1509,7 @@ function collectChosenGrantedFeatures(character, classes, registry, race = null,
       });
     };
     walkChoiceGrants(race.choices, atRace, emitRace, registry);
-    for (const trait of (_b = race.traits) != null ? _b : []) {
+    for (const trait of (_d = race.traits) != null ? _d : []) {
       walkChoiceGrants(trait.choices, atRace, emitRace, registry);
     }
   }
@@ -1622,6 +1798,7 @@ export {
   collectResolvedFeatures,
   collectProficiencyGrants,
   __matchesFilterForTest,
+  __categoryToEntitySelectForTest,
   collectChosenProficiencies,
   computeEffectiveProficiencies,
   collectChosenAbilityPoints,