@bitcobblers/wod-wiki-wql 0.6.36 → 0.7.38

package/dist/index.d.cts

@@ -164,6 +164,8 @@ interface ParsedWqlSuffixes {
     last?: ParsedWqlLastSuffix;
     /** Content scope (`in journal` / `in all`). */
     scope?: string;
+    /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
+    conflicts?: string[];
     /** Primary query text with suffixes removed. */
     primaryText: string;
 }
@@ -236,7 +238,12 @@ interface FindPredicate {
         unit: 'd' | 'w';
     };
 }
-interface ParsedQuery {
+/**
+ * Result of parsing an analytics (aggregate) query — `agg:metric{filters} …`.
+ * Discriminated union member: `family === 'aggregate'` (C5).
+ */
+interface ParsedAggregateQuery {
+    family: 'aggregate';
     raw: string;
     agg: Aggregator;
     /** Canonical Metric Key (fact row `metricKey`). */
@@ -256,6 +263,7 @@ interface ParsedQuery {
 }
 /** Result of parsing a content-discovery query (`find:target{filters} in scope`). */
 interface ParsedFindQuery {
+    family: 'find';
     raw: string;
     /** Content target: 'note' or 'block'. */
     target: string;
@@ -271,11 +279,13 @@ interface ParsedFindQuery {
     join?: MetricPredicate;
     error?: string;
 }
-type AnyParsedQuery = ParsedQuery | ParsedFindQuery | ParsedRowsQuery;
+type AnyParsedQuery = ParsedAggregateQuery | ParsedFindQuery | ParsedRowsQuery;
 /** Type guard: true for content-discovery queries. */
 declare function isFindQuery(parsed: AnyParsedQuery): parsed is ParsedFindQuery;
 /** Type guard: true for rows queries. */
 declare function isRowsQuery(parsed: AnyParsedQuery): parsed is ParsedRowsQuery;
+/** Type guard: true for analytics (aggregate) queries. */
+declare function isAggregateQuery(parsed: AnyParsedQuery): parsed is ParsedAggregateQuery;
 interface SeriesPoint {
     ts: number;
     value: number;
@@ -288,7 +298,7 @@ interface SeriesPoint {
  */
 interface ParsedRowsQuery {
     raw: string;
-    /** Family discriminator (the other families are told apart by 'target'/'agg'). */
+    /** Family discriminator shared by all three query ASTs (C5). */
     family: 'rows';
     /** Output-statement type narrowing from the optional target (`rows:segment{…}`); undefined = all types. */
     outputType?: string;
@@ -307,9 +317,10 @@ interface Series {
     unit?: string;
 }
 /**
- * Parse a WQL query string into either an analytics ParsedQuery or a content
- * ParsedFindQuery. Dispatch is textual: a leading `find:` routes to the
- * content path, everything else to analytics.
+ * Parse a WQL query string into one of the three query families —
+ * analytics aggregate, content find, or rows — discriminated by `family`
+ * (C5). Dispatch is textual: a leading `find:` routes to the content path,
+ * `rows` to the rows path, everything else to analytics.
  */
 declare function parseQuery(raw: string): AnyParsedQuery;
 
@@ -630,7 +641,7 @@ interface FindOptions {
     anchorNow?: number;
 }
 interface QueryResult {
-    parsed: ParsedQuery;
+    parsed: ParsedAggregateQuery;
     series: Series[];
     stages: {
         selected: number;
@@ -691,7 +702,7 @@ declare class QueryService {
      * Execute a find:effort query against the effort registry.
      */
     runFindEffort(parsed: ParsedFindQuery): Promise<FindQueryResult>;
-    run(parsed: ParsedQuery, options?: QueryOptions): Promise<QueryResult>;
+    run(parsed: ParsedAggregateQuery, options?: QueryOptions): Promise<QueryResult>;
     /**
      * Stages 2–4 — BUCKET → GROUP → AGGREGATE over an already-selected +
      * filtered `matched` set.
@@ -945,13 +956,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.6.36";
-declare const GIT_SHA = "c5ad2b0";
-declare const BUILD_TIME = "2026-08-24T20:14:33.951Z";
+declare const VERSION = "0.7.38";
+declare const GIT_SHA = "172cc75";
+declare const BUILD_TIME = "2026-08-25T23:00:14.937Z";
 declare const SEMVER: {
-    readonly version: "0.6.36";
-    readonly gitSha: "c5ad2b0";
-    readonly buildTime: "2026-08-24T20:14:33.951Z";
+    readonly version: "0.7.38";
+    readonly gitSha: "172cc75";
+    readonly buildTime: "2026-08-25T23:00:14.937Z";
 };
 
-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 ParsedFindQuery, type ParsedFrontmatter, type ParsedQuery, type ParsedRowsQuery, type ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, 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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, 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 WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, 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 ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, 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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, 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 WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, 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 };

package/dist/index.d.ts

@@ -164,6 +164,8 @@ interface ParsedWqlSuffixes {
     last?: ParsedWqlLastSuffix;
     /** Content scope (`in journal` / `in all`). */
     scope?: string;
+    /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
+    conflicts?: string[];
     /** Primary query text with suffixes removed. */
     primaryText: string;
 }
@@ -236,7 +238,12 @@ interface FindPredicate {
         unit: 'd' | 'w';
     };
 }
-interface ParsedQuery {
+/**
+ * Result of parsing an analytics (aggregate) query — `agg:metric{filters} …`.
+ * Discriminated union member: `family === 'aggregate'` (C5).
+ */
+interface ParsedAggregateQuery {
+    family: 'aggregate';
     raw: string;
     agg: Aggregator;
     /** Canonical Metric Key (fact row `metricKey`). */
@@ -256,6 +263,7 @@ interface ParsedQuery {
 }
 /** Result of parsing a content-discovery query (`find:target{filters} in scope`). */
 interface ParsedFindQuery {
+    family: 'find';
     raw: string;
     /** Content target: 'note' or 'block'. */
     target: string;
@@ -271,11 +279,13 @@ interface ParsedFindQuery {
     join?: MetricPredicate;
     error?: string;
 }
-type AnyParsedQuery = ParsedQuery | ParsedFindQuery | ParsedRowsQuery;
+type AnyParsedQuery = ParsedAggregateQuery | ParsedFindQuery | ParsedRowsQuery;
 /** Type guard: true for content-discovery queries. */
 declare function isFindQuery(parsed: AnyParsedQuery): parsed is ParsedFindQuery;
 /** Type guard: true for rows queries. */
 declare function isRowsQuery(parsed: AnyParsedQuery): parsed is ParsedRowsQuery;
+/** Type guard: true for analytics (aggregate) queries. */
+declare function isAggregateQuery(parsed: AnyParsedQuery): parsed is ParsedAggregateQuery;
 interface SeriesPoint {
     ts: number;
     value: number;
@@ -288,7 +298,7 @@ interface SeriesPoint {
  */
 interface ParsedRowsQuery {
     raw: string;
-    /** Family discriminator (the other families are told apart by 'target'/'agg'). */
+    /** Family discriminator shared by all three query ASTs (C5). */
     family: 'rows';
     /** Output-statement type narrowing from the optional target (`rows:segment{…}`); undefined = all types. */
     outputType?: string;
@@ -307,9 +317,10 @@ interface Series {
     unit?: string;
 }
 /**
- * Parse a WQL query string into either an analytics ParsedQuery or a content
- * ParsedFindQuery. Dispatch is textual: a leading `find:` routes to the
- * content path, everything else to analytics.
+ * Parse a WQL query string into one of the three query families —
+ * analytics aggregate, content find, or rows — discriminated by `family`
+ * (C5). Dispatch is textual: a leading `find:` routes to the content path,
+ * `rows` to the rows path, everything else to analytics.
  */
 declare function parseQuery(raw: string): AnyParsedQuery;
 
@@ -630,7 +641,7 @@ interface FindOptions {
     anchorNow?: number;
 }
 interface QueryResult {
-    parsed: ParsedQuery;
+    parsed: ParsedAggregateQuery;
     series: Series[];
     stages: {
         selected: number;
@@ -691,7 +702,7 @@ declare class QueryService {
      * Execute a find:effort query against the effort registry.
      */
     runFindEffort(parsed: ParsedFindQuery): Promise<FindQueryResult>;
-    run(parsed: ParsedQuery, options?: QueryOptions): Promise<QueryResult>;
+    run(parsed: ParsedAggregateQuery, options?: QueryOptions): Promise<QueryResult>;
     /**
      * Stages 2–4 — BUCKET → GROUP → AGGREGATE over an already-selected +
      * filtered `matched` set.
@@ -945,13 +956,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.6.36";
-declare const GIT_SHA = "c5ad2b0";
-declare const BUILD_TIME = "2026-08-24T20:14:33.951Z";
+declare const VERSION = "0.7.38";
+declare const GIT_SHA = "172cc75";
+declare const BUILD_TIME = "2026-08-25T23:00:14.937Z";
 declare const SEMVER: {
-    readonly version: "0.6.36";
-    readonly gitSha: "c5ad2b0";
-    readonly buildTime: "2026-08-24T20:14:33.951Z";
+    readonly version: "0.7.38";
+    readonly gitSha: "172cc75";
+    readonly buildTime: "2026-08-25T23:00:14.937Z";
 };
 
-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 ParsedFindQuery, type ParsedFrontmatter, type ParsedQuery, type ParsedRowsQuery, type ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, 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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, 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 WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, 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 ParsedWqlLastSuffix, type ParsedWqlRollupSuffix, type ParsedWqlSuffixes, type QueryOptions, type QueryResult, QueryService, type QueryServiceStores, type QueryWidgetSuffix, 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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, 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 WqlRollupPeriod, type WqlScope, type WqlSource, type WqlTagKey, type WqlVirtualDim, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, 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 };

package/dist/index.mjs

@@ -160,55 +160,62 @@ function parseWqlSuffixes(raw) {
   let groupBy;
   let last;
   let scope;
+  const conflicts = [];
   const isFind = text.startsWith("find:");
   const isRows = /^rows(?=[:{]|\s|$)/.test(text);
+  const stripRepeated = (re) => {
+    const matches = [];
+    for (let m = re.exec(text); m; m = re.exec(text)) {
+      matches.unshift(m);
+      text = text.slice(0, m.index).trim();
+    }
+    return matches;
+  };
+  const conflictFrom = (label, ms) => {
+    if (ms.length > 1) {
+      conflicts.push(
+        `Duplicate '${label}' clause: '${ms[0][0].trim()}' conflicts with '${ms[ms.length - 1][0].trim()}'`
+      );
+    }
+  };
   if (isFind || isRows) {
-    const lastMatch = LAST_RE.exec(text);
-    if (lastMatch) {
-      last = {
-        size: parseInt(lastMatch[1], 10),
-        unit: lastMatch[2].toLowerCase(),
-        raw: lastMatch[0].trim()
-      };
-      text = text.slice(0, lastMatch.index).trim();
+    const lasts = stripRepeated(LAST_RE);
+    conflictFrom("window", lasts);
+    if (lasts.length) {
+      const m = lasts[lasts.length - 1];
+      last = { size: parseInt(m[1], 10), unit: m[2].toLowerCase(), raw: m[0].trim() };
     }
     if (isFind) {
-      const scopeMatch = IN_SCOPE_RE.exec(text);
-      if (scopeMatch) {
-        scope = scopeMatch[1];
-        text = text.slice(0, scopeMatch.index).trim();
-      }
+      const scopes = stripRepeated(IN_SCOPE_RE);
+      conflictFrom("scope", scopes);
+      if (scopes.length) scope = scopes[scopes.length - 1][1];
     } else {
-      const rollupMatch = ROLLUP_RE.exec(text);
-      if (rollupMatch) {
-        const rawRollup = rollupMatch[1] + rollupMatch[2];
-        rollup = { size: rollupMatch[1] ? parseInt(rollupMatch[1], 10) : 1, unit: rollupMatch[2] || "", raw: rawRollup };
-        text = text.slice(0, rollupMatch.index).trim();
+      const rollups = stripRepeated(ROLLUP_RE);
+      conflictFrom(".rollup", rollups);
+      if (rollups.length) {
+        const m = rollups[rollups.length - 1];
+        rollup = { size: m[1] ? parseInt(m[1], 10) : 1, unit: m[2] || "", raw: m[1] + m[2] };
       }
-      const byMatch = BY_RE.exec(text);
-      if (byMatch) {
-        groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
-        text = text.slice(0, byMatch.index).trim();
+      const bys = stripRepeated(BY_RE);
+      conflictFrom("by", bys);
+      if (bys.length) {
+        groupBy = bys[bys.length - 1][1].split(",").map((d) => d.trim()).filter(Boolean);
       }
     }
   } else {
-    const unitMatch = DISPLAY_UNIT_RE.exec(text);
-    if (unitMatch) {
-      displayUnit = unitMatch[1];
-      text = text.slice(0, unitMatch.index).trim();
-    }
-    const rollupMatch = ROLLUP_RE.exec(text);
-    if (rollupMatch) {
-      const rawRollup = rollupMatch[1] + rollupMatch[2];
-      const size = rollupMatch[1] ? parseInt(rollupMatch[1], 10) : 1;
-      const unit = rollupMatch[2] || "";
-      rollup = { size, unit, raw: rawRollup };
-      text = text.slice(0, rollupMatch.index).trim();
+    const units = stripRepeated(DISPLAY_UNIT_RE);
+    conflictFrom("display-unit", units);
+    if (units.length) displayUnit = units[units.length - 1][1];
+    const rollups = stripRepeated(ROLLUP_RE);
+    conflictFrom(".rollup", rollups);
+    if (rollups.length) {
+      const m = rollups[rollups.length - 1];
+      rollup = { size: m[1] ? parseInt(m[1], 10) : 1, unit: m[2] || "", raw: m[1] + m[2] };
     }
-    const byMatch = BY_RE.exec(text);
-    if (byMatch) {
-      groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
-      text = text.slice(0, byMatch.index).trim();
+    const bys = stripRepeated(BY_RE);
+    conflictFrom("by", bys);
+    if (bys.length) {
+      groupBy = bys[bys.length - 1][1].split(",").map((d) => d.trim()).filter(Boolean);
     }
   }
   return {
@@ -218,17 +225,21 @@ function parseWqlSuffixes(raw) {
     groupBy,
     last,
     scope,
+    conflicts: conflicts.length ? conflicts : void 0,
     primaryText: text
   };
 }
 
 // src/wql.ts
 function isFindQuery(parsed) {
-  return "target" in parsed;
+  return parsed.family === "find";
 }
 function isRowsQuery(parsed) {
   return parsed.family === "rows";
 }
+function isAggregateQuery(parsed) {
+  return parsed.family === "aggregate";
+}
 var AGGS = WQL_AGGREGATORS;
 function cannotParse(text) {
   return `Cannot parse "${text}". Expected agg:metric{filters} by {dims} .rollup(period)`;
@@ -279,6 +290,10 @@ function parseRowsQuery(raw) {
     filters: [],
     last: last ? { size: last.size, unit: last.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    result.error = suffixes.conflicts.join("; ");
+    return result;
+  }
   if (whereText || groupBy || rollup) {
     result.error = `Rows queries return raw statements \u2014 no where / by / rollup. Got "${primaryText.trim()}"`;
     return result;
@@ -359,6 +374,7 @@ function parseAnalyticsQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, displayUnit, groupBy, rollup, primaryText: text } = suffixes;
   const base = {
+    family: "aggregate",
     raw,
     agg: "sum",
     metric: "",
@@ -367,6 +383,10 @@ function parseAnalyticsQuery(raw) {
     displayUnit,
     rollup: rollup ? { size: rollup.size, unit: rollup.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    base.error = suffixes.conflicts.join("; ");
+    return base;
+  }
   if (rollup && rollup.unit !== "d" && rollup.unit !== "w") {
     base.error = cannotParse(text);
     return base;
@@ -422,12 +442,17 @@ function parseFindQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
   const { where: whereText, last, scope, primaryText: text } = suffixes;
   const result = {
+    family: "find",
     raw,
     target: "",
     filters: [],
     scope,
     last: last ? { size: last.size, unit: last.unit } : void 0
   };
+  if (suffixes.conflicts?.length) {
+    result.error = suffixes.conflicts.join("; ");
+    return result;
+  }
   const tree = parser.parse(text);
   let syntaxError = false;
   tree.iterate({ enter(node) {
@@ -1276,7 +1301,7 @@ var QueryService = class {
     const parsed = parseQuery(raw);
     if (isFindQuery(parsed)) {
       return {
-        parsed: { raw, agg: "count", metric: parsed.target, filters: [], groupBy: [] },
+        parsed: { family: "aggregate", raw, agg: "count", metric: parsed.target, filters: [], groupBy: [] },
         series: [],
         stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
         matched: []
@@ -1284,7 +1309,7 @@ var QueryService = class {
     }
     if (isRowsQuery(parsed)) {
       return {
-        parsed: { raw, agg: "count", metric: "rows", filters: [], groupBy: [] },
+        parsed: { family: "aggregate", raw, agg: "count", metric: "rows", filters: [], groupBy: [] },
         series: [],
         stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
         matched: []
@@ -1606,6 +1631,7 @@ var QueryService = class {
     };
     const join = parsed.join;
     const findResult = await this.runFind({
+      family: "find",
       raw: "",
       target: join.target,
       filters: join.filters,
@@ -2024,15 +2050,15 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.6.36";
-var GIT_SHA = "c5ad2b0";
-var BUILD_TIME = "2026-08-24T20:14:33.951Z";
+var VERSION = "0.7.38";
+var GIT_SHA = "172cc75";
+var BUILD_TIME = "2026-08-25T23:00:14.937Z";
 var SEMVER = {
-  version: "0.6.36",
-  gitSha: "c5ad2b0",
-  buildTime: "2026-08-24T20:14:33.951Z"
+  version: "0.7.38",
+  gitSha: "172cc75",
+  buildTime: "2026-08-25T23:00:14.937Z"
 };
 
-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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, 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_ROLLUP_PERIODS, WQL_SCOPES, WQL_SOURCES, 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, 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 };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map