@bitcobblers/wod-wiki-tools 0.44.2159 → 0.45.2166

package/dist/index.cjs

@@ -285,8 +285,8 @@ var init_db = __esm({
     CLI_UUID_NAMESPACE = "c0ffee00-8b1a-4e2c-9d3f-5a6b7c8d9e0f";
   }
 });
-function catalogForChunkId(chunkId) {
-  const value = /^(?:collection|feed)\.(.+)$/.exec(chunkId)?.[1];
+function notebookSlugForChunkId(chunkId) {
+  const value = /^notebook\.(.+)$/.exec(chunkId)?.[1];
   return value && value !== "_root" ? value : void 0;
 }
 function canvasRouteSlug(content) {
@@ -302,15 +302,13 @@ function seedNoteSourceId(path, content, chunkId) {
   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);
-    return !catalog ? "collection:_root" : stem.toLowerCase() === "readme" ? `collection:${catalog}` : `collection:${catalog}/${stem}`;
+  if (chunkId.startsWith("notebook.")) {
+    const slug = notebookSlugForChunkId(chunkId);
+    return !slug ? "notebook:_root" : stem.toLowerCase() === "readme" ? `notebook:${slug}` : `notebook:${under}`;
   }
-  if (chunkId.startsWith("feed.")) return `feed:feeds/${under}`;
   return void 0;
 }
-var SEED_SCHEMA2, SEED_REGISTERED_WIDGETS, SEED_NAMESPACE, EFFORTS_CHUNK_ID, EQUIPMENT_CHUNK_ID, CANVAS_CHUNK_ID2, DASHBOARDS_CHUNK_ID, TEMPLATE_CHUNK_ID;
+var SEED_SCHEMA2, SEED_REGISTERED_WIDGETS, SEED_NAMESPACE, EFFORTS_CHUNK_ID, EQUIPMENT_CHUNK_ID, CANVAS_CHUNK_ID2, DASHBOARDS_CHUNK_ID;
 var init_contract = __esm({
   "src/seedbuild/contract.ts"() {
     SEED_SCHEMA2 = 9;
@@ -320,7 +318,6 @@ var init_contract = __esm({
     EQUIPMENT_CHUNK_ID = "equipment";
     CANVAS_CHUNK_ID2 = "canvas";
     DASHBOARDS_CHUNK_ID = "dashboards";
-    TEMPLATE_CHUNK_ID = "template";
   }
 });
 
@@ -547,8 +544,8 @@ __export(compiler_exports, {
   chunkIdFor: () => chunkIdFor,
   collectCorpusMarkdown: () => collectCorpusMarkdown,
   compileSeedRow: () => compileSeedRow,
+  dateKeyToCreatedAt: () => dateKeyToCreatedAt,
   discoverUncatalogedEfforts: () => discoverUncatalogedEfforts,
-  feedDateToCreatedAt: () => feedDateToCreatedAt,
   frontmatterDateToCreatedAt: () => frontmatterDateToCreatedAt,
   generateSeed: () => generateSeed,
   getFileCommit: () => getFileCommit,
@@ -582,16 +579,15 @@ function chunkIdFor(relPath) {
     case "efforts":
     case "equipment":
       return corpus;
-    case "collections":
-      return parts.length === 3 ? `collection._root` : `collection.${slug}`;
-    case "feeds":
-      return parts.length === 3 ? `feed._root` : `feed.${slug}`;
+    case "notebooks":
+      return parts.length === 3 ? `notebook._root` : `notebook.${slug}`;
     default:
       return null;
   }
 }
-function collectCorpusMarkdown(markdownDir) {
-  return listMarkdownFiles(markdownDir).map((p) => `markdown/${p}`);
+function collectCorpusMarkdown(markdownDir, excludePaths = []) {
+  const excluded = new Set(excludePaths);
+  return listMarkdownFiles(markdownDir).map((p) => `markdown/${p}`).filter((path) => !excluded.has(path));
 }
 function partitionIntoChunks(paths) {
   const byId = /* @__PURE__ */ new Map();
@@ -599,7 +595,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 | equipment | 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 | notebooks). Extend chunkIdFor() if this is a new corpus.`
       );
     }
     const list = byId.get(id);
@@ -690,7 +686,7 @@ function frontmatterDateToCreatedAt(raw, path) {
   }
   return ts;
 }
-function feedDateToCreatedAt(dateKey) {
+function dateKeyToCreatedAt(dateKey) {
   if (!/^\d{4}-\d{2}-\d{2}$/.test(dateKey)) return 0;
   const ts = Date.parse(`${dateKey}T00:00:00Z`);
   return Number.isNaN(ts) ? 0 : ts;
@@ -706,18 +702,18 @@ function compileSeedRow(path, content, metadata = {}) {
   });
   return { path, content, blocks, blockIndex, blockEfforts: [], blockEquipment: [] };
 }
-function buildBlockIndexRows(markdownDir, corpusRoot) {
+function buildBlockIndexRows(markdownDir, corpusRoot, excludePaths = []) {
   const rows = [];
-  for (const path$1 of collectCorpusMarkdown(markdownDir)) {
+  for (const path$1 of collectCorpusMarkdown(markdownDir, excludePaths)) {
     const chunkId = chunkIdFor(path$1);
     if (!chunkId) continue;
     const content = fs.readFileSync(path.join(corpusRoot, path$1), "utf8");
     const parts = path$1.split("/");
     const stem = (parts.at(-1) ?? "").replace(/\.md$/, "");
-    const catalog = parts[2];
-    const routeId = chunkId === "canvas" ? canvasRouteSlug(content) ?? void 0 : chunkId.startsWith("collection.") ? stem.toLowerCase() === "readme" ? catalog : `${catalog}/${stem}` : chunkId.startsWith("feed.") ? parts.slice(1).join("/").replace(/\.md$/, "") : void 0;
+    const slug = parts[2];
+    const routeId = chunkId === "canvas" ? canvasRouteSlug(content) ?? void 0 : chunkId.startsWith("notebook.") ? stem.toLowerCase() === "readme" ? slug : parts.slice(2).join("/").replace(/\.md$/, "") : void 0;
     const sourceId = seedNoteSourceId(path$1, content, chunkId);
-    const createdAt = frontmatterDateToCreatedAt(content, path$1) ?? (chunkId.startsWith("feed.") ? feedDateToCreatedAt(parts.at(-2) ?? "") : getFileCreatedAt(path$1, corpusRoot));
+    const createdAt = frontmatterDateToCreatedAt(content, path$1) ?? (chunkId.startsWith("notebook.") && /^\d{4}-\d{2}-\d{2}$/.test(parts.at(-2) ?? "") ? dateKeyToCreatedAt(parts.at(-2) ?? "") : getFileCreatedAt(path$1, corpusRoot));
     rows.push(...compileSeedRow(path$1, content, { routeId, sourceId, createdAt }).blockIndex);
   }
   return rows;
@@ -769,10 +765,10 @@ function loadCorpusReferenceCatalog(markdownDir) {
   }
   return { efforts, equipment };
 }
-function discoverUncatalogedEfforts(markdownDir, corpusRoot) {
+function discoverUncatalogedEfforts(markdownDir, corpusRoot, excludePaths = []) {
   const catalog = loadCorpusReferenceCatalog(markdownDir);
   const index = wodWikiLang.createReferenceIndex(catalog);
-  const blocks = buildBlockIndexRows(markdownDir, corpusRoot);
+  const blocks = buildBlockIndexRows(markdownDir, corpusRoot, excludePaths);
   const discovered = /* @__PURE__ */ new Map();
   for (const block of blocks) {
     if (block.dataType !== "wod" || !block.rawContent) continue;
@@ -906,22 +902,18 @@ function generateSeed(options = {}) {
   const webRepositoryUrl = repositoryUrl?.replace(/^git\+/, "").replace(/\.git$/, "");
   const repositoryLink = webRepositoryUrl && URL.canParse(webRepositoryUrl) ? new URL(webRepositoryUrl) : void 0;
   if (options.scaffoldDiscoveredEfforts) {
-    const discovered = discoverUncatalogedEfforts(markdownDir, corpusRoot);
+    const discovered = discoverUncatalogedEfforts(markdownDir, corpusRoot, options.excludePaths);
     if (discovered.length > 0) {
       scaffoldDiscoveredEfforts(discovered, markdownDir);
     }
   }
   const tScan = Date.now();
-  const paths = collectCorpusMarkdown(markdownDir);
+  const paths = collectCorpusMarkdown(markdownDir, options.excludePaths);
   const groups = partitionIntoChunks(paths);
   gateDashboards(groups, corpusRoot);
-  if (options.templateFile && fs.existsSync(options.templateFile)) {
-    const templateRowPath = options.templateRowPath ?? path.relative(corpusRoot, options.templateFile).split("\\").join("/");
-    groups.push({ id: TEMPLATE_CHUNK_ID, files: [templateRowPath] });
-  }
   passMs.scan = Date.now() - tScan;
   const tBlockIndex = Date.now();
-  const blockRows = buildBlockIndexRows(markdownDir, corpusRoot);
+  const blockRows = buildBlockIndexRows(markdownDir, corpusRoot, options.excludePaths);
   passMs.blockIndex = Date.now() - tBlockIndex;
   const tParseGate = Date.now();
   const syntaxProblems = validateWodBlockSyntax(blockRows);
@@ -963,11 +955,10 @@ ${shown}${more}`);
   const manifestNotebooks = [];
   const tWrite = Date.now();
   for (const { id, files } of groups) {
-    const templateSource = id === TEMPLATE_CHUNK_ID ? options.templateFile : void 0;
     const records = [];
     const rows = files.map((p) => {
-      const raw = fs.readFileSync(templateSource ?? path.join(corpusRoot, p), "utf8");
-      const content = id === TEMPLATE_CHUNK_ID ? raw.replace(/\$CURSOR/g, "") : raw;
+      const raw = fs.readFileSync(path.join(corpusRoot, p), "utf8");
+      const content = raw;
       const compiled = compileSeedRow(p, content);
       compiled.blockIndex = blocksByPath.get(p) ?? compiled.blockIndex;
       compiled.blockEfforts = effortsByPath.get(p) ?? [];
@@ -1006,7 +997,7 @@ ${shown}${more}`);
     const notebookIndex = {
       notebookId: id,
       label: fileToDisplayName(id.split(".").at(-1) ?? id),
-      category: catalogForChunkId(id),
+      category: notebookSlugForChunkId(id),
       indexPath: notebookIndexPath,
       commit: records.find((r) => r.commit)?.commit ?? gitVersion.commit,
       count: rows.length,
@@ -1102,35 +1093,35 @@ var init_compiler = __esm({
 var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
-    VERSION = "0.44.2159";
+    VERSION = "0.45.2166";
   }
 });
 
-// src/cli/scaffoldCatalog.ts
-var scaffoldCatalog_exports = {};
-__export(scaffoldCatalog_exports, {
-  scaffoldCatalog: () => scaffoldCatalog,
-  validateCatalogName: () => validateCatalogName
+// src/cli/scaffoldFeed.ts
+var scaffoldFeed_exports = {};
+__export(scaffoldFeed_exports, {
+  scaffoldFeed: () => scaffoldFeed,
+  validateFeedName: () => validateFeedName
 });
-function validateCatalogName(name) {
+function validateFeedName(name) {
   if (name.length === 0 || name === "." || name === "..") {
-    throw new Error("Catalog name must be a single non-empty directory name");
+    throw new Error("Feed name must be a single non-empty directory name");
   }
   if (name.includes("/") || name.includes("\\") || name.includes("\0")) {
-    throw new Error(`Invalid catalog name '${name}': must be a single directory name (no path separators or traversal)`);
+    throw new Error(`Invalid feed name '${name}': must be a single directory name (no path separators or traversal)`);
   }
   if (/^(?:[A-Za-z]:)?[/\\]/.test(name)) {
-    throw new Error(`Invalid catalog name '${name}': absolute paths are not allowed`);
+    throw new Error(`Invalid feed name '${name}': absolute paths are not allowed`);
   }
   if (name.length > 214 || !/^[a-z0-9][a-z0-9._-]*$/.test(name)) {
     throw new Error(
-      `Invalid catalog name '${name}': must be a valid npm package name (lowercase letters, digits, dots, hyphens, underscores; no leading dot/hyphen)`
+      `Invalid feed name '${name}': must be a valid npm package name (lowercase letters, digits, dots, hyphens, underscores; no leading dot/hyphen)`
     );
   }
   return name;
 }
-function scaffoldCatalog(name, opts = {}) {
-  validateCatalogName(name);
+function scaffoldFeed(name, opts = {}) {
+  validateFeedName(name);
   const dir = path.resolve(opts.cwd ?? process.cwd(), name);
   try {
     fs.mkdirSync(dir);
@@ -1148,7 +1139,7 @@ function scaffoldCatalog(name, opts = {}) {
         version: "0.1.0",
         private: true,
         type: "module",
-        description: `WOD Wiki workout catalog: ${name}`,
+        description: `WOD Wiki workout feed: ${name}`,
         scripts: {
           build: "wod build . --output dist"
         },
@@ -1161,10 +1152,10 @@ function scaffoldCatalog(name, opts = {}) {
     )}
 `],
     [".gitignore", "node_modules/\ndist/\n"],
-    [".github/workflows/publish-catalog.yml", publishWorkflow()],
-    ["markdown/collections/example/README.md", collectionReadme(name)],
-    [`markdown/collections/example/morning-session.md`, exampleWorkout(date)],
-    ["README.md", catalogReadme(name)]
+    [".github/workflows/publish-feed.yml", publishWorkflow()],
+    ["markdown/notebooks/example/README.md", feedReadme(name)],
+    [`markdown/notebooks/example/morning-session.md`, exampleWorkout(date)],
+    ["README.md", repoReadme(name)]
   ];
   try {
     for (const [rel, content] of files) {
@@ -1178,13 +1169,13 @@ function scaffoldCatalog(name, opts = {}) {
   }
   return { dir, files: files.map(([rel]) => rel) };
 }
-var publishWorkflow, collectionReadme, exampleWorkout, catalogReadme;
-var init_scaffoldCatalog = __esm({
-  "src/cli/scaffoldCatalog.ts"() {
+var publishWorkflow, feedReadme, exampleWorkout, repoReadme;
+var init_scaffoldFeed = __esm({
+  "src/cli/scaffoldFeed.ts"() {
     init_version();
-    publishWorkflow = () => `name: Publish catalog
+    publishWorkflow = () => `name: Publish feed
 
-# Compile the catalog with the wod CLI and deploy dist/ to GitHub Pages.
+# Compile the feed with the wod CLI and deploy dist/ to GitHub Pages.
 # Requires Pages enabled: repo Settings \u2192 Pages \u2192 Source: "GitHub Actions".
 
 on:
@@ -1234,10 +1225,10 @@ jobs:
       - id: deployment
         uses: actions/deploy-pages@v4
 `;
-    collectionReadme = (name) => `# ${name}
+    feedReadme = (name) => `# ${name}
 
-Example benchmark collection. Each \`.md\` file in this directory becomes part of
-the \`example\` collection chunk; \`README.md\` is the collection's landing page.
+Example benchmark notebook. Each \`.md\` file in this directory becomes part of
+the \`example\` notebook chunk; \`README.md\` is the notebook's landing page.
 
 Add one file per workout:
 
@@ -1272,9 +1263,9 @@ date: ${date}
   Pull-ups
 \`\`\`
 `;
-    catalogReadme = (name) => `# ${name}
+    repoReadme = (name) => `# ${name}
 
-A [WOD Wiki](https://github.com/bitcobblers/wod-wiki) workout catalog: plain
+A [WOD Wiki](https://github.com/bitcobblers/wod-wiki) workout feed: plain
 Markdown workouts compiled to static, version-stamped seed chunks and published
 via GitHub Pages.
 
@@ -1286,25 +1277,25 @@ bunx wod build . --output dist
 \`\`\`
 
 Workouts live under \`markdown/\` \u2014 this scaffold starts with one example
-collection. Validate everything with \`bunx wod build\`: it gates every file on
+feed. Validate everything with \`bunx wod build\`: it gates every file on
 the Whiteboard grammar and corpus layout before writing \`dist/\`.
 
 ## Publish
 
 Push to GitHub and enable Pages (**Settings \u2192 Pages \u2192 Source: GitHub
-Actions**). The bundled workflow (\`.github/workflows/publish-catalog.yml\`)
-builds the catalog on every push to \`main\` and deploys \`dist/\`.
+Actions**). The bundled workflow (\`.github/workflows/publish-feed.yml\`)
+builds the feed on every push to \`main\` and deploys \`dist/\`.
 
 ## Share
 
-Once published, anyone can subscribe to this catalog from a WOD Wiki instance
+Once published, anyone can subscribe to this feed from a WOD Wiki instance
 at:
 
 \`\`\`
-<app-url>/subscribe?source=<url-encoded published catalog URL>
+<app-url>/subscribe?source=<url-encoded published feed URL>
 \`\`\`
 
-For \`owner\`/\`repo\` on GitHub Pages the catalog URL is the deployed
+For \`owner\`/\`repo\` on GitHub Pages the feed URL is the deployed
 directory, \`https://owner.github.io/repo/\`, e.g.
 \`/subscribe?source=https%3A%2F%2Fowner.github.io%2Frepo%2F\`.
 `;
@@ -3168,8 +3159,6 @@ async function saveSource(db, options, startTime) {
       sourceRevision++;
       for (const block of Object.values(blocks)) block.sourceRevision = sourceRevision;
     }
-    const fm = wodWikiEngine.readFrontmatterMeta(options.source);
-    const catalog = typeof fm["catalog"] === "string" && fm["catalog"].trim() || typeof fm["collection"] === "string" && fm["collection"].trim() || existing?.catalog;
     const note = {
       ...existing,
       id: noteId,
@@ -3179,8 +3168,7 @@ async function saveSource(db, options, startTime) {
       createdAt: existing?.createdAt ?? now,
       rawContent: options.source,
       sourceRevision,
-      blocks,
-      ...catalog ? { catalog } : {}
+      blocks
     };
     const priorRows = await tx.readonly("block_index").getAllFromIndex("by-note", noteId);
     const priorEfforts = await tx.readonly("block_efforts").getAllFromIndex("by-note", noteId);
@@ -3218,7 +3206,6 @@ async function saveSource(db, options, startTime) {
         noteTitle: note.title,
         createdAt: prior?.createdAt ?? now,
         blockContentId: fingerprint,
-        ...catalog ? { catalog } : {},
         ...note.sourceId ? { sourceId: note.sourceId } : {}
       });
       if (block.kind === "wod") {
@@ -3389,16 +3376,46 @@ async function persistSessionBundle(db, session, events) {
   });
   return { events: events.length };
 }
-async function persistEffort(db, effort) {
-  const sql = await loadSql();
-  await db.db.transaction(async (tx) => {
-    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 persistDefinitionNote(db, kind, source) {
+  const parsed = kind === "effort" ? wodWikiLang.parseEffortFile(source) : wodWikiLang.parseEquipmentFile(source);
+  if (!parsed) {
+    throw new Error(kind === "effort" ? "[wod import] Unparseable effort file (need frontmatter id/slug/label + numeric baseAttributes.met)" : "[wod import] Unparseable equipment file (need frontmatter type: equipment + id/slug/label)");
+  }
+  const family = kind === "effort" ? "efforts" : "equipment";
+  const prior = await db.storage.readonly(family).get(parsed.slug);
+  const stamped = wodWikiEngine.extractNoteIdentity(source)?.noteId;
+  const noteId = stamped ?? prior?.ownerNoteId ?? `${kind}/${parsed.slug}`;
+  const now = Date.now();
+  return db.storage.transaction(["notes", family, "tags", "note_tags"], "readwrite", async (tx) => {
+    const previous = await tx.readonly("notes").get(noteId);
+    const sourceRevision = (previous?.sourceRevision ?? 0) + (previous?.rawContent === source ? 0 : 1);
+    const blocks = wodWikiCore.reconcileNoteBlocks(source, { sourceRevision, registeredWidgets, blocks: previous?.blocks });
+    wodWikiCore.validateNoteBlocks(source, blocks, sourceRevision, { registeredWidgets });
+    const note = {
+      ...previous,
+      id: noteId,
+      title: parsed.label,
+      type: previous?.type ?? "note",
+      createdAt: previous?.createdAt ?? now,
+      rawContent: source,
+      sourceRevision,
+      blocks,
+      sourceId: family,
+      sourcePath: noteId
+    };
+    await tx.readwrite("notes").put(note);
+    const isoNow = new Date(now).toISOString();
+    await tx.readwrite(family).put({
+      ...parsed,
+      registrySource: prior?.registrySource ?? "user",
+      ownerNoteId: noteId,
+      sourceId: family,
+      sourcePath: noteId,
+      createdAt: prior?.createdAt ?? isoNow,
+      updatedAt: isoNow
+    });
+    await saveTags(tx, noteId, wodWikiEngine.extractTypedTags(source), now);
+    return { slug: parsed.slug, noteId, createdNote: !previous };
   });
 }
 async function persistTypedTags(db, labels, type) {
@@ -3476,7 +3493,7 @@ init_db();
 init_contract();
 init_compiler();
 init_report();
-async function publishCatalogSeed(db, options) {
+async function publishNotebookSeed(db, options) {
   const t0 = Date.now();
   const fs = nodeFs();
   const path = nodePath();
@@ -3484,31 +3501,30 @@ async function publishCatalogSeed(db, options) {
   if (allNotes.length === 0) {
     throw new Error(`[wod publish] No notes found in database ${db.path}`);
   }
-  const notesByCatalog = /* @__PURE__ */ new Map();
+  const notesByNotebook = /* @__PURE__ */ new Map();
   for (const note of allNotes) {
-    const fm = wodWikiEngine.readFrontmatterMeta(note.rawContent);
-    const cat = typeof fm["catalog"] === "string" && fm["catalog"].trim() || typeof fm["collection"] === "string" && fm["collection"].trim() || note.catalog || wodWikiWql.catalogOfItem(note);
-    const key = cat || "__uncataloged__";
-    const list = notesByCatalog.get(key) ?? [];
+    const slug = wodWikiWql.notebookSlugOfSourceId(note.sourceId);
+    const key = slug || "__unassigned__";
+    const list = notesByNotebook.get(key) ?? [];
     list.push(note);
-    notesByCatalog.set(key, list);
+    notesByNotebook.set(key, list);
   }
-  const targetCatalogs = /* @__PURE__ */ new Map();
-  if (options.catalog) {
-    const matching = notesByCatalog.get(options.catalog);
+  const targetNotebooks = /* @__PURE__ */ new Map();
+  if (options.notebook) {
+    const matching = notesByNotebook.get(options.notebook);
     if (matching) {
-      targetCatalogs.set(options.catalog, matching);
-    } else if (notesByCatalog.has("__uncataloged__") && notesByCatalog.size === 1) {
-      targetCatalogs.set(options.catalog, notesByCatalog.get("__uncataloged__"));
+      targetNotebooks.set(options.notebook, matching);
+    } else if (notesByNotebook.has("__unassigned__") && notesByNotebook.size === 1) {
+      targetNotebooks.set(options.notebook, notesByNotebook.get("__unassigned__"));
     } else {
-      const available = [...notesByCatalog.keys()].filter((k) => k !== "__uncataloged__");
+      const available = [...notesByNotebook.keys()].filter((k) => k !== "__unassigned__");
       throw new Error(
-        `[wod publish] Catalog "${options.catalog}" not found in ${db.path}.` + (available.length > 0 ? ` Available catalogs: ${available.join(", ")}` : "")
+        `[wod publish] Notebook "${options.notebook}" not found in ${db.path}.` + (available.length > 0 ? ` Available notebooks: ${available.join(", ")}` : "")
       );
     }
   } else {
-    for (const [cat, notes] of notesByCatalog.entries()) {
-      targetCatalogs.set(cat === "__uncataloged__" ? "default" : cat, notes);
+    for (const [slug, notes] of notesByNotebook.entries()) {
+      targetNotebooks.set(slug === "__unassigned__" ? "default" : slug, notes);
     }
   }
   const allIndexRows = await db.storage.readonly("block_index").getAll();
@@ -3537,25 +3553,24 @@ async function publishCatalogSeed(db, options) {
   fs.mkdirSync(chunksDir, { recursive: true });
   const manifestChunks = [];
   let totalNotes = 0;
-  const publishedCatalogs = [];
-  for (const [catalogName, notes] of targetCatalogs.entries()) {
-    publishedCatalogs.push(catalogName);
+  const publishedNotebooks = [];
+  for (const [notebookSlug, notes] of targetNotebooks.entries()) {
+    publishedNotebooks.push(notebookSlug);
     const chunkRows = [];
     for (const note of notes) {
       const stem = (note.title || note.id).toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/(^-|-$)/g, "") || "note";
-      const notePath = note.sourcePath ?? `markdown/collections/${catalogName}/${stem}.md`;
+      const notePath = note.sourcePath ?? `markdown/notebooks/${notebookSlug}/${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,
-        sourceId: b.sourceId ?? `collection:${catalogName}/${stem}`,
-        sourcePath: b.sourcePath ?? notePath,
-        catalog: catalogName
+        sourceId: b.sourceId ?? `notebook:${notebookSlug}/${stem}`,
+        sourcePath: b.sourcePath ?? notePath
       })) : compileSeedRow(notePath, note.rawContent, {
-        routeId: `${catalogName}/${stem}`,
-        sourceId: `collection:${catalogName}/${stem}`,
+        routeId: `${notebookSlug}/${stem}`,
+        sourceId: `notebook:${notebookSlug}/${stem}`,
         // Authored frontmatter date first — exports keep the post's own
         // day, never the import/publish time.
         createdAt: note.date ?? note.createdAt,
@@ -3580,7 +3595,7 @@ async function publishCatalogSeed(db, options) {
         blockEquipment
       });
     }
-    const chunkId = `collection.${catalogName}`;
+    const chunkId = `notebook.${notebookSlug}`;
     const json2 = JSON.stringify(chunkRows);
     const digest = nodeCrypto().createHash("sha256").update(json2).digest();
     const sha = [...digest].map((b) => b.toString(16).padStart(2, "0")).join("");
@@ -3612,7 +3627,7 @@ async function publishCatalogSeed(db, options) {
   return {
     manifest,
     outDir,
-    catalogs: publishedCatalogs,
+    notebooks: publishedNotebooks,
     totalNotes
   };
 }
@@ -4048,12 +4063,6 @@ function parseCliArgs(args) {
     } else if (arg === "--force") {
       result.force = true;
       i++;
-    } else if (arg === "--template") {
-      result.template = args[++i];
-      i++;
-    } else if (arg.startsWith("--template=")) {
-      result.template = arg.slice("--template=".length);
-      i++;
     } else if (arg === "--out") {
       result.output = args[++i];
       i++;
@@ -4074,7 +4083,7 @@ function parseCliArgs(args) {
       if (Number.isSafeInteger(v) && v >= 0) result.seedVersion = v;
       i++;
     } else if (!result.subcommand) {
-      if (arg === "parse" || arg === "run" || arg === "query" || arg === "download" || arg === "export" || arg === "import" || arg === "publish" || arg === "build" || arg === "seed" || arg === "reset" || arg === "init" || arg === "db" || arg === "server" || arg === "serve" || arg === "playground" || arg === "init-catalog" || arg === "skills" || arg === "help" || arg === "version") {
+      if (arg === "parse" || arg === "run" || arg === "query" || arg === "download" || arg === "export" || arg === "import" || arg === "publish" || arg === "build" || arg === "seed" || arg === "reset" || arg === "init" || arg === "db" || arg === "server" || arg === "serve" || arg === "playground" || arg === "init-feed" || arg === "skills" || arg === "help" || arg === "version") {
         result.subcommand = arg;
       } else {
         result.target = arg;
@@ -4138,10 +4147,10 @@ USAGE:
   wod export <note|playground|session|effort|equipment> <id> [options]
   wod download <note|playground|session|effort|equipment> <id> [options]
   wod import <note|playground|session|effort|equipment> <file> [options]
-  wod publish [catalog] [options]
+  wod publish [feed] [options]
   wod build [dir] [options]
-  wod init-catalog <name>
-                      Scaffold a new catalog repository (package.json, example
+  wod init-feed <name>
+                      Scaffold a new feed repository (package.json, example
                       collection, GitHub Actions Pages workflow). Refuses an
                       existing destination.
   wod skills <list | install> [options]
@@ -4234,10 +4243,10 @@ SUBCOMMANDS:
                      Upsert an effort registry row from corpus-style markdown.
   import equipment <file>
                      Create/upgrade equipment tags (CSV, one label per row).
-  publish [catalog]   Publish catalog notes from the database into a configured
+  publish [feed]      Publish feed notes from the database into a configured
                      seed directory (manifest.json, chunks/, report.html)
                      compatible with 'wod seed --source <dir>'. Override target
-                     with -o/--out/--output (defaults to ./dist/seed/<catalog>).
+                     with -o/--out/--output (defaults to ./dist/seed/<feed>).
   build [dir]         Compile a seed corpus: validate every .md under
                      <dir>/markdown (parity gate + dashboard format gate) and
                      write manifest.json + content-hashed chunks/ +
@@ -4248,8 +4257,6 @@ SUBCOMMANDS:
 BUILD OPTIONS (for 'build'):
   --scaffold          Also scaffold markdown/efforts/discovered/*.md stubs for
                       workout effort labels missing from the registry.
-  --template <file>   Compile an extra markdown file as the 'template' chunk
-                      (the host's playground intake template).
 
 INPUT SOURCING (for 'query'; without these, the database is queried):
   -c, --corpus <path> Load historical corpus dataset from a versioned JSON file
@@ -4395,20 +4402,20 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
     }
   };
   try {
-    if (parsed.subcommand === "init-catalog") {
+    if (parsed.subcommand === "init-feed") {
       if (!parsed.target) {
-        writeErr("[wod init-catalog] Error: Missing catalog name (a single new directory name)");
+        writeErr("[wod init-feed] Error: Missing feed name (a single new directory name)");
         return 1;
       }
-      const { scaffoldCatalog: scaffoldCatalog2 } = await Promise.resolve().then(() => (init_scaffoldCatalog(), scaffoldCatalog_exports));
+      const { scaffoldFeed: scaffoldFeed2 } = await Promise.resolve().then(() => (init_scaffoldFeed(), scaffoldFeed_exports));
       try {
-        const result = scaffoldCatalog2(parsed.target);
-        writeOut(`[wod init-catalog] Created ${result.dir} (${result.files.length} files)`);
+        const result = scaffoldFeed2(parsed.target);
+        writeOut(`[wod init-feed] Created ${result.dir} (${result.files.length} files)`);
         writeOut(`Next: cd ${parsed.target} && bun install && bunx wod build . --output dist`);
         writeOut(`Agents: wod skills install --dir ${parsed.target}  (Whiteboard Script extraction rules \u2192 .agents/skills/)`);
         return 0;
       } catch (error) {
-        writeErr(`[wod init-catalog] ${error.message}`);
+        writeErr(`[wod init-feed] ${error.message}`);
         return 1;
       }
     }
@@ -4721,30 +4728,22 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         return 0;
       }
       if (kind === "effort") {
-        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;
-        }
+        const source = fs.readFileSync(file, "utf-8");
         const db2 = await openCliDb(cliDb());
         try {
-          await persistEffort(db2, { ...effort, registrySource: "user" });
-          writeOut(`[wod import] effort ${effort.slug} \u2014 ${effort.label} \u2192 ${db2.path}`);
+          const result = await persistDefinitionNote(db2, "effort", source);
+          writeOut(`[wod import] effort ${result.slug}${result.createdNote ? "" : " (updated)"} \u2014 note ${result.noteId} \u2192 ${db2.path}`);
         } finally {
           await db2.close();
         }
         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 source = fs.readFileSync(file, "utf-8");
         const db2 = await openCliDb(cliDb());
         try {
-          await persistEquipment(db2, { ...equipment, registrySource: "user" });
-          writeOut(`[wod import] equipment ${equipment.slug} \u2014 ${equipment.label} \u2192 ${db2.path}`);
+          const result = await persistDefinitionNote(db2, "equipment", source);
+          writeOut(`[wod import] equipment ${result.slug}${result.createdNote ? "" : " (updated)"} \u2014 note ${result.noteId} \u2192 ${db2.path}`);
         } finally {
           await db2.close();
         }
@@ -4779,18 +4778,18 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
     }
     if (parsed.subcommand === "publish") {
       const isDir = (s) => Boolean(s && (s.startsWith(".") || s.startsWith("/") || s.includes("/") || s.includes("\\")));
-      const catalog = isDir(parsed.target) ? void 0 : parsed.target;
+      const notebook = isDir(parsed.target) ? void 0 : parsed.target;
       const targetDir = isDir(parsed.target) ? parsed.target : parsed.target2;
-      const outDir = parsed.output ?? targetDir ?? (catalog ? `./dist/seed/${catalog}` : "./dist/seed");
+      const outDir = parsed.output ?? targetDir ?? (notebook ? `./dist/seed/${notebook}` : "./dist/seed");
       const db = await openCliDb(cliDb());
       try {
-        const result = await publishCatalogSeed(db, {
-          catalog,
+        const result = await publishNotebookSeed(db, {
+          notebook,
           outDir,
           version: parsed.seedVersion
         });
         writeOut(
-          `[wod publish] published ${result.catalogs.join(", ")} (${result.totalNotes} notes) \u2192 ${result.outDir} (manifest schema v${result.manifest.schema}, version ${result.manifest.version})`
+          `[wod publish] published ${result.notebooks.join(", ")} (${result.totalNotes} notes) \u2192 ${result.outDir} (manifest schema v${result.manifest.schema}, version ${result.manifest.version})`
         );
       } finally {
         await db.close();
@@ -4809,7 +4808,6 @@ async function cliMain(argv = process.argv.slice(2), io = {}) {
         const result = generateSeed2({
           corpusRoot: root,
           ...parsed.output ? { outDir: nodePath().resolve(cwd, parsed.output) } : {},
-          ...parsed.template ? { templateFile: nodePath().resolve(cwd, parsed.template) } : {},
           scaffoldDiscoveredEfforts: parsed.scaffold === true
         });
         const kb = (n) => `${(n / 1024).toFixed(0)} KB`;