@bitcobblers/wod-wiki-wql 0.9.40 → 0.10.42

package/dist/index.d.cts

@@ -376,6 +376,36 @@ declare function normalizeWql(raw: string): {
     advisories: string[];
 };
 
+/**
+ * WQL serializer (C6 — one structured interface for code).
+ *
+ * The total serializer over the C5 discriminated query union: code holds the
+ * AST; strings live only at document edges (URL `?q=`, ```query``` fences,
+ * dashboard bodies). Properties (proven by tests/serialize.test.ts):
+ *
+ *   1. `serialize(parse(x)) === x` for canonical inputs (fixed-point text), and
+ *   2. `parse(serialize(a))` is structurally equal to `a` for every AST —
+ *      equal on all query-structure fields; `raw` (provenance text) and
+ *      `advisories` (parse-time deprecation notices) are intentionally not
+ *      reproduced, since serialization emits modern canonical syntax.
+ *
+ * Errored ASTs serialize to their original `raw` text — a query that failed
+ * to parse has no well-defined structure to re-emit, and echoing the input
+ * keeps the function total.
+ *
+ * Round-trip equality holds for text-surface-representable ASTs. Three value
+ * shapes the grammar cannot express (or parses away) sit outside that
+ * contract — documented here rather than silently corrupted:
+ *   - a `"` inside a filter value: the quoted token has no escape form;
+ *   - a quoted value with `wildcard: true`: the parser forces wildcard=false
+ *     on quoted atoms (extractFilters), so the flag cannot survive;
+ *   - thresholds whose String() is exponential (>= 1e21): outside the join
+ *     comparison regex's plain-decimal domain.
+ */
+
+/** Serialize any parsed query to canonical WQL text. Total: never throws. */
+declare function serialize(parsed: AnyParsedQuery): string;
+
 /**
  * Canonical discipline vocabulary — the single source of truth for effort
  * disciplines across the resolver, the TIS factor table, fact-row tags, the
@@ -1009,13 +1039,13 @@ declare function parseFrontmatterProps(lines: string[]): Record<string, string>;
  * Auto-generated build version metadata.
  * Do not edit directly; updated by scripts/stamp-version.ts
  */
-declare const VERSION = "0.9.40";
-declare const GIT_SHA = "2462ec9";
-declare const BUILD_TIME = "2026-08-26T01:04:47.412Z";
+declare const VERSION = "0.10.42";
+declare const GIT_SHA = "79c6d18";
+declare const BUILD_TIME = "2026-08-26T04:44:54.356Z";
 declare const SEMVER: {
-    readonly version: "0.9.40";
-    readonly gitSha: "2462ec9";
-    readonly buildTime: "2026-08-26T01:04:47.412Z";
+    readonly version: "0.10.42";
+    readonly gitSha: "79c6d18";
+    readonly buildTime: "2026-08-26T04:44:54.356Z";
 };
 
-export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedAggregateQuery, type ParsedFindQuery, type ParsedFrontmatter, type ParsedRowsQuery, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type ParsedWqlWindowSuffix, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type QueryWindow, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlResultPlane, type WqlRollupPeriod, type WqlRowsTarget, type WqlSource, type WqlSourceValue, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };
+export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedAggregateQuery, type ParsedFindQuery, type ParsedFrontmatter, type ParsedRowsQuery, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type ParsedWqlWindowSuffix, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type QueryWindow, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlResultPlane, type WqlRollupPeriod, type WqlRowsTarget, type WqlSource, type WqlSourceValue, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serialize, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };

package/dist/index.d.ts

@@ -376,6 +376,36 @@ declare function normalizeWql(raw: string): {
     advisories: string[];
 };
 
