@bitcobblers/wod-wiki-wql 0.35.2116 → 0.35.2117

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { KNOWN_OUTPUT_TYPES, dimensionKeyOf, convertViaCatalog, systemDefaultUnit, MetricType, valueKindOf, normalizeFieldPath, fieldRefKey, normalizeFieldComponent } from '@bitcobblers/wod-wiki-core';
+import { KNOWN_OUTPUT_TYPES, dimensionKeyOf, convertViaCatalog, systemDefaultUnit, MetricType, valueKindOf, normalizeFieldPath, validateNoteBlocks, fieldRefKey, normalizeFieldComponent } from '@bitcobblers/wod-wiki-core';
 export { SYSTEM_DEFAULT_OUTPUT_UNIT, UnitConversionError, convertViaCatalog, dimensionKeyOf, lookupUnit, systemDefaultUnit } from '@bitcobblers/wod-wiki-core';
 import { LRParser } from '@lezer/lr';
 import { LRLanguage, HighlightStyle, LanguageSupport, syntaxHighlighting } from '@codemirror/language';
@@ -2591,8 +2591,8 @@ function normalizeSummaryFacts(logs, identity) {
     origin: identity.origin,
     pageId: identity.pageId,
     grain: "summary",
-    segmentId: identity.segmentId ?? "",
-    segmentVersion: identity.segmentVersion ?? 0,
+    blockId: identity.blockId ?? "",
+    blockVersion: identity.blockVersion ?? 0,
     resultId: identity.resultId,
     type: f.metricKey,
     value: f.value,
@@ -2644,8 +2644,8 @@ function toEventRows(logs, identity) {
     text: output.text,
     dialect: output.dialect,
     completionReason: output.completionReason,
-    segmentId: identity.segmentId,
-    segmentVersion: identity.segmentVersion
+    blockId: identity.blockId,
+    blockVersion: identity.blockVersion
   }));
 }
 function toSummaryEventRows(logs, identity) {
@@ -2692,8 +2692,8 @@ function toSummaryEventRows(logs, identity) {
         ...f.grade ? { grade: f.grade } : {}
       }
     }],
-    segmentId: identity.segmentId,
-    segmentVersion: identity.segmentVersion
+    blockId: identity.blockId,
+    blockVersion: identity.blockVersion
   }));
 }
 function projectEventToFacts(record) {
@@ -2712,8 +2712,8 @@ function projectEventToFacts(record) {
       origin: record.origin,
       pageId: record.pageId,
       grain: "summary",
-      segmentId: record.segmentId ?? "",
-      segmentVersion: record.segmentVersion ?? 0,
+      blockId: record.blockId ?? "",
+      blockVersion: record.blockVersion ?? 0,
       resultId: record.resultId,
       type: metricKey,
       value: m.value,
@@ -2771,8 +2771,8 @@ function projectEventToFacts(record) {
       origin: record.origin,
       pageId: record.pageId,
       grain: "event",
-      segmentId: record.segmentId ?? "",
-      segmentVersion: record.segmentVersion ?? 0,
+      blockId: record.blockId ?? "",
+      blockVersion: record.blockVersion ?? 0,
       resultId: record.resultId,
       type: metricKey,
       value: m.value,
@@ -2814,117 +2814,6 @@ function eventsToStoredLogs(events) {
   }));
 }
 
