@bitcobblers/wod-wiki-wql 0.7.38 → 0.9.40

package/dist/index.d.cts

@@ -58,9 +58,26 @@ type WqlGrain = (typeof WQL_GRAINS)[number];
 /** Content-discovery query targets (find:<target>). */
 declare const WQL_FIND_TARGETS: readonly ["note", "block", "effort"];
 type WqlFindTarget = (typeof WQL_FIND_TARGETS)[number];
-/** Content query scopes (in <scope>). */
-declare const WQL_SCOPES: readonly ["journal", "collections", "feeds", "all"];
-type WqlScope = (typeof WQL_SCOPES)[number];
+/** Canonical source filter values (C2): scope folded into the source: filter key. */
+declare const WQL_SOURCE_VALUES: readonly ["journal", "collections", "feeds", "all"];
+type WqlSourceValue = (typeof WQL_SOURCE_VALUES)[number];
+/** Result planes — `rows:<plane>` narrows raw output-statement rows by the
+ *  unified store's promoted `outputType` column. The STORE vocabulary is
+ *  open (core KNOWN_OUTPUT_TYPES, ticket 002: unknowns are stored and
+ *  returned); the QUERY surface is a closed enum at parse (prototype C7) —
+ *  reopening toward a registry is a later, separate decision. Custom types
+ *  stay addressable programmatically via hand-built ASTs. */
+declare const WQL_RESULT_PLANES: readonly ["segment", "system", "load", "event", "compiler", "completion", "analytics", "wellness"];
+type WqlResultPlane = (typeof WQL_RESULT_PLANES)[number];
+/** All `rows:` targets — content planes plus result planes (rows model
+ *  §1.0: every query selects rows from a target) plus `all`, the explicit
+ *  no-narrowing pseudo-target (spec v2 decision 1: the bare `rows:{…}`
+ *  alias retires). Content-plane targets scope by content, not outputType
+ *  (C4). */
+declare const WQL_ROWS_TARGETS: readonly ["note", "block", "effort", "segment", "system", "load", "event", "compiler", "completion", "analytics", "wellness", "all"];
+type WqlRowsTarget = (typeof WQL_ROWS_TARGETS)[number];
+/** Rows scope filter keys (C4): the exact-match keys a rows query filters by. */
+declare const WQL_ROWS_SCOPE_KEYS: readonly ["result", "block", "note"];
 /** Content-specific filter keys (beyond the analytics tag keys). */
 declare const WQL_CONTENT_FILTER_KEYS: readonly ["type", "text", "has", "source", "catalog", "effort", "discipline", "intensity", "note", "page", "origin", "grain", "metric", "block", "result", "tags"];
 type WqlContentFilterKey = (typeof WQL_CONTENT_FILTER_KEYS)[number];