+/**
+ * WQL serializer (C6 — one structured interface for code).
+ *
+ * The total serializer over the C5 discriminated query union: code holds the
+ * AST; strings live only at document edges (URL `?q=`, ```query``` fences,
+ * dashboard bodies). Properties (proven by tests/serialize.test.ts):
+ *
+ *   1. `serialize(parse(x)) === x` for canonical inputs (fixed-point text), and
+ *   2. `parse(serialize(a))` is structurally equal to `a` for every AST —
+ *      equal on all query-structure fields; `raw` (provenance text) and
+ *      `advisories` (parse-time deprecation notices) are intentionally not
+ *      reproduced, since serialization emits modern canonical syntax.
+ *
+ * Errored ASTs serialize to their original `raw` text — a query that failed
+ * to parse has no well-defined structure to re-emit, and echoing the input
+ * keeps the function total.
+ *
+ * Round-trip equality holds for text-surface-representable ASTs. Three value
+ * shapes the grammar cannot express (or parses away) sit outside that
+ * contract — documented here rather than silently corrupted:
+ *   - a `"` inside a filter value: the quoted token has no escape form;
+ *   - a quoted value with `wildcard: true`: the parser forces wildcard=false
+ *     on quoted atoms (extractFilters), so the flag cannot survive;
+ *   - thresholds whose String() is exponential (>= 1e21): outside the join
+ *     comparison regex's plain-decimal domain.
+ */
+
+/** Serialize any parsed query to canonical WQL text. Total: never throws. */
+declare function serialize(parsed: AnyParsedQuery): string;
+
 /**
  * Canonical discipline vocabulary — the single source of truth for effort
  * disciplines across the resolver, the TIS factor table, fact-row tags, the
@@ -1009,13 +1039,13 @@ declare function parseFrontmatterProps(lines: string[]): Record<string, string>;
  * Auto-generated build version metadata.
  * Do not edit directly; updated by scripts/stamp-version.ts
  */
-declare const VERSION = "0.9.40";
-declare const GIT_SHA = "2462ec9";
-declare const BUILD_TIME = "2026-08-26T01:04:47.412Z";
+declare const VERSION = "0.10.42";
+declare const GIT_SHA = "79c6d18";
+declare const BUILD_TIME = "2026-08-26T04:44:54.356Z";
 declare const SEMVER: {
-    readonly version: "0.9.40";
-    readonly gitSha: "2462ec9";
-    readonly buildTime: "2026-08-26T01:04:47.412Z";
+    readonly version: "0.10.42";
+    readonly gitSha: "79c6d18";
+    readonly buildTime: "2026-08-26T04:44:54.356Z";
 };
 
-export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedAggregateQuery, type ParsedFindQuery, type ParsedFrontmatter, type ParsedRowsQuery, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type ParsedWqlWindowSuffix, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type QueryWindow, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlResultPlane, type WqlRollupPeriod, type WqlRowsTarget, type WqlSource, type WqlSourceValue, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };
+export { type Aggregator, type AnyParsedQuery, BUILD_TIME, type BlockQueryStore, type ComparisonOp, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, type DashboardDocument, type DashboardMeta, type DashboardParsedSection, type DashboardSectionInput, type DashboardToken, type DashboardWidget, type DashboardWidgetType, EFFORT_DISCIPLINES, type EffortDiscipline, type EffortQueryStore, type EventRowIdentity, type FindOptions, type FindPredicate, type FindQueryResult, GIT_SHA, type IEffort, KG_PER_LB, type LinkWidget, type MetricPredicate, type NoteQueryStore, PLANNED_WIDGET_TYPES, type ParsedAggregateQuery, type ParsedFindQuery, type ParsedFrontmatter, type ParsedRowsQuery, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type ParsedWqlWindowSuffix, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, type QueryWindow, type RowsQueryResult, type RowsRun, SEMVER, type Series, type SeriesPoint, type SummaryFactIdentity, type SummaryFactSourceOutput, type TagFilter, type TagValue, UNIT_FAMILIES, type UnifiedEventStore, type UnitFamily, type UnitFamilyDef, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, type WqlAggregator, type WqlCalcTarget, type WqlComparisonOp, type WqlCompletionOptions, type WqlContentFilterKey, type WqlDisplayUnit, type WqlFindTarget, type WqlGrain, type WqlIntensityTier, type WqlKeyword, type WqlMetricAggregate, type WqlMetricFamily, type WqlResultPlane, type WqlRollupPeriod, type WqlRowsTarget, type WqlSource, type WqlSourceValue, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serialize, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms as wqlTerms };