-// src/dashboard/frontmatter.ts
-var FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
-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 parseFrontmatterBody(innerContent) {
-  return parseMetaLines(innerContent.split(/\r?\n/));
-}
-function quoteYamlScalar(value) {
-  if (value === "") return '""';
-  const looksNumeric = !isNaN(Number(value));
-  const looksKeyword = /^(true|false|null|yes|no|on|off)$/i.test(value);
-  if (/[":'\n#{}[\\],&*?|<>=%!@`]/.test(value) || value !== value.trim() || value.startsWith("-") || looksNumeric || looksKeyword) {
-    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
-  }
-  return value;
-}
-function serializeFrontmatter(meta) {
-  const lines = [];
-  for (const [key, value] of Object.entries(meta)) {
-    if (Array.isArray(value)) {
-      if (value.length === 0) {
-        lines.push(`${key}: ""`);
-        continue;
-      }
-      lines.push(`${key}:`);
-      for (const item of value) {
-        lines.push(`  - ${quoteYamlScalar(item)}`);
-      }
-    } else if (typeof value === "number") {
-      lines.push(`${key}: ${value}`);
-    } else {
-      lines.push(`${key}: ${quoteYamlScalar(value)}`);
-    }
-  }
-  return lines.join("\n");
-}
-function stripFrontmatter(raw) {
-  return parseFrontmatter(raw).body;
-}
-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 : [];
-}
-function parseFrontmatterCategories(raw) {
-  return getList(parseFrontmatter(raw).meta, "category").map((c) => c.toLowerCase());
-}
-function extractFrontmatterTags(raw) {
-  const meta = FRONTMATTER_RE.test(raw) ? parseFrontmatter(raw).meta : parseFrontmatterBody(raw);
-  const tags = meta["tags"];
-  const list = Array.isArray(tags) ? tags : typeof tags === "string" && tags.trim() ? tags.trim().startsWith("[") && tags.trim().endsWith("]") ? tags.trim().slice(1, -1).split(",") : [tags] : [];
-  return [...new Set(list.map((tag) => tag.trim()).filter(Boolean))];
-}
-function parseFlatProperties(innerContent) {
-  const props = {};
-  for (const line of innerContent.split(/\r?\n/)) {
-    const match = line.match(/^([^:]+):\s*(.*)$/);
-    if (match) {
-      props[match[1].trim()] = match[2].trim();
-    }
-  }
-  return props;
-}
-function parseFrontmatterProps(lines) {
-  const props = {};
-  for (const line of lines) {
-    const match = line.match(/^([^:]+):\s*(.*)$/);
-    if (match) {
-      props[match[1].trim()] = match[2].trim();
-    }
-  }
-  return props;
-}
-
 // src/selection.ts
 function partitionKey(coverage, effortSlug) {
   const tags = coverage?.groupTags ? Object.entries(coverage.groupTags).sort(([a], [b]) => a < b ? -1 : 1).map(([k, v]) => `${k}=${v}`).join(",") : "";
@@ -3398,7 +3287,6 @@ var QueryService = class {
   noteStore;
   blockStore;
   effortStore;
-  staticNoteStore;
   pageStore;
   relationStore;
   datasetStore;
@@ -3413,14 +3301,13 @@ var QueryService = class {
   noteTagsStore = {
     getAllFromIndex: async () => []
   };
-  constructor(storesOrEventStore, noteStore, blockStore, effortStore, staticNoteStore) {
-    if (storesOrEventStore && typeof storesOrEventStore === "object" && ("eventStore" in storesOrEventStore || "noteStore" in storesOrEventStore || "blockStore" in storesOrEventStore || "effortStore" in storesOrEventStore || "staticNoteStore" in storesOrEventStore || "pageStore" in storesOrEventStore || "relationStore" in storesOrEventStore || "datasetStore" in storesOrEventStore)) {
+  constructor(storesOrEventStore, noteStore, blockStore, effortStore) {
+    if (storesOrEventStore && typeof storesOrEventStore === "object" && ("eventStore" in storesOrEventStore || "noteStore" in storesOrEventStore || "blockStore" in storesOrEventStore || "effortStore" in storesOrEventStore || "pageStore" in storesOrEventStore || "relationStore" in storesOrEventStore || "datasetStore" in storesOrEventStore)) {
       const stores = storesOrEventStore;
       this.store = stores.eventStore ?? defaultEventStore;
       this.noteStore = stores.noteStore ?? defaultNoteStore;
       this.blockStore = stores.blockStore ?? defaultBlockStore;
       this.effortStore = stores.effortStore ?? defaultEffortStore;
-      this.staticNoteStore = stores.staticNoteStore;
       this.pageStore = stores.pageStore;
       this.relationStore = stores.relationStore;
       this.datasetStore = stores.datasetStore;
@@ -3432,7 +3319,6 @@ var QueryService = class {
       this.noteStore = noteStore ?? defaultNoteStore;
       this.blockStore = blockStore ?? defaultBlockStore;
       this.effortStore = effortStore ?? defaultEffortStore;
-      this.staticNoteStore = staticNoteStore;
     }
   }
   /** Windowed flat-fact fetch — the projected view over the event store. */
@@ -3752,14 +3638,11 @@ var QueryService = class {
     }
     const isCatalogHead = parsed.target === "note" && parsed.filters.some((f) => f.key === "type" && !f.negate && f.values.some((v) => v.value === "feed")) && (parsed.filters.some((f) => f.key === "source" && !f.negate && f.values.some((v) => v.value === "feed" || v.value === "feeds")) || parsed.sourceScope?.includes("feeds"));
     if (isCatalogHead) {
-      const notes2 = (await this.noteStore.getAllNotes()).concat(
-        this.staticNoteStore ? await this.staticNoteStore.getAllNotes() : []
-      );
-      return this.runFindCatalog(parsed, options2, notes2);
+      return this.runFindCatalog(parsed, options2, await this.noteStore.getAllNotes());
     }
     const read = compileContentRead(parsed.filters, "note", parsed.sourceScope);
-    const paging = domainPaging(parsed, options2, read.residual || !!this.staticNoteStore);
-    const fetchedNotes = !this.staticNoteStore && (read.filters.length > 0 || read.selection.length > 0 || paging.paged) && this.noteStore.queryDomain ? await this.noteStore.queryDomain({
+    const paging = domainPaging(parsed, options2, read.residual);
+    const fetchedNotes = (read.filters.length > 0 || read.selection.length > 0 || paging.paged) && this.noteStore.queryDomain ? await this.noteStore.queryDomain({
       plan: "notes",
       selection: read.selection,
       ...read.filters.length ? { filters: read.filters } : {},
@@ -3771,11 +3654,6 @@ var QueryService = class {
     let notes = domainNotes ? domainNotes.rows : await this.noteStore.getAllNotes();
     const selectedFromDomain = domainNotes ? domainNotes.selectedCount : void 0;
     const notesPaged = !!domainNotes && paging.paged;
-    if (this.staticNoteStore) {
-      const staticRows = applyNoteSelectionStages(await this.staticNoteStore.getAllNotes(), parsed);
-      const known = new Set(notes.map((n) => n.id));
-      notes = notes.concat(staticRows.filter((n) => !known.has(n.id)));
-    }
     notes = applyNoteSelectionStages(notes, parsed);
     const selectedCount = selectedFromDomain ?? notes.length;
     const ctx = runContext(options2);
@@ -3784,16 +3662,13 @@ var QueryService = class {
         const matchingIds = /* @__PURE__ */ new Set();
         for (const v of filter.values) {
           const ids = await this.noteStore.getNoteIdsForTag(v.value);
-          const sIds = this.staticNoteStore ? await this.staticNoteStore.getNoteIdsForTag(v.value) : /* @__PURE__ */ new Set();
           ids.forEach((id) => matchingIds.add(id));
-          sIds.forEach((id) => matchingIds.add(id));
         }
         notes = notes.filter((n) => matchingIds.has(n.id));
       } else if (filter.key === "tags" && filter.negate) {
         for (const v of filter.values) {
           const ids = await this.noteStore.getNoteIdsForTag(v.value);
-          const sIds = this.staticNoteStore ? await this.staticNoteStore.getNoteIdsForTag(v.value) : /* @__PURE__ */ new Set();
-          notes = notes.filter((n) => !ids.has(n.id) && !sIds.has(n.id));
+          notes = notes.filter((n) => !ids.has(n.id));
         }
       } else if (filter.key === "effort" && !filter.negate) {
         const matchingIds = /* @__PURE__ */ new Set();
@@ -3812,9 +3687,12 @@ var QueryService = class {
       }
     }
     for (const filter of parsed.filters) {
-      if (filter.key === "text" && !filter.negate) {
+      if (filter.key === "text") {
         const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
-        notes = notes.filter((n) => n.title.toLowerCase().includes(search));
+        notes = notes.filter((n) => {
+          const hit = n.title.toLowerCase().includes(search) || n.rawContent.toLowerCase().includes(search);
+          return filter.negate ? !hit : hit;
+        });
       }
     }
     for (const filter of parsed.filters) {
@@ -3911,6 +3789,26 @@ var QueryService = class {
     }
     return containers;
   }
+  async hydrateBlocks(rows) {
+    const ids = [...new Set(rows.map((row) => row.noteId))];
+    if (ids.length === 0) return [];
+    const notes = this.noteStore.getNotesByIds ? await this.noteStore.getNotesByIds(ids) : await this.noteStore.getAllNotes();
+    const parents = /* @__PURE__ */ new Map();
+    for (const note of notes) {
+      if (!Number.isSafeInteger(note.sourceRevision) || note.sourceRevision < 1) continue;
+      try {
+        validateNoteBlocks(note.rawContent, note.blocks, note.sourceRevision);
+        parents.set(note.id, note);
+      } catch {
+      }
+    }
+    return rows.flatMap((row) => {
+      const note = parents.get(row.noteId);
+      const block = note?.blocks[row.blockId];
+      if (!note || !block || row.id !== `${note.id}:${block.id}` || block.id !== row.blockId || block.kind !== row.dataType || block.version !== row.blockVersion || block.sourceRevision !== row.sourceRevision || note.sourceRevision !== row.sourceRevision || block.from !== row.from || block.to !== row.to) return [];
+      return [{ ...row, rawContent: note.rawContent.slice(block.from, block.to) }];
+    });
+  }
   /**
    * Execute a :block query against the derived block_index store.
    */
@@ -3926,17 +3824,20 @@ var QueryService = class {
       ...paging.limit !== void 0 ? { limit: paging.limit } : {}
     }) : void 0;
     const domainBlocks = fetchedBlocks && fetchedBlocks.plan === "blocks" ? fetchedBlocks : void 0;
-    let blocks = domainBlocks ? domainBlocks.rows : await this.blockStore.getAllBlocks();
-    const selectedFromDomain = domainBlocks ? domainBlocks.selectedCount : void 0;
-    const blocksPaged = !!domainBlocks && paging.paged;
+    const candidates = domainBlocks ? domainBlocks.rows : await this.blockStore.getAllBlocks();
+    let blocks = await this.hydrateBlocks(candidates);
+    const invalidCandidates = blocks.length !== candidates.length;
+    const selectedFromDomain = domainBlocks && !invalidCandidates ? domainBlocks.selectedCount : void 0;
+    const blocksPaged = !!domainBlocks && paging.paged && !invalidCandidates;
+    if (domainBlocks && invalidCandidates) blocks = await this.hydrateBlocks(await this.blockStore.getAllBlocks());
     blocks = applySourceFilter(blocks, parsed.filters);
     blocks = blocks.filter((b) => !b.sourceId || WQL_SOURCE_VALUES.some((k) => sourceMatches(b, k)));
     const selectedCount = selectedFromDomain ?? blocks.length;
     const ctx = runContext(options2);
     for (const filter of parsed.filters) {
-      if (filter.key === "text" && !filter.negate) {
+      if (filter.key === "text") {
         const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
-        blocks = blocks.filter((b) => b.rawContent.toLowerCase().includes(search));
+        blocks = blocks.filter((b) => filter.negate !== b.rawContent.toLowerCase().includes(search));
       }
     }
     for (const filter of parsed.filters) {
@@ -3961,18 +3862,16 @@ var QueryService = class {
         const matchingNoteIds = /* @__PURE__ */ new Set();
         for (const v of filter.values) {
           const ids = await this.noteStore.getNoteIdsForTag(v.value);
-          const sIds = this.staticNoteStore ? await this.staticNoteStore.getNoteIdsForTag(v.value) : /* @__PURE__ */ new Set();
           ids.forEach((id) => matchingNoteIds.add(id));
-          sIds.forEach((id) => matchingNoteIds.add(id));
         }
         blocks = blocks.filter((b) => matchingNoteIds.has(b.noteId));
       } else if (filter.key === "effort" && !filter.negate) {
         const matchingBlockIds = /* @__PURE__ */ new Set();
         for (const v of filter.values) {
           const rows = await this.blockEffortsStore.getAllFromIndex("by-effort", v.value);
-          for (const r of rows) matchingBlockIds.add(r.blockContentId);
+          for (const row of rows) matchingBlockIds.add(`${row.noteId}:${row.blockId}`);
         }
-        blocks = blocks.filter((b) => b.blockContentId && matchingBlockIds.has(b.blockContentId));
+        blocks = blocks.filter((block) => matchingBlockIds.has(`${block.noteId}:${block.blockId}`));
       }
     }
     for (const filter of parsed.filters) {
@@ -3982,11 +3881,7 @@ var QueryService = class {
       }
     }
     if (parsed.window || options2.range) {
-      let allNotes = [];
-      allNotes = allNotes.concat(await this.noteStore.getAllNotes());
-      if (this.staticNoteStore) {
-        allNotes = allNotes.concat(await this.staticNoteStore.getAllNotes());
-      }
+      const allNotes = await this.noteStore.getAllNotes();
       const noteTimeMap = new Map(allNotes.map((n) => [n.id, n.date ?? n.createdAt]));
       blocks = blocks.filter((b) => effectiveTimeWindow(noteTimeMap.get(b.noteId) ?? b.createdAt, parsed.window, options2.range, ctx));
     }
@@ -4364,7 +4259,7 @@ var QueryService = class {
         let values;
         try {
           values = members.map(
-            (m) => shouldConvert && targetUnit ? convertViaCatalog(m.value, m.unit ?? m.metricUnit, targetUnit) : m.value
+            (m) => shouldConvert && targetUnit && (m.unit ?? m.metricUnit) !== void 0 ? convertViaCatalog(m.value, m.unit ?? m.metricUnit, targetUnit) : m.value
           );
         } catch (e) {
           error = e instanceof Error ? e.message : String(e);
@@ -4486,7 +4381,7 @@ var QueryService = class {
   }
   /** All content blocks — journal and seeded corpus in one store. */
   async allContentBlocks() {
-    return this.blockStore.getAllBlocks();
+    return this.hydrateBlocks(await this.blockStore.getAllBlocks());
   }
   /** Map each note id to the wod blockContentIds it owns. */
   async noteContentMap(noteIds) {
@@ -4563,7 +4458,10 @@ var QueryService = class {
           type: "feed",
           sourceId: `page:collection:${cat}`,
           catalog: cat,
-          createdAt: n.createdAt ?? 0
+          createdAt: n.createdAt ?? 0,
+          rawContent: "",
+          sourceRevision: 1,
+          blocks: {}
         });
         existingCatIds.add(cat);
       }
@@ -4612,9 +4510,7 @@ var QueryService = class {
         const matchingIds = /* @__PURE__ */ new Set();
         for (const v of filter.values) {
           const ids = await this.noteStore.getNoteIdsForTag(v.value);
-          const sIds = this.staticNoteStore ? await this.staticNoteStore.getNoteIdsForTag(v.value) : /* @__PURE__ */ new Set();
           ids.forEach((id) => matchingIds.add(id));
-          sIds.forEach((id) => matchingIds.add(id));
         }
         matchingCatalogs = matchingCatalogs.filter((c) => {
           const catId = catalogOfItem(c) ?? c.id;
@@ -4639,7 +4535,7 @@ var QueryService = class {
         matchingCatalogs = matchingCatalogs.filter((c) => {
           const catId = catalogOfItem(c) ?? c.id;
           const members = membersByCat.get(catId) ?? [];
-          const hit = members.some((m) => m.title.toLowerCase().includes(search));
+          const hit = members.some((m) => m.title.toLowerCase().includes(search) || m.rawContent.toLowerCase().includes(search));
           return filter.negate ? !hit : hit;
         });
       } else if (filter.key === "note") {
@@ -4679,56 +4575,6 @@ var QueryService = class {
   }
 };
 
-// src/static.ts
-function staticCatalogRoute(block) {
-  const sourceId = block.sourceId;
-  if (sourceId?.startsWith("page:collection:")) {
-    const catalog = sourceId.slice("page:collection:".length);
-    if (catalog) return { landing: true, catalog, sourceId };
-  } else if (sourceId?.startsWith("collection:")) {
-    const route = sourceId.slice("collection:".length);
-    if (route) {
-      const slash = route.indexOf("/");
-      return slash === -1 ? { landing: true, catalog: route, sourceId: `page:collection:${route}` } : { landing: false, catalog: route.slice(0, slash), sourceId };
-    }
-  } else if (sourceId?.startsWith("feed:")) {
-    const route = sourceId.slice("feed:".length);
-    if (route) {
-      const stem = route.startsWith("feeds/") ? route.slice("feeds/".length) : route;
-      return { landing: false, catalog: stem.split("/")[0], sourceId };
-    }
-  }
-  return { landing: false, catalog: catalogOfItem({ noteId: block.noteId, sourceId: block.sourceId }), sourceId };
-}
-function staticNotesFromBlocks(blocks) {
-  const map = /* @__PURE__ */ new Map();
-  for (const block of blocks) {
-    if (map.has(block.noteId)) continue;
-    const route = staticCatalogRoute(block);
-    map.set(block.noteId, {
-      id: block.noteId,
-      title: block.noteTitle,
-      createdAt: block.createdAt,
-      type: route.landing ? "feed" : "note",
-      sourceId: route.sourceId,
-      catalog: route.catalog
-    });
-  }
-  return Array.from(map.values());
-}
-function staticTagIndexFromBlocks(blocks) {
-  const index = /* @__PURE__ */ new Map();
-  for (const block of blocks) {
-    if (block.dataType !== "frontmatter") continue;
-    for (const tag of extractFrontmatterTags(block.rawContent)) {
-      const ids = index.get(tag);
-      if (ids) ids.add(block.noteId);
-      else index.set(tag, /* @__PURE__ */ new Set([block.noteId]));
-    }
-  }
-  return index;
-}
-
 // src/dashboard/model.ts
 var DASHBOARD_WIDGET_TYPES = [
   "table",
@@ -4917,6 +4763,117 @@ function buildDashboardDocument(sections, meta) {
   };
 }
 
+// src/dashboard/frontmatter.ts
+var FRONTMATTER_RE = /^---\r?\n([\s\S]*?)\r?\n---\r?\n?/;
+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 parseFrontmatterBody(innerContent) {
+  return parseMetaLines(innerContent.split(/\r?\n/));
+}
+function quoteYamlScalar(value) {
+  if (value === "") return '""';
+  const looksNumeric = !isNaN(Number(value));
+  const looksKeyword = /^(true|false|null|yes|no|on|off)$/i.test(value);
+  if (/[":'\n#{}[\\],&*?|<>=%!@`]/.test(value) || value !== value.trim() || value.startsWith("-") || looksNumeric || looksKeyword) {
+    return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  }
+  return value;
+}
+function serializeFrontmatter(meta) {
+  const lines = [];
+  for (const [key, value] of Object.entries(meta)) {
+    if (Array.isArray(value)) {
+      if (value.length === 0) {
+        lines.push(`${key}: ""`);
+        continue;
+      }
+      lines.push(`${key}:`);
+      for (const item of value) {
+        lines.push(`  - ${quoteYamlScalar(item)}`);
+      }
+    } else if (typeof value === "number") {
+      lines.push(`${key}: ${value}`);
+    } else {
+      lines.push(`${key}: ${quoteYamlScalar(value)}`);
+    }
+  }
+  return lines.join("\n");
+}
+function stripFrontmatter(raw) {
+  return parseFrontmatter(raw).body;
+}
+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 : [];
+}
+function parseFrontmatterCategories(raw) {
+  return getList(parseFrontmatter(raw).meta, "category").map((c) => c.toLowerCase());
+}
+function extractFrontmatterTags(raw) {
+  const meta = FRONTMATTER_RE.test(raw) ? parseFrontmatter(raw).meta : parseFrontmatterBody(raw);
+  const tags = meta["tags"];
+  const list = Array.isArray(tags) ? tags : typeof tags === "string" && tags.trim() ? tags.trim().startsWith("[") && tags.trim().endsWith("]") ? tags.trim().slice(1, -1).split(",") : [tags] : [];
+  return [...new Set(list.map((tag) => tag.trim()).filter(Boolean))];
+}
+function parseFlatProperties(innerContent) {
+  const props = {};
+  for (const line of innerContent.split(/\r?\n/)) {
+    const match = line.match(/^([^:]+):\s*(.*)$/);
+    if (match) {
+      props[match[1].trim()] = match[2].trim();
+    }
+  }
+  return props;
+}
+function parseFrontmatterProps(lines) {
+  const props = {};
+  for (const line of lines) {
+    const match = line.match(/^([^:]+):\s*(.*)$/);
+    if (match) {
+      props[match[1].trim()] = match[2].trim();
+    }
+  }
+  return props;
+}
+
 // src/dashboard/parser.ts
 function parseDashboardNote(rawContent) {
   const { meta } = parseFrontmatter(rawContent);
@@ -5121,6 +5078,44 @@ function appendWidget(raw, spec) {
   while (lines.length > 0 && lines[lines.length - 1] === "") lines.pop();
   return [...lines, "", ...group, ""].join("\n");
 }
+function widgetResult(raw, note, order) {
+  let from = 0;
+  while (from < raw.length && from < note.length && raw[from] === note[from]) from++;
+  let to = raw.length;
+  let nextTo = note.length;
+  while (to > from && nextTo > from && raw[to - 1] === note[nextTo - 1]) {
+    to--;
+    nextTo--;
+  }
+  const queries = parseDashboardNote(raw).sections.filter((section) => section.type === "query");
+  const nextQueries = parseDashboardNote(note).sections.filter((section) => section.type === "query");
+  const oldOffsets = lineOffsets(raw);
+  const nextOffsets = lineOffsets(note);
+  const oldLines = raw.split("\n");
+  const nextLines = note.split("\n");
+  const retainedBlocks = [];
+  for (const [nextIndex, oldIndex] of (order ?? queries.map((_, index) => index)).entries()) {
+    if (oldIndex === null) continue;
+    const block = queries[oldIndex];
+    const next = nextQueries[nextIndex];
+    if (!block || !next) throw new Error("Widget mutation lost its source lineage");
+    retainedBlocks.push({
+      from: oldOffsets[block.startLine],
+      to: oldOffsets[block.endLine] + oldLines[block.endLine].replace(/\r$/, "").length,
+      nextFrom: nextOffsets[next.startLine],
+      nextTo: nextOffsets[next.endLine] + nextLines[next.endLine].replace(/\r$/, "").length
+    });
+  }
+  return { ok: true, note, changes: raw === note ? [] : [{ from, to, insert: note.slice(from, nextTo) }], retainedBlocks };
+}
+function lineOffsets(raw) {
+  let offset = 0;
+  return raw.split("\n").map((line) => {
+    const from = offset;
+    offset += line.length + 1;
+    return from;
+  });
+}
 function updateWidget(raw, key, expectedBody, spec) {
   const { sections } = parseDashboardNote(raw);
   const found = findWidgetGroup(sections, key, expectedBody);
@@ -5128,7 +5123,7 @@ function updateWidget(raw, key, expectedBody, spec) {
   const { group } = found;
   const lines = raw.split("\n");
   lines.splice(group.startLine, group.endLine - group.startLine + 1, ...renderWidgetGroup(spec));
-  return { ok: true, note: lines.join("\n") };
+  return widgetResult(raw, lines.join("\n"));
 }
 function duplicateWidget(raw, key, expectedBody) {
   const { sections } = parseDashboardNote(raw);
@@ -5138,7 +5133,9 @@ function duplicateWidget(raw, key, expectedBody) {
   const lines = raw.split("\n");
   const copy = lines.slice(group.startLine, group.endLine + 1);
   lines.splice(group.endLine + 1, 0, "", ...copy);
-  return { ok: true, note: lines.join("\n") };
+  const order = sections.filter((section) => section.type === "query").map((_, index) => index);
+  order.splice(group.widgetIndex + 1, 0, null);
+  return widgetResult(raw, lines.join("\n"), order);
 }
 function removeWidget(raw, key, expectedBody) {
   const { sections } = parseDashboardNote(raw);
@@ -5150,7 +5147,9 @@ function removeWidget(raw, key, expectedBody) {
   if (group.startLine > 0 && group.startLine < lines.length && lines[group.startLine - 1] === "" && lines[group.startLine] === "") {
     lines.splice(group.startLine, 1);
   }
-  return { ok: true, note: lines.join("\n") };
+  const order = sections.filter((section) => section.type === "query").map((_, index) => index);
+  order.splice(group.widgetIndex, 1);
+  return widgetResult(raw, lines.join("\n"), order);
 }
 function moveWidget(raw, key, expectedBody, delta) {
   const { sections } = parseDashboardNote(raw);
@@ -5159,7 +5158,7 @@ function moveWidget(raw, key, expectedBody, delta) {
   const { group } = found;
   const groups = widgetGroupRanges(sections);
   const neighbor = groups[group.widgetIndex + delta];
-  if (!neighbor) return { ok: true, note: raw };
+  if (!neighbor) return widgetResult(raw, raw);
   const lines = raw.split("\n");
   const moving = lines.slice(group.startLine, group.endLine + 1);
   if (delta === -1) {
@@ -5171,7 +5170,10 @@ function moveWidget(raw, key, expectedBody, delta) {
     const insertAt = neighbor.endLine - shift + 1;
     lines.splice(insertAt, 0, ...moving);
   }
-  return { ok: true, note: lines.join("\n") };
+  const order = groups.map((_, index) => index);
+  order.splice(group.widgetIndex, 1);
+  order.splice(group.widgetIndex + delta, 0, group.widgetIndex);
+  return widgetResult(raw, lines.join("\n"), order);
 }
 function resizeWidget(raw, key, expectedBody, span) {
   if (span.spanCols != null && (span.spanCols < 1 || span.spanCols > DASHBOARD_GRID_MAX_COLS)) {
@@ -5193,7 +5195,7 @@ function resizeWidget(raw, key, expectedBody, span) {
     attributes: block.attributes,
     attributeOrder: block.attributeOrder
   });
-  return { ok: true, note: lines.join("\n") };
+  return widgetResult(raw, lines.join("\n"));
 }
 function migrateLegacyDashboardBodies(raw) {
   let out = raw;
@@ -5214,15 +5216,15 @@ ${query}
 }
 
 // src/version.ts
-var VERSION = "0.35.2116";
-var GIT_SHA = "a4d411f";
-var BUILD_TIME = "2026-10-12T00:14:24.795Z";
+var VERSION = "0.35.2117";
+var GIT_SHA = "03d1dfc";
+var BUILD_TIME = "2026-10-12T20:08:12.374Z";
 var SEMVER = {
-  version: "0.35.2116",
-  gitSha: "a4d411f",
-  buildTime: "2026-10-12T00:14:24.795Z"
+  version: "0.35.2117",
+  gitSha: "03d1dfc",
+  buildTime: "2026-10-12T20:08:12.374Z"
 };
 
-export { BUILD_TIME, CONTENT_GROUPING_DIMENSIONS, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, PLANNED_WIDGET_TYPES, PageSourceRegistry, QueryDocumentRunner, QueryService, SEMVER, QueryDocumentRunner2 as SharedQueryDocumentRunner, UNASSIGNED, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_CHART_HEADS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_CONTENT_ONLY_KEYS, WQL_DISPLAY_UNITS, WQL_EFFORT_FILTER_KEYS, WQL_FIND_TARGETS, WQL_FUNCTION_HEADS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_NOTE_DEFAULT_SOURCES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_SOURCES, WQL_SOURCE_HEADS, WQL_SOURCE_HEAD_SCOPES, WQL_SOURCE_VALUES, WQL_STANDARD_DATASETS, WQL_TAG_KEYS, WQL_TYPED_TAG_KEYS, WQL_TYPE_HEADS, WQL_VIRTUAL_DIMS, allowedFilterTypesForTarget, appendSuffixes, appendWidget, buildDashboardDocument, buildDashboardScaffold, buildDrillDownQuery, captureContext, catalogOfItem, civilDateAdd, civilDateDiff, civilDateOf, civilDatesCoveredByRange, civilMonday, consumesRollupFacts, convertDisplay, createBuiltinFormulaEvaluator, dashboardSlug, defaultTokenValues, disciplineFactorFor, duplicateWidget, eventsToStoredLogs, extractDashboardTokens, extractFrontmatterTags, findTargetAdvisories, getList, getScalar, getUnitFamily, inRange, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isPipelineQuery, isProposedMetric, migrateLegacyDashboardBodies, moveWidget, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseDocument, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, removeWidget, renderWidgetGroup, resizeWidget, resolveCanonicalMetricKey, resolveOutputUnit, resolveWidgetType, resolveWindowRange, rowsParseError, serialize, serializeDocument, serializeFrontmatter, setDashboardTokenValue, sourceMatches, splitAtWhere, staticCatalogRoute, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens2 as substituteTokens, substituteTokens as substituteTokensRaw, supportsWqlFilterKey, systemTimeZone, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, updateWidget, widgetBodyLine, widgetFenceTag, wql, wqlCompletion, wqlCompletionSource, wqlFilterKeys, wqlGroupingDimensions, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms, zonedNoon, zonedStartOfDay };
+export { BUILD_TIME, CONTENT_GROUPING_DIMENSIONS, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, PLANNED_WIDGET_TYPES, PageSourceRegistry, QueryDocumentRunner, QueryService, SEMVER, QueryDocumentRunner2 as SharedQueryDocumentRunner, UNASSIGNED, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_CHART_HEADS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_CONTENT_ONLY_KEYS, WQL_DISPLAY_UNITS, WQL_EFFORT_FILTER_KEYS, WQL_FIND_TARGETS, WQL_FUNCTION_HEADS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_NOTE_DEFAULT_SOURCES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_SOURCES, WQL_SOURCE_HEADS, WQL_SOURCE_HEAD_SCOPES, WQL_SOURCE_VALUES, WQL_STANDARD_DATASETS, WQL_TAG_KEYS, WQL_TYPED_TAG_KEYS, WQL_TYPE_HEADS, WQL_VIRTUAL_DIMS, allowedFilterTypesForTarget, appendSuffixes, appendWidget, buildDashboardDocument, buildDashboardScaffold, buildDrillDownQuery, captureContext, catalogOfItem, civilDateAdd, civilDateDiff, civilDateOf, civilDatesCoveredByRange, civilMonday, consumesRollupFacts, convertDisplay, createBuiltinFormulaEvaluator, dashboardSlug, defaultTokenValues, disciplineFactorFor, duplicateWidget, eventsToStoredLogs, extractDashboardTokens, extractFrontmatterTags, findTargetAdvisories, getList, getScalar, getUnitFamily, inRange, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isPipelineQuery, isProposedMetric, migrateLegacyDashboardBodies, moveWidget, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseDocument, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, removeWidget, renderWidgetGroup, resizeWidget, resolveCanonicalMetricKey, resolveOutputUnit, resolveWidgetType, resolveWindowRange, rowsParseError, serialize, serializeDocument, serializeFrontmatter, setDashboardTokenValue, sourceMatches, splitAtWhere, stripFrontmatter, substituteTokens2 as substituteTokens, substituteTokens as substituteTokensRaw, supportsWqlFilterKey, systemTimeZone, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, updateWidget, widgetBodyLine, widgetFenceTag, wql, wqlCompletion, wqlCompletionSource, wqlFilterKeys, wqlGroupingDimensions, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms, zonedNoon, zonedStartOfDay };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map