@@ -135,22 +152,31 @@ declare namespace wql_parser_terms {
  * Encapsulates suffix parsing order, regexes, depth-0 brace-aware splitting,
  * and AST extraction for all WQL suffix clauses:
  *   - Outer join: `where <joinClause>`
- *   - Display unit: `in <unit>`
+ *   - Display unit: `in <unit>` (analytics queries only — C2 de-overloaded `in`)
  *   - Rollup period: `.rollup(<size><unit>)`
  *   - Group-by: `by {<dims>}`
- *   - Time window: `last <n><unit>`
- *   - Scope: `in <scope>`
+ *   - Time window: `last <n><unit>` or `from <YYYY-MM-DD> [to <YYYY-MM-DD>]`
+ *     (C1 — one window per query, every family)
  */
 interface ParsedWqlRollupSuffix {
     size: number;
     unit: string;
     raw: string;
 }
-interface ParsedWqlLastSuffix {
+/** A window clause (C1): relative (`last 8w`) or civil-date range
+ *  (`from 2026-01-01 [to 2026-03-31]`). One window per query — `last` and
+ *  `from` are mutually exclusive (validated as a C3-style conflict). */
+type ParsedWqlWindowSuffix = {
+    kind: 'relative';
     size: number;
     unit: 'd' | 'w';
     raw: string;
-}
+} | {
+    kind: 'range';
+    start: string;
+    end?: string;
+    raw: string;
+};
 interface ParsedWqlSuffixes {
     /** Outer cross-store join clause text (`where ...`). */
     where?: string;
@@ -160,10 +186,10 @@ interface ParsedWqlSuffixes {
     rollup?: ParsedWqlRollupSuffix;
     /** Group-by dimensions (`by {week, effort}`). */
     groupBy?: string[];
-    /** Content time window (`last 8w`). */
-    last?: ParsedWqlLastSuffix;
-    /** Content scope (`in journal` / `in all`). */
-    scope?: string;
+    /** Time window — relative or civil-date range, legal on every family (C1). */
+    window?: ParsedWqlWindowSuffix;
+    /** Legacy scope clause (`in journal` / `in all`) stripped for the C2 compatibility normalizer. */
+    legacyScope?: string;
     /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
     conflicts?: string[];
     /** Primary query text with suffixes removed. */
@@ -180,7 +206,8 @@ declare function splitAtWhere(text: string): {
 /**
  * Extract suffixes from a raw WQL query string.
  * Strips outer join (`where`), display unit (`in kg`), rollup (`.rollup(1w)`),
- * group-by (`by {week}`), time window (`last 8w`), and scope (`in journal`).
+ * group-by (`by {week}`), time window (`last 8w` / `from … [to …]`), and
+ * legacy scope (`in journal`).
  */
 declare function parseWqlSuffixes(raw: string): ParsedWqlSuffixes;
 
@@ -232,7 +259,6 @@ interface MetricPredicate {
 interface FindPredicate {
     target: string;
     filters: TagFilter[];
-    scope?: string;
     last?: {
         size: number;
         unit: 'd' | 'w';
@@ -255,30 +281,46 @@ interface ParsedAggregateQuery {
         size: number;
         unit: 'd' | 'w';
     };
+    /** Time-selection window (C1): `last 6w` or `from … [to …]`. */
+    window?: QueryWindow;
     /** Optional display unit directive — `in kg` / `in lb`. */
     displayUnit?: string;
     /** Cross-store content join (`where find:note{...}`); restricts to raw logs. */
     join?: FindPredicate;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
 /** Result of parsing a content-discovery query (`find:target{filters} in scope`). */
 interface ParsedFindQuery {
     family: 'find';
     raw: string;
-    /** Content target: 'note' or 'block'. */
+    /** Content target — a WQL_FIND_TARGETS value (C7 closed enum). */
     target: string;
     filters: TagFilter[];
-    /** Where to look: journal | collections | feeds | all. */
-    scope?: string;
-    /** Time window: last 8w, last 4d. */
-    last?: {
-        size: number;
-        unit: 'd' | 'w';
-    };
+    /** Time-selection window (C1): `last 8w` or `from … [to …]`. */
+    window?: QueryWindow;
     /** Cross-store metric join (`where sum:totalVolume{} > 5000`). */
     join?: MetricPredicate;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
+/**
+ * Time-selection window (C1) — legal on every query family. `last <n><d|w>`
+ * is relative; `from <YYYY-MM-DD> [to <YYYY-MM-DD>]` is a civil-date range
+ * (local-midnight semantics, inclusive end day). One window per query;
+ * `last` and `from` are mutually exclusive (C3-style conflict).
+ */
+type QueryWindow = {
+    kind: 'relative';
+    size: number;
+    unit: 'd' | 'w';
+} | {
+    kind: 'range';
+    start: string;
+    end?: string;
+};
 type AnyParsedQuery = ParsedAggregateQuery | ParsedFindQuery | ParsedRowsQuery;
 /** Type guard: true for content-discovery queries. */
 declare function isFindQuery(parsed: AnyParsedQuery): parsed is ParsedFindQuery;
@@ -303,11 +345,11 @@ interface ParsedRowsQuery {
     /** Output-statement type narrowing from the optional target (`rows:segment{…}`); undefined = all types. */
     outputType?: string;
     filters: TagFilter[];
-    /** Time window over the workout end time: last 8w, last 4d. */
-    last?: {
-        size: number;
-        unit: 'd' | 'w';
-    };
+    /** Time-selection window (C1): `last 4w` or `from … [to …]` over the
+     *  workout end time. */
+    window?: QueryWindow;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
 interface Series {
@@ -323,6 +365,16 @@ interface Series {
  * `rows` to the rows path, everything else to analytics.
  */
 declare function parseQuery(raw: string): AnyParsedQuery;
+/**
+ * C2 Compatibility normalizer: rewrites legacy query syntax into modern WQL.
+ *   - Bare `rows:{…}` heads rewrite to `rows:all{…}`
+ *   - Legacy trailing `in <scope>` rewrites into `{source:<scope>}`
+ * Returns the normalized query string and any deprecation advisories.
+ */
+declare function normalizeWql(raw: string): {
+    query: string;
+    advisories: string[];
+};
 
 /**
  * Canonical discipline vocabulary — the single source of truth for effort
@@ -681,9 +733,10 @@ declare class QueryService {
     getFactsByTimeRange(start: number, end: number): Promise<AnalyticsDataPoint[]>;
     runQuery(raw: string, options?: QueryOptions): Promise<QueryResult>;
     /**
-     * Execute a rows query (rows:{…}, #949) — the session results table plane.
-     * Reads event rows directly over the unified store (ticket 003): no
-     * WorkoutResult blob parsing; outputType narrowing hits the promoted column.
+     * Execute a rows query (rows:<target>{…}, #949/C4) — the session results
+     * table plane. Filter rules are validated at parse; this executes only.
+     * Reads event rows directly over the unified store: outputType narrowing
+     * hits the promoted column; content-plane targets scope by content.
      */
     runRows(parsed: ParsedRowsQuery, options?: {
         anchorNow?: number;
@@ -956,13 +1009,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.7.38";
-declare const GIT_SHA = "172cc75";
-declare const BUILD_TIME = "2026-08-25T23:00:14.937Z";
+declare const VERSION = "0.9.40";
+declare const GIT_SHA = "2462ec9";
+declare const BUILD_TIME = "2026-08-26T01:04:47.412Z";
 declare const SEMVER: {
-    readonly version: "0.7.38";
-    readonly gitSha: "172cc75";
-    readonly buildTime: "2026-08-25T23:00:14.937Z";
+    readonly version: "0.9.40";
+    readonly gitSha: "2462ec9";
+    readonly buildTime: "2026-08-26T01:04:47.412Z";
 };
 
-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 };
+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 };

package/dist/index.d.ts

@@ -58,9 +58,26 @@ type WqlGrain = (typeof WQL_GRAINS)[number];
 /** Content-discovery query targets (find:<target>). */
 declare const WQL_FIND_TARGETS: readonly ["note", "block", "effort"];
 type WqlFindTarget = (typeof WQL_FIND_TARGETS)[number];
-/** Content query scopes (in <scope>). */
-declare const WQL_SCOPES: readonly ["journal", "collections", "feeds", "all"];
-type WqlScope = (typeof WQL_SCOPES)[number];
+/** Canonical source filter values (C2): scope folded into the source: filter key. */
+declare const WQL_SOURCE_VALUES: readonly ["journal", "collections", "feeds", "all"];
+type WqlSourceValue = (typeof WQL_SOURCE_VALUES)[number];
+/** Result planes — `rows:<plane>` narrows raw output-statement rows by the
+ *  unified store's promoted `outputType` column. The STORE vocabulary is
+ *  open (core KNOWN_OUTPUT_TYPES, ticket 002: unknowns are stored and
+ *  returned); the QUERY surface is a closed enum at parse (prototype C7) —
+ *  reopening toward a registry is a later, separate decision. Custom types
+ *  stay addressable programmatically via hand-built ASTs. */
+declare const WQL_RESULT_PLANES: readonly ["segment", "system", "load", "event", "compiler", "completion", "analytics", "wellness"];
+type WqlResultPlane = (typeof WQL_RESULT_PLANES)[number];
+/** All `rows:` targets — content planes plus result planes (rows model
+ *  §1.0: every query selects rows from a target) plus `all`, the explicit
+ *  no-narrowing pseudo-target (spec v2 decision 1: the bare `rows:{…}`
+ *  alias retires). Content-plane targets scope by content, not outputType
+ *  (C4). */
+declare const WQL_ROWS_TARGETS: readonly ["note", "block", "effort", "segment", "system", "load", "event", "compiler", "completion", "analytics", "wellness", "all"];
+type WqlRowsTarget = (typeof WQL_ROWS_TARGETS)[number];
+/** Rows scope filter keys (C4): the exact-match keys a rows query filters by. */
+declare const WQL_ROWS_SCOPE_KEYS: readonly ["result", "block", "note"];
 /** Content-specific filter keys (beyond the analytics tag keys). */
 declare const WQL_CONTENT_FILTER_KEYS: readonly ["type", "text", "has", "source", "catalog", "effort", "discipline", "intensity", "note", "page", "origin", "grain", "metric", "block", "result", "tags"];
 type WqlContentFilterKey = (typeof WQL_CONTENT_FILTER_KEYS)[number];
@@ -135,22 +152,31 @@ declare namespace wql_parser_terms {
  * Encapsulates suffix parsing order, regexes, depth-0 brace-aware splitting,
  * and AST extraction for all WQL suffix clauses:
  *   - Outer join: `where <joinClause>`
- *   - Display unit: `in <unit>`
+ *   - Display unit: `in <unit>` (analytics queries only — C2 de-overloaded `in`)
  *   - Rollup period: `.rollup(<size><unit>)`
  *   - Group-by: `by {<dims>}`
- *   - Time window: `last <n><unit>`
- *   - Scope: `in <scope>`
+ *   - Time window: `last <n><unit>` or `from <YYYY-MM-DD> [to <YYYY-MM-DD>]`
+ *     (C1 — one window per query, every family)
  */
 interface ParsedWqlRollupSuffix {
     size: number;
     unit: string;
     raw: string;
 }
-interface ParsedWqlLastSuffix {
+/** A window clause (C1): relative (`last 8w`) or civil-date range
+ *  (`from 2026-01-01 [to 2026-03-31]`). One window per query — `last` and
+ *  `from` are mutually exclusive (validated as a C3-style conflict). */
+type ParsedWqlWindowSuffix = {
+    kind: 'relative';
     size: number;
     unit: 'd' | 'w';
     raw: string;
-}
+} | {
+    kind: 'range';
+    start: string;
+    end?: string;
+    raw: string;
+};
 interface ParsedWqlSuffixes {
     /** Outer cross-store join clause text (`where ...`). */
     where?: string;
@@ -160,10 +186,10 @@ interface ParsedWqlSuffixes {
     rollup?: ParsedWqlRollupSuffix;
     /** Group-by dimensions (`by {week, effort}`). */
     groupBy?: string[];
-    /** Content time window (`last 8w`). */
-    last?: ParsedWqlLastSuffix;
-    /** Content scope (`in journal` / `in all`). */
-    scope?: string;
+    /** Time window — relative or civil-date range, legal on every family (C1). */
+    window?: ParsedWqlWindowSuffix;
+    /** Legacy scope clause (`in journal` / `in all`) stripped for the C2 compatibility normalizer. */
+    legacyScope?: string;
     /** Duplicate-clause diagnostics (C3) — each names both conflicting spans. */
     conflicts?: string[];
     /** Primary query text with suffixes removed. */
@@ -180,7 +206,8 @@ declare function splitAtWhere(text: string): {
 /**
  * Extract suffixes from a raw WQL query string.
  * Strips outer join (`where`), display unit (`in kg`), rollup (`.rollup(1w)`),
- * group-by (`by {week}`), time window (`last 8w`), and scope (`in journal`).
+ * group-by (`by {week}`), time window (`last 8w` / `from … [to …]`), and
+ * legacy scope (`in journal`).
  */
 declare function parseWqlSuffixes(raw: string): ParsedWqlSuffixes;
 
@@ -232,7 +259,6 @@ interface MetricPredicate {
 interface FindPredicate {
     target: string;
     filters: TagFilter[];
-    scope?: string;
     last?: {
         size: number;
         unit: 'd' | 'w';
@@ -255,30 +281,46 @@ interface ParsedAggregateQuery {
         size: number;
         unit: 'd' | 'w';
     };
+    /** Time-selection window (C1): `last 6w` or `from … [to …]`. */
+    window?: QueryWindow;
     /** Optional display unit directive — `in kg` / `in lb`. */
     displayUnit?: string;
     /** Cross-store content join (`where find:note{...}`); restricts to raw logs. */
     join?: FindPredicate;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
 /** Result of parsing a content-discovery query (`find:target{filters} in scope`). */
 interface ParsedFindQuery {
     family: 'find';
     raw: string;
-    /** Content target: 'note' or 'block'. */
+    /** Content target — a WQL_FIND_TARGETS value (C7 closed enum). */
     target: string;
     filters: TagFilter[];
-    /** Where to look: journal | collections | feeds | all. */
-    scope?: string;
-    /** Time window: last 8w, last 4d. */
-    last?: {
-        size: number;
-        unit: 'd' | 'w';
-    };
+    /** Time-selection window (C1): `last 8w` or `from … [to …]`. */
+    window?: QueryWindow;
     /** Cross-store metric join (`where sum:totalVolume{} > 5000`). */
     join?: MetricPredicate;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
+/**
+ * Time-selection window (C1) — legal on every query family. `last <n><d|w>`
+ * is relative; `from <YYYY-MM-DD> [to <YYYY-MM-DD>]` is a civil-date range
+ * (local-midnight semantics, inclusive end day). One window per query;
+ * `last` and `from` are mutually exclusive (C3-style conflict).
+ */
+type QueryWindow = {
+    kind: 'relative';
+    size: number;
+    unit: 'd' | 'w';
+} | {
+    kind: 'range';
+    start: string;
+    end?: string;
+};
 type AnyParsedQuery = ParsedAggregateQuery | ParsedFindQuery | ParsedRowsQuery;
 /** Type guard: true for content-discovery queries. */
 declare function isFindQuery(parsed: AnyParsedQuery): parsed is ParsedFindQuery;
@@ -303,11 +345,11 @@ interface ParsedRowsQuery {
     /** Output-statement type narrowing from the optional target (`rows:segment{…}`); undefined = all types. */
     outputType?: string;
     filters: TagFilter[];
-    /** Time window over the workout end time: last 8w, last 4d. */
-    last?: {
-        size: number;
-        unit: 'd' | 'w';
-    };
+    /** Time-selection window (C1): `last 4w` or `from … [to …]` over the
+     *  workout end time. */
+    window?: QueryWindow;
+    /** Deprecation advisories (C2 normalizer). */
+    advisories?: string[];
     error?: string;
 }
 interface Series {
@@ -323,6 +365,16 @@ interface Series {
  * `rows` to the rows path, everything else to analytics.
  */
 declare function parseQuery(raw: string): AnyParsedQuery;
+/**
+ * C2 Compatibility normalizer: rewrites legacy query syntax into modern WQL.
+ *   - Bare `rows:{…}` heads rewrite to `rows:all{…}`
+ *   - Legacy trailing `in <scope>` rewrites into `{source:<scope>}`
+ * Returns the normalized query string and any deprecation advisories.
+ */
+declare function normalizeWql(raw: string): {
+    query: string;
+    advisories: string[];
+};
 
 /**
  * Canonical discipline vocabulary — the single source of truth for effort
@@ -681,9 +733,10 @@ declare class QueryService {
     getFactsByTimeRange(start: number, end: number): Promise<AnalyticsDataPoint[]>;
     runQuery(raw: string, options?: QueryOptions): Promise<QueryResult>;
     /**
-     * Execute a rows query (rows:{…}, #949) — the session results table plane.
-     * Reads event rows directly over the unified store (ticket 003): no
-     * WorkoutResult blob parsing; outputType narrowing hits the promoted column.
+     * Execute a rows query (rows:<target>{…}, #949/C4) — the session results
+     * table plane. Filter rules are validated at parse; this executes only.
+     * Reads event rows directly over the unified store: outputType narrowing
+     * hits the promoted column; content-plane targets scope by content.
      */
     runRows(parsed: ParsedRowsQuery, options?: {
         anchorNow?: number;
@@ -956,13 +1009,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.7.38";
-declare const GIT_SHA = "172cc75";
-declare const BUILD_TIME = "2026-08-25T23:00:14.937Z";
+declare const VERSION = "0.9.40";
+declare const GIT_SHA = "2462ec9";
+declare const BUILD_TIME = "2026-08-26T01:04:47.412Z";
 declare const SEMVER: {
-    readonly version: "0.7.38";
-    readonly gitSha: "172cc75";
-    readonly buildTime: "2026-08-25T23:00:14.937Z";
+    readonly version: "0.9.40";
+    readonly gitSha: "2462ec9";
+    readonly buildTime: "2026-08-26T01:04:47.412Z";
 };
 
-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 };
+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 };