package/dist/index.mjs

@@ -279,7 +279,10 @@ function parseJoinClause(where) {
     if (fp.window?.kind === "range") {
       return { error: "Range windows are not supported on join halves \u2014 use last <n>d|w" };
     }
-    return { find: { target: fp.target, filters: fp.filters, last: fp.window?.kind === "relative" ? { size: fp.window.size, unit: fp.window.unit } : void 0 } };
+    return {
+      find: { target: fp.target, filters: fp.filters, last: fp.window?.kind === "relative" ? { size: fp.window.size, unit: fp.window.unit } : void 0 },
+      advisories: fp.advisories
+    };
   }
   const m = CMP_RE.exec(where.trim());
   if (!m) return { error: cannotParseJoin(where) };
@@ -340,6 +343,12 @@ function normalizeWql(raw) {
         head = `${head}{source:${scope}}`;
       }
       const parts = [head];
+      if (suffixes.groupBy) {
+        parts.push(`by {${suffixes.groupBy.join(", ")}}`);
+      }
+      if (suffixes.rollup) {
+        parts.push(`.rollup(${suffixes.rollup.raw})`);
+      }
       if (suffixes.window) {
         parts.push(suffixes.window.raw);
       }
@@ -361,7 +370,8 @@ function validateRowsFilters(filters) {
     (f) => !allowedKeys.has(f.key) || f.negate || f.values.some((v) => v.wildcard)
   );
   if (unsupported.length > 0) {
-    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")} values.`;
+    const allowed = [...WQL_ROWS_SCOPE_KEYS, "source"];
+    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${allowed.map((k) => `${k}:`).join(", ")} values.`;
   }
   if (!filters.some((f) => scopeKeys.has(f.key))) {
     return `Rows query needs a scope: ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")}.`;
@@ -377,7 +387,7 @@ function validateSourceFilter(filters) {
       if (validSources.has(val) || val === "collection" || val === "feed" || val.startsWith("collection:") || val.startsWith("feed:")) {
         continue;
       }
-      return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")}`;
+      return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")} (or collection:<id>, feed:<id>)`;
     }
   }
   return void 0;
@@ -585,6 +595,9 @@ function parseAnalyticsQuery(raw) {
       base.error = join.error;
       return base;
     }
