@bitcobblers/wod-wiki-tools 0.37.2137 → 0.37.2140

package/dist/bin/wod.cjs

@@ -267,6 +267,11 @@ async function getEffortBySlug(db, slug) {
   const efforts = await allRows(sql, db, "efforts");
   return efforts.find((e) => e.slug === slug);
 }
+async function getEquipmentBySlug(db, slug) {
+  const sql = await loadSql();
+  const equipment = await allRows(sql, db, "equipment");
+  return equipment.find((e) => e.slug === slug);
+}
 async function listTagsByType(db, type) {
   const sql = await loadSql();
   const tags = await allRows(sql, db, "tags");
@@ -297,6 +302,7 @@ function seedNoteSourceId(path, content, chunkId) {
   if (chunkId === CANVAS_CHUNK_ID2) return `guides:${canvasRouteSlug(content) ?? under}`;
   if (chunkId === DASHBOARDS_CHUNK_ID) return "dashboards";
   if (chunkId === EFFORTS_CHUNK_ID) return "efforts";
+  if (chunkId === EQUIPMENT_CHUNK_ID) return "equipment";
   if (chunkId === TEMPLATE_CHUNK_ID) return "playground";
   if (chunkId.startsWith("collection.")) {
     const catalog = catalogForChunkId(chunkId);
@@ -305,40 +311,19 @@ function seedNoteSourceId(path, content, chunkId) {
   if (chunkId.startsWith("feed.")) return `feed:feeds/${under}`;
   return void 0;
 }
-var SEED_SCHEMA2, SEED_REGISTERED_WIDGETS, EFFORTS_CHUNK_ID, CANVAS_CHUNK_ID2, DASHBOARDS_CHUNK_ID, TEMPLATE_CHUNK_ID;
+var SEED_SCHEMA2, SEED_REGISTERED_WIDGETS, EFFORTS_CHUNK_ID, EQUIPMENT_CHUNK_ID, CANVAS_CHUNK_ID2, DASHBOARDS_CHUNK_ID, TEMPLATE_CHUNK_ID;
 var init_contract = __esm({
   "src/seedbuild/contract.ts"() {
-    SEED_SCHEMA2 = 8;
+    SEED_SCHEMA2 = 9;
     SEED_REGISTERED_WIDGETS = wodWikiCore.KNOWN_SECTION_WIDGETS;
     EFFORTS_CHUNK_ID = "efforts";
+    EQUIPMENT_CHUNK_ID = "equipment";
     CANVAS_CHUNK_ID2 = "canvas";
     DASHBOARDS_CHUNK_ID = "dashboards";
     TEMPLATE_CHUNK_ID = "template";
   }
 });
 
-// src/seedbuild/effort-slugs.ts
-function extractEffortSlugs2(statements) {
-  const slugs = /* @__PURE__ */ new Set();
-  for (const statement of statements) {
-    if (statement.exerciseId) {
-      slugs.add(statement.exerciseId);
-    } else {
-      const effortMetric = statement.metrics?.getMetric?.("effort");
-      const effort = effortMetric && typeof effortMetric.value === "string" ? effortMetric.value : void 0;
-      if (effort) {
-        const slug = effort.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-        if (slug) slugs.add(slug);
-      }
-    }
-  }
-  return Array.from(slugs);
-}
-var init_effort_slugs = __esm({
-  "src/seedbuild/effort-slugs.ts"() {
-  }
-});
-
 // src/seedbuild/filename.ts
 function fileToDisplayName(filename) {
   const base = filename.replace(/\.md$/, "");
@@ -384,149 +369,6 @@ var init_filename = __esm({
     };
   }
 });
-
-// src/seedbuild/frontmatter.ts
-function unquote(value) {
-  return value.replace(
-    /^(['"])(.*)\1$/,
-    (_match, quote, inner) => quote === '"' ? inner.replace(/\\(["\\])/g, "$1") : inner
-  );
-}
-function parseFrontmatter(raw) {
-  const match = raw.match(FRONTMATTER_RE);
-  if (!match) return { meta: {}, body: raw };
-  return { meta: parseMetaLines(match[1].split(/\r?\n/)), body: raw.slice(match[0].length) };
-}
-function parseMetaLines(lines) {
-  const meta = {};
-  for (let i = 0; i < lines.length; i++) {
-    const keyMatch = lines[i].match(/^([A-Za-z][\w.-]*)\s*:(.*)$/);
-    if (!keyMatch) continue;
-    const key = keyMatch[1];
-    const rawVal = keyMatch[2].trim();
-    if (rawVal === "") {
-      const items = [];
-      while (i + 1 < lines.length) {
-        const itemMatch = lines[i + 1].match(/^\s+-\s+(.+)$/);
-        if (!itemMatch) break;
-        items.push(itemMatch[1].trim());
-        i++;
-      }
-      meta[key] = items.length > 0 ? items : "";
-    } else {
-      const wasQuoted = /^(['"])(.*)\1$/.test(rawVal);
-      const value = unquote(rawVal);
-      const num = Number(value);
-      meta[key] = !wasQuoted && value !== "" && !isNaN(num) ? num : value;
-    }
-  }
-  return meta;
-}
-function getScalar(meta, key) {
-  const value = meta[key];
-  return typeof value === "string" || typeof value === "number" ? value : void 0;
-}
-function getList(meta, key) {
-  const value = meta[key];
-  return Array.isArray(value) ? value : [];
-}
-var FRONTMATTER_RE;
-var init_frontmatter = __esm({
-  "src/seedbuild/frontmatter.ts"() {
-    FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
-  }
-});
-function parseDiscipline(val) {
-  if (!val) return void 0;
-  const normalized = unquoteYaml(val.trim()).toLowerCase();
-  if (wodWikiLang.isEffortDiscipline(normalized)) return normalized;
-  console.warn(`[effort-file] unknown discipline '${val}' \u2014 treating as unset`);
-  return void 0;
-}
-function unquoteYaml(val) {
-  if (val.startsWith('"') && val.endsWith('"')) {
-    return val.slice(1, -1).replace(/\\(["\\])/g, "$1");
-  }
-  if (val.startsWith("'") && val.endsWith("'")) {
-    return val.slice(1, -1).replace(/\\'/g, "'");
-  }
-  return val;
-}
-function coerceNestedScalar(raw) {
-  if (raw === "true") return true;
-  if (raw === "false") return false;
-  if (raw !== "" && !Number.isNaN(Number(raw))) return Number(raw);
-  return raw;
-}
-function readNestedSection(lines, key) {
-  const start = lines.findIndex((l) => new RegExp(`^${key}:\\s*$`).test(l));
-  if (start === -1) return void 0;
-  const result = {};
-  let subKey = null;
-  for (let i = start + 1; i < lines.length; i++) {
-    const line = lines[i];
-    if (/^\S/.test(line)) break;
-    const trimmed = line.trim();
-    if (!trimmed || trimmed.startsWith("#")) continue;
-    const indent = line.length - line.trimStart().length;
-    const m = trimmed.match(/^([\w.-]+):\s*(.*)$/);
-    if (!m) continue;
-    const [, k, rawVal] = m;
-    if (indent === 2) {
-      if (rawVal === "") {
-        subKey = k;
-        result[k] = {};
-      } else {
-        subKey = null;
-        result[k] = coerceNestedScalar(rawVal);
-      }
-    } else if (indent >= 4 && subKey !== null) {
-      result[subKey][k] = coerceNestedScalar(rawVal);
-    }
-  }
-  return Object.keys(result).length > 0 ? result : void 0;
-}
-function parseEffortFile(raw) {
-  const blockMatch = raw.match(/^---\r?\n([\s\S]*?)\r?\n---/);
-  if (!blockMatch) return null;
-  const { meta, body } = parseFrontmatter(raw);
-  const innerLines = blockMatch[1].split(/\r?\n/);
-  const id = getScalar(meta, "id");
-  const slug = getScalar(meta, "slug");
-  const label = getScalar(meta, "label");
-  const aliases = getList(meta, "aliases");
-  const baseAttrs = readNestedSection(innerLines, "baseAttributes");
-  const hints = readNestedSection(innerLines, "hints");
-  const derivation = readNestedSection(innerLines, "derivation");
-  const metRaw = baseAttrs?.met;
-  const met = typeof metRaw === "number" ? metRaw : Number(metRaw);
-  if (!id || !slug || !label || metRaw === void 0 || Number.isNaN(met)) return null;
-  const discipline = parseDiscipline(
-    typeof baseAttrs?.discipline === "string" ? baseAttrs.discipline : void 0
-  );
-  const intensityTier = baseAttrs?.intensityTier;
-  const trimmedBody = body.trim();
-  return {
-    id: String(id),
-    slug: String(slug),
-    label: String(label),
-    aliases,
-    baseAttributes: {
-      met,
-      ...discipline ? { discipline } : {},
-      ...intensityTier ? { intensityTier } : {}
-    },
-    registrySource: "bundled",
-    ...trimmedBody ? { body: trimmedBody } : {},
-    ...hints ? { hints } : {},
-    ...derivation ? { derivation } : {}
-  };
-}
-var init_effort_file = __esm({
-  "src/seedbuild/effort-file.ts"() {
-    init_frontmatter();
-  }
-});
 function resolveGitVersion(repoRoot) {
   try {
     const run = (args) => child_process.execSync(`git ${args}`, { cwd: repoRoot, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] }).trim();
@@ -614,6 +456,54 @@ var init_report = __esm({
   "src/seedbuild/report.ts"() {
   }
 });
+
+// src/seedbuild/frontmatter.ts
+function unquote(value) {
+  return value.replace(
+    /^(['"])(.*)\1$/,
+    (_match, quote, inner) => quote === '"' ? inner.replace(/\\(["\\])/g, "$1") : inner
+  );
+}
+function parseFrontmatter(raw) {
+  const match = raw.match(FRONTMATTER_RE);
+  if (!match) return { meta: {}, body: raw };
+  return { meta: parseMetaLines(match[1].split(/\r?\n/)), body: raw.slice(match[0].length) };
+}
+function parseMetaLines(lines) {
+  const meta = {};
+  for (let i = 0; i < lines.length; i++) {
+    const keyMatch = lines[i].match(/^([A-Za-z][\w.-]*)\s*:(.*)$/);
+    if (!keyMatch) continue;
+    const key = keyMatch[1];
+    const rawVal = keyMatch[2].trim();
+    if (rawVal === "") {
+      const items = [];
+      while (i + 1 < lines.length) {
+        const itemMatch = lines[i + 1].match(/^\s+-\s+(.+)$/);
+        if (!itemMatch) break;
+        items.push(itemMatch[1].trim());
+        i++;
+      }
+      meta[key] = items.length > 0 ? items : "";
+    } else {
+      const wasQuoted = /^(['"])(.*)\1$/.test(rawVal);
+      const value = unquote(rawVal);
+      const num = Number(value);
+      meta[key] = !wasQuoted && value !== "" && !isNaN(num) ? num : value;
+    }
+  }
+  return meta;
+}
+function getScalar(meta, key) {
+  const value = meta[key];
+  return typeof value === "string" || typeof value === "number" ? value : void 0;
+}
+var FRONTMATTER_RE;
+var init_frontmatter = __esm({
+  "src/seedbuild/frontmatter.ts"() {
+    FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
+  }
+});
 function object(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -644,6 +534,7 @@ var init_validation = __esm({
 var compiler_exports = {};
 __export(compiler_exports, {
   buildBlockEffortRows: () => buildBlockEffortRows,
+  buildBlockEquipmentRows: () => buildBlockEquipmentRows,
   buildBlockIndexRows: () => buildBlockIndexRows,
   chunkIdFor: () => chunkIdFor,
   collectCorpusMarkdown: () => collectCorpusMarkdown,
@@ -652,7 +543,7 @@ __export(compiler_exports, {
   feedDateToCreatedAt: () => feedDateToCreatedAt,
   frontmatterDateToCreatedAt: () => frontmatterDateToCreatedAt,
   generateSeed: () => generateSeed,
-  loadExistingEffortMap: () => loadExistingEffortMap,
+  loadCorpusReferenceCatalog: () => loadCorpusReferenceCatalog,
   partitionIntoChunks: () => partitionIntoChunks,
   scaffoldDiscoveredEfforts: () => scaffoldDiscoveredEfforts,
   validateDashboardNote: () => validateDashboardNote,
@@ -678,6 +569,7 @@ function chunkIdFor(relPath) {
     case "canvas":
     case "dashboards":
     case "efforts":
+    case "equipment":
       return corpus;
     case "collections":
       return parts.length === 3 ? `collection._root` : `collection.${slug}`;
@@ -696,7 +588,7 @@ function partitionIntoChunks(paths) {
     const id = chunkIdFor(p);
     if (id === null) {
       throw new Error(
-        `[generate-seed] Parity failure: '${p}' is not part of any known corpus (canvas | dashboards | efforts | collections | feeds). Extend chunkIdFor() if this is a new corpus.`
+        `[generate-seed] Parity failure: '${p}' is not part of any known corpus (canvas | dashboards | efforts | equipment | collections | feeds). Extend chunkIdFor() if this is a new corpus.`
       );
     }
     const list = byId.get(id);
@@ -778,7 +670,7 @@ function compileSeedRow(path, content, metadata = {}) {
     const section = sections.find((section2) => section2.from === block.from && section2.to === block.to);
     return { id: `${noteId}:${block.id}`, noteId, blockId: block.id, blockVersion: 1, sourceRevision: 1, from: block.from, to: block.to, position, dataType: block.kind, ...block.kind === "wod" ? { blockContentId: wodWikiCore.blockContentId(section?.scriptBlock?.content ?? content.slice(block.from, block.to)) } : {}, rawContent: content.slice(block.from, block.to), noteTitle: metadata.noteTitle ?? fileToDisplayName(path.split("/").at(-1) ?? path), createdAt: metadata.createdAt ?? 0, isStatic: true, sourceId: metadata.sourceId, sourcePath: path, routeId: metadata.routeId };
   });
-  return { path, content, blocks, blockIndex, blockEfforts: [] };
+  return { path, content, blocks, blockIndex, blockEfforts: [], blockEquipment: [] };
 }
 function buildBlockIndexRows(markdownDir, corpusRoot) {
   const rows = [];
@@ -828,41 +720,37 @@ function formatDiscoveredLabel(raw) {
   const clean = raw.replace(/[-_]+/g, " ").trim();
   return clean.split(/\s+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1).toLowerCase()).join(" ");
 }
-function loadExistingEffortMap(markdownDir) {
-  const slugs = /* @__PURE__ */ new Set();
-  const aliasToCanonical = /* @__PURE__ */ new Map();
+function loadCorpusReferenceCatalog(markdownDir) {
+  const efforts = [];
+  const equipment = [];
   const effortsDir = path.join(markdownDir, "efforts");
   for (const file of listMarkdownFiles(effortsDir)) {
-    const raw = fs.readFileSync(path.join(effortsDir, file), "utf8");
-    const parsed = parseEffortFile(raw);
-    if (!parsed) continue;
-    slugs.add(parsed.slug);
-    aliasToCanonical.set(parsed.slug, parsed.slug);
-    aliasToCanonical.set(parsed.label.toLowerCase(), parsed.slug);
-    aliasToCanonical.set(parsed.slug.replace(/-/g, " "), parsed.slug);
-    for (const alias of parsed.aliases) {
-      aliasToCanonical.set(alias.toLowerCase(), parsed.slug);
-      aliasToCanonical.set(alias.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, ""), parsed.slug);
-    }
+    const parsed = wodWikiLang.parseEffortFile(fs.readFileSync(path.join(effortsDir, file), "utf8"));
+    if (parsed) efforts.push(parsed);
+  }
+  const equipmentDir = path.join(markdownDir, "equipment");
+  for (const file of listMarkdownFiles(equipmentDir)) {
+    const parsed = wodWikiLang.parseEquipmentFile(fs.readFileSync(path.join(equipmentDir, file), "utf8"));
+    if (parsed) equipment.push(parsed);
   }
-  return { slugs, aliasToCanonical };
+  return { efforts, equipment };
 }
 function discoverUncatalogedEfforts(markdownDir, corpusRoot) {
-  const { slugs, aliasToCanonical } = loadExistingEffortMap(markdownDir);
+  const catalog = loadCorpusReferenceCatalog(markdownDir);
+  const index = wodWikiLang.createReferenceIndex(catalog);
   const blocks = buildBlockIndexRows(markdownDir, corpusRoot);
   const discovered = /* @__PURE__ */ new Map();
   for (const block of blocks) {
     if (block.dataType !== "wod" || !block.rawContent) continue;
     const section = wodWikiCore.parseDocumentSections(block.rawContent, { registeredWidgets: SEED_REGISTERED_WIDGETS }).find((section2) => section2.scriptBlock);
-    const script = wodWikiLang.parseScript(section?.scriptBlock?.content ?? block.rawContent);
+    const script = wodWikiLang.parseScript(section?.scriptBlock?.content ?? block.rawContent, { references: index });
     for (const statement of script.statements) {
       const effortMetric = statement.metrics?.getMetric?.("effort");
       const effortLabel = (effortMetric && typeof effortMetric.value === "string" ? effortMetric.value : void 0) ?? statement.exerciseId;
       if (!effortLabel) continue;
-      const slugified = effortLabel.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
+      const slugified = wodWikiLang.slugifyRefLabel(effortLabel);
       if (!slugified || NON_EFFORT_SLUGS[slugified]) continue;
-      const canonical = aliasToCanonical.get(slugified) ?? aliasToCanonical.get(effortLabel.toLowerCase());
-      if (canonical && slugs.has(canonical)) continue;
+      if (index.resolveEffort(slugified) || index.resolveEffort(effortLabel)) continue;
       const existing = discovered.get(slugified);
       if (existing) {
         existing.rawLabels.add(effortLabel);
@@ -912,17 +800,16 @@ ${aliases.join("\n")}` : "aliases: []",
 }
 function buildBlockEffortRows(markdownDir, corpusRoot, blocks = buildBlockIndexRows(markdownDir, corpusRoot)) {
   const efforts = [];
-  const { aliasToCanonical } = loadExistingEffortMap(markdownDir);
+  const index = wodWikiLang.createReferenceIndex(loadCorpusReferenceCatalog(markdownDir));
   for (const block of blocks) {
     if (block.dataType !== "wod" || !block.rawContent) continue;
     const section = wodWikiCore.parseDocumentSections(block.rawContent, { registeredWidgets: SEED_REGISTERED_WIDGETS }).find((section2) => section2.scriptBlock);
-    const script = wodWikiLang.parseScript(section?.scriptBlock?.content ?? block.rawContent);
-    const effortSlugs = extractEffortSlugs2(script.statements);
+    const script = wodWikiLang.parseScript(section?.scriptBlock?.content ?? block.rawContent, { references: index });
     const linked = /* @__PURE__ */ new Set();
-    for (const rawSlug of effortSlugs) {
-      const norm = rawSlug.toLowerCase().trim();
-      const canonicalSlug = aliasToCanonical.get(norm) ?? aliasToCanonical.get(norm.replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "")) ?? norm.replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "");
-      if (!canonicalSlug || NON_EFFORT_SLUGS[canonicalSlug] || NON_EFFORT_SLUGS[norm]) {
+    for (const rawSlug of wodWikiLang.extractStatementRefs(script.statements).efforts) {
+      const canonical = index.resolveEffort(rawSlug);
+      const canonicalSlug = canonical?.slug;
+      if (!canonicalSlug || NON_EFFORT_SLUGS[canonicalSlug] || NON_EFFORT_SLUGS[rawSlug]) {
         continue;
       }
       if (linked.has(canonicalSlug)) continue;
@@ -941,6 +828,32 @@ function buildBlockEffortRows(markdownDir, corpusRoot, blocks = buildBlockIndexR
   }
   return efforts;
 }
+function buildBlockEquipmentRows(markdownDir, corpusRoot, blocks = buildBlockIndexRows(markdownDir, corpusRoot)) {
+  const links = [];
+  const index = wodWikiLang.createReferenceIndex(loadCorpusReferenceCatalog(markdownDir));
+  for (const block of blocks) {
+    if (block.dataType !== "wod" || !block.rawContent) continue;
+    const section = wodWikiCore.parseDocumentSections(block.rawContent, { registeredWidgets: SEED_REGISTERED_WIDGETS }).find((s) => s.scriptBlock);
+    const script = wodWikiLang.parseScript(section?.scriptBlock?.content ?? block.rawContent, { references: index });
+    const linked = /* @__PURE__ */ new Set();
+    for (const rawSlug of wodWikiLang.extractStatementRefs(script.statements).equipment) {
+      const canonicalSlug = index.resolveEquipment(rawSlug)?.slug;
+      if (!canonicalSlug || linked.has(canonicalSlug)) continue;
+      linked.add(canonicalSlug);
+      links.push({
+        id: `${block.id}:${canonicalSlug}`,
+        noteId: block.noteId,
+        blockId: block.blockId,
+        blockContentId: block.blockContentId,
+        equipmentSlug: canonicalSlug,
+        isStatic: block.isStatic,
+        sourcePath: block.sourcePath,
+        createdAt: block.createdAt
+      });
+    }
+  }
+  return links;
+}
 function sha256Hex(data) {
   return crypto.createHash("sha256").update(data).digest("hex");
 }
@@ -992,9 +905,11 @@ ${shown}${more}`);
   const manifestChunks = [];
   const tBlockEfforts = Date.now();
   const effortRows = buildBlockEffortRows(markdownDir, corpusRoot, blockRows);
+  const equipmentRows = buildBlockEquipmentRows(markdownDir, corpusRoot, blockRows);
   passMs.blockEfforts = Date.now() - tBlockEfforts;
   const blocksByPath = /* @__PURE__ */ new Map();
   const effortsByPath = /* @__PURE__ */ new Map();
+  const equipmentByPath = /* @__PURE__ */ new Map();
   for (const row of blockRows) {
     const rows = blocksByPath.get(row.sourcePath) ?? [];
     rows.push(row);
@@ -1005,6 +920,11 @@ ${shown}${more}`);
     rows.push(row);
     effortsByPath.set(row.sourcePath, rows);
   }
+  for (const row of equipmentRows) {
+    const rows = equipmentByPath.get(row.sourcePath) ?? [];
+    rows.push(row);
+    equipmentByPath.set(row.sourcePath, rows);
+  }
   let totalFiles = 0;
   const tWrite = Date.now();
   for (const { id, files } of groups) {
@@ -1015,6 +935,7 @@ ${shown}${more}`);
       const compiled = compileSeedRow(p, content);
       compiled.blockIndex = blocksByPath.get(p) ?? compiled.blockIndex;
       compiled.blockEfforts = effortsByPath.get(p) ?? [];
+      compiled.blockEquipment = equipmentByPath.get(p) ?? [];
       return compiled;
     });
     const bytes = Buffer.from(JSON.stringify(rows), "utf8");
@@ -1050,9 +971,7 @@ var NON_EFFORT_SLUGS;
 var init_compiler = __esm({
   "src/seedbuild/compiler.ts"() {
     init_contract();
-    init_effort_slugs();
     init_filename();
-    init_effort_file();
     init_git_version();
     init_report();
     init_frontmatter();
@@ -1110,7 +1029,7 @@ var init_compiler = __esm({
 var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
-    VERSION = "0.37.2137";
+    VERSION = "0.37.2140";
   }
 });
 
@@ -2408,23 +2327,7 @@ function resolveDatabaseConfig(options = {}, env) {
 // src/cli/persist.ts
 init_db();
 var registeredWidgets = wodWikiCore.KNOWN_SECTION_WIDGETS;
-var saveStores = ["notes", "block_revisions", "block_index", "block_efforts", "tags", "note_tags", "sessions"];
-function extractEffortSlugs(statements) {
-  const slugs = /* @__PURE__ */ new Set();
-  for (const statement of statements) {
-    if (statement.exerciseId) {
-      slugs.add(statement.exerciseId);
-    } else {
-      const effortMetric = statement.metrics?.getMetric?.("effort");
-      const effort = effortMetric && "effort" in effortMetric ? effortMetric.effort : void 0;
-      if (typeof effort === "string") {
-        const slug = effort.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
-        if (slug) slugs.add(slug);
-      }
-    }
-  }
-  return [...slugs];
-}
+var saveStores = ["notes", "block_revisions", "block_index", "block_efforts", "block_equipment", "efforts", "equipment", "tags", "note_tags", "sessions"];
 function titleFromLabel(sourceLabel) {
   if (!sourceLabel || sourceLabel === "-") return "stdin";
   const stem = sourceLabel.split("/").pop() ?? sourceLabel;
@@ -2496,9 +2399,19 @@ async function saveSource(db, options, startTime) {
     };
     const priorRows = await tx.readonly("block_index").getAllFromIndex("by-note", noteId);
     const priorEfforts = await tx.readonly("block_efforts").getAllFromIndex("by-note", noteId);
+    const priorEquipment = await tx.readonly("block_equipment").getAllFromIndex("by-note", noteId);
+    const storedEfforts = await tx.readonly("efforts").getAll();
+    const effortsBySlug = /* @__PURE__ */ new Map();
+    for (const effort of wodWikiLang.bundledEfforts) effortsBySlug.set(effort.slug, effort);
+    for (const effort of storedEfforts) effortsBySlug.set(effort.slug, effort);
+    const referenceIndex = wodWikiLang.createReferenceIndex({
+      efforts: [...effortsBySlug.values()],
+      equipment: await tx.readonly("equipment").getAll()
+    });
     const priorById = new Map(priorRows.map((row) => [row.id, row]));
     const nextRows = [];
     const nextEfforts = [];
+    const nextEquipment = [];
     for (const [position, block] of Object.values(blocks).sort((a, b) => a.from - b.from).entries()) {
       const id = `${noteId}:${block.id}`;
       const prior = priorById.get(id);
@@ -2524,7 +2437,20 @@ async function saveSource(db, options, startTime) {
         ...note.sourceId ? { sourceId: note.sourceId } : {}
       });
       if (block.kind === "wod") {
-        for (const effortSlug of extractEffortSlugs(wodWikiLang.parseScript(body, { sport: block.sport, dialect: block.dialect }).statements)) {
+        const statements = wodWikiLang.parseScript(body, { sport: block.sport, dialect: block.dialect, references: referenceIndex }).statements;
+        const refs = wodWikiLang.extractStatementRefs(statements);
+        const effortSlugs = new Set(refs.efforts);
+        if (effortSlugs.size === 0) {
+          for (const s of statements) {
+            const m = s.metrics?.getMetric?.(wodWikiCore.MetricType.Effort);
+            const val = typeof m?.value === "string" ? m.value : m && "effort" in m ? String(m.effort) : "";
+            const slug = val.toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+            if (slug && !["rest", "amrap", "emom", "tabata", "for-time"].includes(slug)) {
+              effortSlugs.add(slug);
+            }
+          }
+        }
+        for (const effortSlug of effortSlugs) {
           const effortId = `${noteId}:${block.id}:${effortSlug}`;
           const previous = priorEfforts.find((row) => row.id === effortId);
           nextEfforts.push({
@@ -2537,12 +2463,26 @@ async function saveSource(db, options, startTime) {
             createdAt: previous?.createdAt ?? now
           });
         }
+        for (const equipmentSlug of refs.equipment) {
+          const equipmentId = `${noteId}:${block.id}:${equipmentSlug}`;
+          const previous = priorEquipment.find((row) => row.id === equipmentId);
+          nextEquipment.push({
+            ...previous,
+            id: equipmentId,
+            noteId,
+            blockId: block.id,
+            blockContentId: fingerprint,
+            equipmentSlug,
+            createdAt: previous?.createdAt ?? now
+          });
+        }
       }
     }
     if (!wodWikiStorage.rowsEqual(existing, note)) await tx.readwrite("notes").put(note);
     if (revisions.length) await tx.readwrite("block_revisions").putMany(revisions);
     await diffProjection(tx, "block_index", priorRows, nextRows);
     await diffProjection(tx, "block_efforts", priorEfforts, nextEfforts);
+    await diffProjection(tx, "block_equipment", priorEquipment, nextEquipment);
     const tags = await saveTags(tx, noteId, options.tags, now);
     let session;
     let revision;
@@ -2578,6 +2518,7 @@ async function diffProjection(tx, store, previous, next) {
     if (!wodWikiStorage.rowsEqual(old.get(row.id), row)) {
       if (store === "block_index" && "blockVersion" in row) await tx.readwrite("block_index").put(row);
       if (store === "block_efforts" && "effortSlug" in row) await tx.readwrite("block_efforts").put(row);
+      if (store === "block_equipment" && "equipmentSlug" in row) await tx.readwrite("block_equipment").put(row);
     }
   }
 }
@@ -2669,6 +2610,12 @@ async function persistEffort(db, effort) {
     await sql.putRow(tx, sql.storeDefinition("efforts"), effort);
   });
 }
+async function persistEquipment(db, equipment) {
+  const sql = await loadSql();
+  await db.db.transaction(async (tx) => {
+    await sql.putRow(tx, sql.storeDefinition("equipment"), equipment);
+  });
+}
 async function persistTypedTags(db, labels, type) {
   return db.storage.transaction(["tags"], "readwrite", async (tx) => {
     let added = 0;
@@ -2694,17 +2641,18 @@ async function importSeedDir(db, dir, sourceId) {
   const source = sourceId || path.basename(dir);
   const manifest = wodWikiEngine.assertSeedManifest(JSON.parse(fs.readFileSync(path.resolve(dir, "manifest.json"), "utf-8")));
   const key = wodWikiEngine.seedMetaKey(source);
-  let expected = await db.storage.readonly("meta").get(key);
-  if (expected && expected.schema !== wodWikiEngine.SEED_SCHEMA) throw new Error("Incompatible seed checkpoint; recreate storage");
+  const stored = await db.storage.readonly("meta").get(key);
+  let expected = stored?.schema === wodWikiEngine.SEED_SCHEMA ? stored : void 0;
   let meta = expected ?? wodWikiEngine.emptySeedMeta(key);
   if (manifest.version < meta.seedVersion) throw new Error("Seed manifest is older than stored checkpoint");
-  const summary = { sourceId: source, version: manifest.version, notes: 0, efforts: 0, blocks: 0, blockEfforts: 0, deleted: 0, skippedUserOwned: 0 };
+  const summary = { sourceId: source, version: manifest.version, notes: 0, efforts: 0, equipment: 0, blocks: 0, blockEfforts: 0, deleted: 0, skippedUserOwned: 0 };
   const metadataChanged = manifest.version !== meta.seedVersion || manifest.builtAt !== meta.builtAt;
   const plan = manifest.chunks.filter((c) => metadataChanged || meta.chunks[c.id]?.sha256 !== c.sha256);
   plan.sort((a, b) => Number(b.id === wodWikiEngine.CANVAS_CHUNK_ID) - Number(a.id === wodWikiEngine.CANVAS_CHUNK_ID));
   const accumulate = (result) => {
     summary.notes += result.totalNotes;
     summary.efforts += result.totalEfforts;
+    summary.equipment += result.totalEquipment;
     summary.blocks += result.totalBlocks;
     summary.deleted += result.deleted;
     summary.skippedUserOwned += result.skippedUserOwned;
@@ -2780,6 +2728,7 @@ async function publishCatalogSeed(db, options) {
   }
   const allIndexRows = await db.storage.readonly("block_index").getAll();
   const allEffortRows = await db.storage.readonly("block_efforts").getAll();
+  const allEquipmentRows = await db.storage.readonly("block_equipment").getAll();
   const indexByNote = /* @__PURE__ */ new Map();
   for (const row of allIndexRows) {
     const list = indexByNote.get(row.noteId) ?? [];
@@ -2792,6 +2741,12 @@ async function publishCatalogSeed(db, options) {
     list.push(row);
     effortsByNote.set(row.noteId, list);
   }
+  const equipmentByNote = /* @__PURE__ */ new Map();
+  for (const row of allEquipmentRows) {
+    const list = equipmentByNote.get(row.noteId) ?? [];
+    list.push(row);
+    equipmentByNote.set(row.noteId, list);
+  }
   const outDir = path.resolve(process.cwd(), options.outDir);
   const chunksDir = path.join(outDir, "chunks");
   fs.mkdirSync(chunksDir, { recursive: true });
@@ -2806,6 +2761,7 @@ async function publishCatalogSeed(db, options) {
       const notePath = note.sourcePath ?? `markdown/collections/${catalogName}/${stem}.md`;
       const noteBlockIndex = indexByNote.get(note.id) ?? [];
       const noteBlockEfforts = effortsByNote.get(note.id) ?? [];
+      const noteBlockEquipment = equipmentByNote.get(note.id) ?? [];
       const blockIndex = noteBlockIndex.length > 0 ? noteBlockIndex.map((b) => ({
         ...b,
         isStatic: true,
@@ -2825,12 +2781,18 @@ async function publishCatalogSeed(db, options) {
         isStatic: true,
         sourcePath: e.sourcePath ?? notePath
       }));
+      const blockEquipment = noteBlockEquipment.map((e) => ({
+        ...e,
+        isStatic: true,
+        sourcePath: e.sourcePath ?? notePath
+      }));
       chunkRows.push({
         path: notePath,
         content: note.rawContent,
         blocks: note.blocks,
         blockIndex,
-        blockEfforts
+        blockEfforts,
+        blockEquipment
       });
     }
     const chunkId = `collection.${catalogName}`;
@@ -3800,7 +3762,9 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
             writeErr(`[wod ${verb}] Effort not found in ${db.path}: ${id}`);
             return 1;
           }
-          const markdown = wodWikiEngine.effortToMarkdown(effort);
+          const ownerNoteId = typeof effort.ownerNoteId === "string" ? effort.ownerNoteId : `effort/${effort.slug}`;
+          const owner = await db.storage.readonly("notes").get(ownerNoteId);
+          const markdown = owner?.rawContent ?? wodWikiEngine.effortToMarkdown(effort);
           const target = parsed.output && parsed.output !== "-" ? parsed.output : `${id}.md`;
           if (parsed.output === "-") {
             writeOut(markdown);
@@ -3809,15 +3773,29 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
           }
           writeOut(`[wod ${verb}] effort ${id} \u2192 ${target}`);
         } else {
-          const labels = (await listTagsByType(db.db, "equipment")).map((t) => t.label).sort();
-          const csv = wodWikiEngine.equipmentToCsv(labels);
-          const target = parsed.output && parsed.output !== "-" ? parsed.output : "equipment.csv";
-          if (parsed.output === "-") {
-            writeOut(csv);
+          const equipment = id ? await getEquipmentBySlug(db.db, targetId) : void 0;
+          if (equipment) {
+            const ownerNoteId = typeof equipment.ownerNoteId === "string" ? equipment.ownerNoteId : `equipment/${equipment.slug}`;
+            const owner = await db.storage.readonly("notes").get(ownerNoteId);
+            const markdown = owner?.rawContent ?? wodWikiEngine.equipmentToMarkdown(equipment);
+            const target = parsed.output && parsed.output !== "-" ? parsed.output : `${id}.md`;
+            if (parsed.output === "-") {
+              writeOut(markdown);
+            } else {
+              nodeFs().writeFileSync(target, markdown, "utf-8");
+            }
+            writeOut(`[wod ${verb}] equipment ${id} \u2192 ${target}`);
           } else {
-            nodeFs().writeFileSync(target, csv, "utf-8");
+            const labels = (await listTagsByType(db.db, "equipment")).map((t) => t.label).sort();
+            const csv = wodWikiEngine.equipmentToCsv(labels);
+            const target = parsed.output && parsed.output !== "-" ? parsed.output : "equipment.csv";
+            if (parsed.output === "-") {
+              writeOut(csv);
+            } else {
+              nodeFs().writeFileSync(target, csv, "utf-8");
+            }
+            writeOut(`[wod ${verb}] equipment \u2192 ${target} (${labels.length} labels)`);
           }
-          writeOut(`[wod ${verb}] equipment \u2192 ${target} (${labels.length} labels)`);
         }
       } finally {
         await db.close();
@@ -3859,7 +3837,7 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         return 0;
       }
       if (kind === "effort") {
-        const effort = wodWikiEngine.markdownToEffort(fs.readFileSync(file, "utf-8"));
+        const effort = wodWikiLang.parseEffortFile(fs.readFileSync(file, "utf-8"));
         if (!effort) {
           writeErr(`[wod import] Unparseable effort file (need frontmatter id/slug/label + numeric baseAttributes.met): ${file}`);
           return 1;
@@ -3873,6 +3851,21 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         }
         return 0;
       }
+      if (kind === "equipment" && /\.md$/i.test(file)) {
+        const equipment = wodWikiLang.parseEquipmentFile(fs.readFileSync(file, "utf-8"));
+        if (!equipment) {
+          writeErr(`[wod import] Unparseable equipment file (need frontmatter type: equipment + id/slug/label): ${file}`);
+          return 1;
+        }
+        const db2 = await openCliDb(cliDb());
+        try {
+          await persistEquipment(db2, { ...equipment, registrySource: "user" });
+          writeOut(`[wod import] equipment ${equipment.slug} \u2014 ${equipment.label} \u2192 ${db2.path}`);
+        } finally {
+          await db2.close();
+        }
+        return 0;
+      }
       if (kind === "equipment") {
         const labels = wodWikiEngine.csvToEquipmentLabels(fs.readFileSync(file, "utf-8"));
         if (labels.length === 0) {