+    if (join.advisories?.length) {
+      base.advisories = [...base.advisories ?? [], ...join.advisories];
+    }
     if (!join.find) {
       base.error = `Cross-store join on an analytics query must be find:\u2026, got "${whereText}"`;
       return base;
@@ -680,6 +693,64 @@ function parseFindQuery(raw) {
   return result;
 }
 
+// src/serialize.ts
+function serializeValue(value) {
+  if (/^[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)?$/.test(value)) return value;
+  return `"${value}"`;
+}
+function serializeFilters(filters) {
+  return filters.map((f) => `${f.negate ? "!" : ""}${f.key}:${f.values.map((v) => serializeValue(v.value) + (v.wildcard ? "*" : "")).join("|")}`).join(",");
+}
+function serializeAggHead(agg, metric, filters) {
+  return `${agg}:${metric}{${serializeFilters(filters)}}`;
+}
+function serializeAggregateHead(a) {
+  return serializeAggHead(a.agg, a.metric, a.filters);
+}
+function serializeFindHalf(target, filters, last) {
+  const head = `find:${target}${filters.length ? `{${serializeFilters(filters)}}` : ""}`;
+  return last ? `${head} last ${last.size}${last.unit}` : head;
+}
+function serializeMetricHalf(j) {
+  return `${serializeAggHead(j.agg, j.metric, j.filters)} ${j.operator} ${j.threshold}`;
+}
+function serializeFindHead(f) {
+  return serializeFindHalf(f.target, f.filters);
+}
+function serializeRowsHead(r) {
+  return `rows:${r.outputType ?? "all"}{${serializeFilters(r.filters)}}`;
+}
+function serializeWindow(w) {
+  if (!w) return "";
+  if (w.kind === "relative") return `last ${w.size}${w.unit}`;
+  return w.end ? `from ${w.start} to ${w.end}` : `from ${w.start}`;
+}
+function serialize(parsed) {
+  if (parsed.error) return parsed.raw;
+  if (parsed.family === "aggregate") {
+    const a = parsed;
+    let text = serializeAggregateHead(a);
+    if (a.groupBy.length) text += ` by {${a.groupBy.join(", ")}}`;
+    if (a.rollup) text += `.rollup(${a.rollup.size}${a.rollup.unit})`;
+    if (a.displayUnit) text += ` in ${a.displayUnit}`;
+    const win = serializeWindow(a.window);
+    if (win) text += ` ${win}`;
+    if (a.join) text += ` where ${serializeFindHalf(a.join.target, a.join.filters, a.join.last)}`;
+    return text;
+  }
+  if (parsed.family === "find") {
+    const parts = [serializeFindHead(parsed), serializeWindow(parsed.window)];
+    if (parsed.join) parts.push(`where ${serializeMetricHalf(parsed.join)}`);
+    return parts.filter(Boolean).join(" ");
+  }
+  if (parsed.family === "rows") {
+    const win = serializeWindow(parsed.window);
+    return [serializeRowsHead(parsed), win].filter(Boolean).join(" ");
+  }
+  const unhandled = parsed;
+  return unhandled.raw ?? "";
+}
+
 // src/disciplines.ts
 var EFFORT_DISCIPLINES = [
   "bodyweight",
@@ -1588,9 +1659,9 @@ var QueryService = class {
     if (this.staticNoteStore) {
       notes = notes.concat(await this.staticNoteStore.getAllNotes());
     }
+    notes = applySourceFilter(notes, parsed.filters);
     const selectedCount = notes.length;
     const anchorNow = windowAnchor(notes, parsed, options2);
-    notes = applySourceFilter(notes, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "tags" && !filter.negate) {
         const matchingIds = /* @__PURE__ */ new Set();
@@ -1650,9 +1721,9 @@ var QueryService = class {
     if (this.staticBlockStore) {
       blocks = blocks.concat(await this.staticBlockStore.getAllBlocks());
     }
+    blocks = applySourceFilter(blocks, parsed.filters);
     const selectedCount = blocks.length;
     const anchorNow = windowAnchor(blocks, parsed, options2);
-    blocks = applySourceFilter(blocks, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "text" && !filter.negate) {
         const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
@@ -2249,15 +2320,15 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.9.40";
-var GIT_SHA = "2462ec9";
-var BUILD_TIME = "2026-08-26T01:04:47.412Z";
+var VERSION = "0.10.42";
+var GIT_SHA = "79c6d18";
+var BUILD_TIME = "2026-08-26T04:44:54.356Z";
 var SEMVER = {
-  version: "0.9.40",
-  gitSha: "2462ec9",
-  buildTime: "2026-08-26T01:04:47.412Z"
+  version: "0.10.42",
+  gitSha: "79c6d18",
+  buildTime: "2026-08-26T04:44:54.356Z"
 };
 
-export { BUILD_TIME, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, KG_PER_LB, PLANNED_WIDGET_TYPES, QueryService, SEMVER, UNIT_FAMILIES, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms };
+export { BUILD_TIME, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, KG_PER_LB, PLANNED_WIDGET_TYPES, QueryService, SEMVER, UNIT_FAMILIES, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serialize, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map