@bitcobblers/wod-wiki-wql 0.51.2196 → 0.52.2198

package/dist/index.mjs

@@ -1,8 +1,9 @@
-import { KNOWN_OUTPUT_TYPES, dimensionKeyOf, convertViaCatalog, systemDefaultUnit, createMetricOwnershipLedger, MetricType, valueKindOf, normalizeFieldPath, toNotebookId, notebookSlugFromId, resolvePlacements, validateNoteBlocks, parseFrontmatter, getScalar, fieldRefKey, normalizeFieldComponent } from '@bitcobblers/wod-wiki-core';
+import { KNOWN_OUTPUT_TYPES, dimensionKeyOf, convertViaCatalog, systemDefaultUnit, createMetricOwnershipLedger, MetricType, valueKindOf, normalizeFieldPath, notebookSlugFromId, toNotebookId, resolvePlacements, validateNoteBlocks, parseFrontmatter, getScalar, fieldRefKey, normalizeFieldComponent } from '@bitcobblers/wod-wiki-core';
 export { DEFAULT_NOTEBOOK_SLUGS, SYSTEM_DEFAULT_OUTPUT_UNIT, UnitConversionError, convertViaCatalog, dimensionKeyOf, extractFrontmatterTags, extractTypedFrontmatterTags, getList, getScalar, isNoteEditable, lookupUnit, notebookSlugFromId, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, serializeFrontmatter, stripFrontmatter, systemDefaultUnit, toNotebookId } from '@bitcobblers/wod-wiki-core';
 import { LRParser } from '@lezer/lr';
 import { LRLanguage, HighlightStyle, LanguageSupport, syntaxHighlighting } from '@codemirror/language';
-import { autocompletion, CompletionContext, startCompletion, snippetCompletion } from '@codemirror/autocomplete';
+import { autocompletion, CompletionContext, snippetCompletion, startCompletion } from '@codemirror/autocomplete';
+import { EditorState } from '@codemirror/state';
 import { styleTags, tags } from '@lezer/highlight';
 
 var __defProp = Object.defineProperty;
@@ -58,7 +59,7 @@ var WQL_CALC_TARGETS = [
 ];
 var WQL_INTENSITY_TIERS = ["low", "moderate", "high"];
 var WQL_GRAINS = ["summary", "event"];
-var WQL_FIND_TARGETS = ["note", "block", "effort", "session", "segment", "event", "notebook", "page", "tag", "equipment"];
+var WQL_FIND_TARGETS = ["note", "block", "effort", "session", "segment", "event", "notebook", "page", "tag", "equipment", "feed"];
 var WQL_SOURCE_VALUES = ["journal", "notebooks", "guides", "playground", "dashboards", "efforts", "equipment"];
 var WQL_SOURCE_HEADS = [
   "note",
@@ -75,6 +76,8 @@ var WQL_SOURCE_HEADS = [
   "page",
   "tag",
   "equipment",
+  "feed",
+  "feeds",
   "dashboard"
 ];
 var WQL_SOURCE_HEAD_SCOPES = {
@@ -88,8 +91,8 @@ var WQL_TYPE_HEADS = {
 };
 var WQL_NOTE_DEFAULT_SOURCES = [];
 var WQL_FUNCTION_HEADS = WQL_AGGREGATORS;
-var WQL_CHART_HEADS = ["timeseries", "bar", "table", "donut", "toplist", "value"];
-var WQL_STANDARD_DATASETS = ["@session", "@today"];
+var WQL_CHART_HEADS = ["timeseries", "bar", "stacked-bar", "table", "list", "donut", "toplist", "value", "goal-rings", "zone-distribution"];
+var WQL_STANDARD_DATASETS = ["@session", "@today", "@note"];
 var WQL_RESULT_PLANES = KNOWN_OUTPUT_TYPES;
 var WQL_CONTENT_FILTER_KEYS = ["type", "text", "source", "notebook", "page", "contributes", "feed", "subscribed", ...WQL_TAG_KEYS];
 var WQL_SOURCES = WQL_FIND_TARGETS;
@@ -146,10 +149,11 @@ var TARGET_TYPES = {
   // return flat rows (no `by {}` grouping), so groupby stays unadvertised.
   page: /* @__PURE__ */ new Set(["page", "notebook", "text", "note", "time"]),
   tag: /* @__PURE__ */ new Set(["tag", "type", "text", "contributes", "time"]),
-  equipment: /* @__PURE__ */ new Set(["equipment", "tags", "text", "notebook", "time"])
+  equipment: /* @__PURE__ */ new Set(["equipment", "tags", "text", "notebook", "time"]),
+  feed: /* @__PURE__ */ new Set(["feed", "tag", "text", "subscribed", "groupby"])
 };
 var EMPTY_TYPES = /* @__PURE__ */ new Set();
-var AGGREGATE_KEYS = WQL_TAG_KEYS;
+var AGGREGATE_KEYS = ["metric", ...WQL_TAG_KEYS.filter((key) => key !== "metric")];
 var TARGET_KEYS = Object.fromEntries(
   Object.entries(TARGET_TYPES).map(([target, types]) => [
     target,
@@ -178,14 +182,14 @@ function supportsWqlFilterKey(target, family, rawKey) {
 }
 var parser = LRParser.deserialize({
   version: 14,
-  states: "+dOVQPOOOOQO'#Cb'#CbObQPO'#C`OgQPO'#C`OlQPO'#ClOqQQO'#C_OOQO'#C_'#C_O!SQQO'#CnQOQPOOOOQO,58z,58zO!bQPO,58zOOQO,59W,59WO!gQPO'#CdOOQO,58y,58yOVQPO,58xO!rQPO'#CoO!wQPO'#CrOOQO,59Y,59YO!|QPO,59YO#UQQO'#CcOOQO1G.f1G.fOOQO'#Cg'#CgO#jQPO'#CeO#oQPO'#CeOOQO,59O,59OO#tQPO,59OO#|QPO'#C_O$XQPO1G.dO$aQPO,59ZO$iQQO,59^OOQO1G.t1G.tO$nQPO'#CuO$sQQO,58}O%XQPO,59PO%dQPO,59PO%iQPO'#CxO%qQPO1G.jOOQO1G.j1G.jOVQPO'#CyO%yQPO7+$OOOQO'#Cq'#CqOOQO1G.u1G.uO&RQPO1G.uO&ZQPO1G.xOOQO,59a,59aOOQO-E6s-E6sOOQO'#Ci'#CiO&`QPO'#CiO&tQPO'#CiO'SQPO'#ChOOQO1G.k1G.kO%XQPO1G.kOOQO,59d,59dOOQO-E6v-E6vOOQO7+$U7+$UO'_QPO'#CcOOQO,59e,59eOOQO-E6w-E6wO'mQPO'#CzO'rQPO7+$aOOQO7+$a7+$aO'zQPO7+$dO(PQPO'#CvO(UQPO,59TOOQO,59T,59TO%XQPO'#CwO(jQPO,59SOOQO7+$V7+$VO(uQPO,58}OOQO,59f,59fOOQO-E6x-E6xOOQO<<G{<<G{OOQO<<HO<<HOOOQO,59b,59bOOQO-E6t-E6tOOQO1G.o1G.oOOQO,59c,59cOOQO-E6u-E6uO)TQPO,58zO)YQPO'#C`",
-  stateData: ")_~OqOS~OTPOaSOrQO~OTXO~OrYO~OTZO~Ot[OdRXgRXoRXuRX~Od_Og`Ou^OobX~OTcO~OTeOYgOwhO~OtlO~OxmO~Og`Ooba~OsoOdVXgVXoVXtVXuVX~OrqO~OTeO~OvsOwuO~Ot[OoRXuRX~OuvOoQi~OTxOwyO~Oh{O~OT|O~OsoOdVagVaoVatVauVa~OT!PO^!OO_!QO~Or!TO~OTeOYgO~OvsOw!WO~OuvOoQq~Ov![Ow!^O~OT!_O~O^!bOr!`Os!`Ou]Xv]Xw]X~O^!bOu]Xv]Xw]X~Ou!cOv[Xw[X~OsoOoVXtVXuVX~OTxO~Ov![Ow!iO~Oy!jO~OT!kO~O^!mOr!`Os!`Ou]av]aw]a~Ou!cOv[aw[a~OsoOoVatVauVa~OT!XO~Or!pO~O",
-  goto: "$^oPPps|P!T![!`!dP!j!q!wPP#OPp#TP#W#^PP#d#n#t#z$Q$WRWOQVOQk^R!YvQTOTj^vQROT!q^vTdY!pT]TjQi[R!UsSf[sRrgQ!SqR!e!TS!Rq!TR!n!cVUO^vRbVQzlR!g![QaVRnbQpcS}p!fR!f!XQ!a!PR!l!aQ!d!RR!o!dQtiR!VtQwkR!ZwQ!]zR!h!]",
-  nodeNames: "\u26A0 Query Pipeline Stage Head Word Aggregator Metric Filters Filter Negate TagKey TagValue Value Star Quoted DatasetReference At Single GroupBy By Dimension Rollup RollupDot Int",
-  maxTerm: 41,
+  states: "+|OVQPOOOOQO'#Cb'#CbObQPO'#C`OgQPO'#C`OlQPO'#CnOqQQO'#C_OOQO'#C_'#C_O!SQQO'#CpQOQPOOOOQO,58z,58zO!bQPO,58zOOQO,59Y,59YO!jQPO'#CfOOQO,58y,58yOVQPO,58xO!xQPO'#CqO!}QPO'#CtOOQO,59[,59[O#SQPO,59[O#[QPO'#CdO#aQQO'#CcOOQO'#Cc'#CcOOQO1G.f1G.fOOQO'#Ci'#CiO#uQPO'#CgO#zQPO'#CgOOQO'#Cg'#CgOOQO,59Q,59QO$PQPO,59QO$XQPO'#C_O$dQPO1G.dO$lQPO,59]O$tQQO,59`OOQO1G.v1G.vOOQO,59O,59OO$yQPO'#CwO%OQQO,58}O%dQPO,59RO%rQPO,59RO%wQPO'#CzO&SQPO1G.lOOQO1G.l1G.lOVQPO'#C{O&[QPO7+$OOOQO'#Cs'#CsOOQO1G.w1G.wO&dQPO1G.wO&lQPO1G.zOOQO,59c,59cOOQO-E6u-E6uOOQO'#Ck'#CkO&qQPO'#CkO'VQPO'#CkO'eQPO'#CjOOQO1G.m1G.mO%dQPO1G.mOOQO,59f,59fOOQO-E6x-E6xOOQO7+$W7+$WO'pQPO'#CcOOQO,59g,59gOOQO-E6y-E6yO(OQPO'#C|O(TQPO7+$cOOQO7+$c7+$cO(]QPO7+$fO(bQPO'#CxO(gQPO,59VOOQO,59V,59VO%dQPO'#CyO({QPO,59UOOQO7+$X7+$XO)WQPO,58}OOQO,59h,59hOOQO-E6z-E6zOOQO<<G}<<G}OOQO<<HQ<<HQOOQO,59d,59dOOQO-E6v-E6vOOQO1G.q1G.qOOQO,59e,59eOOQO-E6w-E6wO)fQPO,58zO)nQPO'#C`",
+  stateData: ")s~OsOS~OTPOcSOtQO~OTXO~OtYO~OTZO~Ov[OfRXiRXqRXwRX~Of_Oi`Ow^OqdX~OTdOXcO~OTgOXcO[iOykO~OvoO~OzpO~Oi`Oqda~OTrO~OusOfVXiVXqVXvVXwVX~OtuO~OTgO~OxwOyyO~Ov[OqRXwRX~OwzOqQi~OT|Oy}O~Oj!PO~OT!QO~OusOfVaiVaqVavVawVa~OT!TOXcO`!SOa!UO~Ot!XO~OTgOXcO[iO~OxwOy![O~OwzOqQq~Ox!`Oy!bO~OT!cO~O`!fOt!dOu!dOw_Xx_Xy_X~O`!fOw_Xx_Xy_X~Ow!gOx^Xy^X~OusOqVXvVXwVX~OT|O~Ox!`Oy!mO~O{!nO~OT!oO~O`!qOt!dOu!dOw_ax_ay_a~Ow!gOx^ay^a~OusOqVavVawVa~OT!]OXcO~Ot!tO~O",
+  goto: "$mqPPru!OP!V!^!bP!o!sP!y#Q#WPP#_Pr#dP#g#mPP#s#}$T$Z$a$gRWOQVOQn^R!^zQTOTm^zQROT!u^zTfY!tSeY!tSj[wV!Su!X!gT]TmQl[R!YwSh[wRviQ!WuR!i!XS!Vu!XR!r!gVUO^zRbVQ!OoR!k!`QaVRqbQtdS!Rt!jR!j!]Q!e!TR!p!eQ!h!VR!s!hQxlR!ZxQ{nR!_{Q!a!OR!l!a",
+  nodeNames: "\u26A0 Query Pipeline Stage Head Word Aggregator Metric ParamRef Dollar Filters Filter Negate TagKey TagValue Value Star Quoted DatasetReference At Single GroupBy By Dimension Rollup RollupDot Int",
+  maxTerm: 43,
   skippedNodes: [0],
   repeatNodeCount: 6,
-  tokenData: "'i~RgXY!jYZ!j]^!jpq!jqr!{rs#Qxy#oyz#tz{#y|}$O}!O$T!O!P$i!Q![%f![!]%|!b!c&R!c!}$T#R#S$T#T#U$T#U#V&W#V#o$T#o#p'Y#p#q'_#q#r'd~!oSq~XY!jYZ!j]^!jpq!j~#QOY~~#TTOr#Qrs#ds;'S#Q;'S;=`#i<%lO#Q~#iO_~~#lP;=`<%l#Q~#tOx~~#yOy~~$OO^~~$TOv~P$YTTP}!O$T!Q![$T!c!}$T#R#S$T#T#o$T~$nPs~#f#g$q~$tP#c#d$w~$zP#`#a$}~%QP#`#a%T~%WP#i#j%Z~%^P#d#e%a~%fOg~R%mThQTP}!O$T!Q![%f!c!}$T#R#S$T#T#o$T~&ROr~~&WOa~R&]VTP}!O$T!Q![$T!c!}$T#R#S$T#T#m$T#m#n&r#n#o$TR&yTdQTP}!O$T!Q![$T!c!}$T#R#S$T#T#o$T~'_Ot~~'dOu~~'iOw~",
+  tokenData: "'q~RhXY!mYZ!m]^!mpq!mqr#Ors#Ttu#rxy#wyz#|z{$R|}$W}!O$]!O!P$q!Q![%n![!]&U!b!c&Z!c!}$]#R#S$]#T#U$]#U#V&`#V#o$]#o#p'b#p#q'g#q#r'l~!rSs~XY!mYZ!m]^!mpq!m~#TO[~~#WTOr#Trs#gs;'S#T;'S;=`#l<%lO#T~#lOa~~#oP;=`<%l#T~#wOX~~#|Oz~~$RO{~~$WO`~~$]Ox~P$bTTP}!O$]!Q![$]!c!}$]#R#S$]#T#o$]~$vPu~#f#g$y~$|P#c#d%P~%SP#`#a%V~%YP#`#a%]~%`P#i#j%c~%fP#d#e%i~%nOi~R%uTjQTP}!O$]!Q![%n!c!}$]#R#S$]#T#o$]~&ZOt~~&`Oc~R&eVTP}!O$]!Q![$]!c!}$]#R#S$]#T#m$]#m#n&z#n#o$]R'RTfQTP}!O$]!Q![$]!c!}$]#R#S$]#T#o$]~'gOv~~'lOw~~'qOy~",
   tokenizers: [0, 1],
   topRules: { "Query": [0, 1] },
   tokenPrec: 0
@@ -199,6 +203,7 @@ __export(wql_parser_terms_exports, {
   By: () => By,
   DatasetReference: () => DatasetReference,
   Dimension: () => Dimension,
+  Dollar: () => Dollar,
   Filter: () => Filter,
   Filters: () => Filters,
   GroupBy: () => GroupBy,
@@ -206,6 +211,7 @@ __export(wql_parser_terms_exports, {
   Int: () => Int,
   Metric: () => Metric,
   Negate: () => Negate,
+  ParamRef: () => ParamRef,
   Pipeline: () => Pipeline,
   Query: () => Query,
   Quoted: () => Quoted,
@@ -226,23 +232,25 @@ var Head = 4;
 var Word = 5;
 var Aggregator = 6;
 var Metric = 7;
-var Filters = 8;
-var Filter = 9;
-var Negate = 10;
-var TagKey = 11;
-var TagValue = 12;
-var Value = 13;
-var Star = 14;
-var Quoted = 15;
-var DatasetReference = 16;
-var At = 17;
-var Single = 18;
-var GroupBy = 19;
-var By = 20;
-var Dimension = 21;
-var Rollup = 22;
-var RollupDot = 23;
-var Int = 24;
+var ParamRef = 8;
+var Dollar = 9;
+var Filters = 10;
+var Filter = 11;
+var Negate = 12;
+var TagKey = 13;
+var TagValue = 14;
+var Value = 15;
+var Star = 16;
+var Quoted = 17;
+var DatasetReference = 18;
+var At = 19;
+var Single = 20;
+var GroupBy = 21;
+var By = 22;
+var Dimension = 23;
+var Rollup = 24;
+var RollupDot = 25;
+var Int = 26;
 
 // src/wqlSuffix.ts
 function splitAtWhere(text) {
@@ -264,6 +272,7 @@ var DISPLAY_UNIT_RE = /\s+in\s+([a-zA-Z0-9_-]+)\s*$/;
 var ROLLUP_RE = /\.rollup\((\d+)?([a-zA-Z]*)\)\s*$/;
 var BY_RE = /\s+by\s+\{([^}]*)\}\s*$/;
 var LAST_RE = /\s+last\s+(\d+)([dw])\s*$/i;
+var LAST_PARAM_RE = /\s+last\s+\$([a-zA-Z_][\w-]*)(?:\s+([dw]))?\s*$/i;
 var FROM_TO_RE = /\s+from\s+(\d{4}-\d{2}-\d{2})(?:\s+to\s+(\d{4}-\d{2}-\d{2}))?\s*$/i;
 function parseWqlSuffixes(raw) {
   const { primary, where } = splitAtWhere(raw);
@@ -304,6 +313,7 @@ function parseWqlSuffixes(raw) {
     storedAs = "@" + storeMatches[storeMatches.length - 1][1];
   }
   const froms = stripRepeated(FROM_TO_RE);
+  const lastParams = stripRepeated(LAST_PARAM_RE);
   const lasts = stripRepeated(LAST_RE);
   {
     const windows = [
@@ -314,6 +324,13 @@ function parseWqlSuffixes(raw) {
         raw: m[0].trim(),
         at: m.index
       })),
+      ...lastParams.map((m) => ({
+        kind: "param",
+        param: m[1],
+        ...m[2] ? { unit: m[2].toLowerCase() } : {},
+        raw: m[0].trim(),
+        at: m.index
+      })),
       ...lasts.map((m) => ({
         kind: "relative",
         size: parseInt(m[1], 10),
@@ -328,8 +345,8 @@ function parseWqlSuffixes(raw) {
       );
     }
     if (windows.length === 1) {
-      const w = windows[0];
-      window = w.kind === "range" ? { kind: "range", start: w.start, end: w.end, raw: w.raw } : { kind: "relative", size: w.size, unit: w.unit, raw: w.raw };
+      const { at: _at, ...w } = windows[0];
+      window = w;
     }
   }
   const units = stripRepeated(DISPLAY_UNIT_RE);
@@ -394,12 +411,14 @@ function normalizeCommaFilterValues(text) {
   const merged = [];
   for (let i = 0; i < parts.length; i++) {
     let part = parts[i];
-    while (i + 1 < parts.length) {
-      const next = parts[i + 1].trim();
-      if (next && !next.includes(":") && !next.includes('"')) {
-        part = `${part}|${next}`;
-        i++;
-      } else break;
+    if (!part.trim().startsWith("$")) {
+      while (i + 1 < parts.length) {
+        const next = parts[i + 1].trim();
+        if (next && !next.includes(":") && !next.includes('"') && !next.startsWith("$")) {
+          part = `${part}|${next}`;
+          i++;
+        } else break;
+      }
     }
     merged.push(part);
   }
@@ -657,8 +676,9 @@ function normalizeWql(raw) {
 }
 function validateSourceFilter(filters) {
   for (const f of filters) {
-    if (f.key !== "source") continue;
+    if (f.kind === "spreadParam" || f.key !== "source") continue;
     for (const v of f.values) {
+      if (v.param !== void 0) continue;
       const val = v.value;
       if (val === "page" || val === "pages") {
         return `source:${val} is retired \u2014 page-ness is handled by type:page or source:guides.`;
@@ -685,8 +705,9 @@ function validateSourceFilter(filters) {
 }
 function validateSubscribedFilter(filters) {
   for (const f of filters) {
-    if (f.key !== "subscribed") continue;
+    if (f.kind === "spreadParam" || f.key !== "subscribed") continue;
     for (const v of f.values) {
+      if (v.param !== void 0) continue;
       if (v.value !== "true" && v.value !== "false") {
         return `Invalid subscribed: value '${v.value}' \u2014 expected true or false`;
       }
@@ -696,8 +717,9 @@ function validateSubscribedFilter(filters) {
 }
 function validateFeedFilter(filters) {
   for (const f of filters) {
-    if (f.key !== "feed") continue;
+    if (f.kind === "spreadParam" || f.key !== "feed") continue;
     for (const v of f.values) {
+      if (v.param !== void 0) continue;
       if (!v.value && !v.wildcard) {
         return `Invalid feed: value \u2014 expected a non-empty feed identifier or wildcard`;
       }
@@ -748,6 +770,9 @@ function toQueryWindow(w) {
   if (w.kind === "relative") {
     return { window: { kind: "relative", size: w.size, unit: w.unit } };
   }
+  if (w.kind === "param") {
+    return { window: { kind: "param", param: w.param, ...w.unit ? { unit: w.unit } : {} } };
+  }
   for (const d of [w.start, w.end]) {
     if (d !== void 0 && !isCivilDate(d)) {
       return { error: `Invalid window date "${d}" \u2014 expected a real calendar date YYYY-MM-DD` };
@@ -766,11 +791,33 @@ function extractFilters(query, text) {
   const filters = query.getChild(Filters);
   if (!filters) return out;
   for (const filter of filters.getChildren(Filter)) {
+    const spreadParamNode = filter.getChild(ParamRef);
+    if (spreadParamNode && !filter.getChild(TagKey)) {
+      const wordNode = spreadParamNode.getChild(Word);
+      const param = wordNode ? text.slice(wordNode.from, wordNode.to) : text.slice(spreadParamNode.from + 1, spreadParamNode.to);
+      if (param) {
+        out.push({
+          kind: "spreadParam",
+          param,
+          key: `$${param}`,
+          negate: false,
+          values: []
+        });
+      }
+      continue;
+    }
     const keyNode = filter.getChild(TagKey);
     const valueNode = filter.getChild(TagValue);
     if (!keyNode || !valueNode) continue;
     const values = [];
     for (const valueChild of valueNode.getChildren(Value)) {
+      const paramNode = valueChild.getChild(ParamRef);
+      if (paramNode) {
+        const wordNode = paramNode.getChild(Word);
+        const param = wordNode ? text.slice(wordNode.from, wordNode.to) : text.slice(paramNode.from + 1, paramNode.to);
+        if (param) values.push({ value: `$${param}`, wildcard: false, param });
+        continue;
+      }
       const raw = text.slice(valueChild.from, valueChild.to);
       const quoted = valueChild.getChild(Quoted) !== null;
       let value = quoted ? raw.slice(1, -1) : raw;
@@ -868,6 +915,7 @@ function parseAggregateQuery(raw, opts) {
       return base;
     } else {
       base.metric = mf.values[0].value;
+      if (mf.values[0].param) base.metricParam = mf.values[0].param;
     }
   } else {
     if (!stage || !head || !aggNode || !metricNode) {
@@ -881,8 +929,13 @@ function parseAggregateQuery(raw, opts) {
     }
     base.agg = aggText;
     base.metric = text.slice(metricNode.from, metricNode.to);
+    const metricParamNode = metricNode.getChild(ParamRef);
+    if (metricParamNode) {
+      const w = metricParamNode.getChild(Word);
+      base.metricParam = w ? text.slice(w.from, w.to) : base.metric.slice(1);
+    }
   }
-  const contentKeys = base.filters.map((f) => f.key).filter((k) => WQL_CONTENT_ONLY_KEYS.includes(k));
+  const contentKeys = base.filters.filter((f) => f.kind !== "spreadParam" && !f.key.startsWith("$")).map((f) => f.key).filter((k) => WQL_CONTENT_ONLY_KEYS.includes(k));
   if (contentKeys.length > 0) {
     base.error = `Content filter key(s) ${contentKeys.map((k) => `"${k}"`).join(", ")} cannot narrow an aggregate \u2014 facts carry effort/dimension data, not note text. Aggregate dims: ${WQL_TAG_KEYS.join(", ")}, plus any custom dimension.`;
     return base;
@@ -983,7 +1036,7 @@ function parseFindQuery(raw, opts) {
   if (scope || typeScope) {
     result.target = "note";
   } else {
-    result.target = WQL_NOTE_HEAD_ALIASES.includes(headName) ? "note" : headName;
+    result.target = WQL_NOTE_HEAD_ALIASES.includes(headName) ? "note" : headName === "feeds" ? "feed" : headName;
     if (!WQL_FIND_TARGETS.includes(result.target)) {
       result.error = `Unknown find target "${result.target}". Try: ${WQL_FIND_TARGETS.join(", ")}`;
       return result;
@@ -1162,7 +1215,7 @@ function findTargetAdvisories(query) {
   const advisories = [];
   const target = query.target;
   const supported = allowedFilterTypesForTarget(target, "find");
-  const ignored = [...new Set(query.filters.filter((f) => !supportsWqlFilterKey(target, "find", f.key)).map((f) => f.key))];
+  const ignored = [...new Set(query.filters.filter((f) => f.kind !== "spreadParam" && !f.key.startsWith("$") && !supportsWqlFilterKey(target, "find", f.key)).map((f) => f.key))];
   if (ignored.length) {
     const custom = target === "segment" || target === "event" ? ", custom fact dimensions" : "";
     const effortKey = ignored.find((key) => WQL_EFFORT_FILTER_KEYS.includes(key));
@@ -1235,7 +1288,14 @@ function serializeFindStage(f) {
   return parts.filter(Boolean).join(" ");
 }
 function serializeFunctionStage(a) {
-  const filters = a.metric ? [{ key: "metric", negate: false, values: [{ value: a.metric, wildcard: false }] }, ...a.filters] : a.filters;
+  const filters = a.metric ? [
+    {
+      key: "metric",
+      negate: false,
+      values: [{ value: a.metric, wildcard: false, ...a.metricParam ? { param: a.metricParam } : {} }]
+    },
+    ...a.filters
+  ] : a.filters;
   let text = `:${a.agg}{${serializeFilters(filters)}}`;
   if (a.groupBy.length) text += ` by {${a.groupBy.join(", ")}}`;
   if (a.rollup) text += `.rollup(${a.rollup.size}${a.rollup.unit})`;
@@ -1260,16 +1320,22 @@ function serializeValue(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(",");
+  return filters.map((f) => {
+    if (f.kind === "spreadParam" || f.key.startsWith("$") && f.values.length === 0) {
+      const p = f.param ?? f.key.replace(/^\$/, "");
+      return `$${p}`;
+    }
+    return `${f.negate ? "!" : ""}${f.key}:${f.values.map((v) => v.param ? `$${v.param}` : 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);
+  return serializeAggHead(a.agg, a.metricParam ? `$${a.metricParam}` : a.metric, a.filters);
 }
 function serializeFindHalf(target, filters, last) {
-  const head = `find:${target}${filters.length ? `{${serializeFilters(filters)}}` : ""}`;
+  const head = `:${target}${filters.length ? `{${serializeFilters(filters)}}` : ""}`;
   return last ? `${head} last ${last.size}${last.unit}` : head;
 }
 function serializeMetricHalf(j) {
@@ -1278,6 +1344,7 @@ function serializeMetricHalf(j) {
 function serializeWindow(w) {
   if (!w) return "";
   if (w.kind === "relative") return `last ${w.size}${w.unit}`;
+  if (w.kind === "param") return `last $${w.param}${w.unit ? ` ${w.unit}` : ""}`;
   return w.end ? `from ${w.start} to ${w.end}` : `from ${w.start}`;
 }
 function serialize(parsed) {
@@ -1328,220 +1395,1615 @@ function serialize(parsed) {
   return unhandled.raw ?? "";
 }
 
-// src/disciplines.ts
-var EFFORT_DISCIPLINES = [
-  "bodyweight",
-  "cycling",
-  "gymnastics",
-  "kettlebell",
-  "recovery",
-  "rowing",
-  "running",
-  "strength",
-  "swimming",
-  "walking"
-];
-function isEffortDiscipline(value) {
-  return typeof value === "string" && EFFORT_DISCIPLINES.includes(value.toLowerCase());
+// src/paramRef.ts
+function collectFromFilters(filters, out) {
+  for (const f of filters) {
+    if (f.kind === "spreadParam" || f.key.startsWith("$") && f.values.length === 0) {
+      const name = f.param ?? f.key.replace(/^\$/, "");
+      if (name) out.add(name);
+      continue;
+    }
+    for (const v of f.values) {
+      if (v.param) out.add(v.param);
+    }
+  }
 }
-var DISCIPLINE_FACTORS = {
-  strength: 1.2,
-  kettlebell: 1.2,
-  gymnastics: 1.2,
-  recovery: 0.9,
-  bodyweight: 1,
-  cycling: 1,
-  rowing: 1,
-  running: 1,
-  swimming: 1,
-  walking: 1
-};
-function disciplineFactorFor(discipline) {
-  if (!discipline) return 1;
-  const key = discipline.toLowerCase();
-  return isEffortDiscipline(key) ? DISCIPLINE_FACTORS[key] : 1;
+function collectFromWindow(w, out) {
+  if (w?.kind === "param") out.add(w.param);
 }
-var wqlLanguage = LRLanguage.define({
-  parser: parser.configure({
-    props: [
-      styleTags({
-        // Rule styles color stray punctuation; the Word tokens inside carry
-        // the visible styling (unstyled children reset the parent class) —
-        // so parents with punctuation children (Head spans `:journal`) are
-        // NOT styled directly, or highlightTree merges the word into the
-        // parent span.
-        "Aggregator/Word": tags.keyword,
-        "Metric/Word": tags.variableName,
-        // Direct Word child of Head = the colon head name (`:sum`, `:journal`).
-        "Head/Word": tags.keyword,
-        DatasetReference: tags.keyword,
-        "DatasetReference/Word": tags.keyword,
-        At: tags.punctuation,
-        TagKey: tags.propertyName,
-        "TagKey/Word": tags.propertyName,
-        TagValue: tags.string,
-        "TagValue/Value/Word": tags.string,
-        "TagValue/Word": tags.string,
-        Negate: tags.operator,
-        Star: tags.operator,
-        Dimension: tags.attributeName,
-        "Dimension/Word": tags.attributeName,
-        By: tags.keyword,
-        RollupDot: tags.keyword,
-        Int: tags.number,
-        "Rollup/Word": tags.unit,
-        braceOpen: tags.bracket,
-        braceClose: tags.bracket,
-        parenOpen: tags.bracket,
-        parenClose: tags.bracket,
-        colon: tags.punctuation,
-        comma: tags.punctuation,
-        pipe: tags.punctuation,
-        dot: tags.punctuation
-      })
-    ]
-  }),
-  languageData: {
-    closeBrackets: { brackets: ["{", "("] }
+function collectFromSingle(q, out) {
+  if (q.family === "aggregate") {
+    if (q.metricParam) out.add(q.metricParam);
+    collectFromFilters(q.filters, out);
+    collectFromWindow(q.window, out);
+    if (q.join) collectFromFilters(q.join.filters, out);
+    return;
   }
-});
-function options(labels) {
-  return labels.map((label) => typeof label === "string" ? { label } : label);
+  collectFromFilters(q.filters, out);
+  collectFromWindow(q.window, out);
+  if (q.join) collectFromFilters(q.join.filters, out);
 }
-function scanContext(doc, pos) {
-  let depth = 0, quoted = false, pipeFrom = -1, lastBrace = -1, fragStart = 0;
-  for (let i = 0; i < pos; i++) {
-    const ch = doc[i];
-    if (quoted) {
-      if (ch === '"') quoted = false;
+function collectQueryParams(parsed) {
+  const out = /* @__PURE__ */ new Set();
+  if (parsed.family === "pipeline") {
+    if (parsed.source.kind === "query") collectFromSingle(parsed.source.query, out);
+    for (const t2 of parsed.transforms) collectFromSingle(t2, out);
+    if (parsed.sink) collectFromFilters(parsed.sink.filters, out);
+    return [...out];
+  }
+  collectFromSingle(parsed, out);
+  return [...out];
+}
+function parseFilterFragment(fragment) {
+  const trimmed = fragment.trim();
+  if (!trimmed) return { filters: [] };
+  if (trimmed.startsWith(":") || trimmed.startsWith("find:")) {
+    const asQuery = parseQuery(trimmed);
+    if (asQuery.error) return { filters: [], error: asQuery.error };
+    if (asQuery.family === "find" || asQuery.family === "aggregate") {
+      return { filters: asQuery.filters };
+    }
+    if (asQuery.family === "pipeline" && asQuery.source.kind === "query") {
+      return { filters: asQuery.source.query.filters };
+    }
+    return { filters: [] };
+  }
+  const inner = trimmed.startsWith("{") && trimmed.endsWith("}") ? trimmed.slice(1, -1).trim() : trimmed;
+  if (!inner) return { filters: [] };
+  const probe = parseQuery(`:segment{${inner}}`);
+  if (!probe.error && probe.family === "find") {
+    return { filters: probe.filters };
+  }
+  const noteProbe = parseQuery(`:note{${inner}}`);
+  if (!noteProbe.error && noteProbe.family === "find") {
+    return { filters: noteProbe.filters };
+  }
+  return { filters: [], error: noteProbe.error ?? probe.error ?? `Cannot parse filter parameter "${fragment}"` };
+}
+function bindWindow(w, params) {
+  if (!w || w.kind !== "param") return { window: w };
+  const raw = (params[w.param] ?? "").trim();
+  if (!raw || raw.toLowerCase() === "all") return { window: void 0 };
+  const withUnit = w.unit && /^\d+$/.test(raw) ? `${raw}${w.unit}` : raw;
+  const rel = /^(?:last\s+)?(\d+)\s*([dw])$/i.exec(withUnit);
+  if (rel) {
+    return {
+      window: {
+        kind: "relative",
+        size: Number(rel[1]),
+        unit: rel[2].toLowerCase()
+      }
+    };
+  }
+  const range = /^(?:from\s+)?(\d{4}-\d{2}-\d{2})(?:\s*(?:to|\.\.)\s*(\d{4}-\d{2}-\d{2}))?$/i.exec(raw);
+  if (range) {
+    return {
+      window: {
+        kind: "range",
+        start: range[1],
+        ...range[2] ? { end: range[2] } : {}
+      }
+    };
+  }
+  return { error: `Invalid window value "${raw}" for $${w.param} \u2014 expected <n>d|<n>w or YYYY-MM-DD[..YYYY-MM-DD]` };
+}
+function bindFilters(filters, params, opts) {
+  const bound = [];
+  const contentJoinFilters = [];
+  for (const f of filters) {
+    if (f.kind === "spreadParam" || f.key.startsWith("$") && f.values.length === 0) {
+      const name = f.param ?? f.key.replace(/^\$/, "");
+      const rawVal = (params[name] ?? "").trim();
+      if (!rawVal) continue;
+      const frag = parseFilterFragment(rawVal);
+      if (frag.error) return { filters: [], contentJoinFilters: [], error: frag.error };
+      for (const expanded of frag.filters) {
+        if (opts.isAggregate && WQL_CONTENT_ONLY_KEYS.includes(expanded.key)) {
+          contentJoinFilters.push(expanded);
+        } else {
+          bound.push(expanded);
+        }
+      }
       continue;
     }
-    if (ch === '"') {
-      quoted = true;
+    if (!f.values.some((v) => v.param !== void 0)) {
+      bound.push(f);
       continue;
     }
-    if (ch === "{") {
-      depth++;
-      lastBrace = i;
-      fragStart = i + 1;
-    } else if (ch === "}") {
-      depth = Math.max(0, depth - 1);
-      fragStart = i + 1;
-    } else if (ch === "," && depth > 0) fragStart = i + 1;
-    else if (ch === "|" && depth === 0) {
-      pipeFrom = i + 1;
-      fragStart = i + 1;
+    const nextValues = [];
+    for (const v of f.values) {
+      if (!v.param) {
+        nextValues.push(v);
+        continue;
+      }
+      const rawVal = (params[v.param] ?? "").trim();
+      if (!rawVal) continue;
+      const formatted = /[\s,{}"]/.test(rawVal) && !rawVal.startsWith('"') ? `"${rawVal.replace(/"/g, "")}"` : rawVal;
+      const probe = parseQuery(`:segment{${f.key}:${formatted}}`);
+      if (!probe.error && probe.family === "find" && probe.filters[0]) {
+        nextValues.push(...probe.filters[0].values);
+      } else {
+        const noteProbe = parseQuery(`:note{${f.key}:${formatted}}`);
+        if (!noteProbe.error && noteProbe.family === "find" && noteProbe.filters[0]) {
+          nextValues.push(...noteProbe.filters[0].values);
+        } else {
+          return {
+            filters: [],
+            contentJoinFilters: [],
+            error: noteProbe.error ?? probe.error ?? `Invalid value "${rawVal}" for $${v.param}`
+          };
+        }
+      }
+    }
+    if (nextValues.length > 0) {
+      bound.push({ key: f.key, negate: f.negate, values: nextValues });
     }
   }
-  return { depth, quoted, pipeFrom, lastBrace, fragStart };
+  return { filters: bound, contentJoinFilters };
 }
-function maskQuotes(text) {
-  let out = "";
-  let quoted = false;
-  for (const ch of text) {
-    if (ch === '"') {
-      quoted = !quoted;
-      out += " ";
-    } else out += quoted ? " " : ch;
+function bindAggregate(q, params, opts = {}) {
+  const metric = q.metricParam ? (params[q.metricParam] ?? "").trim() : q.metric;
+  if (q.metricParam && !metric && q.agg !== "count") {
+    return { ...q, error: `Parameter $${q.metricParam} resolved to an empty metric` };
   }
-  return out;
-}
-function unquotedColonIndex(text) {
-  let quoted = false;
-  for (let i = 0; i < text.length; i++) {
-    const ch = text[i];
-    if (ch === '"') quoted = !quoted;
-    else if (ch === ":" && !quoted) return i;
+  const win = bindWindow(q.window, params);
+  if (win.error) return { ...q, error: win.error };
+  const fRes = bindFilters(q.filters, params, { isAggregate: true });
+  if (fRes.error) return { ...q, error: fRes.error };
+  let join = q.join;
+  if (join) {
+    const jRes = bindFilters(join.filters, params, { isAggregate: false });
+    if (jRes.error) return { ...q, error: jRes.error };
+    join = { ...join, filters: jRes.filters };
   }
-  return -1;
-}
-function usedEntries(doc, groupStart, fragStart) {
-  const text = maskQuotes(doc.slice(groupStart + 1, fragStart));
-  const used = /* @__PURE__ */ new Set();
-  for (const entry of text.split(",")) {
-    const m = /!?\s*([A-Za-z][\w-]*)/.exec(entry);
-    if (m) used.add(m[1]);
+  if (fRes.contentJoinFilters.length > 0 && !opts.inPipelineTransform) {
+    join = join ? { ...join, filters: [...join.filters, ...fRes.contentJoinFilters] } : { target: "note", filters: fRes.contentJoinFilters };
   }
-  return used;
-}
-function valueOf(c) {
-  return typeof c.apply === "string" ? c.apply : c.label;
-}
-function quoteApply(c) {
-  const value = valueOf(c);
-  if (!/\s/.test(value)) return c;
   return {
-    ...c,
-    apply: (view, _c, from, to) => {
-      const text = view.state.sliceDoc(Math.max(0, from - 1), from) === '"' ? value : `"${value}"`;
-      view.dispatch({ changes: { from, to, insert: text }, selection: { anchor: from + text.length }, userEvent: "input.complete" });
-    }
+    ...q,
+    metric,
+    metricParam: void 0,
+    filters: fRes.filters,
+    window: win.window,
+    ...join ? { join } : { join: void 0 }
   };
 }
-function mergeValues(host, statics) {
-  const seen = /* @__PURE__ */ new Set();
-  const out = [];
-  host.forEach((c, i) => {
-    const k = valueOf(c).toLowerCase();
-    if (!k || seen.has(k)) return;
-    seen.add(k);
-    out.push(quoteApply({ ...c, boost: Math.max(-99, Math.min(99, 80 - i)) }));
-  });
-  for (const c of statics) {
-    const k = valueOf(c).toLowerCase();
-    if (!k || seen.has(k)) continue;
-    seen.add(k);
-    out.push(quoteApply(c));
-  }
-  return out;
-}
-function narrow(options2, typed) {
-  const q = typed.toLowerCase();
-  if (!q) return [...options2];
-  const prefix = [];
-  const rest = [];
-  for (const o of options2) {
-    const label = o.label.toLowerCase();
-    if (label.startsWith(q)) prefix.push(o);
-    else if (label.includes(q)) rest.push(o);
+function bindFind(q, params) {
+  const win = bindWindow(q.window, params);
+  if (win.error) return { ...q, error: win.error };
+  const fRes = bindFilters(q.filters, params, { isAggregate: false });
+  if (fRes.error) return { ...q, error: fRes.error };
+  let join = q.join;
+  if (join) {
+    const jRes = bindFilters(join.filters, params, { isAggregate: true });
+    if (jRes.error) return { ...q, error: jRes.error };
+    join = { ...join, filters: jRes.filters };
   }
-  return [...prefix, ...rest];
-}
-function finish(_context, from, options2, typed) {
-  const ranked = narrow(options2, typed);
-  if (!ranked.length) return null;
   return {
-    from,
-    options: ranked.map((o, i) => o.boost === void 0 ? { ...o, boost: Math.max(-99, 50 - i) } : o),
-    filter: false
+    ...q,
+    filters: fRes.filters,
+    window: win.window,
+    ...join ? { join } : { join: void 0 }
   };
 }
-function chained(list, suffix) {
-  return list.map((c) => ({
-    ...c,
-    apply: (view, _c, from, to) => {
-      const text = typeof c.apply === "string" ? c.apply : c.label;
-      const selfTerminated = /\W$/.test(text);
-      const present = view.state.sliceDoc(to, to + suffix.length) === suffix;
-      const insert = selfTerminated || present ? text : text + suffix;
-      view.dispatch({
-        changes: { from, to: to + (selfTerminated && present ? suffix.length : 0), insert },
-        selection: { anchor: from + insert.length },
-        userEvent: "input.complete"
-      });
-      startCompletion(view);
+function bindQueryParams(parsed, params) {
+  if (parsed.error) return { parsed, missing: [] };
+  const referenced = collectQueryParams(parsed);
+  if (referenced.length === 0) return { parsed, missing: [] };
+  const missing = referenced.filter((name) => params[name] === void 0);
+  if (missing.length > 0) return { parsed, missing };
+  let bound;
+  if (parsed.family === "aggregate") {
+    bound = bindAggregate(parsed, params);
+  } else if (parsed.family === "find") {
+    bound = bindFind(parsed, params);
+  } else {
+    let source = parsed.source;
+    let contentJoinForSource = [];
+    if (source.kind === "query") {
+      const sq = source.query.family === "aggregate" ? bindAggregate(source.query, params) : bindFind(source.query, params);
+      if (sq.error) return { parsed: { ...parsed, error: sq.error }, missing: [] };
+      source = { kind: "query", query: sq };
+    }
+    const transforms = [];
+    for (const t2 of parsed.transforms) {
+      const rawFilterBind = bindFilters(t2.filters, params, { isAggregate: true });
+      if (rawFilterBind.contentJoinFilters.length > 0) {
+        contentJoinForSource = [...contentJoinForSource, ...rawFilterBind.contentJoinFilters];
+      }
+      const bt = bindAggregate(t2, params, { inPipelineTransform: true });
+      if (bt.error) return { parsed: { ...parsed, error: bt.error }, missing: [] };
+      transforms.push(bt);
+    }
+    if (contentJoinForSource.length > 0 && source.kind === "query" && source.query.family === "find") {
+      if (source.query.target === "note" || source.query.target === "block") {
+        source = {
+          kind: "query",
+          query: { ...source.query, filters: [...source.query.filters, ...contentJoinForSource] }
+        };
+      }
     }
-  }));
+    let sink = parsed.sink;
+    if (sink) {
+      const sRes = bindFilters(sink.filters, params, { isAggregate: false });
+      if (sRes.error) return { parsed: { ...parsed, error: sRes.error }, missing: [] };
+      sink = { ...sink, filters: sRes.filters };
+    }
+    bound = {
+      ...parsed,
+      source,
+      transforms,
+      ...sink ? { sink } : {}
+    };
+  }
+  if (bound.error) return { parsed: bound, missing: [] };
+  const reparsed = parseQuery(serialize(bound));
+  return { parsed: reparsed, missing: [] };
 }
-var HEAD_OPTIONS = [
-  ...WQL_FUNCTION_HEADS.map((label) => ({ label, detail: "function head", type: "keyword" })),
-  ...WQL_SOURCE_HEADS.map((label) => ({ label, detail: "source head", type: "keyword" })),
-  ...WQL_CHART_HEADS.map((label) => ({ label, detail: "chart head", type: "class" })),
-  ...WQL_STANDARD_DATASETS.map((label) => ({ label, detail: "page dataset", type: "class" }))
-];
-function headApply(o, colonTyped) {
-  if (o.label.startsWith("@")) return { ...o, apply: o.label };
-  return { ...o, apply: `${colonTyped ? "" : ":"}${o.label}{` };
+
+// src/document.ts
+var FORMULA_CHARS = /^[\w$\s.+\-*/(),]+$/;
+function referencesOf(expression, known) {
+  const refs = [];
+  for (const match of expression.matchAll(/[A-Za-z_][\w-]*/g)) {
+    const name = match[0];
+    if (known.has(name) && !refs.includes(name)) refs.push(name);
+  }
+  return refs;
+}
+function parseDocument(text) {
+  const diagnostics = [];
+  const lines = text.split("\n").map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("//"));
+  const defaults = {};
+  let hasDefaults = false;
+  const assignments = [];
+  let show;
+  let showChart;
+  let degenerate = false;
+  const known = /* @__PURE__ */ new Set();
+  for (const line of lines) {
+    if (line.startsWith("defaults ")) {
+      hasDefaults = true;
+      const rest = line.slice("defaults ".length).trim();
+      const byMatch = /by\s*\{([^}]*)\}/.exec(rest);
+      if (byMatch) {
+        defaults.groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
+      }
+      const lastParamMatch = /last\s+\$([a-zA-Z_][\w-]*)(?:\s*(d|w))?/.exec(rest);
+      const lastMatch = !lastParamMatch ? /last\s+(\d+)\s*(d|w)/.exec(rest) : null;
+      if (lastParamMatch) {
+        defaults.window = {
+          kind: "param",
+          param: lastParamMatch[1],
+          ...lastParamMatch[2] ? { unit: lastParamMatch[2] } : {}
+        };
+      } else if (lastMatch) {
+        defaults.window = { kind: "relative", size: Number(lastMatch[1]), unit: lastMatch[2] };
+      }
+      const fromMatch = /from\s+(\d{4}-\d{2}-\d{2})(?:\s+to\s+(\d{4}-\d{2}-\d{2}))?/.exec(rest);
+      if (fromMatch) {
+        defaults.window = { kind: "range", start: fromMatch[1], end: fromMatch[2] };
+      }
+      continue;
+    }
+    if (line.startsWith("show ")) {
+      const rest = line.slice("show ".length).trim();
+      const pipeIdx = rest.indexOf("|");
+      const namesPart = pipeIdx === -1 ? rest : rest.slice(0, pipeIdx).trim();
+      show = namesPart.split(",").map((s) => s.trim()).filter(Boolean);
+      if (pipeIdx !== -1) {
+        const sinkText = rest.slice(pipeIdx + 1).trim();
+        const sinkParsed = parseQuery(`:segment{} | ${sinkText}`);
+        if (!sinkParsed.error && sinkParsed.family === "pipeline" && sinkParsed.sink && sinkParsed.transforms.length === 0) {
+          showChart = sinkParsed.sink;
+        } else {
+          diagnostics.push(`Invalid chart sink on show: "${sinkText}"`);
+        }
+      }
+      continue;
+    }
+    const assign = /^([A-Za-z_][\w-]*)\s*=\s*(.+)$/.exec(line);
+    if (assign) {
+      const name = assign[1];
+      const body = assign[2].trim();
+      known.add(name);
+      const unitMatch = /->\s*([\w/%.]+)\s*$/.exec(body);
+      const normalizeMatch = /\(normalize\s+([^)]+)\)/.exec(body);
+      const expression = body.replace(/->\s*[\w/%.]+\s*$/, "").replace(/\(normalize\s+[^)]+\)/, "").trim();
+      const looksLikeQuery = /^(sum|avg|min|max|count|last|delta|find|rows)\b|^[:@|]/.test(expression);
+      if (looksLikeQuery) {
+        const parsed = parseQuery(expression);
+        if (!parsed.error) {
+          assignments.push({ name, kind: "query", queryText: expression, parsed, raw: line });
+        } else {
+          diagnostics.push(`Assignment "${name}" is not a valid query`);
+        }
+        continue;
+      }
+      const refPipe = /^([A-Za-z_][\w-]*)\s*\|\s*(.+)$/.exec(expression);
+      if (refPipe) {
+        const sourceRef = refPipe[1];
+        const pipeTail = refPipe[2].trim();
+        const synthetic = parseQuery(`:segment{} | ${pipeTail}`);
+        if (!synthetic.error && synthetic.family === "pipeline") {
+          assignments.push({
+            name,
+            kind: "query",
+            sourceRef,
+            pipeTail,
+            transformsText: pipeTail,
+            queryText: expression,
+            parsed: synthetic,
+            raw: line
+          });
+        } else {
+          diagnostics.push(`Assignment "${name}" is not a valid pipeline over "${sourceRef}"`);
+        }
+        continue;
+      }
+      if (!FORMULA_CHARS.test(expression)) {
+        diagnostics.push(`Assignment "${name}" has characters a formula cannot parse`);
+        continue;
+      }
+      const formula = {
+        expression,
+        references: [],
+        ...normalizeMatch ? { normalize: normalizeMatch[1].trim() } : {},
+        ...unitMatch ? { unit: unitMatch[1] } : {}
+      };
+      assignments.push({ name, kind: "formula", formula, raw: line });
+      continue;
+    }
+    degenerate = true;
+  }
+  if (!hasDefaults && show === void 0 && !degenerate && assignments.length === 1 && assignments[0].kind === "query") ;
+  if (!hasDefaults && show === void 0 && assignments.length === 0) {
+    const parsed = parseQuery(lines.join(" "));
+    if (!parsed.error) {
+      known.add("query");
+      assignments.push({ name: "query", kind: "query", queryText: lines.join(" "), parsed, raw: lines.join(" ") });
+      show = ["query"];
+      degenerate = true;
+    } else {
+      diagnostics.push("Body is neither a valid query nor a valid document");
+    }
+  }
+  for (const assignment of assignments) {
+    if (assignment.sourceRef && !known.has(assignment.sourceRef)) {
+      diagnostics.push(`Assignment "${assignment.name}" references unknown source "${assignment.sourceRef}"`);
+    }
+    if (assignment.kind !== "formula" || !assignment.formula) continue;
+    assignment.formula.references = referencesOf(assignment.formula.expression, known);
+    for (const match of assignment.formula.expression.matchAll(/[A-Za-z_][\w-]*/g)) {
+      const name = match[0];
+      if (!known.has(name)) {
+        diagnostics.push(`Formula "${assignment.name}" references unknown name "${name}"`);
+      }
+    }
+    if (assignment.formula.references.length === 0) {
+      diagnostics.push(`Formula "${assignment.name}" references no named query or formula`);
+    }
+  }
+  const cycle = findCycle(assignments);
+  if (cycle) {
+    diagnostics.push(`Reference cycle detected: ${cycle.join(" -> ")}`);
+  }
+  if (show === void 0) {
+    show = assignments.filter((a) => a.kind === "query").map((a) => a.name);
+    if (assignments.length > 0 && show.length === 0) show = [assignments[0].name];
+  } else {
+    for (const name of show) {
+      if (!known.has(name)) diagnostics.push(`show references unknown name "${name}"`);
+    }
+  }
+  return {
+    doc: {
+      ...Object.keys(defaults).length > 0 ? { defaults } : {},
+      assignments,
+      show,
+      ...showChart ? { showChart } : {},
+      degenerate
+    },
+    diagnostics
+  };
+}
+function findCycle(assignments) {
+  const deps = /* @__PURE__ */ new Map();
+  for (const a of assignments) {
+    if (a.kind === "formula" && a.formula) deps.set(a.name, a.formula.references);
+    else if (a.sourceRef) deps.set(a.name, [a.sourceRef]);
+  }
+  const state = /* @__PURE__ */ new Map();
+  const stack = [];
+  const visit = (name) => {
+    const s = state.get(name);
+    if (s === 2) return void 0;
+    if (s === 1) {
+      const start = stack.indexOf(name);
+      return [...stack.slice(start === -1 ? 0 : start), name];
+    }
+    state.set(name, 1);
+    stack.push(name);
+    for (const ref of deps.get(name) ?? []) {
+      const cycle = visit(ref);
+      if (cycle) return cycle;
+    }
+    stack.pop();
+    state.set(name, 2);
+    return void 0;
+  };
+  for (const name of deps.keys()) {
+    const cycle = visit(name);
+    if (cycle) return cycle;
+  }
+  return void 0;
+}
+function serializeDocument(doc) {
+  if (doc.degenerate) {
+    const only = doc.assignments[0];
+    return only?.queryText ?? "";
+  }
+  const lines = [];
+  if (doc.defaults) {
+    const parts = [];
+    if (doc.defaults.groupBy?.length) parts.push(`by {${doc.defaults.groupBy.join(", ")}}`);
+    if (doc.defaults.window) {
+      const w = doc.defaults.window;
+      parts.push(
+        w.kind === "relative" ? `last ${w.size}${w.unit}` : w.kind === "param" ? `last $${w.param}${w.unit ? ` ${w.unit}` : ""}` : `from ${w.start}${w.end ? ` to ${w.end}` : ""}`
+      );
+    }
+    if (parts.length > 0) lines.push(`defaults ${parts.join(" ")}`);
+  }
+  for (const a of doc.assignments) {
+    lines.push(a.raw);
+  }
+  if (doc.show.length > 0) {
+    let showLine = `show ${doc.show.join(", ")}`;
+    if (doc.showChart) {
+      const sinkSerialized = serialize({
+        family: "pipeline",
+        raw: "",
+        source: { kind: "dataset", name: "@session" },
+        transforms: [],
+        sink: doc.showChart
+      }).replace(/^@session\s*\|\s*/, "");
+      showLine += ` | ${sinkSerialized}`;
+    }
+    lines.push(showLine);
+  }
+  return lines.join("\n");
+}
+
+// src/dashboard/fenceSuffix.ts
+var DASHBOARD_WIDGET_TYPES = [
+  "table",
+  "list",
+  "value",
+  "timeseries",
+  "bar",
+  "donut",
+  "toplist",
+  "stacked-bar",
+  "goal-rings",
+  "zone-distribution"
+];
+function isDashboardWidgetType(type) {
+  return DASHBOARD_WIDGET_TYPES.includes(type);
+}
+var DASHBOARD_GRID_MAX_COLS = 4;
+function parseQueryWidgetSuffix(suffix) {
+  if (suffix === "") {
+    return { type: "", attributes: {}, attributeOrder: [], error: 'missing widget type after "query:"' };
+  }
+  const attributes = {};
+  const attributeOrder = [];
+  const trimmedSuffix = suffix.trim();
+  const headEnd = trimmedSuffix.search(/\s/);
+  const head = headEnd === -1 ? trimmedSuffix : trimmedSuffix.slice(0, headEnd);
+  const attrTail = headEnd === -1 ? "" : trimmedSuffix.slice(headEnd);
+  const attrPattern = /([a-zA-Z][a-zA-Z0-9_-]*)=("([^"]*)"|\S+)/g;
+  for (const match of attrTail.matchAll(attrPattern)) {
+    const key = match[1].toLowerCase();
+    const value = match[3] !== void 0 ? match[3] : match[2];
+    if (key in attributes) {
+      return { type: head, attributes, attributeOrder, error: `duplicate attribute "${key}"` };
+    }
+    attributes[key] = value;
+    attributeOrder.push(key);
+  }
+  const leftover = attrTail.replace(attrPattern, "").trim();
+  if (leftover !== "") {
+    return { type: head, attributes, attributeOrder, error: `malformed attribute "${leftover.split(/\s+/)[0]}"` };
+  }
+  let rest = head.toLowerCase();
+  let spanCols;
+  let spanFull;
+  if (rest.endsWith("-full")) {
+    spanFull = true;
+    rest = rest.slice(0, -"-full".length);
+  } else {
+    const spanMatch = rest.match(/-(\d+)$/);
+    if (spanMatch) {
+      spanCols = Number(spanMatch[1]);
+      rest = rest.slice(0, -spanMatch[0].length);
+    }
+  }
+  if (rest === "" || !/^[a-z][a-z0-9-]*$/.test(rest)) {
+    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `malformed widget type "${suffix}"` };
+  }
+  if (/-(\d+|full)$/.test(rest)) {
+    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `malformed widget suffix "${suffix}"` };
+  }
+  if (spanCols != null && (spanCols < 1 || spanCols > DASHBOARD_GRID_MAX_COLS)) {
+    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `span ${spanCols} outside 1..${DASHBOARD_GRID_MAX_COLS}` };
+  }
+  return { type: rest, spanCols, spanFull, attributes, attributeOrder };
+}
+
+// src/queryBlockCodec.ts
+var KNOWN_YAML_KEYS = /* @__PURE__ */ new Set([
+  "title",
+  "description",
+  "question",
+  "view",
+  "type",
+  "span",
+  "unit",
+  "window",
+  "groupBy",
+  "query",
+  "series",
+  "columns",
+  "sort",
+  "limit",
+  "goal",
+  "targets",
+  "comparePr"
+]);
+function unquoteYaml(raw) {
+  const t2 = raw.trim();
+  if (t2.length >= 2 && t2.startsWith('"') && t2.endsWith('"')) {
+    return t2.slice(1, -1).replace(/\\n/g, "\n").replace(/\\r/g, "\r").replace(/\\t/g, "	").replace(/\\"/g, '"').replace(/\\\\/g, "\\");
+  }
+  if (t2.length >= 2 && t2.startsWith("'") && t2.endsWith("'")) {
+    return t2.slice(1, -1).replace(/''/g, "'");
+  }
+  return t2;
+}
+function stripInlineYamlComment(line) {
+  let inSingle = false;
+  let inDouble = false;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (inDouble) {
+      if (ch === "\\") i++;
+      else if (ch === '"') inDouble = false;
+      continue;
+    }
+    if (inSingle) {
+      if (ch === "'") inSingle = false;
+      continue;
+    }
+    if (ch === '"') inDouble = true;
+    else if (ch === "'") inSingle = true;
+    else if (ch === "#" && (i === 0 || /\s/.test(line[i - 1]))) {
+      return line.slice(0, i).trimEnd();
+    }
+  }
+  return line;
+}
+function quoteYamlString(value, opts = {}) {
+  if (value === "") return '""';
+  if (opts.allowWqlBare && value === value.trim() && !/^[{["'&*!|>%@`#-]/.test(value) && !value.includes(": ") && !value.includes(" #") && !value.includes("\n")) {
+    return value;
+  }
+  const looksNumeric = /^-?\d+(?:\.\d+)?$/.test(value);
+  const looksKeyword = /^(true|false|null|yes|no|on|off)$/i.test(value);
+  if (/^[$a-zA-Z0-9_./-]+$/.test(value) && !value.startsWith("-") && !looksNumeric && !looksKeyword) {
+    return value;
+  }
+  if (!/[:"'\n#{}[\],&*?|<>=!%@`]/.test(value) && value === value.trim() && !value.startsWith("-") && !looksNumeric && !looksKeyword) {
+    return value;
+  }
+  return `"${value.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t")}"`;
+}
+function splitFlowList(inner) {
+  const out = [];
+  let current = "";
+  let inSingle = false;
+  let inDouble = false;
+  for (let i = 0; i < inner.length; i++) {
+    const ch = inner[i];
+    if (inDouble) {
+      if (ch === "\\" && i + 1 < inner.length) {
+        current += ch + inner[i + 1];
+        i++;
+        continue;
+      }
+      if (ch === '"') inDouble = false;
+      current += ch;
+      continue;
+    }
+    if (inSingle) {
+      if (ch === "'") inSingle = false;
+      current += ch;
+      continue;
+    }
+    if (ch === '"') {
+      inDouble = true;
+      current += ch;
+      continue;
+    }
+    if (ch === "'") {
+      inSingle = true;
+      current += ch;
+      continue;
+    }
+    if (ch === ",") {
+      if (current.trim()) out.push(unquoteYaml(current));
+      current = "";
+      continue;
+    }
+    current += ch;
+  }
+  if (current.trim()) out.push(unquoteYaml(current));
+  return out;
+}
+function isYamlQueryBlockBody(rawBody) {
+  const lines = rawBody.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("#") && !l.startsWith("//"));
+  if (lines.length === 0) return false;
+  const first = lines[0];
+  if (first.startsWith(":") || first.startsWith("@")) return false;
+  const m = /^([a-zA-Z][a-zA-Z0-9_]*)\s*:(?:\s+(.*))?$/.exec(first);
+  if (!m) return false;
+  return KNOWN_YAML_KEYS.has(m[1]);
+}
+function parseScalarOrParam(raw) {
+  const clean = unquoteYaml(raw).trim();
+  if (!clean) return void 0;
+  if (clean.startsWith("$") && clean.length > 1) {
+    return { param: clean.slice(1) };
+  }
+  const num = Number(clean);
+  if (!Number.isNaN(num)) return num;
+  return void 0;
+}
+function formatScalarOrParam(val) {
+  return typeof val === "number" ? String(val) : `$${val.param}`;
+}
+function parseYamlWindow(raw) {
+  const clean = unquoteYaml(raw).trim();
+  if (!clean || clean.toLowerCase() === "all") return {};
+  if (clean.startsWith("$") && clean.length > 1) {
+    const m = /^\$([a-zA-Z_][\w-]*)(?:\s*([dw]))?$/i.exec(clean);
+    if (m) {
+      return {
+        window: {
+          kind: "param",
+          param: m[1],
+          ...m[2] ? { unit: m[2].toLowerCase() } : {}
+        }
+      };
+    }
+  }
+  const relParam = /^last\s+\$([a-zA-Z_][\w-]*)(?:\s*([dw]))?$/i.exec(clean);
+  if (relParam) {
+    return {
+      window: {
+        kind: "param",
+        param: relParam[1],
+        ...relParam[2] ? { unit: relParam[2].toLowerCase() } : {}
+      }
+    };
+  }
+  const rel = /^(?:last\s+)?(\d+)\s*([dw])$/i.exec(clean);
+  if (rel) {
+    return {
+      window: {
+        kind: "relative",
+        size: Number(rel[1]),
+        unit: rel[2].toLowerCase()
+      }
+    };
+  }
+  const range = /^(?:from\s+)?(\d{4}-\d{2}-\d{2})(?:\s*(?:to|\.\.)\s*(\d{4}-\d{2}-\d{2}))?$/i.exec(clean);
+  if (range) {
+    return {
+      window: {
+        kind: "range",
+        start: range[1],
+        ...range[2] ? { end: range[2] } : {}
+      }
+    };
+  }
+  return { error: `Invalid window "${clean}" \u2014 expected 8w, 14d, $range, or YYYY-MM-DD..YYYY-MM-DD` };
+}
+function formatYamlWindow(w) {
+  if (w.kind === "relative") return `${w.size}${w.unit}`;
+  if (w.kind === "param") return w.unit ? `$${w.param} ${w.unit}` : `$${w.param}`;
+  return w.end ? `${w.start}..${w.end}` : `from ${w.start}`;
+}
+function parseSortItem(raw) {
+  const clean = unquoteYaml(raw).trim();
+  if (!clean) return void 0;
+  const m = /^(\S+)(?:\s+(asc|desc))?$/i.exec(clean);
+  if (!m) return void 0;
+  return { col: m[1], dir: m[2]?.toLowerCase() ?? "asc" };
+}
+function parseIndentedYamlMap(rawBody) {
+  const scalars = {};
+  const stringLists = {};
+  const objectLists = {};
+  const rawLines = rawBody.split(/\r?\n/);
+  let i = 0;
+  while (i < rawLines.length) {
+    const cleaned = stripInlineYamlComment(rawLines[i]);
+    const trimmed = cleaned.trim();
+    if (!trimmed || trimmed.startsWith("//")) {
+      i++;
+      continue;
+    }
+    const indent = cleaned.length - cleaned.trimStart().length;
+    if (indent !== 0) {
+      return { data: { scalars, stringLists, objectLists }, error: `Unexpected indentation on line ${i + 1}: "${trimmed}"` };
+    }
+    const m = /^([a-zA-Z][a-zA-Z0-9_]*)\s*:(?:\s*(.*))?$/.exec(trimmed);
+    if (!m) {
+      return { data: { scalars, stringLists, objectLists }, error: `Malformed YAML property on line ${i + 1}: "${trimmed}"` };
+    }
+    const key = m[1];
+    const rest = (m[2] ?? "").trim();
+    if (rest !== "") {
+      if (rest.startsWith("[") && rest.endsWith("]")) {
+        stringLists[key] = splitFlowList(rest.slice(1, -1));
+      } else {
+        scalars[key] = unquoteYaml(rest);
+      }
+      i++;
+      continue;
+    }
+    i++;
+    const strItems = [];
+    const objItems = [];
+    let isObjList = false;
+    while (i < rawLines.length) {
+      const childClean = stripInlineYamlComment(rawLines[i]);
+      const childTrim = childClean.trim();
+      if (!childTrim || childTrim.startsWith("//")) {
+        i++;
+        continue;
+      }
+      const childIndent = childClean.length - childClean.trimStart().length;
+      if (childIndent === 0) break;
+      if (childTrim.startsWith("- ")) {
+        const afterDash = childTrim.slice(2).trim();
+        const kvMatch = /^([a-zA-Z][a-zA-Z0-9_]*)\s*:\s*(.*)$/.exec(afterDash);
+        if (kvMatch) {
+          isObjList = true;
+          const itemObj = {
+            [kvMatch[1]]: unquoteYaml(kvMatch[2] ?? "")
+          };
+          const itemIndent = childIndent;
+          i++;
+          while (i < rawLines.length) {
+            const propClean = stripInlineYamlComment(rawLines[i]);
+            const propTrim = propClean.trim();
+            if (!propTrim || propTrim.startsWith("//")) {
+              i++;
+              continue;
+            }
+            const propIndent = propClean.length - propClean.trimStart().length;
+            if (propIndent <= itemIndent) break;
+            const propMatch = /^([a-zA-Z][a-zA-Z0-9_]*)\s*:\s*(.*)$/.exec(propTrim);
+            if (propMatch) {
+              itemObj[propMatch[1]] = unquoteYaml(propMatch[2] ?? "");
+            }
+            i++;
+          }
+          objItems.push(itemObj);
+          continue;
+        }
+        strItems.push(unquoteYaml(afterDash));
+        i++;
+        continue;
+      }
+      i++;
+    }
+    if (isObjList) objectLists[key] = objItems;
+    else stringLists[key] = strItems;
+  }
+  return { data: { scalars, stringLists, objectLists } };
+}
+function parseTargetsString(raw) {
+  return raw.split(/[\s,]+/).map((tok) => parseScalarOrParam(tok)).filter((v) => v !== void 0);
+}
+function normalizeSingleWqlForObject(rawWql) {
+  const trimmed = rawWql.trim();
+  const parsed = parseQuery(trimmed);
+  if (parsed.error) return { query: trimmed };
+  if (isFindQuery(parsed) && parsed.pipes) {
+    const columns = parsed.pipes.select?.map((s) => s.unit ? `${s.col} in ${s.unit}` : s.col);
+    const sort = parsed.pipes.order?.map((o) => ({ col: o.col, dir: o.dir }));
+    const limit = parsed.pipes.limit;
+    const stripped = { ...parsed, pipes: void 0 };
+    return {
+      query: serialize(stripped),
+      ...columns?.length ? { columns } : {},
+      ...sort?.length ? { sort } : {},
+      ...limit !== void 0 ? { limit } : {}
+    };
+  }
+  if (!isPipelineQuery(parsed)) {
+    return { query: trimmed };
+  }
+  let sinkView;
+  let sinkGoal;
+  let sinkTargets;
+  if (parsed.sink) {
+    if (isDashboardWidgetType(parsed.sink.head)) {
+      sinkView = parsed.sink.head;
+    }
+    for (const f of parsed.sink.filters) {
+      if (f.key === "goal" && f.values[0]) {
+        const v = f.values[0];
+        sinkGoal = v.param ? { param: v.param } : parseScalarOrParam(v.value);
+      } else if (f.key === "targets" && f.values[0]) {
+        sinkTargets = parseTargetsString(f.values[0].value);
+      }
+    }
+  }
+  if (parsed.source.kind === "query" && parsed.source.query.family === "find" && parsed.source.query.target === "segment" && !parsed.source.query.join && !parsed.source.query.groupBy?.length && parsed.transforms.length === 1) {
+    const src = parsed.source.query;
+    const tr = parsed.transforms[0];
+    if (tr.metric || tr.agg === "count") {
+      const collapsed = {
+        family: "aggregate",
+        raw: "",
+        agg: tr.agg,
+        metric: tr.metric || "sessionLoad",
+        ...tr.metricParam ? { metricParam: tr.metricParam } : {},
+        filters: [...src.filters, ...tr.filters],
+        groupBy: tr.groupBy,
+        ...tr.rollup ? { rollup: tr.rollup } : {},
+        ...tr.displayUnit ?? src.displayUnit ? { displayUnit: tr.displayUnit ?? src.displayUnit } : {},
+        ...tr.window ?? src.window ? { window: tr.window ?? src.window } : {}
+      };
+      return {
+        query: serialize(collapsed),
+        ...sinkView ? { sinkView } : {},
+        ...sinkGoal !== void 0 ? { sinkGoal } : {},
+        ...sinkTargets?.length ? { sinkTargets } : {}
+      };
+    }
+  }
+  if (parsed.source.kind === "query" && parsed.transforms.length === 0 && parsed.sink) {
+    return {
+      query: serialize(parsed.source.query),
+      ...sinkView ? { sinkView } : {},
+      ...sinkGoal !== void 0 ? { sinkGoal } : {},
+      ...sinkTargets?.length ? { sinkTargets } : {}
+    };
+  }
+  if (parsed.sink) {
+    const withoutSink = serialize({ ...parsed, sink: void 0 });
+    return {
+      query: withoutSink,
+      ...sinkView ? { sinkView } : {},
+      ...sinkGoal !== void 0 ? { sinkGoal } : {},
+      ...sinkTargets?.length ? { sinkTargets } : {}
+    };
+  }
+  return { query: trimmed };
+}
+function applyLegacyFenceOptions(base, options2) {
+  const next = { ...base };
+  if (options2.fenceTag) {
+    const tag = options2.fenceTag.trim().replace(/^`+/, "");
+    const colonMatch = tag.match(/^(?:query|widget):(.*)$/i);
+    const suffixText = colonMatch ? colonMatch[1] : tag.toLowerCase() === "query" ? "" : tag;
+    if (suffixText !== "") {
+      const spec = parseQueryWidgetSuffix(suffixText);
+      if (spec.error) next.error = spec.error;
+      if (spec.type) {
+        if (isDashboardWidgetType(spec.type)) {
+          next.view = spec.type;
+        } else {
+          next.rawViewType = spec.type;
+        }
+      }
+      if (spec.spanFull) next.span = "full";
+      else if (spec.spanCols) next.span = spec.spanCols;
+      const extraAttrs = {};
+      for (const [k, v] of Object.entries(spec.attributes)) {
+        if (k === "goal" || k === "param1") {
+          const parsedGoal = parseScalarOrParam(v);
+          if (parsedGoal !== void 0) next.goal = next.goal ?? parsedGoal;
+          else extraAttrs[k] = v;
+        } else if (k === "targets") {
+          const parsedTargets = parseTargetsString(v);
+          if (parsedTargets.length > 0) next.targets = next.targets ?? parsedTargets;
+          else extraAttrs[k] = v;
+        } else if (k === "comparepr") {
+          next.comparePr = v === "true";
+        } else {
+          extraAttrs[k] = v;
+        }
+      }
+      if (Object.keys(extraAttrs).length > 0) {
+        next.attributes = { ...next.attributes ?? {}, ...extraAttrs };
+      }
+    }
+  }
+  if (!next.title && options2.adjacentTitle) next.title = options2.adjacentTitle;
+  if (!next.description && options2.adjacentDescription) next.description = options2.adjacentDescription;
+  return next;
+}
+function parseQueryBlock(rawBody, options2 = {}) {
+  const trimmed = rawBody.trim();
+  if (isYamlQueryBlockBody(trimmed)) {
+    const { data, error } = parseIndentedYamlMap(trimmed);
+    const rawView = (data.scalars.view ?? data.scalars.type ?? "").toLowerCase();
+    const view = isDashboardWidgetType(rawView) ? rawView : "table";
+    const obj2 = {
+      view,
+      ...rawView && !isDashboardWidgetType(rawView) ? { rawViewType: rawView } : {},
+      ...error ? { error } : {}
+    };
+    if (data.scalars.title) obj2.title = data.scalars.title;
+    const desc = data.scalars.description ?? data.scalars.question;
+    if (desc) obj2.description = desc;
+    if (data.scalars.span) {
+      const s = data.scalars.span.toLowerCase();
+      if (s === "full") obj2.span = "full";
+      else {
+        const n = Number(s);
+        if (n >= 1 && n <= 4) obj2.span = n;
+        else obj2.error = obj2.error ?? `span ${data.scalars.span} outside 1..4`;
+      }
+    }
+    if (data.scalars.unit) obj2.unit = data.scalars.unit;
+    if (data.scalars.window) {
+      const wRes = parseYamlWindow(data.scalars.window);
+      if (wRes.error) obj2.error = obj2.error ?? wRes.error;
+      else if (wRes.window) obj2.window = wRes.window;
+    }
+    const groupByList = data.stringLists.groupBy ?? (data.scalars.groupBy ? splitFlowList(data.scalars.groupBy) : void 0);
+    if (groupByList?.length) obj2.groupBy = groupByList;
+    if (data.scalars.goal !== void 0) {
+      const g = parseScalarOrParam(data.scalars.goal);
+      if (g !== void 0) obj2.goal = g;
+    }
+    const targetStrings = data.stringLists.targets ?? (data.scalars.targets ? parseTargetsString(data.scalars.targets).map(formatScalarOrParam) : void 0);
+    if (targetStrings?.length) {
+      const parsedTargets = targetStrings.map(parseScalarOrParam).filter((v) => v !== void 0);
+      if (parsedTargets.length) obj2.targets = parsedTargets;
+    }
+    if (data.scalars.comparePr !== void 0) {
+      obj2.comparePr = data.scalars.comparePr.toLowerCase() === "true";
+    }
+    const cols = data.stringLists.columns ?? (data.scalars.columns ? splitFlowList(data.scalars.columns) : void 0);
+    if (cols?.length) obj2.columns = cols;
+    if (data.objectLists.sort) {
+      obj2.sort = data.objectLists.sort.filter((item) => Boolean(item.col)).map((item) => ({
+        col: item.col,
+        dir: item.dir?.toLowerCase() === "desc" ? "desc" : "asc"
+      }));
+    } else if (data.stringLists.sort) {
+      obj2.sort = data.stringLists.sort.map(parseSortItem).filter((s) => Boolean(s));
+    } else if (data.scalars.sort) {
+      const single = parseSortItem(data.scalars.sort);
+      if (single) obj2.sort = [single];
+    }
+    if (data.scalars.limit !== void 0) {
+      const lim = Number(data.scalars.limit);
+      if (!Number.isNaN(lim)) obj2.limit = lim;
+    }
+    if (data.scalars.query !== void 0) {
+      const norm2 = normalizeSingleWqlForObject(data.scalars.query);
+      obj2.query = norm2.query;
+      if (!data.scalars.view && !data.scalars.type && norm2.sinkView) obj2.view = norm2.sinkView;
+      if (obj2.goal === void 0 && norm2.sinkGoal !== void 0) obj2.goal = norm2.sinkGoal;
+      if (!obj2.targets && norm2.sinkTargets?.length) obj2.targets = norm2.sinkTargets;
+    }
+    if (data.objectLists.series?.length) {
+      obj2.series = data.objectLists.series.map((item, idx) => ({
+        id: item.id || `s${idx + 1}`,
+        ...item.label ? { label: item.label } : {},
+        ...item.query ? { query: normalizeSingleWqlForObject(item.query).query } : {},
+        ...item.formula ? { formula: item.formula } : {},
+        ...item.normalize ? { normalize: item.normalize } : {},
+        ...item.unit ? { unit: item.unit } : {},
+        ...item.visible === "false" ? { visible: false } : {}
+      }));
+    }
+    return applyLegacyFenceOptions(obj2, options2);
+  }
+  const nonCommentLines = trimmed.split(/\r?\n/).map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("#") && !l.startsWith("//"));
+  if (nonCommentLines.length > 1 || nonCommentLines[0] && /^(?:defaults\s+|show\s+|[A-Za-z_][\w-]*\s*=)/.test(nonCommentLines[0])) {
+    const docParsed = parseDocument(nonCommentLines.join("\n"));
+    if (!docParsed.doc.degenerate && docParsed.doc.assignments.length > 0) {
+      const shownSet = new Set(docParsed.doc.show);
+      const sinkView = docParsed.doc.showChart && isDashboardWidgetType(docParsed.doc.showChart.head) ? docParsed.doc.showChart.head : void 0;
+      const obj2 = {
+        view: sinkView ?? "timeseries",
+        ...docParsed.doc.defaults?.window ? { window: docParsed.doc.defaults.window } : {},
+        ...docParsed.doc.defaults?.groupBy?.length ? { groupBy: docParsed.doc.defaults.groupBy } : {},
+        series: docParsed.doc.assignments.map((a) => ({
+          id: a.name,
+          ...a.kind === "query" ? { query: a.queryText } : {},
+          ...a.kind === "formula" && a.formula ? {
+            formula: a.formula.expression,
+            ...a.formula.normalize ? { normalize: a.formula.normalize } : {},
+            ...a.formula.unit ? { unit: a.formula.unit } : {}
+          } : {},
+          ...shownSet.size > 0 && !shownSet.has(a.name) ? { visible: false } : {}
+        }))
+      };
+      return applyLegacyFenceOptions(obj2, options2);
+    }
+  }
+  const singleLine = nonCommentLines.join(" ");
+  const norm = normalizeSingleWqlForObject(singleLine);
+  const obj = {
+    view: norm.sinkView ?? "table",
+    query: norm.query,
+    ...norm.columns ? { columns: norm.columns } : {},
+    ...norm.sort ? { sort: norm.sort } : {},
+    ...norm.limit !== void 0 ? { limit: norm.limit } : {},
+    ...norm.sinkGoal !== void 0 ? { goal: norm.sinkGoal } : {},
+    ...norm.sinkTargets?.length ? { targets: norm.sinkTargets } : {}
+  };
+  return applyLegacyFenceOptions(obj, options2);
+}
+function isDefaultShorthandQueryBlock(obj) {
+  const effectiveView = obj.rawViewType ?? obj.view;
+  if (effectiveView !== "table") return false;
+  if (obj.title || obj.description || obj.span !== void 0 && obj.span !== 1 || obj.unit || obj.window || obj.groupBy?.length || obj.columns?.length || obj.sort?.length || obj.limit !== void 0 || obj.goal !== void 0 || obj.targets?.length || obj.comparePr !== void 0 || obj.attributes && Object.keys(obj.attributes).length > 0) {
+    return false;
+  }
+  if (obj.series && obj.series.length > 0) {
+    if (obj.series.length > 1) return false;
+    const s = obj.series[0];
+    if (s.label || s.formula || s.normalize || s.unit || s.visible === false || !s.query) return false;
+    return true;
+  }
+  return Boolean(obj.query && !obj.query.includes("\n"));
+}
+function serializeQueryBlock(obj, opts = {}) {
+  if (!opts.forceYaml && isDefaultShorthandQueryBlock(obj)) {
+    return (obj.query ?? obj.series?.[0]?.query ?? "").trim();
+  }
+  const lines = [];
+  if (obj.title) lines.push(`title: ${quoteYamlString(obj.title)}`);
+  if (obj.description) lines.push(`description: ${quoteYamlString(obj.description)}`);
+  lines.push(`view: ${quoteYamlString(obj.rawViewType ?? obj.view)}`);
+  if (obj.span !== void 0 && obj.span !== 1) {
+    lines.push(`span: ${obj.span}`);
+  }
+  if (obj.unit) lines.push(`unit: ${quoteYamlString(obj.unit)}`);
+  if (obj.window) lines.push(`window: ${quoteYamlString(formatYamlWindow(obj.window))}`);
+  if (obj.groupBy?.length) {
+    lines.push(`groupBy: [${obj.groupBy.map((g) => quoteYamlString(g)).join(", ")}]`);
+  }
+  if (obj.goal !== void 0) {
+    lines.push(`goal: ${formatScalarOrParam(obj.goal)}`);
+  }
+  if (obj.targets?.length) {
+    lines.push(`targets: [${obj.targets.map(formatScalarOrParam).join(", ")}]`);
+  }
+  if (obj.comparePr !== void 0) {
+    lines.push(`comparePr: ${obj.comparePr ? "true" : "false"}`);
+  }
+  if (obj.columns?.length) {
+    lines.push(`columns: [${obj.columns.map((c) => quoteYamlString(c)).join(", ")}]`);
+  }
+  if (obj.sort?.length) {
+    lines.push(
+      `sort: [${obj.sort.map((s) => quoteYamlString(s.dir === "desc" ? `${s.col} desc` : `${s.col} asc`)).join(", ")}]`
+    );
+  }
+  if (obj.limit !== void 0) {
+    lines.push(`limit: ${obj.limit}`);
+  }
+  const hasRichSeries = obj.series && (obj.series.length > 1 || obj.series.some((s) => Boolean(s.formula || s.label || s.normalize || s.unit || s.visible === false)));
+  if (hasRichSeries && obj.series) {
+    lines.push("series:");
+    for (const s of obj.series) {
+      lines.push(`  - id: ${quoteYamlString(s.id)}`);
+      if (s.label) lines.push(`    label: ${quoteYamlString(s.label)}`);
+      if (s.query) lines.push(`    query: ${quoteYamlString(s.query, { allowWqlBare: true })}`);
+      if (s.formula) lines.push(`    formula: ${quoteYamlString(s.formula, { allowWqlBare: true })}`);
+      if (s.normalize) lines.push(`    normalize: ${quoteYamlString(s.normalize)}`);
+      if (s.unit) lines.push(`    unit: ${quoteYamlString(s.unit)}`);
+      if (s.visible === false) lines.push("    visible: false");
+    }
+  } else {
+    const singleQuery = obj.query ?? obj.series?.[0]?.query ?? "";
+    lines.push(`query: ${quoteYamlString(singleQuery, { allowWqlBare: true })}`);
+  }
+  return lines.join("\n");
+}
+function serializeQueryBlockFence(obj, opts = {}) {
+  return `\`\`\`query
+${serializeQueryBlock(obj, opts)}
+\`\`\``;
+}
+function applyTopLevelClausesToSingleQuery(rawQuery, obj) {
+  const trimmed = rawQuery.trim();
+  if (!trimmed) return "";
+  const hasTopOverrides = Boolean(
+    obj.window || obj.groupBy?.length || obj.unit || obj.columns?.length || obj.sort?.length || obj.limit !== void 0
+  );
+  if (!hasTopOverrides) return trimmed;
+  const parsed = parseQuery(trimmed);
+  if (parsed.error) return trimmed;
+  if (parsed.family === "aggregate") {
+    const next = {
+      ...parsed,
+      ...obj.groupBy?.length && parsed.groupBy.length === 0 ? { groupBy: obj.groupBy } : {},
+      ...obj.window && !parsed.window ? { window: obj.window } : {},
+      ...obj.unit && !parsed.displayUnit ? { displayUnit: obj.unit } : {}
+    };
+    return serialize(next);
+  }
+  if (parsed.family === "find") {
+    const pipes = { ...parsed.pipes ?? {} };
+    if (obj.columns?.length && !pipes.select) {
+      pipes.select = obj.columns.map((c) => {
+        const m = /^([\w.-]+)(?:\s+in\s+([\w/%]+))?$/i.exec(c.trim());
+        return m ? { col: m[1], ...m[2] ? { unit: m[2] } : {} } : { col: c.trim() };
+      });
+    }
+    if (obj.sort?.length && !pipes.order) {
+      pipes.order = obj.sort.map((s) => ({ col: s.col, dir: s.dir }));
+    }
+    if (obj.limit !== void 0 && pipes.limit === void 0) {
+      pipes.limit = obj.limit;
+    }
+    const next = {
+      ...parsed,
+      ...obj.groupBy?.length && !parsed.groupBy?.length ? { groupBy: obj.groupBy } : {},
+      ...obj.window && !parsed.window ? { window: obj.window } : {},
+      ...obj.unit && !parsed.displayUnit ? { displayUnit: obj.unit } : {},
+      ...Object.keys(pipes).length > 0 ? { pipes } : {}
+    };
+    return serialize(next);
+  }
+  if (parsed.family === "pipeline") {
+    const transforms = [...parsed.transforms];
+    if (transforms.length > 0 && obj.groupBy?.length) {
+      const lastIdx = transforms.length - 1;
+      if (transforms[lastIdx].groupBy.length === 0) {
+        transforms[lastIdx] = { ...transforms[lastIdx], groupBy: obj.groupBy };
+      }
+    }
+    let source = parsed.source;
+    if (obj.window && source.kind === "query" && !source.query.window) {
+      source = { kind: "query", query: { ...source.query, window: obj.window } };
+    }
+    return serialize({ ...parsed, source, transforms });
+  }
+  return trimmed;
+}
+function queryBlockToDocumentText(obj) {
+  const hasMultiOrFormula = obj.series && (obj.series.length > 1 || obj.series.some((s) => Boolean(s.formula || s.visible === false)));
+  if (!hasMultiOrFormula) {
+    const single = obj.query ?? obj.series?.[0]?.query ?? "";
+    return applyTopLevelClausesToSingleQuery(single, obj);
+  }
+  const lines = [];
+  if (obj.groupBy?.length || obj.window) {
+    const parts = [];
+    if (obj.groupBy?.length) parts.push(`by {${obj.groupBy.join(", ")}}`);
+    if (obj.window) {
+      const w = obj.window;
+      parts.push(
+        w.kind === "relative" ? `last ${w.size}${w.unit}` : w.kind === "param" ? `last $${w.param}${w.unit ? ` ${w.unit}` : ""}` : `from ${w.start}${w.end ? ` to ${w.end}` : ""}`
+      );
+    }
+    lines.push(`defaults ${parts.join(" ")}`);
+  }
+  const showIds = [];
+  for (const s of obj.series ?? []) {
+    if (s.visible !== false) showIds.push(s.id);
+    if (s.formula) {
+      const normPart = s.normalize ? ` (normalize ${s.normalize})` : "";
+      const unitPart = s.unit ? ` -> ${s.unit}` : "";
+      lines.push(`${s.id} = ${s.formula}${normPart}${unitPart}`);
+    } else if (s.query) {
+      lines.push(`${s.id} = ${s.query}`);
+    }
+  }
+  if (showIds.length > 0) {
+    lines.push(`show ${showIds.join(", ")}`);
+  }
+  return lines.join("\n");
+}
+function queryBlockAttributes(obj) {
+  const attributes = { ...obj.attributes ?? {} };
+  const attributeOrder = Object.keys(attributes);
+  const setAttr = (k, v) => {
+    if (!(k in attributes)) attributeOrder.push(k);
+    attributes[k] = v;
+  };
+  if (obj.goal !== void 0) {
+    setAttr("goal", formatScalarOrParam(obj.goal));
+  }
+  if (obj.targets?.length) {
+    setAttr("targets", obj.targets.map(formatScalarOrParam).join(" "));
+  }
+  if (obj.comparePr !== void 0) {
+    setAttr("comparePr", obj.comparePr ? "true" : "false");
+  }
+  if (obj.series) {
+    for (const s of obj.series) {
+      if (s.label) setAttr(`label.${s.id}`, s.label);
+    }
+  }
+  if (!obj.series && obj.title) ;
+  return { attributes, attributeOrder };
+}
+function collectQueryBlockParams(obj) {
+  const out = /* @__PURE__ */ new Set();
+  const addFromText = (text) => {
+    if (!text) return;
+    const parsed = parseQuery(text);
+    if (!parsed.error) {
+      for (const m of text.matchAll(/\$([A-Za-z_][\w-]*)/g)) out.add(m[1]);
+      return;
+    }
+    for (const m of text.matchAll(/\$([A-Za-z_][\w-]*)/g)) out.add(m[1]);
+  };
+  if (obj.window?.kind === "param") out.add(obj.window.param);
+  if (obj.goal && typeof obj.goal === "object") out.add(obj.goal.param);
+  for (const t2 of obj.targets ?? []) {
+    if (typeof t2 === "object") out.add(t2.param);
+  }
+  addFromText(obj.query);
+  for (const s of obj.series ?? []) {
+    addFromText(s.query);
+    addFromText(s.formula);
+  }
+  for (const v of Object.values(obj.attributes ?? {})) {
+    addFromText(v);
+  }
+  return [...out];
+}
+
+// src/disciplines.ts
+var EFFORT_DISCIPLINES = [
+  "bodyweight",
+  "cycling",
+  "gymnastics",
+  "kettlebell",
+  "recovery",
+  "rowing",
+  "running",
+  "strength",
+  "swimming",
+  "walking"
+];
+function isEffortDiscipline(value) {
+  return typeof value === "string" && EFFORT_DISCIPLINES.includes(value.toLowerCase());
+}
+var DISCIPLINE_FACTORS = {
+  strength: 1.2,
+  kettlebell: 1.2,
+  gymnastics: 1.2,
+  recovery: 0.9,
+  bodyweight: 1,
+  cycling: 1,
+  rowing: 1,
+  running: 1,
+  swimming: 1,
+  walking: 1
+};
+function disciplineFactorFor(discipline) {
+  if (!discipline) return 1;
+  const key = discipline.toLowerCase();
+  return isEffortDiscipline(key) ? DISCIPLINE_FACTORS[key] : 1;
+}
+var wqlLanguage = LRLanguage.define({
+  parser: parser.configure({
+    props: [
+      styleTags({
+        // Rule styles color stray punctuation; the Word tokens inside carry
+        // the visible styling (unstyled children reset the parent class) —
+        // so parents with punctuation children (Head spans `:journal`) are
+        // NOT styled directly, or highlightTree merges the word into the
+        // parent span.
+        "Aggregator/Word": tags.keyword,
+        "Metric/Word": tags.variableName,
+        // Direct Word child of Head = the colon head name (`:sum`, `:journal`).
+        "Head/Word": tags.keyword,
+        DatasetReference: tags.keyword,
+        "DatasetReference/Word": tags.keyword,
+        At: tags.punctuation,
+        ParamRef: tags.special(tags.variableName),
+        "ParamRef/Word": tags.special(tags.variableName),
+        Dollar: tags.punctuation,
+        TagKey: tags.propertyName,
+        "TagKey/Word": tags.propertyName,
+        TagValue: tags.string,
+        "TagValue/Value/Word": tags.string,
+        "TagValue/Word": tags.string,
+        Negate: tags.operator,
+        Star: tags.operator,
+        Dimension: tags.attributeName,
+        "Dimension/Word": tags.attributeName,
+        By: tags.keyword,
+        RollupDot: tags.keyword,
+        Int: tags.number,
+        "Rollup/Word": tags.unit,
+        braceOpen: tags.bracket,
+        braceClose: tags.bracket,
+        parenOpen: tags.bracket,
+        parenClose: tags.bracket,
+        colon: tags.punctuation,
+        comma: tags.punctuation,
+        pipe: tags.punctuation,
+        dot: tags.punctuation
+      })
+    ]
+  }),
+  languageData: {
+    closeBrackets: { brackets: ["{", "("] }
+  }
+});
+function options(labels) {
+  return labels.map((label) => typeof label === "string" ? { label } : label);
+}
+function scanContext(doc, pos) {
+  let depth = 0, quoted = false, pipeFrom = -1, lastBrace = -1, fragStart = 0;
+  for (let i = 0; i < pos; i++) {
+    const ch = doc[i];
+    if (quoted) {
+      if (ch === '"') quoted = false;
+      continue;
+    }
+    if (ch === '"') {
+      quoted = true;
+      continue;
+    }
+    if (ch === "{") {
+      depth++;
+      lastBrace = i;
+      fragStart = i + 1;
+    } else if (ch === "}") {
+      depth = Math.max(0, depth - 1);
+      fragStart = i + 1;
+    } else if (ch === "," && depth > 0) fragStart = i + 1;
+    else if (ch === "|" && depth === 0) {
+      pipeFrom = i + 1;
+      fragStart = i + 1;
+    }
+  }
+  return { depth, quoted, pipeFrom, lastBrace, fragStart };
+}
+function maskQuotes(text) {
+  let out = "";
+  let quoted = false;
+  for (const ch of text) {
+    if (ch === '"') {
+      quoted = !quoted;
+      out += " ";
+    } else out += quoted ? " " : ch;
+  }
+  return out;
+}
+function unquotedColonIndex(text) {
+  let quoted = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    if (ch === '"') quoted = !quoted;
+    else if (ch === ":" && !quoted) return i;
+  }
+  return -1;
+}
+function usedEntries(doc, groupStart, fragStart) {
+  const text = maskQuotes(doc.slice(groupStart + 1, fragStart));
+  const used = /* @__PURE__ */ new Set();
+  for (const entry of text.split(",")) {
+    const m = /!?\s*([A-Za-z][\w-]*)/.exec(entry);
+    if (m) used.add(m[1]);
+  }
+  return used;
+}
+function valueOf(c) {
+  return typeof c.apply === "string" ? c.apply : c.label;
+}
+function quoteApply(c) {
+  const value = valueOf(c);
+  if (!/\s/.test(value)) return c;
+  return {
+    ...c,
+    apply: (view, _c, from, to) => {
+      const text = view.state.sliceDoc(Math.max(0, from - 1), from) === '"' ? value : `"${value}"`;
+      view.dispatch({ changes: { from, to, insert: text }, selection: { anchor: from + text.length }, userEvent: "input.complete" });
+    }
+  };
+}
+function mergeValues(host, statics) {
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  host.forEach((c, i) => {
+    const k = valueOf(c).toLowerCase();
+    if (!k || seen.has(k)) return;
+    seen.add(k);
+    out.push(quoteApply({ ...c, boost: Math.max(-99, Math.min(99, 80 - i)) }));
+  });
+  for (const c of statics) {
+    const k = valueOf(c).toLowerCase();
+    if (!k || seen.has(k)) continue;
+    seen.add(k);
+    out.push(quoteApply(c));
+  }
+  return out;
+}
+function narrow(options2, typed) {
+  const q = typed.toLowerCase();
+  if (!q) return [...options2];
+  const prefix = [];
+  const rest = [];
+  for (const o of options2) {
+    const label = o.label.toLowerCase();
+    if (label.startsWith(q)) prefix.push(o);
+    else if (label.includes(q)) rest.push(o);
+  }
+  return [...prefix, ...rest];
+}
+function finish(_context, from, options2, typed) {
+  const ranked = narrow(options2, typed);
+  if (!ranked.length) return null;
+  return {
+    from,
+    options: ranked.map((o, i) => o.boost === void 0 ? { ...o, boost: Math.max(-99, 50 - i) } : o),
+    filter: false
+  };
+}
+function chained(list, suffix) {
+  return list.map((c) => ({
+    ...c,
+    apply: (view, _c, from, to) => {
+      const text = typeof c.apply === "string" ? c.apply : c.label;
+      const selfTerminated = /\W$/.test(text);
+      const present = view.state.sliceDoc(to, to + suffix.length) === suffix;
+      const insert = selfTerminated || present ? text : text + suffix;
+      view.dispatch({
+        changes: { from, to: to + (selfTerminated && present ? suffix.length : 0), insert },
+        selection: { anchor: from + insert.length },
+        userEvent: "input.complete"
+      });
+      startCompletion(view);
+    }
+  }));
+}
+var HEAD_OPTIONS = [
+  ...WQL_FUNCTION_HEADS.map((label) => ({ label, detail: "function head", type: "keyword" })),
+  ...WQL_SOURCE_HEADS.map((label) => ({ label, detail: "source head", type: "keyword" })),
+  ...WQL_CHART_HEADS.map((label) => ({ label, detail: "chart head", type: "class" })),
+  ...WQL_STANDARD_DATASETS.map((label) => ({ label, detail: "page dataset", type: "class" }))
+];
+var PIPELINE_STAGE_HEAD_OPTIONS = [
+  ...WQL_FUNCTION_HEADS.map((label) => ({ label, detail: "function head", type: "keyword" })),
+  ...WQL_CHART_HEADS.map((label) => ({ label, detail: "chart head", type: "class" }))
+];
+var CHART_HEAD_OPTIONS = WQL_CHART_HEADS.map((label) => ({
+  label,
+  detail: "chart head",
+  type: "class"
+}));
+var TOKEN_COMPLETION_OPTIONS = [
+  { label: "$thisnote", detail: "current note ID", type: "variable" },
+  { label: "$note", detail: "current note ID", type: "variable" },
+  { label: "$scope", detail: "entity scope filter", type: "variable" }
+];
+function splitLinePipeRanges(line, lineOffset = 0) {
+  const stages = [];
+  let depth = 0;
+  let quoted = false;
+  let start = 0;
+  for (let i = 0; i < line.length; i++) {
+    const ch = line[i];
+    if (quoted) {
+      if (ch === '"') quoted = false;
+      continue;
+    }
+    if (ch === '"') {
+      quoted = true;
+      continue;
+    }
+    if (ch === "{") depth++;
+    else if (ch === "}") depth = Math.max(0, depth - 1);
+    else if (ch === "|" && depth === 0) {
+      stages.push({ text: line.slice(start, i), from: lineOffset + start, to: lineOffset + i });
+      start = i + 1;
+    }
+  }
+  stages.push({ text: line.slice(start), from: lineOffset + start, to: lineOffset + line.length });
+  return stages;
+}
+function resolveWqlCursorStage(doc, pos) {
+  const clamped = Math.max(0, Math.min(pos, doc.length));
+  const lineStart = doc.lastIndexOf("\n", Math.max(0, clamped - 1)) + 1;
+  const nextNl = doc.indexOf("\n", clamped);
+  const lineEnd = nextNl === -1 ? doc.length : nextNl;
+  const rawLine = doc.slice(lineStart, lineEnd);
+  if (/^\s*defaults\b/.test(rawLine)) {
+    return { role: "defaults", stageIndex: 0, from: lineStart, to: lineEnd };
+  }
+  const showM = /^(\s*show\s+)/.exec(rawLine);
+  if (showM) {
+    const bodyOffset = lineStart + showM[1].length;
+    const stages2 = splitLinePipeRanges(rawLine.slice(showM[1].length), bodyOffset);
+    const activeIdx2 = Math.max(0, stages2.findIndex((s) => clamped >= s.from && clamped <= s.to));
+    const active2 = stages2[activeIdx2] ?? stages2[stages2.length - 1];
+    if (activeIdx2 > 0) {
+      const headM2 = /^\s*:?([A-Za-z][\w-]*)/.exec(active2.text);
+      return { role: "sink", stageIndex: activeIdx2, head: headM2?.[1], from: active2.from, to: active2.to };
+    }
+    return { role: "binding", stageIndex: 0, from: active2.from, to: active2.to };
+  }
+  const assignM = /^(\s*[A-Za-z_][\w-]*\s*=\s*)/.exec(rawLine);
+  const exprStart = assignM ? lineStart + assignM[1].length : lineStart;
+  if (assignM && clamped < exprStart) {
+    return { role: "binding", stageIndex: 0, from: lineStart, to: exprStart };
+  }
+  const exprText = doc.slice(exprStart, lineEnd);
+  const stages = splitLinePipeRanges(exprText, exprStart);
+  let activeIdx = stages.findIndex((s) => clamped >= s.from && clamped <= s.to);
+  if (activeIdx === -1) activeIdx = stages.length - 1;
+  const active = stages[activeIdx];
+  const headM = /^\s*([:@]?)([A-Za-z][\w-]*)/.exec(active.text);
+  const headName = headM?.[2]?.toLowerCase();
+  if (headName && WQL_CHART_HEADS.includes(headName)) {
+    return { role: "sink", stageIndex: activeIdx, head: headName, from: active.from, to: active.to };
+  }
+  if (activeIdx === 0) {
+    if (headName && WQL_FUNCTION_HEADS.includes(headName) && stages.length === 1) {
+      return { role: "reduce", stageIndex: 0, reduceIndex: 0, head: headName, from: active.from, to: active.to };
+    }
+    return { role: "source", stageIndex: 0, head: headM ? `${headM[1] ?? ""}${headName}` : void 0, from: active.from, to: active.to };
+  }
+  if (/^\s*(?:select|order\s+by|limit|offset)\b/i.test(active.text)) {
+    return { role: "source", stageIndex: activeIdx, head: "pipes", from: active.from, to: active.to };
+  }
+  return {
+    role: "reduce",
+    stageIndex: activeIdx,
+    reduceIndex: activeIdx - 1,
+    head: headName,
+    from: active.from,
+    to: active.to
+  };
+}
+function collectPriorBindings(doc, lineStart) {
+  if (lineStart <= 0) return [];
+  const priorText = doc.slice(0, lineStart);
+  const seen = /* @__PURE__ */ new Set();
+  const out = [];
+  for (const raw of priorText.split("\n")) {
+    const line = raw.trim();
+    if (!line || line.startsWith("//")) continue;
+    const m = /^([A-Za-z_][\w-]*)\s*=\s*(.+)$/.exec(line);
+    if (!m) continue;
+    const name = m[1];
+    if (seen.has(name)) continue;
+    seen.add(name);
+    const rhs = m[2].trim();
+    const isList = /^:(?:note|notes|journal|notebook|notebooks|playground|block|effort|session|segment|event)\b/.test(rhs) && !rhs.includes("| :");
+    out.push({
+      label: name,
+      detail: isList ? "bound list" : "bound value",
+      type: "variable"
+    });
+  }
+  return out;
+}
+function headApply(o, colonTyped) {
+  if (o.label.startsWith("@")) return { ...o, apply: o.label };
+  return { ...o, apply: `${colonTyped ? "" : ":"}${o.label}{` };
 }
 var LEGACY_HEAD_OPTIONS = WQL_AGGREGATORS.map((label) => ({ label, type: "keyword" }));
 var NOTE_COLUMNS = ["title", "date", "createdAt", "type", "sourceId", "notebookId"];
@@ -1567,12 +3029,14 @@ var UNIT_OPTIONS = WQL_DISPLAY_UNITS.map((label) => ({ label, detail: "display u
 function resolveHead(_agg, _typedTarget) {
   return { family: "aggregate" };
 }
+var CHART_PARAM_KEYS = ["label", "unit", "goal", "limit", "stack", "type", "smooth"];
 function resolveColonHead(name) {
   const n = name.toLowerCase();
   if (WQL_FUNCTION_HEADS.includes(n)) return { family: "aggregate" };
-  if (WQL_CHART_HEADS.includes(n)) return { family: "find" };
+  if (WQL_CHART_HEADS.includes(n)) return { family: "find", target: "__chart__" };
   const headTarget = (head) => {
     if (WQL_NOTE_HEAD_ALIASES.includes(head)) return "note";
+    if (head === "feeds") return "feed";
     const scoped = WQL_SOURCE_HEAD_SCOPES[head] || WQL_TYPE_HEADS[head];
     return scoped ? "note" : head;
   };
@@ -1590,6 +3054,7 @@ var FIND_KEY_UNION = [
   ...new Set(WQL_FIND_TARGETS.flatMap((t2) => [...wqlFilterKeys(t2, "find")]))
 ];
 function filterKeysFor(head) {
+  if (head.target === "__chart__") return CHART_PARAM_KEYS;
   return head.family === "find" ? head.target ? wqlFilterKeys(head.target, "find") : FIND_KEY_UNION : wqlFilterKeys("", "aggregate");
 }
 function pipeColumns(target) {
@@ -1796,39 +3261,148 @@ function wqlCompletionSource(options_ = {}) {
       { label: "order by", apply: "order by ", detail: head.target === "session" ? "advisory: order ignored for sessions" : "sort rows", type: "keyword" },
       { label: "select", apply: "select ", detail: SELECT_IGNORED.has(head.target ?? "") ? `advisory: select ignored for find:${head.target}` : "choose columns", type: "keyword" }
     ];
-    return finish(context, from, [...chained(kw, " "), limitSnippet], typed);
+    const colonTyped = /^[ \t]*:/.test(text);
+    return finish(context, from, [
+      ...PIPELINE_STAGE_HEAD_OPTIONS.map((o) => headApply(o, colonTyped)),
+      ...chained(kw, " "),
+      limitSnippet
+    ], typed);
   };
   function inner(context, replaceSelection = false) {
-    const doc = context.state.doc.toString();
-    const pos = context.pos;
-    const word = context.matchBefore(/[\w.*-]*/) ?? { from: pos, to: pos, text: "" };
-    const opens = word.from === word.to && pos > 0 && /[{,:|(!"@]/.test(doc[pos - 1]);
+    const fullDoc = context.state.doc.toString();
+    const fullPos = context.pos;
+    const lineStart = fullDoc.lastIndexOf("\n", Math.max(0, fullPos - 1)) + 1;
+    const nextNl = fullDoc.indexOf("\n", fullPos);
+    const lineEnd = nextNl === -1 ? fullDoc.length : nextNl;
+    const lineText = fullDoc.slice(lineStart, lineEnd);
+    const priorBindings = collectPriorBindings(fullDoc, lineStart);
+    const dollarMatch = context.matchBefore(/\$[A-Za-z_0-9-]*/);
+    if (dollarMatch) {
+      const typedToken = replaceSelection ? "$" : dollarMatch.text;
+      return finish(context, dollarMatch.from, TOKEN_COMPLETION_OPTIONS, typedToken);
+    }
+    const defaultsM = /^(\s*defaults\s+)/.exec(lineText);
+    if (defaultsM && fullPos >= lineStart + defaultsM[1].length) {
+      const subOffset = lineStart + defaultsM[1].length;
+      const subDoc = ":segment{} " + fullDoc.slice(subOffset, lineEnd);
+      const shift = ":segment{} ".length - subOffset;
+      const subPos = fullPos + shift;
+      const word2 = context.matchBefore(/[\w.*-]*/) ?? { from: fullPos, text: "" };
+      const typed2 = replaceSelection ? "" : word2.text;
+      const scan = scanContext(subDoc, subPos);
+      const subCtx2 = new CompletionContext(EditorState.create({ doc: subDoc }), subPos, context.explicit);
+      const res = suffixSlot(subCtx2, subDoc, scan, word2.from + shift, typed2, { family: "aggregate" }, ":segment{}".length);
+      return res && { ...res, from: res.from - shift, ...res.to !== void 0 ? { to: res.to - shift } : {} };
+    }
+    const showM = /^(\s*show\s+)/.exec(lineText);
+    if (showM && fullPos >= lineStart + showM[1].length) {
+      const showBodyOffset = lineStart + showM[1].length;
+      const showStages = splitLinePipeRanges(lineText.slice(showM[1].length), showBodyOffset);
+      const showActiveIdx = Math.max(0, showStages.findIndex((s) => fullPos >= s.from && fullPos <= s.to));
+      if (showActiveIdx === 0) {
+        const word3 = context.matchBefore(/[\w.*-]*/) ?? { from: fullPos, text: "" };
+        const typed3 = replaceSelection ? "" : word3.text;
+        return finish(context, word3.from, priorBindings, typed3);
+      }
+      const sinkStage = showStages[showActiveIdx];
+      const stageDoc = fullDoc.slice(sinkStage.from, lineEnd);
+      const stagePos = fullPos - sinkStage.from;
+      const word2 = context.matchBefore(/[\w.*-]*/) ?? { from: fullPos, text: "" };
+      const typed2 = replaceSelection ? "" : word2.text;
+      const scan = scanContext(stageDoc, stagePos);
+      const colonHeadM = /^[ \t]*:[ \t]*([A-Za-z][\w-]*)/.exec(stageDoc);
+      if (scan.depth > 0 && colonHeadM) {
+        const head = resolveColonHead(colonHeadM[1]);
+        const subCtx2 = new CompletionContext(EditorState.create({ doc: stageDoc }), stagePos, context.explicit);
+        const res = braceSlot(subCtx2, stageDoc, scan, word2.from - sinkStage.from, typed2, head);
+        const rebase = (r) => r && { ...r, from: r.from + sinkStage.from, ...r.to !== void 0 ? { to: r.to + sinkStage.from } : {} };
+        return res instanceof Promise ? res.then(rebase) : rebase(res);
+      }
+      const colonTyped2 = word2.from > sinkStage.from && fullDoc[word2.from - 1] === ":";
+      const headFrom2 = colonTyped2 ? word2.from : word2.from;
+      return finish(context, headFrom2, CHART_HEAD_OPTIONS.map((o) => headApply(o, colonTyped2)), typed2);
+    }
+    const assignM = /^(\s*[A-Za-z_][\w-]*\s*=\s*)/.exec(lineText);
+    const exprOffset = assignM && fullPos >= lineStart + assignM[1].length ? lineStart + assignM[1].length : lineStart;
+    const exprDoc = fullDoc.slice(exprOffset, lineEnd);
+    const exprPos = fullPos - exprOffset;
+    const word = context.matchBefore(/[\w.*-]*/) ?? { from: fullPos, to: fullPos, text: "" };
+    const opens = word.from === word.to && fullPos > exprOffset && (/[{,:|(!"@]/.test(fullDoc[fullPos - 1]) || /\|[ \t]*$/.test(exprDoc.slice(0, exprPos)));
     if (word.from === word.to && !context.explicit && !opens) return null;
-    const scan = scanContext(doc, pos);
-    if (scan.quoted && scan.depth === 0) return null;
+    const fullScan = scanContext(exprDoc, exprPos);
+    if (fullScan.quoted && fullScan.depth === 0) return null;
     const typed = replaceSelection ? "" : word.text;
-    const colonHeadM = /^[ \t]*:[ \t]*([A-Za-z][\w-]*)/.exec(doc);
-    const headM = colonHeadM ?? /^[ \t]*([A-Za-z]+)[ \t]*:[ \t]*([A-Za-z0-9_.-]*)/.exec(doc);
-    const head = colonHeadM ? resolveColonHead(colonHeadM[1]) : headM ? resolveHead(headM[1], headM[2]) : { family: "aggregate" };
-    if (scan.pipeFrom >= 0 && scan.depth === 0) return pipeSlot(context, doc, scan, word.from, typed, head);
-    if (scan.depth > 0) return braceSlot(context, doc, scan, word.from, typed, head);
-    const datasetTyped = word.from > 0 && doc[word.from - 1] === "@";
-    const headPool = datasetTyped ? HEAD_OPTIONS.filter((o) => o.label.startsWith("@")) : HEAD_OPTIONS;
+    const stages = splitLinePipeRanges(exprDoc, 0);
+    let activeStageIdx = stages.findIndex((s) => exprPos >= s.from && exprPos <= s.to);
+    if (activeStageIdx === -1) activeStageIdx = stages.length - 1;
+    const activeStage = stages[activeStageIdx];
+    const firstStageText = stages[0].text;
+    const firstColonM = /^[ \t]*:[ \t]*([A-Za-z][\w-]*)/.exec(firstStageText);
+    const firstHeadM = firstColonM ?? /^[ \t]*([A-Za-z]+)[ \t]*:[ \t]*([A-Za-z0-9_.-]*)/.exec(firstStageText);
+    const firstHead = firstColonM ? resolveColonHead(firstColonM[1]) : firstHeadM ? resolveHead(firstHeadM[1], firstHeadM[2]) : { family: "aggregate" };
+    if (activeStageIdx > 0) {
+      const stageText = activeStage.text;
+      const stagePos = exprPos - activeStage.from;
+      const stageAbsOffset = exprOffset + activeStage.from;
+      const stageColonM = /^[ \t]*:[ \t]*([A-Za-z][\w-]*)/.exec(stageText);
+      if (stageColonM || /^[ \t]*:[ \t]*$/.test(stageText.slice(0, stagePos))) {
+        const stageScan = scanContext(stageText, stagePos);
+        const stageHead = stageColonM ? resolveColonHead(stageColonM[1]) : { family: "aggregate" };
+        const subCtx3 = new CompletionContext(EditorState.create({ doc: stageText }), stagePos, context.explicit);
+        const rebase = (r) => r && { ...r, from: r.from + stageAbsOffset, ...r.to !== void 0 ? { to: r.to + stageAbsOffset } : {} };
+        if (stageScan.depth > 0) {
+          const res3 = braceSlot(subCtx3, stageText, stageScan, word.from - stageAbsOffset, typed, stageHead);
+          return res3 instanceof Promise ? res3.then(rebase) : rebase(res3);
+        }
+        if (!stageColonM || stagePos <= stageColonM[0].length) {
+          return finish(context, word.from, PIPELINE_STAGE_HEAD_OPTIONS.map((o) => headApply(o, true)), typed);
+        }
+        const res2 = suffixSlot(subCtx3, stageText, stageScan, word.from - stageAbsOffset, typed, stageHead, stageColonM[0].length);
+        return rebase(res2);
+      }
+      const subCtx2 = new CompletionContext(EditorState.create({ doc: exprDoc }), exprPos, context.explicit);
+      const res = pipeSlot(subCtx2, exprDoc, fullScan, word.from - exprOffset, typed, firstHead);
+      return res && { ...res, from: res.from + exprOffset, ...res.to !== void 0 ? { to: res.to + exprOffset } : {} };
+    }
+    const subCtx = new CompletionContext(EditorState.create({ doc: exprDoc }), exprPos, context.explicit);
+    const rebaseExpr = (r) => r && { ...r, from: r.from + exprOffset, ...r.to !== void 0 ? { to: r.to + exprOffset } : {} };
+    if (fullScan.depth > 0) {
+      const res = braceSlot(subCtx, exprDoc, fullScan, word.from - exprOffset, typed, firstHead);
+      return res instanceof Promise ? res.then(rebaseExpr) : rebaseExpr(res);
+    }
+    if (priorBindings.length > 0 && /[+\-*/(]\s*[\w-]*$/.test(exprDoc.slice(0, exprPos))) {
+      return finish(context, word.from, priorBindings, typed);
+    }
+    const datasetTyped = word.from > exprOffset && fullDoc[word.from - 1] === "@";
+    const colonTyped = word.from > exprOffset && fullDoc[word.from - 1] === ":";
+    const docKeywords = exprOffset === lineStart && lineStart > 0 ? [
+      { label: "defaults", apply: "defaults ", detail: "block defaults", type: "keyword" },
+      { label: "show", apply: "show ", detail: "display outputs", type: "keyword" }
+    ] : [];
+    const headPool = datasetTyped ? HEAD_OPTIONS.filter((o) => o.label.startsWith("@")) : colonTyped ? HEAD_OPTIONS : [...priorBindings, ...docKeywords, ...HEAD_OPTIONS];
     const headTyped = datasetTyped ? "@" + typed : typed;
     const headFrom = datasetTyped ? word.from - 1 : word.from;
-    if (!headM) return finish(context, headFrom, headPool.map((o) => headApply(o, false)), headTyped);
-    if (colonHeadM) {
-      if (pos <= colonHeadM[0].length) {
-        return finish(context, headFrom, headPool.map((o) => headApply(o, true)), headTyped);
+    if (!firstHeadM) {
+      return finish(
+        context,
+        headFrom,
+        headPool.map((o) => o.type === "variable" || o.label === "defaults" || o.label === "show" ? o : headApply(o, colonTyped)),
+        headTyped
+      );
+    }
+    if (firstColonM) {
+      if (exprPos <= firstColonM[0].length) {
+        return finish(context, headFrom, HEAD_OPTIONS.map((o) => headApply(o, true)), headTyped);
       }
-      return suffixSlot(context, doc, scan, word.from, typed, head, colonHeadM[0].length);
+      return rebaseExpr(suffixSlot(subCtx, exprDoc, fullScan, word.from - exprOffset, typed, firstHead, firstColonM[0].length));
     }
-    const colonIdx = headM[0].indexOf(":");
-    if (pos <= colonIdx) return finish(context, word.from, chained(LEGACY_HEAD_OPTIONS, ":"), typed);
-    if (pos <= headM[0].length) {
-      return metricHeadSlot(context, word.from, typed);
+    const colonIdx = firstHeadM[0].indexOf(":");
+    if (exprPos <= colonIdx) return finish(context, word.from, [...priorBindings, ...chained(LEGACY_HEAD_OPTIONS, ":")], typed);
+    if (exprPos <= firstHeadM[0].length) {
+      const res = metricHeadSlot(subCtx, word.from - exprOffset, typed);
+      return res instanceof Promise ? res.then(rebaseExpr) : rebaseExpr(res);
     }
-    return suffixSlot(context, doc, scan, word.from, typed, head, headM[0].length);
+    return rebaseExpr(suffixSlot(subCtx, exprDoc, fullScan, word.from - exprOffset, typed, firstHead, firstHeadM[0].length));
   }
   function source(context) {
     const selection = context.state.selection.main;
@@ -1995,7 +3569,7 @@ function zonedNoon(iso, timeZone) {
   return zonedStartOfDay(iso, timeZone) + 12 * 36e5;
 }
 function resolveWindowRange(w, ctx) {
-  if (!w) return void 0;
+  if (!w || w.kind === "param") return void 0;
   if (w.kind === "relative") {
     const today = civilDateOf(ctx.instant, ctx.timeZone);
     const start2 = w.unit === "d" ? civilDateAdd(today, -(w.size - 1)) : civilDateAdd(civilMonday(today), -7 * (w.size - 1));
@@ -2023,176 +3597,6 @@ function inRange(instant, range) {
   return instant <= range.end;
 }
 
-// src/document.ts
-var FORMULA_CHARS = /^[\w\s.+\-*/(),]+$/;
-function referencesOf(expression, known) {
-  const refs = [];
-  for (const match of expression.matchAll(/[A-Za-z_][\w-]*/g)) {
-    const name = match[0];
-    if (known.has(name) && !refs.includes(name)) refs.push(name);
-  }
-  return refs;
-}
-function parseDocument(text) {
-  const diagnostics = [];
-  const lines = text.split("\n").map((l) => l.trim()).filter((l) => l.length > 0 && !l.startsWith("//"));
-  const defaults = {};
-  let hasDefaults = false;
-  const assignments = [];
-  let show;
-  let degenerate = false;
-  const known = /* @__PURE__ */ new Set();
-  for (const line of lines) {
-    if (line.startsWith("defaults ")) {
-      hasDefaults = true;
-      const rest = line.slice("defaults ".length).trim();
-      const byMatch = /by\s*\{([^}]*)\}/.exec(rest);
-      if (byMatch) {
-        defaults.groupBy = byMatch[1].split(",").map((d) => d.trim()).filter(Boolean);
-      }
-      const lastMatch = /last\s+(\d+)\s*(d|w)/.exec(rest);
-      if (lastMatch) {
-        defaults.window = { kind: "relative", size: Number(lastMatch[1]), unit: lastMatch[2] };
-      }
-      const fromMatch = /from\s+(\d{4}-\d{2}-\d{2})(?:\s+to\s+(\d{4}-\d{2}-\d{2}))?/.exec(rest);
-      if (fromMatch) {
-        defaults.window = { kind: "range", start: fromMatch[1], end: fromMatch[2] };
-      }
-      continue;
-    }
-    if (line.startsWith("show ")) {
-      show = line.slice("show ".length).split(",").map((s) => s.trim()).filter(Boolean);
-      continue;
-    }
-    const assign = /^([A-Za-z_][\w-]*)\s*=\s*(.+)$/.exec(line);
-    if (assign) {
-      const name = assign[1];
-      const body = assign[2].trim();
-      known.add(name);
-      const unitMatch = /->\s*([\w/%.]+)\s*$/.exec(body);
-      const normalizeMatch = /\(normalize\s+([^)]+)\)/.exec(body);
-      const expression = body.replace(/->\s*[\w/%.]+\s*$/, "").replace(/\(normalize\s+[^)]+\)/, "").trim();
-      const looksLikeQuery = /^(sum|avg|min|max|count|last|delta|find|rows)\b|^[:@|]/.test(expression);
-      if (looksLikeQuery) {
-        const parsed = parseQuery(expression);
-        if (!parsed.error) {
-          assignments.push({ name, kind: "query", queryText: expression, parsed, raw: line });
-        } else {
-          diagnostics.push(`Assignment "${name}" is not a valid query`);
-        }
-        continue;
-      }
-      if (!FORMULA_CHARS.test(expression)) {
-        diagnostics.push(`Assignment "${name}" has characters a formula cannot parse`);
-        continue;
-      }
-      const formula = {
-        expression,
-        references: [],
-        ...normalizeMatch ? { normalize: normalizeMatch[1].trim() } : {},
-        ...unitMatch ? { unit: unitMatch[1] } : {}
-      };
-      assignments.push({ name, kind: "formula", formula, raw: line });
-      continue;
-    }
-    degenerate = true;
-  }
-  if (!hasDefaults && show === void 0 && !degenerate && assignments.length === 1 && assignments[0].kind === "query") ;
-  if (!hasDefaults && show === void 0 && assignments.length === 0) {
-    const parsed = parseQuery(lines.join(" "));
-    if (!parsed.error) {
-      known.add("query");
-      assignments.push({ name: "query", kind: "query", queryText: lines.join(" "), parsed, raw: lines.join(" ") });
-      show = ["query"];
-      degenerate = true;
-    } else {
-      diagnostics.push("Body is neither a valid query nor a valid document");
-    }
-  }
-  for (const assignment of assignments) {
-    if (assignment.kind !== "formula" || !assignment.formula) continue;
-    assignment.formula.references = referencesOf(assignment.formula.expression, known);
-    for (const match of assignment.formula.expression.matchAll(/[A-Za-z_][\w-]*/g)) {
-      const name = match[0];
-      if (!known.has(name)) {
-        diagnostics.push(`Formula "${assignment.name}" references unknown name "${name}"`);
-      }
-    }
-    if (assignment.formula.references.length === 0) {
-      diagnostics.push(`Formula "${assignment.name}" references no named query or formula`);
-    }
-  }
-  const cycle = findCycle(assignments);
-  if (cycle) {
-    diagnostics.push(`Reference cycle detected: ${cycle.join(" -> ")}`);
-  }
-  if (show === void 0) {
-    show = assignments.filter((a) => a.kind === "query").map((a) => a.name);
-    if (assignments.length > 0 && show.length === 0) show = [assignments[0].name];
-  } else {
-    for (const name of show) {
-      if (!known.has(name)) diagnostics.push(`show references unknown name "${name}"`);
-    }
-  }
-  return {
-    doc: {
-      ...Object.keys(defaults).length > 0 ? { defaults } : {},
-      assignments,
-      show,
-      degenerate
-    },
-    diagnostics
-  };
-}
-function findCycle(assignments) {
-  const formulas = new Map(assignments.filter((a) => a.kind === "formula").map((a) => [a.name, a.formula.references]));
-  const state = /* @__PURE__ */ new Map();
-  const stack = [];
-  const visit = (name) => {
-    const s = state.get(name);
-    if (s === 2) return void 0;
-    if (s === 1) {
-      const start = stack.indexOf(name);
-      return [...stack.slice(start === -1 ? 0 : start), name];
-    }
-    state.set(name, 1);
-    stack.push(name);
-    for (const ref of formulas.get(name) ?? []) {
-      const cycle = visit(ref);
-      if (cycle) return cycle;
-    }
-    stack.pop();
-    state.set(name, 2);
-    return void 0;
-  };
-  for (const name of formulas.keys()) {
-    const cycle = visit(name);
-    if (cycle) return cycle;
-  }
-  return void 0;
-}
-function serializeDocument(doc) {
-  if (doc.degenerate) {
-    const only = doc.assignments[0];
-    return only?.queryText ?? "";
-  }
-  const lines = [];
-  if (doc.defaults) {
-    const parts = [];
-    if (doc.defaults.groupBy?.length) parts.push(`by {${doc.defaults.groupBy.join(", ")}}`);
-    if (doc.defaults.window) {
-      const w = doc.defaults.window;
-      parts.push(w.kind === "relative" ? `last ${w.size}${w.unit}` : `from ${w.start}${w.end ? ` to ${w.end}` : ""}`);
-    }
-    if (parts.length > 0) lines.push(`defaults ${parts.join(" ")}`);
-  }
-  for (const a of doc.assignments) {
-    lines.push(a.raw);
-  }
-  if (doc.show.length > 0) lines.push(`show ${doc.show.join(", ")}`);
-  return lines.join("\n");
-}
-
 // src/documentRunner.ts
 function createBuiltinFormulaEvaluator() {
   const evalExpr = (expr, inputs, position) => {
@@ -2280,6 +3684,8 @@ function appendSuffixes(queryText, window, groupBy) {
   }
   if (window.kind === "relative" && !/\blast\b/.test(text)) {
     text += ` last ${window.size}${window.unit}`;
+  } else if (window.kind === "param" && !/\blast\b/.test(text)) {
+    text += ` last $${window.param}${window.unit ? ` ${window.unit}` : ""}`;
   } else if (window.kind === "range" && !/\bfrom\b/.test(text)) {
     text += ` from ${window.start}${window.end ? ` to ${window.end}` : ""}`;
   }
@@ -2301,6 +3707,7 @@ var QueryDocumentRunner = class {
     const doc = parsed.doc;
     const outputs = [];
     const values = /* @__PURE__ */ new Map();
+    const findPayloads = /* @__PURE__ */ new Map();
     const evaluate = async (assignment) => {
       if (assignment.kind === "query") {
         const merged = this.mergeDefaults(assignment, doc);
@@ -2310,6 +3717,7 @@ var QueryDocumentRunner = class {
           const findRun = await this.options?.runFind?.(text2) ?? {
             error: "find queries are not supported by this host"
           };
+          findPayloads.set(assignment.name, { payload: findRun, queryText: text2 });
           outputs.push({
             name: assignment.name,
             kind: "find",
@@ -2326,18 +3734,43 @@ var QueryDocumentRunner = class {
           return;
         }
         if (parsedFamily === "pipeline") {
-          const text2 = merged.window ? appendSuffixes(merged.queryText, merged.window, merged.groupBy) : merged.queryText;
-          const pipelineRun = await this.options?.runPipeline?.(text2) ?? {
-            error: "pipeline queries are not supported by this host"
-          };
+          let pipelineRun;
+          if (assignment.sourceRef && (assignment.pipeTail ?? assignment.transformsText)) {
+            const rawTail = assignment.pipeTail ?? assignment.transformsText;
+            const tailWithDefaults = merged.window ? appendSuffixes(rawTail, merged.window, merged.groupBy) : merged.groupBy?.length && !/by\s*\{/.test(rawTail) ? `${rawTail} by {${merged.groupBy.join(", ")}}` : rawTail;
+            const sourceEntry = findPayloads.get(assignment.sourceRef);
+            if (sourceEntry && this.options?.runPipelineFromFind) {
+              pipelineRun = await this.options.runPipelineFromFind(sourceEntry.payload, tailWithDefaults);
+            } else if (sourceEntry && this.options?.runAggregateEvents) {
+              pipelineRun = await this.options.runAggregateEvents(tailWithDefaults, sourceEntry.payload.events ?? [], sourceEntry.payload);
+            } else if (sourceEntry) {
+              pipelineRun = await this.options?.runPipeline?.(`${sourceEntry.queryText} | ${tailWithDefaults}`) ?? {
+                error: "pipeline queries are not supported by this host"
+              };
+            } else {
+              pipelineRun = { error: `Source "${assignment.sourceRef}" is not a valid list source` };
+            }
+          } else {
+            const text2 = merged.window ? appendSuffixes(merged.queryText, merged.window, merged.groupBy) : merged.queryText;
+            pipelineRun = await this.options?.runPipeline?.(text2) ?? {
+              error: "pipeline queries are not supported by this host"
+            };
+          }
           const byPosition3 = /* @__PURE__ */ new Map();
           for (const s of pipelineRun.series ?? []) {
             for (const point of s.points) {
               if (!point.missing) byPosition3.set(point.ts, { value: point.value, missingDerived: false });
             }
           }
+          const lastTransform = assignment.parsed?.family === "pipeline" ? assignment.parsed.transforms[assignment.parsed.transforms.length - 1] : void 0;
+          const hasBuckets2 = Boolean(merged.groupBy && merged.groupBy.length > 0 || lastTransform?.groupBy?.length || lastTransform?.rollup);
           if (byPosition3.size > 0) {
-            values.set(assignment.name, { byPosition: byPosition3, unit: pipelineRun.unit, groupKeys: (pipelineRun.series ?? []).map((s) => s.key) });
+            values.set(assignment.name, {
+              byPosition: byPosition3,
+              unit: pipelineRun.unit,
+              groupKeys: (pipelineRun.series ?? []).map((s) => s.key),
+              isScalar: !hasBuckets2 && byPosition3.size === 1
+            });
           }
           outputs.push({
             name: assignment.name,
@@ -2369,7 +3802,13 @@ var QueryDocumentRunner = class {
             }
           }
         }
-        values.set(assignment.name, { byPosition: byPosition2, unit: run.unit, groupKeys: series2.map((s) => s.key) });
+        const hasBuckets = Boolean(merged.groupBy && merged.groupBy.length > 0 || assignment.parsed?.family === "aggregate" && assignment.parsed.rollup);
+        values.set(assignment.name, {
+          byPosition: byPosition2,
+          unit: run.unit,
+          groupKeys: series2.map((s) => s.key),
+          isScalar: !hasBuckets && byPosition2.size === 1
+        });
         outputs.push({
           name: assignment.name,
           kind: "aggregate",
@@ -2384,14 +3823,30 @@ var QueryDocumentRunner = class {
       const formula = assignment.formula;
       const inputs = {};
       const positions = /* @__PURE__ */ new Set();
+      const seriesRefs = formula.references.filter((ref) => {
+        const v = values.get(ref);
+        return v !== void 0 && !v.isScalar;
+      });
       for (const ref of formula.references) {
         const input = values.get(ref);
         if (!input) {
           diagnostics.push(`Formula "${assignment.name}" references unavailable input "${ref}"`);
           return;
         }
-        for (const position of input.byPosition.keys()) positions.add(position);
-        inputs[ref] = (position) => input.byPosition.get(position);
+        const scalarFallback = input.isScalar ? [...input.byPosition.values()][0] : void 0;
+        if (!input.isScalar) {
+          for (const position of input.byPosition.keys()) positions.add(position);
+        }
+        inputs[ref] = (position) => input.byPosition.get(position) ?? scalarFallback;
+      }
+      if (positions.size === 0 && formula.references.length > 0) {
+        for (const ref of formula.references) {
+          const anchorTs = [...values.get(ref)?.byPosition.keys() ?? []][0];
+          if (anchorTs !== void 0) {
+            positions.add(anchorTs);
+            break;
+          }
+        }
       }
       const byPosition = /* @__PURE__ */ new Map();
       let error;
@@ -2417,7 +3872,7 @@ var QueryDocumentRunner = class {
             pairs: pairCount,
             error: "corr needs at least two paired positions"
           });
-          values.set(assignment.name, { byPosition: /* @__PURE__ */ new Map(), groupKeys: [] });
+          values.set(assignment.name, { byPosition: /* @__PURE__ */ new Map(), groupKeys: [], isScalar: false });
           return;
         }
         const mean = (xs) => xs.reduce((s, v) => s + v, 0) / xs.length;
@@ -2436,13 +3891,13 @@ var QueryDocumentRunner = class {
             pairs: pairCount,
             error: "corr is undefined for zero-variance inputs"
           });
-          values.set(assignment.name, { byPosition: /* @__PURE__ */ new Map(), groupKeys: [] });
+          values.set(assignment.name, { byPosition: /* @__PURE__ */ new Map(), groupKeys: [], isScalar: false });
           return;
         }
         const value = cov / Math.sqrt(va * vb);
         byPosition.set(0, { value, missingDerived: false });
         outputs.push({ name: assignment.name, kind: "formula", pairs: pairCount, series: [{ key: "corr", label: "corr", points: [{ ts: 0, value }] }] });
-        values.set(assignment.name, { byPosition, groupKeys: ["corr"] });
+        values.set(assignment.name, { byPosition, groupKeys: ["corr"], isScalar: true });
         return;
       }
       for (const position of [...positions].sort((a, b) => a - b)) {
@@ -2462,7 +3917,7 @@ var QueryDocumentRunner = class {
           ...v.missingDerived ? { missingDerived: true } : {}
         }))
       }];
-      values.set(assignment.name, { byPosition, unit: formula.unit, groupKeys: [assignment.name] });
+      values.set(assignment.name, { byPosition, unit: formula.unit, groupKeys: [assignment.name], isScalar: seriesRefs.length === 0 && byPosition.size === 1 });
       outputs.push({
         name: assignment.name,
         kind: "formula",
@@ -2478,7 +3933,7 @@ var QueryDocumentRunner = class {
       progressed = false;
       for (let i = pending.length - 1; i >= 0; i--) {
         const assignment = pending[i];
-        const refs = assignment.formula?.references ?? [];
+        const refs = assignment.formula?.references ?? (assignment.sourceRef ? [assignment.sourceRef] : []);
         if (refs.every((r) => evaluated.has(r))) {
           await evaluate(assignment);
           evaluated.add(assignment.name);
@@ -2487,27 +3942,197 @@ var QueryDocumentRunner = class {
         }
       }
     }
-    const shown = new Set(doc.show);
-    return {
-      outputs: outputs.filter((o) => shown.has(o.name)),
-      diagnostics
-    };
+    const byName = new Map(outputs.map((o) => [o.name, o]));
+    const orderedOutputs = doc.show.map((name) => byName.get(name)).filter((o) => o !== void 0).map((o) => doc.showChart && !o.chart ? { ...o, chart: doc.showChart } : o);
+    return {
+      outputs: orderedOutputs,
+      diagnostics,
+      ...doc.showChart ? { showChart: doc.showChart } : {}
+    };
+  }
+  /** Defaults precedence (ticket 17): explicit per-query range/grouping >
+   *  block defaults > host. Explicit per-query by{} fully replaces block
+   *  grouping — never merges. */
+  mergeDefaults(assignment, doc) {
+    const parsed = assignment.parsed;
+    const pipelineTransformGroupBy = parsed?.family === "pipeline" ? parsed.transforms.find((t2) => t2.groupBy.length > 0)?.groupBy : void 0;
+    const aggregateGroupBy = parsed?.family === "aggregate" ? parsed.groupBy : pipelineTransformGroupBy;
+    const groupBy = aggregateGroupBy?.length ? aggregateGroupBy : doc.defaults?.groupBy;
+    const window = (parsed && parsed.family !== "pipeline" ? parsed.window : void 0) ?? doc.defaults?.window;
+    return {
+      queryText: assignment.queryText ?? "",
+      ...groupBy ? { groupBy } : {},
+      ...window ? { window } : {}
+    };
+  }
+};
+
+// src/dashboard/model.ts
+function resolveWidgetType(type) {
+  return type == null || type === "" ? "table" : type;
+}
+function unknownWidgetTypeMessage(type) {
+  return `unknown widget type "${type}"`;
+}
+function unknownTokensMessage(missing) {
+  return `unknown token${missing.length > 1 ? "s" : ""}: ${missing.map((m) => `$${m}`).join(", ")}`;
+}
+var PLANNED_WIDGET_TYPES = [];
+var KNOWN_CALC_METRICS = new Set(WQL_CALC_TARGETS);
+function isProposedMetric(metricKey) {
+  if (!metricKey) return false;
+  if (!metricKey.startsWith("calc.")) return false;
+  return !KNOWN_CALC_METRICS.has(metricKey);
+}
+var TOKEN_PREFIX = "dashboard.";
+function isDashboardMeta(meta) {
+  return meta["dashboard"] === "true" || meta["dashboard"] === true;
+}
+function extractDashboardTokens(meta) {
+  const tokens = [];
+  for (const [key, value] of Object.entries(meta)) {
+    if (!key.startsWith(TOKEN_PREFIX) || key === TOKEN_PREFIX) continue;
+    const name = key.slice(TOKEN_PREFIX.length);
+    if (name === "") continue;
+    if (Array.isArray(value)) {
+      if (value.length > 0) tokens.push({ name, values: value.map(String), isList: true });
+    } else {
+      tokens.push({ name, values: [String(value)], isList: false });
+    }
   }
-  /** Defaults precedence (ticket 17): explicit per-query range/grouping >
-   *  block defaults > host. Explicit per-query by{} fully replaces block
-   *  grouping — never merges. */
-  mergeDefaults(assignment, doc) {
-    const parsed = assignment.parsed;
-    const aggregateGroupBy = parsed?.family === "aggregate" ? parsed.groupBy : void 0;
-    const groupBy = aggregateGroupBy?.length ? aggregateGroupBy : doc.defaults?.groupBy;
-    const window = (parsed && parsed.family !== "pipeline" ? parsed.window : void 0) ?? doc.defaults?.window;
-    return {
-      queryText: assignment.queryText ?? "",
-      ...groupBy ? { groupBy } : {},
-      ...window ? { window } : {}
-    };
+  return tokens;
+}
+function defaultTokenValues(tokens) {
+  const values = {};
+  for (const token of tokens) values[token.name] = token.values[0];
+  return values;
+}
+function setDashboardTokenValue(meta, name, value) {
+  const key = `${TOKEN_PREFIX}${name}`;
+  const current = meta[key];
+  const next = { ...meta };
+  if (Array.isArray(current)) {
+    if (!current.includes(value)) return meta;
+    next[key] = [value, ...current.filter((v) => v !== value)];
+  } else if (current != null) {
+    next[key] = typeof current === "number" && !isNaN(Number(value)) ? Number(value) : value;
+  } else {
+    next[key] = value;
   }
-};
+  return next;
+}
+var TOKEN_REF_RE = /\$([A-Za-z_][\w-]*)/g;
+function substituteTokens(query, values) {
+  const missing = /* @__PURE__ */ new Set();
+  let hadEmpty = false;
+  let substituted = query.replace(TOKEN_REF_RE, (raw, name) => {
+    const value = values[name];
+    if (value == null) {
+      missing.add(name);
+      return raw;
+    }
+    if (value.trim() === "") hadEmpty = true;
+    return value;
+  });
+  if (hadEmpty) {
+    substituted = substituted.replace(/\{\s*,+/g, "{").replace(/,+\s*\}/g, "}").replace(/,\s*,+/g, ", ").replace(/\blast\s+(?:[dw]\b)?(?=\s*(?:\||$|\r?\n))/gi, "").replace(/[ \t]{2,}/g, " ").trim();
+  }
+  return { query: substituted, missing: [...missing] };
+}
+function referencedTokens(query) {
+  const names = /* @__PURE__ */ new Set();
+  for (const match of query.matchAll(TOKEN_REF_RE)) names.add(match[1]);
+  return [...names];
+}
+function headingText(content) {
+  const line = content.split("\n", 1)[0].replace(/^#{1,6}\s*/, "").trim();
+  return line === "" ? void 0 : line;
+}
+function paragraphText(content) {
+  const text = content.replace(/\s*\n\s*/g, " ").trim();
+  return text === "" ? void 0 : text;
+}
+function buildDashboardDocument(sections, meta) {
+  const widgets = [];
+  sections.forEach((section, i) => {
+    if (section.type !== "query") return;
+    let adjacentTitle;
+    let adjacentQuestion;
+    const above = sections[i - 1];
+    if (above?.type === "markdown" && above.subtype === "paragraph") {
+      adjacentQuestion = paragraphText(above.content);
+      const heading = sections[i - 2];
+      if (heading?.type === "markdown" && heading.subtype === "heading") {
+        adjacentTitle = headingText(heading.content);
+      }
+    } else if (above?.type === "markdown" && above.subtype === "heading") {
+      adjacentTitle = headingText(above.content);
+    }
+    if (isYamlQueryBlockBody(section.content)) {
+      const obj2 = parseQueryBlock(section.content, {
+        fenceTag: section.fenceTag,
+        adjacentTitle,
+        adjacentDescription: adjacentQuestion
+      });
+      const compiledBody = queryBlockToDocumentText(obj2);
+      const derivedAttrs = queryBlockAttributes(obj2);
+      const mergedAttributes = {
+        ...derivedAttrs.attributes,
+        ...section.attributes ?? {}
+      };
+      const mergedOrder = [
+        ...derivedAttrs.attributeOrder,
+        ...(section.attributeOrder ?? []).filter((k) => !(k in derivedAttrs.attributes))
+      ];
+      widgets.push({
+        key: `w${widgets.length}`,
+        type: section.widgetType ?? obj2.rawViewType ?? obj2.view,
+        spanCols: section.spanCols ?? (typeof obj2.span === "number" ? obj2.span : void 0),
+        spanFull: section.spanFull ?? (obj2.span === "full" ? true : void 0),
+        widgetError: section.widgetError ?? obj2.error,
+        body: compiledBody,
+        rawBody: section.content.trim(),
+        queryObject: obj2,
+        attributes: mergedAttributes,
+        attributeOrder: mergedOrder,
+        title: obj2.title ?? adjacentTitle,
+        question: obj2.description ?? adjacentQuestion
+      });
+      return;
+    }
+    const body = section.content.split("\n").filter((l) => {
+      const s = l.trim();
+      return s !== "" && !s.startsWith("#");
+    }).map((l) => l.trim()).join("\n");
+    const synthesizedTag = section.fenceTag ?? (section.widgetType ? `query:${section.widgetType}${section.spanFull ? "-full" : section.spanCols ? `-${section.spanCols}` : ""}` : "query");
+    const obj = parseQueryBlock(section.content, {
+      fenceTag: synthesizedTag,
+      adjacentTitle,
+      adjacentDescription: adjacentQuestion
+    });
+    widgets.push({
+      key: `w${widgets.length}`,
+      type: section.widgetType ?? "",
+      spanCols: section.spanCols,
+      spanFull: section.spanFull,
+      widgetError: section.widgetError,
+      body,
+      rawBody: body,
+      queryObject: obj,
+      attributes: section.attributes ?? {},
+      attributeOrder: section.attributeOrder ?? [],
+      title: adjacentTitle,
+      question: adjacentQuestion
+    });
+  });
+  const titleMeta = meta["title"];
+  return {
+    isDashboard: isDashboardMeta(meta),
+    title: typeof titleMeta === "string" && titleMeta !== "" ? titleMeta : void 0,
+    tokens: extractDashboardTokens(meta),
+    widgets
+  };
+}
 
 // src/queryDocumentRunner.ts
 var PageSourceRegistry = class extends Map {
@@ -2539,8 +4164,55 @@ var QueryDocumentRunner2 = class {
       // that supply none still get a single capture for the run.
       context: runOptions.context ?? this.initialOptions.context ?? captureContext()
     };
-    const substituted = substituteTokens(text, captured.tokens ?? {});
-    const parsed = parseDocument(substituted);
+    const tokens = captured.tokens ?? {};
+    const initialParsed = parseDocument(text);
+    let effectiveText;
+    if (initialParsed.diagnostics.length === 0 && initialParsed.doc.assignments.length > 0) {
+      const missingAll = /* @__PURE__ */ new Set();
+      const boundAssignments = initialParsed.doc.assignments.map((a) => {
+        if (a.kind === "query" && a.parsed && !a.sourceRef) {
+          const bound = bindQueryParams(a.parsed, tokens);
+          for (const m of bound.missing) missingAll.add(m);
+          if (bound.missing.length === 0 && !bound.parsed.error) {
+            const serialized = serialize(bound.parsed);
+            return {
+              ...a,
+              parsed: bound.parsed,
+              queryText: serialized,
+              raw: initialParsed.doc.degenerate ? serialized : `${a.name} = ${serialized}`
+            };
+          }
+        }
+        const subRaw = substituteTokens(a.raw, tokens);
+        for (const m of subRaw.missing) missingAll.add(m);
+        return { ...a, raw: subRaw.query };
+      });
+      let boundDefaults = initialParsed.doc.defaults;
+      if (boundDefaults?.window?.kind === "param") {
+        const probe = bindQueryParams(
+          { family: "find", raw: ":segment{}", target: "segment", filters: [], window: boundDefaults.window },
+          tokens
+        );
+        for (const m of probe.missing) missingAll.add(m);
+        if (probe.missing.length === 0 && probe.parsed.family === "find") {
+          boundDefaults = { ...boundDefaults, window: probe.parsed.window };
+        }
+      }
+      if (missingAll.size > 0) {
+        return {
+          outputs: [],
+          diagnostics: [unknownTokensMessage([...missingAll])]
+        };
+      }
+      effectiveText = serializeDocument({
+        ...initialParsed.doc,
+        ...boundDefaults ? { defaults: boundDefaults } : {},
+        assignments: boundAssignments
+      });
+    } else {
+      effectiveText = substituteTokens2(text, tokens);
+    }
+    const parsed = parseDocument(effectiveText);
     if (parsed.doc.assignments.some((a) => consumesRollupFacts(a.parsed))) {
       await this.host.rollupEnsure?.();
     }
@@ -2560,16 +4232,16 @@ var QueryDocumentRunner2 = class {
       runPipeline: async (queryText) => {
         const res = await this.host.runPipeline?.(queryText, captured.context);
         return res ?? { error: "pipeline queries are not supported by this host" };
-      }
+      },
+      ...this.host.runPipelineFromFind ? {
+        runPipelineFromFind: async (sourceFind, pipeTail) => this.host.runPipelineFromFind(sourceFind, pipeTail, captured.context)
+      } : {}
     });
-    return formulaRunner.run(substituted);
+    return formulaRunner.run(effectiveText);
   }
 };
-function substituteTokens(text, tokens) {
-  return text.replace(/\$([A-Za-z_][\w-]*)/g, (match, name) => {
-    const value = tokens[name];
-    return value !== void 0 ? value : match;
-  });
+function substituteTokens2(text, tokens) {
+  return substituteTokens(text, tokens).query;
 }
 function consumesRollupFacts(parsed) {
   if (!parsed) return false;
@@ -2677,8 +4349,9 @@ function firstEffortSlug(metrics) {
   }
   return void 0;
 }
+var PLUMBING_OUTPUT_TYPES = /* @__PURE__ */ new Set(["load", "compiler", "system", "event"]);
 function toEventRows(logs, identity) {
-  return logs.map((output, seq) => ({
+  return logs.filter((output) => !PLUMBING_OUTPUT_TYPES.has(output.outputType ?? "segment")).map((output, seq) => ({
     id: `${identity.resultId}:${seq}`,
     resultId: identity.resultId,
     noteId: identity.noteId,
@@ -2751,13 +4424,18 @@ function toSummaryEventRows(logs, identity) {
     blockVersion: identity.blockVersion
   }));
 }
-function projectEventToFacts(record) {
+function matchesFactMetricKey(metricKey, queryMetric) {
+  return !queryMetric || metricKey === queryMetric || queryMetric === "rep" && metricKey === "reps" || queryMetric === "reps" && metricKey === "rep";
+}
+function projectEventToFacts(record, filter) {
+  const resolvedFilter = typeof filter === "object" && filter !== null ? filter : void 0;
   const metrics = createMetricOwnershipLedger(record.metrics).visible();
   if (record.grain === "summary") {
     const m = metrics[0];
     if (!m || typeof m.value !== "number") return [];
     const fieldRef = readFieldRef(m.metadata);
     const metricKey = metadataString(m.metadata, "canonicalKey") ?? fieldRef?.path ?? (m.type ?? "");
+    if (!matchesFactMetricKey(metricKey, resolvedFilter?.metricKey)) return [];
     const temporal = record.metricTemporal?.[0];
     const dims2 = readGroupTags(m.metadata);
     return [{
@@ -2810,13 +4488,15 @@ function projectEventToFacts(record) {
     if (dimKey) dims[dimKey] = String(m.value);
   }
   const rowDims = Object.keys(dims).length > 0 ? dims : void 0;
+  let metricOrdinal = 0;
   metrics.forEach((m) => {
     if (m.type === MetricType.Label || m.type === "label" || typeof m.value !== "number") return;
     const fieldRef = readFieldRef(m.metadata);
     const legacyFallback = m.type === MetricType.Rep || m.type === "rep" ? "reps" : m.type ?? "metric";
     if (!fieldRef && legacyFallback === "custom") return;
     const metricKey = metadataString(m.metadata, "canonicalKey") ?? fieldRef?.path ?? (labelName ? resolveCanonicalMetricKey(labelName) : legacyFallback);
-    const ordinal = facts.length;
+    const ordinal = metricOrdinal++;
+    if (!matchesFactMetricKey(metricKey, resolvedFilter?.metricKey)) return [];
     const temporal = record.metricTemporal?.[ordinal];
     const factTimestamp = temporal?.temporalKind === "instant" && temporal.instant !== void 0 ? temporal.instant : record.timestamp;
     facts.push({
@@ -2968,18 +4648,7 @@ function feedOfItem(item) {
   const id = item.feedSourceId;
   return typeof id === "string" && id.trim() ? id : void 0;
 }
-function notebookOfItem(item) {
-  if (item.notebookId && item.notebookId.trim()) {
-    return toNotebookId(item.notebookId);
-  }
-  if (item.tags) {
-    for (const tag of item.tags) {
-      if (tag.startsWith("notebook:") || tag.startsWith("notebook/")) {
-        const slug2 = notebookSlugFromId(tag);
-        if (slug2) return toNotebookId(slug2);
-      }
-    }
-  }
+function resolveIntrinsicNotebook(item) {
   const corpus = /^markdown\/(notebooks|canvas|efforts|dashboards|equipment)\/(.+)$/.exec(item.sourcePath ?? "");
   if (corpus) {
     const [, family, rest] = corpus;
@@ -2998,10 +4667,67 @@ function notebookOfItem(item) {
   if (isJournalRow(item)) return "notebook/journal";
   return void 0;
 }
+function notebooksOfItem(item) {
+  const out = [];
+  const push = (raw) => {
+    if (!raw || !raw.trim()) return;
+    const id = toNotebookId(raw);
+    if (!out.includes(id)) out.push(id);
+  };
+  if (item.notebookIds?.length) {
+    for (const raw of item.notebookIds) push(raw);
+  }
+  if (item.notebookId?.trim()) {
+    push(item.notebookId);
+  }
+  if (item.tags) {
+    for (const tag of item.tags) {
+      if (tag.startsWith("notebook:") || tag.startsWith("notebook/")) {
+        const slug = notebookSlugFromId(tag);
+        if (slug) push(slug);
+      }
+    }
+  }
+  if (out.length === 0) {
+    const intrinsic = resolveIntrinsicNotebook(item);
+    if (intrinsic) {
+      push(intrinsic);
+      const isCorePrimitive = (intrinsic === "notebook/efforts" || intrinsic === "notebook/equipment") && item.seedOrigin === "seed" && (!item.feedSourceId || item.feedSourceId === "core");
+      if (isCorePrimitive) {
+        push("notebook/defaults");
+      }
+    }
+  }
+  return out;
+}
+function notebookOfItem(item) {
+  if (item.notebookId && item.notebookId.trim()) {
+    return toNotebookId(item.notebookId);
+  }
+  if (item.notebookIds?.length) {
+    const nonDefaultUser = item.notebookIds.map((id) => toNotebookId(id)).find((id) => id !== "notebook/journal" && id !== "notebook/playground");
+    if (nonDefaultUser) return nonDefaultUser;
+    return toNotebookId(item.notebookIds[0]);
+  }
+  if (item.tags) {
+    for (const tag of item.tags) {
+      if (tag.startsWith("notebook:") || tag.startsWith("notebook/")) {
+        const slug = notebookSlugFromId(tag);
+        if (slug) return toNotebookId(slug);
+      }
+    }
+  }
+  return resolveIntrinsicNotebook(item);
+}
 function notebookOriginOfItem(item) {
   const notebook = notebookOfItem(item);
   if (!notebook) return void 0;
+  if (notebook === "notebook/defaults") return "default";
   if (item.notebookId?.trim()) return "user";
+  if (item.notebookIds?.some((id) => {
+    const norm = toNotebookId(id);
+    return norm !== "notebook/journal" && norm !== "notebook/playground" && norm !== "notebook/defaults";
+  })) return "user";
   if (item.tags?.some((t2) => t2.startsWith("notebook:") || t2.startsWith("notebook/"))) return "user";
   if (notebook === "notebook/journal" || notebook === "notebook/playground") return "default";
   return "feed";
@@ -3086,9 +4812,9 @@ function applyNotebookFilter(items, filters) {
     if (filter.key !== "notebook") continue;
     const wanted = new Set(filter.values.map((v) => toNotebookId(v.value)));
     items = items.filter((item) => {
-      const nb = notebookOfItem(item);
-      if (!nb) return filter.negate;
-      const hit = wanted.has(nb);
+      const memberships = notebooksOfItem(item);
+      if (memberships.length === 0) return filter.negate;
+      const hit = memberships.some((nb) => wanted.has(nb));
       return filter.negate ? !hit : hit;
     });
   }
@@ -3224,14 +4950,38 @@ function civilDatesCoveredByRange(start, end, timeZone) {
   }
   return dates;
 }
-function factTagValue(row, key, noteTags) {
+var EMPTY_FACT_DIMS = {
+  noteTags: /* @__PURE__ */ new Map(),
+  typedNoteTags: /* @__PURE__ */ new Map(),
+  effortsBySlug: /* @__PURE__ */ new Map()
+};
+function resolveDimensionContext(dimsOrNoteTags) {
+  if ("noteTags" in dimsOrNoteTags) return dimsOrNoteTags;
+  return { ...EMPTY_FACT_DIMS, noteTags: dimsOrNoteTags };
+}
+var TYPED_TAG_KEY_SET = new Set(WQL_TYPED_TAG_KEYS);
+function factTagValue(row, key, dimsOrNoteTags = EMPTY_FACT_DIMS) {
+  const ctx = resolveDimensionContext(dimsOrNoteTags);
+  const effort = row.effortSlug ? ctx.effortsBySlug.get(row.effortSlug) : void 0;
   switch (key) {
     case "effort":
       return row.effortSlug;
-    case "discipline":
-      return row.discipline;
-    case "intensity":
-      return row.intensityTier;
+    case "discipline": {
+      const explicit = row.discipline ?? row.dimensions?.["discipline"];
+      if (explicit) return explicit;
+      const fromEffort = effort?.baseAttributes?.discipline;
+      if (fromEffort) return fromEffort;
+      const fromNote = ctx.typedNoteTags.get(row.noteId)?.get("discipline");
+      return fromNote && fromNote.length > 0 ? fromNote : void 0;
+    }
+    case "intensity": {
+      const explicit = row.intensityTier ?? row.dimensions?.["intensity"];
+      if (explicit) return explicit;
+      const fromEffort = effort?.baseAttributes?.intensityTier;
+      if (fromEffort) return fromEffort;
+      const fromNote = ctx.typedNoteTags.get(row.noteId)?.get("intensity");
+      return fromNote && fromNote.length > 0 ? fromNote : void 0;
+    }
     case "grade":
       return row.grade;
     case "note":
@@ -3249,15 +4999,27 @@ function factTagValue(row, key, noteTags) {
     case "result":
       return row.resultId;
     case "tags":
-      return noteTags.get(row.noteId) ?? [];
+      return ctx.noteTags.get(row.noteId) ?? [];
+    case "equipment": {
+      const explicit = row.dimensions?.["equipment"];
+      if (explicit) return explicit;
+      if (effort?.equipment && effort.equipment.length > 0) return effort.equipment;
+      const fromNote = ctx.typedNoteTags.get(row.noteId)?.get("equipment");
+      return fromNote && fromNote.length > 0 ? fromNote : void 0;
+    }
     default: {
-      const dims = row.dimensions;
-      if (!dims) return void 0;
-      return dims[key] ?? dims[normalizeFieldComponent(key)];
+      const rowDims = row.dimensions;
+      const explicit = rowDims ? rowDims[key] ?? rowDims[normalizeFieldComponent(key)] : void 0;
+      if (explicit !== void 0) return explicit;
+      if (TYPED_TAG_KEY_SET.has(key)) {
+        const fromNote = ctx.typedNoteTags.get(row.noteId)?.get(key);
+        if (fromNote && fromNote.length > 0) return fromNote;
+      }
+      return void 0;
     }
   }
 }
-function matchesFilters(row, filters, noteTags) {
+function matchesFilters(row, filters, dimsOrNoteTags) {
   const groups = /* @__PURE__ */ new Map();
   for (const f of filters) {
     const groupKey = `${f.negate ? "!" : ""}${f.key}`;
@@ -3268,7 +5030,7 @@ function matchesFilters(row, filters, noteTags) {
   return [...groups.values()].every((group) => {
     const key = group[0].key;
     const negate = group[0].negate;
-    const raw = factTagValue(row, key, noteTags);
+    const raw = factTagValue(row, key, dimsOrNoteTags);
     const rowValues = Array.isArray(raw) ? raw : raw !== void 0 ? [raw] : [];
     const hit = rowValues.some(
       (value) => group.some(
@@ -3280,11 +5042,11 @@ function matchesFilters(row, filters, noteTags) {
     return negate ? !hit : hit;
   });
 }
-function dimValue(row, dim, noteTags, ctx) {
+function dimValue(row, dim, dimsOrNoteTags, ctx) {
   if (dim === "day") return row.metricDate ?? civilDateOf(row.timestamp, ctx.timeZone);
   if (dim === "week") return civilMonday(row.metricDate ?? civilDateOf(row.timestamp, ctx.timeZone));
   if (dim === "session") return row.resultId;
-  const raw = factTagValue(row, dim, noteTags);
+  const raw = factTagValue(row, dim, dimsOrNoteTags);
   if (raw === void 0) return UNASSIGNED;
   if (typeof raw === "string") return raw;
   return raw.length ? raw.join(",") : UNASSIGNED;
@@ -3442,11 +5204,15 @@ var QueryService = class {
   relationStore;
   datasetStore;
   isNotebookSubscribed;
-  // Optional storage seam properties for block_efforts and typed tag resolution.
+  feedCatalogStore;
+  // Optional storage seam properties for block_efforts, block_equipment, and typed tag resolution.
   // Injected by the app adapter (`services/queryService.ts`); tests can supply fakes.
   blockEffortsStore = {
     getAllFromIndex: async () => []
   };
+  blockEquipmentStore = {
+    getAllFromIndex: async () => []
+  };
   tagsStore = {
     getAllFromIndex: async () => []
   };
@@ -3454,7 +5220,7 @@ var QueryService = class {
     getAllFromIndex: async () => []
   };
   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)) {
+    if (storesOrEventStore && typeof storesOrEventStore === "object" && ("eventStore" in storesOrEventStore || "noteStore" in storesOrEventStore || "blockStore" in storesOrEventStore || "effortStore" in storesOrEventStore || "blockEffortsStore" in storesOrEventStore || "blockEquipmentStore" in storesOrEventStore || "tagsStore" in storesOrEventStore || "noteTagsStore" in storesOrEventStore || "pageStore" in storesOrEventStore || "relationStore" in storesOrEventStore || "datasetStore" in storesOrEventStore || "feedCatalogStore" in storesOrEventStore || "isNotebookSubscribed" in storesOrEventStore)) {
       const stores = storesOrEventStore;
       this.store = stores.eventStore ?? defaultEventStore;
       this.noteStore = stores.noteStore ?? defaultNoteStore;
@@ -3464,9 +5230,11 @@ var QueryService = class {
       this.relationStore = stores.relationStore;
       this.datasetStore = stores.datasetStore;
       if (stores.blockEffortsStore) this.blockEffortsStore = stores.blockEffortsStore;
+      if (stores.blockEquipmentStore) this.blockEquipmentStore = stores.blockEquipmentStore;
       if (stores.tagsStore) this.tagsStore = stores.tagsStore;
       if (stores.noteTagsStore) this.noteTagsStore = stores.noteTagsStore;
       if (stores.isNotebookSubscribed) this.isNotebookSubscribed = stores.isNotebookSubscribed;
+      if (stores.feedCatalogStore) this.feedCatalogStore = stores.feedCatalogStore;
     } else {
       this.store = storesOrEventStore ?? defaultEventStore;
       this.noteStore = noteStore ?? defaultNoteStore;
@@ -3477,7 +5245,7 @@ var QueryService = class {
   /** Windowed flat-fact fetch — the projected view over the event store. */
   async getFactsByTimeRange(start, end) {
     const rows = await this.store.getEventsByTimeRange(start, end);
-    return rows.flatMap(projectEventToFacts);
+    return rows.flatMap((row) => projectEventToFacts(row));
   }
   async runQuery(raw, options2 = {}) {
     const parsed = parseQuery(raw);
@@ -3552,13 +5320,15 @@ var QueryService = class {
     groups.sort((a, b) => sessionCompletedAt(b[1]) - sessionCompletedAt(a[1]));
     const planeFilters = parsed.filters.filter((f) => f.key === "plane");
     const factFilters = parsed.filters.filter((f) => !["result", "block", "note", "plane"].includes(f.key));
-    const touchesTags = factFilters.some((f) => isTagLabelKey(f.key));
-    let sessionNoteTags = /* @__PURE__ */ new Map();
-    if (touchesTags && groups.length > 0) {
-      const dummyPoints = groups.map(([, rows]) => ({ noteId: rows[0]?.noteId ?? "" }));
-      sessionNoteTags = await this.loadNoteTags(dummyPoints, true);
-    }
     const normalizedFactFilters = factFilters.map((f) => f.key === "tag" ? { ...f, key: "tags" } : f);
+    const sessionDims = groups.length > 0 && normalizedFactFilters.length > 0 ? await this.loadFactDimensions(
+      groups.map(([, rows]) => ({
+        noteId: rows[0]?.noteId ?? "",
+        effortSlug: rows.find((r) => r.effortSlug)?.effortSlug
+      })),
+      normalizedFactFilters,
+      []
+    ) : EMPTY_FACT_DIMS;
     let runs = groups.map(([resultId, rows]) => {
       let events = rows;
       if (planeFilters.length > 0) {
@@ -3572,7 +5342,7 @@ var QueryService = class {
       if (normalizedFactFilters.length > 0) {
         const matchingSession = events.some((row) => {
           const facts = projectEventToFacts(row);
-          return facts.some((fact) => matchesFilters(fact, normalizedFactFilters, sessionNoteTags));
+          return facts.some((fact) => matchesFilters(fact, normalizedFactFilters, sessionDims));
         });
         if (!matchingSession) events = [];
       }
@@ -3666,14 +5436,17 @@ var QueryService = class {
     };
     const rawTagFilters = parsed.filters.filter((f) => !["result", "block", "note", "plane"].includes(f.key));
     const tagFilters = rawTagFilters.map((f) => f.key === "tag" ? { ...f, key: "tags" } : f);
-    const touchesTags = tagFilters.some((f) => f.key === "tags");
-    const noteTags = touchesTags && eligibleRecords.length > 0 ? await this.loadNoteTags(eligibleRecords.map((r) => ({ noteId: r.noteId })), true) : /* @__PURE__ */ new Map();
+    const tableDims = eligibleRecords.length > 0 && tagFilters.length > 0 ? await this.loadFactDimensions(
+      eligibleRecords.map((r) => ({ noteId: r.noteId, effortSlug: r.effortSlug })),
+      tagFilters,
+      []
+    ) : EMPTY_FACT_DIMS;
     const timeScoped = !!(parsed.window || options2.range);
     const eligible = eligibleRecords.filter((row) => !timeScoped || effectiveTimeWindow(anchorTs(row), parsed.window, options2.range, ctx)).filter((row) => {
       if (tagFilters.length === 0) return true;
       const facts = projectEventToFacts(row);
       if (facts.length === 0) return false;
-      return facts.some((fact) => matchesFilters(fact, tagFilters, noteTags));
+      return facts.some((fact) => matchesFilters(fact, tagFilters, tableDims));
     });
     const totalCount = eligible.length;
     const unitByMetric = /* @__PURE__ */ new Map();
@@ -3706,7 +5479,13 @@ var QueryService = class {
       return { name: col, type: "number", ...unitFor(col) ? { unit: unitFor(col) } : {} };
     });
     const typeOf = new Map(columns.map((c) => [c.name, c.type]));
-    let records = eligible.map((row) => {
+    const offset = pipes?.offset ?? 0;
+    const limit = pipes?.limit;
+    const hasOrder = Boolean(pipes?.order && pipes.order.length > 0);
+    const hasGroupBy = Boolean(parsed.groupBy && parsed.groupBy.length > 0);
+    const canSliceBeforeProject = !hasOrder && !hasGroupBy && (limit !== void 0 || offset > 0);
+    const rowsToProject = canSliceBeforeProject ? limit !== void 0 ? eligible.slice(offset, offset + limit) : eligible.slice(offset) : eligible;
+    let records = rowsToProject.map((row) => {
       const record = {};
       for (const col of selectCols) {
         const type = typeOf.get(col);
@@ -3760,9 +5539,7 @@ var QueryService = class {
       }
       groups = [...groupMap.entries()].map(([key, rows]) => ({ key, label: key, rows }));
     }
-    const offset = pipes?.offset ?? 0;
-    const limit = pipes?.limit;
-    const page = limit !== void 0 ? records.slice(offset, offset + limit) : records.slice(offset);
+    const page = canSliceBeforeProject ? records : limit !== void 0 ? records.slice(offset, offset + limit) : records.slice(offset);
     return {
       parsed,
       notes: [],
@@ -3789,6 +5566,17 @@ var QueryService = class {
     if (parsed.error) {
       return { parsed, notes: [], blocks: [], stages: { selected: 0, matched: 0 } };
     }
+    const bound = bindQueryParams(parsed, options2.params ?? {});
+    if (bound.missing.length > 0) {
+      const errored = { ...parsed, error: unknownTokensMessage(bound.missing) };
+      return { parsed: errored, notes: [], blocks: [], stages: { selected: 0, matched: 0 } };
+    }
+    if (bound.parsed.family === "find") {
+      parsed = bound.parsed;
+      if (parsed.error) {
+        return { parsed, notes: [], blocks: [], stages: { selected: 0, matched: 0 } };
+      }
+    }
     const computed = findTargetAdvisories(parsed);
     if (computed.length) {
       const merged = [.../* @__PURE__ */ new Set([...parsed.advisories ?? [], ...computed])];
@@ -3818,6 +5606,9 @@ var QueryService = class {
     if (parsed.target === "equipment") {
       return this.runFindEquipment(parsed, options2);
     }
+    if (parsed.target === "feed") {
+      return this.runFindFeed(parsed, options2);
+    }
     const read = compileContentRead(parsed.filters, "note", parsed.sourceScope);
     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({
@@ -3887,6 +5678,31 @@ var QueryService = class {
       }
     }
     notes = applyNotebookFilter(notes, parsed.filters);
+    if (notes.length === 0 && this.feedCatalogStore?.getRemoteNotebookNotes) {
+      const posNbFilter = parsed.filters.find((f) => f.key === "notebook" && !f.negate && f.values.length === 1 && !f.values[0].wildcard);
+      const subFilter = parsed.filters.find((f) => f.key === "subscribed" && !f.negate);
+      const explicitlySubscribedOnly = subFilter !== void 0 && subFilter.values.some((v) => v.value === "true") && !subFilter.values.some((v) => v.value === "false");
+      if (posNbFilter && !explicitlySubscribedOnly) {
+        const wantedSlug = notebookSlugFromId(posNbFilter.values[0].value);
+        const posFeedFilter = parsed.filters.find((f) => f.key === "feed" && !f.negate && f.values.length === 1 && !f.values[0].wildcard);
+        let remoteNotes = await this.feedCatalogStore.getRemoteNotebookNotes(
+          wantedSlug,
+          posFeedFilter?.values[0]?.value
+        );
+        for (const filter of parsed.filters) {
+          if (filter.key === "text") {
+            const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
+            remoteNotes = remoteNotes.filter((n) => {
+              const hit = n.title.toLowerCase().includes(search);
+              return filter.negate ? !hit : hit;
+            });
+          }
+        }
+        if (remoteNotes.length > 0) {
+          notes = remoteNotes;
+        }
+      }
+    }
     const isSubscribedFn = options2.isNotebookSubscribed ?? this.isNotebookSubscribed ?? (() => true);
     for (const filter of parsed.filters) {
       if (filter.key === "feed") {
@@ -3948,7 +5764,7 @@ var QueryService = class {
       const offset = pipes.offset ?? 0;
       notes = pipes.limit !== void 0 ? notes.slice(offset, offset + pipes.limit) : notes.slice(offset);
     }
-    const relations = notes.length && (this.pageStore || this.relationStore) ? await this.containersAndPlacements(notes) : void 0;
+    const relations = !options2.skipContainers && notes.length && (this.pageStore || this.relationStore) ? await this.containersAndPlacements(notes) : void 0;
     return {
       parsed,
       notes,
@@ -4220,7 +6036,15 @@ var QueryService = class {
       stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
       matched: []
     };
-    if (parsed.error) return empty;
+    const bound = bindQueryParams(parsed, options2.params ?? {});
+    if (bound.missing.length > 0) {
+      const err = unknownTokensMessage(bound.missing);
+      return { ...empty, parsed: { ...parsed, error: err }, error: err };
+    }
+    if (bound.parsed.family === "aggregate") {
+      parsed = bound.parsed;
+    }
+    if (parsed.error) return { ...empty, parsed, error: parsed.error };
     if (parsed.join) return this.runJoined(parsed, options2);
     const ctx = runContext(options2);
     const range = resolveAggregateRange(parsed, options2, ctx);
@@ -4253,7 +6077,15 @@ var QueryService = class {
       stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
       matched: []
     };
-    if (query.error) return empty;
+    const bound = bindQueryParams(query, options2.params ?? {});
+    if (bound.missing.length > 0) {
+      const err = unknownTokensMessage(bound.missing);
+      return { ...empty, parsed: { ...query, error: err }, error: err };
+    }
+    if (bound.parsed.family === "aggregate") {
+      query = bound.parsed;
+    }
+    if (query.error) return { ...empty, parsed: query, error: query.error };
     if (query.join) {
       return {
         ...empty,
@@ -4278,33 +6110,41 @@ var QueryService = class {
       const error = parsed.error ?? `Not a pipeline: "${parsed.raw}". Pipelines look like :source{filters} | :sum{metric:x} | :table.`;
       return { parsed: { family: "pipeline", raw: parsed.raw, source: { kind: "dataset", name: "" }, transforms: [], error }, error };
     }
-    const fail = (error) => ({ parsed, error });
-    if (parsed.error) return fail(parsed.error);
+    let pipeline = parsed;
+    const fail = (error) => ({ parsed: pipeline, error });
+    if (pipeline.error) return fail(pipeline.error);
+    const bound = bindQueryParams(pipeline, options2.params ?? {});
+    if (bound.missing.length > 0) return fail(unknownTokensMessage(bound.missing));
+    if (bound.parsed.family === "pipeline") {
+      pipeline = bound.parsed;
+      if (pipeline.error) return fail(pipeline.error);
+    }
     let content;
     let carried;
     let sourceEvents;
     let datasetNotes = [];
-    if (parsed.source.kind === "dataset") {
-      const name = parsed.source.name;
+    if (pipeline.source.kind === "dataset") {
+      const name = pipeline.source.name;
       const dataset = options2.pageSources?.get(name) ?? this.datasetStore?.getDataset(name);
       if (!dataset) return fail(`Unknown dataset "${name}" \u2014 the host must register it before the query runs.`);
       sourceEvents = dataset.events;
       datasetNotes = dataset.notes;
-    } else if (isFindQuery(parsed.source.query)) {
-      const q = parsed.source.query;
+    } else if (isFindQuery(pipeline.source.query)) {
+      const q = pipeline.source.query;
       content = await this.runFind(q, {
         context: options2.context,
+        skipContainers: pipeline.transforms.length > 0,
         ...options2.rangeStart !== void 0 || options2.rangeEnd !== void 0 ? { range: { start: options2.rangeStart ?? 0, end: options2.rangeEnd ?? Number.MAX_SAFE_INTEGER, endExclusive: false } } : {}
       });
       if (q.error) return fail(q.error);
     } else {
-      carried = await this.run(parsed.source.query, options2);
-      if (parsed.source.query.error) return fail(parsed.source.query.error);
+      carried = await this.run(pipeline.source.query, options2);
+      if (pipeline.source.query.error) return fail(pipeline.source.query.error);
     }
-    if (parsed.transforms.length === 0) {
+    if (pipeline.transforms.length === 0) {
       if (content) {
         return {
-          parsed,
+          parsed: pipeline,
           ...content.notes.length ? { notes: content.notes } : {},
           ...content.blocks.length ? { blocks: content.blocks } : {},
           ...content.efforts?.length ? { efforts: content.efforts } : {},
@@ -4312,37 +6152,81 @@ var QueryService = class {
           ...content.table ? { table: content.table } : {},
           ...content.containers ? { containers: content.containers } : {},
           ...content.placements ? { placements: content.placements } : {},
-          ...parsed.sink ? { chart: parsed.sink } : {}
+          ...pipeline.sink ? { chart: pipeline.sink } : {}
         };
       }
-      if (parsed.source.kind === "dataset") {
-        return { parsed, notes: datasetNotes, ...parsed.sink ? { chart: parsed.sink } : {} };
+      if (pipeline.source.kind === "dataset") {
+        return { parsed: pipeline, notes: datasetNotes, ...pipeline.sink ? { chart: pipeline.sink } : {} };
       }
       return {
-        parsed,
+        parsed: pipeline,
         ...carried ? { series: carried.series, ...carried.unit ? { unit: carried.unit } : {}, ...carried.error ? { error: carried.error } : {} } : {},
-        ...parsed.sink ? { chart: parsed.sink } : {}
+        ...pipeline.sink ? { chart: pipeline.sink } : {}
       };
     }
     if (!carried) {
       if (!sourceEvents && content) sourceEvents = await this.sourceEventsFromFind(content);
-      carried = await this.runAggregateEvents(parsed.transforms[0], sourceEvents ?? [], options2);
-      for (const transform of parsed.transforms.slice(1)) {
+      carried = await this.runAggregateEvents(pipeline.transforms[0], sourceEvents ?? [], options2);
+      for (const transform of pipeline.transforms.slice(1)) {
         if (carried.error) break;
         carried = reduceCarriedResult(carried, transform, options2, runContext(options2));
       }
     } else {
-      for (const transform of parsed.transforms) {
+      for (const transform of pipeline.transforms) {
         if (carried.error) break;
         carried = reduceCarriedResult(carried, transform, options2, runContext(options2));
       }
     }
     return {
-      parsed,
+      parsed: pipeline,
+      series: carried.series,
+      ...carried.unit ? { unit: carried.unit } : {},
+      ...carried.error ? { error: carried.error } : {},
+      ...pipeline.sink ? { chart: pipeline.sink } : {}
+    };
+  }
+  /**
+   * Evaluate pipeline tail stages (`:sum{…} | :bar{…}`) over an already-fetched
+   * `FindQueryResult` (or `FamilyRunPayload`). Resolves and caches `content.events`
+   * on the first call so multiple downstream named branches (`kb = bench | :sum{…}`,
+   * `bb = bench | :sum{…}`) share the exact `EventRecord[]` slice in memory.
+   */
+  async runPipelineFromFind(content, pipeTail, options2 = {}) {
+    const synthetic = parseQuery(`:segment{} | ${pipeTail}`);
+    if (!isPipelineQuery(synthetic) || synthetic.error) {
+      const error = synthetic.error ?? `Invalid pipeline tail: "${pipeTail}"`;
+      return { parsed: { family: "pipeline", raw: pipeTail, source: { kind: "dataset", name: "" }, transforms: [], error }, error };
+    }
+    if (!content.events) {
+      content.events = await this.sourceEventsFromFind({
+        parsed: { family: "find", raw: "", target: "note", filters: [] },
+        notes: content.notes ?? [],
+        blocks: content.blocks ?? [],
+        stages: { selected: 0, matched: 0 }
+      });
+    }
+    const sourceEvents = content.events;
+    if (synthetic.transforms.length === 0) {
+      return {
+        parsed: synthetic,
+        ...content.notes?.length ? { notes: content.notes } : {},
+        ...content.blocks?.length ? { blocks: content.blocks } : {},
+        ...content.runs?.length ? { runs: content.runs } : {},
+        ...content.table ? { table: content.table } : {},
+        ...synthetic.sink ? { chart: synthetic.sink } : {}
+      };
+    }
+    let carried = await this.runAggregateEvents(synthetic.transforms[0], sourceEvents, options2);
+    for (const transform of synthetic.transforms.slice(1)) {
+      if (carried.error) break;
+      carried = reduceCarriedResult(carried, transform, options2, runContext(options2));
+    }
+    return {
+      parsed: synthetic,
       series: carried.series,
       ...carried.unit ? { unit: carried.unit } : {},
       ...carried.error ? { error: carried.error } : {},
-      ...parsed.sink ? { chart: parsed.sink } : {}
+      ...synthetic.sink ? { chart: synthetic.sink } : {}
     };
   }
   /** Events behind a content source — resolved ONLY when a transform needs
@@ -4393,17 +6277,16 @@ var QueryService = class {
         error: `Aggregate "${parsed.agg}" requires a metric \u2014 use ${parsed.agg}{metric:<key>}`
       };
     }
-    const matchesMetric = (metricKey, queryMetric) => !queryMetric || metricKey === queryMetric || queryMetric === "rep" && metricKey === "reps" || queryMetric === "reps" && metricKey === "rep";
     const factTime = (row) => {
       if (row.metricDate) return zonedNoon(row.metricDate, ctx.timeZone);
       return row.timestamp;
     };
-    const candidates = eventRows.flatMap(projectEventToFacts).filter((row) => matchesMetric(row.metricKey, parsed.metric)).filter((row) => !range || inRange(factTime(row), range));
-    const touchesTags = parsed.filters.some((f) => f.key === "tags") || parsed.groupBy.includes("tags");
-    const noteTags = await this.loadNoteTags(candidates, touchesTags);
-    const matched = candidates.filter((row) => matchesFilters(row, parsed.filters, noteTags));
+    const metricFilter = parsed.metric ? { metricKey: parsed.metric } : void 0;
+    const candidates = eventRows.flatMap((row) => projectEventToFacts(row, metricFilter)).filter((row) => !range || inRange(factTime(row), range));
+    const factDims = await this.loadFactDimensions(candidates, parsed.filters, parsed.groupBy);
+    const matched = candidates.filter((row) => matchesFilters(row, parsed.filters, factDims));
     const { selected, report } = selectContributions(matched, parsed.agg);
-    return this.buildResult(selected, parsed, options2, noteTags, range, report);
+    return this.buildResult(selected, parsed, options2, factDims, range, report);
   }
   /**
    * Stages 2–4 — BUCKET → GROUP → AGGREGATE over an already-selected +
@@ -4565,11 +6448,10 @@ var QueryService = class {
     if (joinRange) {
       facts = facts.filter((f) => inRange(f.timestamp, joinRange));
     }
-    const touchesTags = parsed.filters.some((f) => f.key === "tags") || parsed.groupBy.includes("tags");
-    const noteTags = await this.loadNoteTags(facts, touchesTags);
-    const matched = facts.filter((f) => matchesFilters(f, parsed.filters, noteTags));
+    const factDims = await this.loadFactDimensions(facts, parsed.filters, parsed.groupBy);
+    const matched = facts.filter((f) => matchesFilters(f, parsed.filters, factDims));
     const { selected, report } = selectContributions(matched, parsed.agg);
-    return this.buildResult(selected, parsed, options2, noteTags, joinRange, report);
+    return this.buildResult(selected, parsed, options2, factDims, joinRange, report);
   }
   /** Direction 1 — keep only content owning a wod block whose raw-log metric
    *  aggregate satisfies the predicate. `notes` for :note, `blocks` for
@@ -4592,9 +6474,9 @@ var QueryService = class {
    *  and return the ids whose aggregate satisfies the join predicate. */
   async contentIdsSatisfying(contentIds, join) {
     const facts = dedupeById(await this.deriveMetricFacts(contentIds, join.metric));
-    const noteTags = await this.loadNoteTags(facts, join.filters.some((f) => f.key === "tags"));
+    const factDims = await this.loadFactDimensions(facts, join.filters, []);
     const filtered = selectContributions(
-      facts.filter((f) => matchesFilters(f, join.filters, noteTags)),
+      facts.filter((f) => matchesFilters(f, join.filters, factDims)),
       join.agg
     ).selected;
     const byContent = /* @__PURE__ */ new Map();
@@ -4620,7 +6502,8 @@ var QueryService = class {
   async deriveMetricFacts(contentIds, metricKey) {
     const ids = [...new Set(contentIds)];
     const rows = await Promise.all(ids.map((blockContentId) => this.store.getEventsByContent(blockContentId)));
-    return rows.flat().flatMap(projectEventToFacts).filter((f) => f.metricKey === metricKey);
+    const metricFilter = metricKey ? { metricKey } : void 0;
+    return rows.flat().flatMap((row) => projectEventToFacts(row, metricFilter));
   }
   /** All content blocks — journal and seeded corpus in one store. */
   async allContentBlocks() {
@@ -4653,22 +6536,78 @@ var QueryService = class {
     }
     return ids;
   }
-  /** Load note tag labels only when the query touches 'tags'. Batched when
-   *  a relationStore is injected — one bundle read per run instead of a
-   *  junction read per row's note. */
-  async loadNoteTags(rows, touchesTags) {
+  /**
+   * Load 3-tier fact dimensions (`noteTags`, `typedNoteTags`, `effortsBySlug`)
+   * in at most one batched `relationStore.getBatches` call and one
+   * `effortStore.getAllEfforts` call per query run.
+   */
+  async loadFactDimensions(rows, filters, groupBy) {
+    if (rows.length === 0) return EMPTY_FACT_DIMS;
+    const keys = /* @__PURE__ */ new Set([...filters.map((f) => f.key), ...groupBy]);
+    const needsUntypedTags = keys.has("tags") || keys.has("tag");
+    const neededTypedKeys = [...keys].filter((k) => TYPED_TAG_KEY_SET.has(k) || k === "discipline" || k === "intensity");
+    const needsTypedTags = neededTypedKeys.length > 0;
+    const needsEfforts = keys.has("equipment") || keys.has("discipline") || keys.has("intensity");
     const noteTags = /* @__PURE__ */ new Map();
-    if (!touchesTags) return noteTags;
-    const noteIds = [...new Set(rows.map((r) => r.noteId))];
-    if (this.relationStore) {
-      const bundles = await this.relationStore.getBatches(noteIds);
-      for (const id of noteIds) {
-        noteTags.set(id, (bundles.get(id)?.tags ?? []).map((t2) => t2.label));
+    const typedNoteTags = /* @__PURE__ */ new Map();
+    const effortsBySlug = /* @__PURE__ */ new Map();
+    if (needsEfforts) {
+      const efforts = await this.effortStore.getAllEfforts();
+      for (const effort of efforts) {
+        effortsBySlug.set(effort.slug, effort);
+      }
+    }
+    if (needsUntypedTags || needsTypedTags) {
+      const noteIds = [...new Set(rows.map((r) => r.noteId).filter(Boolean))];
+      if (this.relationStore) {
+        const bundles = await this.relationStore.getBatches(noteIds);
+        for (const id of noteIds) {
+          const tags = bundles.get(id)?.tags ?? [];
+          if (needsUntypedTags) {
+            noteTags.set(id, tags.map((t2) => t2.label));
+          }
+          if (needsTypedTags) {
+            const byType = /* @__PURE__ */ new Map();
+            for (const tag of tags) {
+              if (!tag.type) continue;
+              const list = byType.get(tag.type);
+              if (list) {
+                if (!list.includes(tag.label)) list.push(tag.label);
+              } else {
+                byType.set(tag.type, [tag.label]);
+              }
+            }
+            typedNoteTags.set(id, byType);
+          }
+        }
+      } else {
+        if (needsUntypedTags) {
+          await Promise.all(noteIds.map(async (id) => noteTags.set(id, await this.noteStore.getNoteTagLabels(id))));
+        }
+        if (needsTypedTags && this.tagsStore.getAll) {
+          const allTags = await this.tagsStore.getAll();
+          const tagById = new Map(allTags.map((t2) => [t2.id, t2]));
+          await Promise.all(
+            noteIds.map(async (id) => {
+              const links = await this.noteTagsStore.getAllFromIndex("by-note", id);
+              const byType = /* @__PURE__ */ new Map();
+              for (const link of links) {
+                const tag = tagById.get(link.tagId);
+                if (!tag?.type) continue;
+                const list = byType.get(tag.type);
+                if (list) {
+                  if (!list.includes(tag.label)) list.push(tag.label);
+                } else {
+                  byType.set(tag.type, [tag.label]);
+                }
+              }
+              typedNoteTags.set(id, byType);
+            })
+          );
+        }
       }
-      return noteTags;
     }
-    await Promise.all(noteIds.map(async (id) => noteTags.set(id, await this.noteStore.getNoteTagLabels(id))));
-    return noteTags;
+    return { noteTags, typedNoteTags, effortsBySlug };
   }
   /** Resolve matching note IDs for an exercise slug via the block_efforts containment index. */
   async getNoteIdsForEffort(effortSlug) {
@@ -4677,25 +6616,195 @@ var QueryService = class {
   }
   /** Resolve matching note IDs for a canonical typed tag (e.g. equipment:kettlebell). */
   async getNoteIdsForTypedTag(type, label) {
+    const out = /* @__PURE__ */ new Set();
     const tags = await this.tagsStore.getAllFromIndex("by-label", label);
     const typedTag = tags.find((t2) => t2.type === type);
-    if (!typedTag) return /* @__PURE__ */ new Set();
-    const links = await this.noteTagsStore.getAllFromIndex("by-tag", typedTag.id);
-    return new Set(links.map((l) => l.noteId));
+    if (typedTag) {
+      const links = await this.noteTagsStore.getAllFromIndex("by-tag", typedTag.id);
+      for (const link of links) out.add(link.noteId);
+    }
+    if (type === "equipment") {
+      const slug = label.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-|-$/g, "");
+      const candidates = slug && slug !== label ? [label, slug] : [label];
+      for (const key of candidates) {
+        const rows = await this.blockEquipmentStore.getAllFromIndex("by-equipment", key);
+        for (const row of rows) {
+          if (row?.noteId) out.add(row.noteId);
+        }
+      }
+    }
+    return out;
+  }
+  /**
+   * Execute a :notebook query (ticket 08) — the notebook plane is a NOTE
+   * plane (ticket 05 semantics preserved): bare `:notebook{}` returns the
+   * notes of every notebook — journal, playground, defaults, user-created,
+   * feed-delivered. `notebook:{slug}` narrows to members of those
+   * notebooks and `!notebook:` excludes them; the result shape never
+   * changes with polarity, and container criteria (tags:, effort:, typed
+   * tags, text:) narrow the members exactly like the note plane — this
+   * delegates to it. The notebook CONTAINER listing (the /notebooks
+   * management surface) is the app's NotebookService model, not WQL rows.
+   */
+  async runFindNotebook(parsed, options2 = {}) {
+    const wantsContainers = options2.notebookPlane === "containers" || parsed.filters.some(
+      (f) => f.key === "type" && !f.negate && f.values.some((v) => v.value === "notebook")
+    );
+    if (wantsContainers && this.feedCatalogStore) {
+      return this.runFindNotebookContainers(parsed);
+    }
+    return this.runFind({ ...parsed, target: "note" }, options2);
+  }
+  /**
+   * Execute `:feed{}` — the distributed Feed sources plane.
+   * Returns one synthetic Note-shaped row per registered Feed source
+   * (including "My Published Feed" when local public content or server snapshot exists).
+   */
+  async runFindFeed(parsed, _options = {}) {
+    const allFeeds = this.feedCatalogStore ? await this.feedCatalogStore.getAllFeeds() : [];
+    const selected = allFeeds.length;
+    let matched = allFeeds;
+    for (const filter of parsed.filters) {
+      if (filter.key === "feed") {
+        const wanted = new Set(filter.values.map((v) => v.value));
+        const hasWildcard = filter.values.some((v) => v.wildcard);
+        matched = matched.filter((f) => {
+          const hit = hasWildcard ? f.id !== "local" : wanted.has(f.id);
+          return filter.negate ? !hit : hit;
+        });
+      } else if (filter.key === "subscribed") {
+        const vals = new Set(filter.values.map((v) => v.value));
+        const wantsTrue = vals.has("true");
+        const wantsFalse = vals.has("false");
+        matched = matched.filter((f) => {
+          const hit = wantsTrue && wantsFalse ? true : wantsTrue ? f.subscribed : wantsFalse ? !f.subscribed : true;
+          return filter.negate ? !hit : hit;
+        });
+      } else if (filter.key === "text") {
+        const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
+        matched = matched.filter((f) => {
+          const hit = f.label.toLowerCase().includes(search) || (f.description ?? "").toLowerCase().includes(search) || f.url.toLowerCase().includes(search);
+          return filter.negate ? !hit : hit;
+        });
+      } else if (isTagLabelKey(filter.key)) {
+        const wanted = new Set(filter.values.map((v) => v.value.toLowerCase()));
+        matched = matched.filter((f) => {
+          const rowTags = [
+            `tier:${f.tier}`,
+            f.tier,
+            f.subscribed ? "subscribed:true" : "subscribed:false",
+            ...f.unpublishedChanges ? ["status:unpublished", "unpublished"] : [],
+            ...f.updateAvailable ? ["status:update-available", "update-available"] : []
+          ].map((t2) => t2.toLowerCase());
+          const hit = rowTags.some((t2) => wanted.has(t2));
+          return filter.negate ? !hit : hit;
+        });
+      }
+    }
+    let rows = matched.map((f) => {
+      const summaryParts = [
+        `${f.notebookCount} notebook${f.notebookCount === 1 ? "" : "s"}`,
+        f.itemCount > 0 ? `${f.itemCount} notes` : "",
+        f.unpublishedChanges ? "Unpublished changes" : "",
+        f.updateAvailable ? `Update v${f.localVersion ?? 0} \u2192 v${f.remoteVersion}` : ""
+      ].filter(Boolean);
+      const body = [f.description ?? "", summaryParts.join(" \xB7 "), f.url].filter(Boolean).join("\n");
+      return {
+        id: `feed/${f.id}`,
+        title: f.label,
+        type: "feed",
+        rawContent: body,
+        sourceRevision: 1,
+        blocks: {},
+        createdAt: f.builtAt ? Date.parse(f.builtAt) || 0 : 0,
+        sourceId: `feed:${f.id}`,
+        sourcePath: f.url,
+        ...f.id !== "local" ? { feedOrigin: "feed", feedSourceId: f.id, seedOrigin: "seed" } : { seedOrigin: "user" },
+        tags: [
+          `tier:${f.tier}`,
+          f.subscribed ? "subscribed:true" : "subscribed:false",
+          ...f.unpublishedChanges ? ["status:unpublished"] : [],
+          ...f.updateAvailable ? ["status:update-available"] : []
+        ]
+      };
+    });
+    rows = applyOrderAndPage(rows, parsed);
+    return { parsed, notes: rows, blocks: [], stages: { selected, matched: rows.length } };
   }
   /**
-   * Execute a :notebook query (ticket 08) — the notebook plane is a NOTE
-   * plane (ticket 05 semantics preserved): bare `:notebook{}` returns the
-   * notes of every notebook — journal, playground, defaults, user-created,
-   * feed-delivered. `notebook:{slug}` narrows to members of those
-   * notebooks and `!notebook:` excludes them; the result shape never
-   * changes with polarity, and container criteria (tags:, effort:, typed
-   * tags, text:) narrow the members exactly like the note plane — this
-   * delegates to it. The notebook CONTAINER listing (the /notebooks
-   * management surface) is the app's NotebookService model, not WQL rows.
+   * Execute `:notebook{type:notebook, ...}` — the Notebook container listing
+   * across user-owned local notebooks and manifest-discovered remote Feed notebooks.
    */
-  async runFindNotebook(parsed, options2 = {}) {
-    return this.runFind({ ...parsed, target: "note" }, options2);
+  async runFindNotebookContainers(parsed) {
+    const allNotebooks = this.feedCatalogStore ? await this.feedCatalogStore.getAllNotebooks() : [];
+    const selected = allNotebooks.length;
+    let matched = allNotebooks;
+    for (const filter of parsed.filters) {
+      if (filter.key === "feed") {
+        const wanted = new Set(filter.values.map((v) => v.value));
+        const hasWildcard = filter.values.some((v) => v.wildcard);
+        matched = matched.filter((nb) => {
+          const hit = hasWildcard ? nb.feedId !== "local" : wanted.has(nb.feedId);
+          return filter.negate ? !hit : hit;
+        });
+      } else if (filter.key === "notebook") {
+        const wanted = new Set(filter.values.map((v) => notebookSlugFromId(v.value)));
+        matched = matched.filter((nb) => {
+          const hit = wanted.has(nb.slug) || wanted.has(nb.id) || wanted.has(notebookSlugFromId(nb.chunkId));
+          return filter.negate ? !hit : hit;
+        });
+      } else if (filter.key === "text") {
+        const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
+        matched = matched.filter((nb) => {
+          const hit = nb.label.toLowerCase().includes(search) || (nb.description ?? "").toLowerCase().includes(search) || nb.feedLabel.toLowerCase().includes(search);
+          return filter.negate ? !hit : hit;
+        });
+      }
+    }
+    const subFilter = parsed.filters.find((f) => f.key === "subscribed");
+    if (subFilter) {
+      const vals = new Set(subFilter.values.map((v) => v.value));
+      const wantsTrue = vals.has("true");
+      const wantsFalse = vals.has("false");
+      matched = matched.filter((nb) => {
+        const isSub = nb.origin === "user" || nb.origin === "default" || nb.subscribed;
+        const hit = wantsTrue && wantsFalse ? true : wantsTrue ? isSub : wantsFalse ? !isSub : false;
+        return subFilter.negate ? !hit : hit;
+      });
+    } else {
+      matched = matched.filter((nb) => nb.origin === "user" || nb.origin === "default" || nb.subscribed);
+    }
+    let rows = matched.map((nb) => {
+      const isLocal = nb.origin === "user" || nb.origin === "default";
+      return {
+        id: isLocal ? `notebook/${nb.slug}` : `feed-notebook/${nb.feedId}/${nb.slug}`,
+        title: nb.label,
+        type: "notebook",
+        rawContent: nb.description ?? "",
+        sourceRevision: 1,
+        blocks: {},
+        createdAt: nb.updatedAt ? Date.parse(nb.updatedAt) || 0 : 0,
+        notebookId: `notebook/${nb.slug}`,
+        sourceId: `notebook:${nb.slug}`,
+        ...nb.feedUrl ? { sourcePath: nb.feedUrl } : {},
+        ...isLocal ? { seedOrigin: "user", ...nb.public !== void 0 ? { public: nb.public } : {} } : {
+          feedOrigin: "feed",
+          feedSourceId: nb.feedId,
+          seedOrigin: "seed",
+          seedChunkId: nb.chunkId,
+          ...nb.version !== void 0 ? { seedVersion: nb.version } : {}
+        },
+        tags: [
+          ...nb.category ? [`category:${nb.category}`] : [],
+          `origin:${nb.origin}`,
+          `count:${nb.count}`,
+          nb.subscribed ? "subscribed:true" : "subscribed:false",
+          ...nb.public ? ["visibility:public"] : []
+        ]
+      };
+    });
+    rows = applyOrderAndPage(rows, parsed);
+    return { parsed, notes: rows, blocks: [], stages: { selected, matched: rows.length } };
   }
   /**
    * Execute a :page query (ticket 08) — the placement plane. Results are
@@ -4972,194 +7081,6 @@ function hasLegacyIdentity(row) {
   return false;
 }
 
-// src/dashboard/model.ts
-var DASHBOARD_WIDGET_TYPES = [
-  "table",
-  "list",
-  "value",
-  "timeseries",
-  "bar",
-  "donut",
-  "toplist",
-  "stacked-bar",
-  "goal-rings",
-  "zone-distribution"
-];
-function isDashboardWidgetType(type) {
-  return DASHBOARD_WIDGET_TYPES.includes(type);
-}
-function resolveWidgetType(type) {
-  return type == null || type === "" ? "table" : type;
-}
-function unknownWidgetTypeMessage(type) {
-  return `unknown widget type "${type}"`;
-}
-function unknownTokensMessage(missing) {
-  return `unknown token${missing.length > 1 ? "s" : ""}: ${missing.map((m) => `$${m}`).join(", ")}`;
-}
-var PLANNED_WIDGET_TYPES = [];
-var KNOWN_CALC_METRICS = new Set(WQL_CALC_TARGETS);
-function isProposedMetric(metricKey) {
-  if (!metricKey) return false;
-  if (!metricKey.startsWith("calc.")) return false;
-  return !KNOWN_CALC_METRICS.has(metricKey);
-}
-var DASHBOARD_GRID_MAX_COLS = 4;
-function parseQueryWidgetSuffix(suffix) {
-  if (suffix === "") {
-    return { type: "", attributes: {}, attributeOrder: [], error: 'missing widget type after "query:"' };
-  }
-  const attributes = {};
-  const attributeOrder = [];
-  const trimmedSuffix = suffix.trim();
-  const headEnd = trimmedSuffix.search(/\s/);
-  const head = headEnd === -1 ? trimmedSuffix : trimmedSuffix.slice(0, headEnd);
-  const attrTail = headEnd === -1 ? "" : trimmedSuffix.slice(headEnd);
-  const attrPattern = /([a-zA-Z][a-zA-Z0-9_-]*)=("([^"]*)"|\S+)/g;
-  let consumed = 0;
-  for (const match of attrTail.matchAll(attrPattern)) {
-    consumed += match[0].length;
-    const key = match[1].toLowerCase();
-    const value = match[3] !== void 0 ? match[3] : match[2];
-    if (key in attributes) {
-      return { type: head, attributes, attributeOrder, error: `duplicate attribute "${key}"` };
-    }
-    attributes[key] = value;
-    attributeOrder.push(key);
-  }
-  const leftover = attrTail.replace(attrPattern, "").trim();
-  if (leftover !== "") {
-    return { type: head, attributes, attributeOrder, error: `malformed attribute "${leftover.split(/\s+/)[0]}"` };
-  }
-  let rest = head.toLowerCase();
-  let spanCols;
-  let spanFull;
-  if (rest.endsWith("-full")) {
-    spanFull = true;
-    rest = rest.slice(0, -"-full".length);
-  } else {
-    const spanMatch = rest.match(/-(\d+)$/);
-    if (spanMatch) {
-      spanCols = Number(spanMatch[1]);
-      rest = rest.slice(0, -spanMatch[0].length);
-    }
-  }
-  if (rest === "" || !/^[a-z][a-z0-9-]*$/.test(rest)) {
-    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `malformed widget type "${suffix}"` };
-  }
-  if (/-(\d+|full)$/.test(rest)) {
-    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `malformed widget suffix "${suffix}"` };
-  }
-  if (spanCols != null && (spanCols < 1 || spanCols > DASHBOARD_GRID_MAX_COLS)) {
-    return { type: rest, spanCols, spanFull, attributes, attributeOrder, error: `span ${spanCols} outside 1..${DASHBOARD_GRID_MAX_COLS}` };
-  }
-  return { type: rest, spanCols, spanFull, attributes, attributeOrder };
-}
-var TOKEN_PREFIX = "dashboard.";
-function isDashboardMeta(meta) {
-  return meta["dashboard"] === "true" || meta["dashboard"] === true;
-}
-function extractDashboardTokens(meta) {
-  const tokens = [];
-  for (const [key, value] of Object.entries(meta)) {
-    if (!key.startsWith(TOKEN_PREFIX) || key === TOKEN_PREFIX) continue;
-    const name = key.slice(TOKEN_PREFIX.length);
-    if (name === "") continue;
-    if (Array.isArray(value)) {
-      if (value.length > 0) tokens.push({ name, values: value.map(String), isList: true });
-    } else {
-      tokens.push({ name, values: [String(value)], isList: false });
-    }
-  }
-  return tokens;
-}
-function defaultTokenValues(tokens) {
-  const values = {};
-  for (const token of tokens) values[token.name] = token.values[0];
-  return values;
-}
-function setDashboardTokenValue(meta, name, value) {
-  const key = `${TOKEN_PREFIX}${name}`;
-  const current = meta[key];
-  const next = { ...meta };
-  if (Array.isArray(current)) {
-    if (!current.includes(value)) return meta;
-    next[key] = [value, ...current.filter((v) => v !== value)];
-  } else if (current != null) {
-    next[key] = typeof current === "number" && !isNaN(Number(value)) ? Number(value) : value;
-  } else {
-    next[key] = value;
-  }
-  return next;
-}
-var TOKEN_REF_RE = /\$([A-Za-z][\w-]*)/g;
-function substituteTokens2(query, values) {
-  const missing = /* @__PURE__ */ new Set();
-  const substituted = query.replace(TOKEN_REF_RE, (raw, name) => {
-    const value = values[name];
-    if (value == null) {
-      missing.add(name);
-      return raw;
-    }
-    return value;
-  });
-  return { query: substituted, missing: [...missing] };
-}
-function referencedTokens(query) {
-  const names = /* @__PURE__ */ new Set();
-  for (const match of query.matchAll(TOKEN_REF_RE)) names.add(match[1]);
-  return [...names];
-}
-function headingText(content) {
-  const line = content.split("\n", 1)[0].replace(/^#{1,6}\s*/, "").trim();
-  return line === "" ? void 0 : line;
-}
-function paragraphText(content) {
-  const text = content.replace(/\s*\n\s*/g, " ").trim();
-  return text === "" ? void 0 : text;
-}
-function buildDashboardDocument(sections, meta) {
-  const widgets = [];
-  sections.forEach((section, i) => {
-    if (section.type !== "query") return;
-    const body = section.content.split("\n").filter((l) => {
-      const s = l.trim();
-      return s !== "" && !s.startsWith("#");
-    }).map((l) => l.trim()).join("\n");
-    let title;
-    let question;
-    const above = sections[i - 1];
-    if (above?.type === "markdown" && above.subtype === "paragraph") {
-      question = paragraphText(above.content);
-      const heading = sections[i - 2];
-      if (heading?.type === "markdown" && heading.subtype === "heading") {
-        title = headingText(heading.content);
-      }
-    } else if (above?.type === "markdown" && above.subtype === "heading") {
-      title = headingText(above.content);
-    }
-    widgets.push({
-      key: `w${widgets.length}`,
-      type: section.widgetType ?? "",
-      spanCols: section.spanCols,
-      spanFull: section.spanFull,
-      widgetError: section.widgetError,
-      body,
-      attributes: section.attributes ?? {},
-      attributeOrder: section.attributeOrder ?? [],
-      title,
-      question
-    });
-  });
-  const titleMeta = meta["title"];
-  return {
-    isDashboard: isDashboardMeta(meta),
-    title: typeof titleMeta === "string" && titleMeta !== "" ? titleMeta : void 0,
-    tokens: extractDashboardTokens(meta),
-    widgets
-  };
-}
-
 // src/dashboard/parser.ts
 function parseDashboardNote(rawContent) {
   const { meta } = parseFrontmatter(rawContent);
@@ -5210,6 +7131,7 @@ function parseDashboardNote(rawContent) {
       sections.push({
         type: "query",
         content: bodyLines.join("\n"),
+        fenceTag: tag,
         widgetType,
         spanCols,
         spanFull,
@@ -5290,11 +7212,11 @@ dashboard.metric:
   - totalVolume
 ---
 
-## Weekly Trend
-How does $metric trend week over week?
-
-\`\`\`query:timeseries
-sum:$metric{} by {week}
+\`\`\`query
+title: Weekly Trend
+description: How does $metric trend week over week?
+view: timeseries
+query: sum:$metric{} by {week}
 \`\`\`
 `;
 }
@@ -5320,34 +7242,59 @@ function widgetFenceTag(spec) {
 function widgetBodyLine(spec) {
   return spec.wql.trim();
 }
+function widgetSpecToQueryObject(spec) {
+  if (spec.queryObject) {
+    const base = { ...spec.queryObject };
+    if (spec.title !== void 0) base.title = spec.title.trim() || void 0;
+    if (spec.question !== void 0) base.description = spec.question.trim() || void 0;
+    if (spec.spanFull) base.span = "full";
+    else if (spec.spanCols !== void 0) base.span = spec.spanCols;
+    return base;
+  }
+  const tag = widgetFenceTag(spec).slice(3);
+  return parseQueryBlock(spec.wql, {
+    fenceTag: tag,
+    adjacentTitle: spec.title?.trim() || void 0,
+    adjacentDescription: spec.question?.trim() || void 0
+  });
+}
 function renderWidgetGroup(spec) {
-  const lines = [];
-  const title = spec.title?.trim();
-  const question = spec.question?.trim();
-  if (title) lines.push(`## ${title}`);
-  if (question) lines.push(question);
-  if (lines.length > 0) lines.push("");
-  lines.push(widgetFenceTag(spec));
-  lines.push(widgetBodyLine(spec));
-  lines.push("```");
-  return lines;
+  const obj = widgetSpecToQueryObject(spec);
+  return serializeQueryBlockFence(obj).split("\n");
+}
+function normalizedBlockBodies(block) {
+  const candidates = /* @__PURE__ */ new Set();
+  const trimmed = block.content.trim();
+  candidates.add(trimmed);
+  const legacyNorm = block.content.split("\n").filter((l) => {
+    const s = l.trim();
+    return s !== "" && !s.startsWith("#");
+  }).map((l) => l.trim()).join("\n");
+  candidates.add(legacyNorm);
+  if (isYamlQueryBlockBody(block.content)) {
+    const obj = parseQueryBlock(block.content, { fenceTag: block.fenceTag });
+    candidates.add(queryBlockToDocumentText(obj).trim());
+  }
+  return candidates;
 }
 function findWidgetGroup(sections, key, expectedBody) {
   const querySections = sections.filter((s) => s.type === "query");
   const widgetIndex = querySections.findIndex((_, i) => `w${i}` === key);
   if (widgetIndex === -1) return { ok: false, reason: "not-found" };
   const block = querySections[widgetIndex];
-  const body = block.content.split("\n").filter((l) => {
-    const s = l.trim();
-    return s !== "" && !s.startsWith("#");
-  }).map((l) => l.trim()).join("\n");
-  if (body !== expectedBody.trim()) return { ok: false, reason: "stale-body" };
+  if (!normalizedBlockBodies(block).has(expectedBody.trim())) {
+    return { ok: false, reason: "stale-body" };
+  }
   return {
     ok: true,
     group: { widgetIndex, startLine: groupStartLine(sections, block), endLine: block.endLine }
   };
 }
 function groupStartLine(sections, block) {
+  if (isYamlQueryBlockBody(block.content)) {
+    const obj = parseQueryBlock(block.content, { fenceTag: block.fenceTag });
+    if (obj.title) return block.startLine;
+  }
   const idx = sections.indexOf(block);
   const above = sections[idx - 1];
   if (above?.type === "markdown" && above.subtype === "paragraph") {
@@ -5479,6 +7426,16 @@ function resizeWidget(raw, key, expectedBody, span) {
     (s) => s.type === "query" && s.startLine >= group.startLine && s.endLine <= group.endLine
   );
   const lines = raw.split("\n");
+  if (isYamlQueryBlockBody(block.content)) {
+    const obj = parseQueryBlock(block.content, { fenceTag: block.fenceTag });
+    if (span.spanFull) obj.span = "full";
+    else if (span.spanCols != null && span.spanCols > 1) obj.span = span.spanCols;
+    else delete obj.span;
+    const indent2 = lines[block.startLine].match(/^\s*/)[0];
+    const nextFenceLines = serializeQueryBlockFence(obj, { forceYaml: true }).split("\n").map((l) => indent2 + l);
+    lines.splice(block.startLine, block.endLine - block.startLine + 1, ...nextFenceLines);
+    return widgetResult(raw, lines.join("\n"));
+  }
   const indent = lines[block.startLine].match(/^\s*/)[0];
   lines[block.startLine] = indent + widgetFenceTag({
     type: block.widgetType ?? "",
@@ -5589,6 +7546,7 @@ function resolveEntityScope(input) {
           scope: scopeFilter,
           effort: slug,
           note: id,
+          thisnote: id,
           metric: "totalVolume"
         }
       };
@@ -5615,6 +7573,7 @@ function resolveEntityScope(input) {
           scope: scopeFilter,
           equipment: slug,
           note: id,
+          thisnote: id,
           metric: "totalVolume"
         }
       };
@@ -5650,6 +7609,7 @@ function resolveEntityScope(input) {
           tag: slug,
           category: cat,
           note: id,
+          thisnote: id,
           metric: "tis"
         }
       };
@@ -5678,6 +7638,7 @@ function resolveEntityScope(input) {
           scope: scopeFilter,
           category: cat,
           note: id,
+          thisnote: id,
           metric: "tis"
         }
       };
@@ -5799,12 +7760,34 @@ function resolveEntityScope(input) {
         tokens: {
           scope: scopeFilter,
           note: id || slug,
+          thisnote: id || slug,
           metric: "tis"
         }
       };
     }
   }
 }
+function resolveQueryExecutionScope(input = {}) {
+  const entityTokens = input.noteId?.trim() ? resolveEntityScope({ noteId: input.noteId, rawContent: input.rawContent }).tokens : {};
+  const fmMeta = input.rawContent ? parseFrontmatter(input.rawContent).meta : void 0;
+  const fmTokens = fmMeta ? defaultTokenValues(extractDashboardTokens(fmMeta)) : {};
+  const tokens = {
+    ...entityTokens,
+    ...fmTokens,
+    ...input.tokenValues ?? {}
+  };
+  const pageSources = input.pageSources instanceof PageSourceRegistry ? input.pageSources : new PageSourceRegistry(input.pageSources ? [...input.pageSources.entries()] : []);
+  if (input.noteEvents !== void 0 || input.note !== void 0) {
+    const existing = pageSources.get("@note");
+    pageSources.set("@note", {
+      events: input.noteEvents ?? existing?.events ?? [],
+      notes: input.note ? [input.note] : existing?.notes ?? []
+    });
+  } else if (input.noteId?.trim() && !pageSources.has("@note")) {
+    pageSources.set("@note", { events: [], notes: [] });
+  }
+  return { tokens, pageSources };
+}
 function buildWidgetsForWqlScope(wqlOrScope, extraWidgets = []) {
   if (typeof wqlOrScope === "string") {
     const query = wqlOrScope.trim();
@@ -5982,16 +7965,145 @@ function buildDashboardFromScope(options2) {
   return headerLines.join("\n") + bodyGroups.join("\n\n") + "\n";
 }
 
+// src/queryCache.ts
+var MUTATION_MESSAGE = "ANALYTICS_MUTATION";
+var AnalyticsInvalidationBus = class {
+  makeChannel;
+  channel;
+  generation = 0;
+  listeners = /* @__PURE__ */ new Set();
+  constructor(makeChannel) {
+    this.makeChannel = makeChannel;
+  }
+  get generationId() {
+    return this.generation;
+  }
+  /** Commit hook: bump local generation and broadcast the receipt. */
+  async publishMutation() {
+    this.generation += 1;
+    this.notify();
+    this.channel ??= this.makeChannel();
+    try {
+      this.channel?.postMessage({ type: MUTATION_MESSAGE, generation: this.generation });
+    } catch {
+    }
+  }
+  /** Listen for receipts from OTHER tabs (and this one). */
+  subscribe() {
+    this.channel ??= this.makeChannel();
+    this.channel?.addEventListener("message", (event) => {
+      const data = event.data;
+      if (data?.type !== MUTATION_MESSAGE) return;
+      this.generation = Math.max(this.generation, data.generation ?? 0) + 1;
+      this.notify();
+    });
+  }
+  onChange(listener) {
+    this.listeners.add(listener);
+    return () => this.listeners.delete(listener);
+  }
+  notify() {
+    for (const listener of this.listeners) listener();
+  }
+};
+var QueryCache = class {
+  entries = /* @__PURE__ */ new Map();
+  maxEntries;
+  constructor(bus, options2 = {}) {
+    this.maxEntries = Math.max(1, options2.maxEntries ?? DEFAULT_MAX_ENTRIES);
+    bus.onChange(() => this.entries.clear());
+  }
+  get(key, generation) {
+    const entry = this.entries.get(key);
+    if (!entry) return void 0;
+    if (entry.generation !== generation) {
+      this.entries.delete(key);
+      return void 0;
+    }
+    this.entries.delete(key);
+    this.entries.set(key, entry);
+    return entry.value;
+  }
+  set(key, value, generation) {
+    this.entries.delete(key);
+    this.entries.set(key, { generation, value });
+    while (this.entries.size > this.maxEntries) {
+      const oldest = this.entries.keys().next();
+      if (oldest.done) break;
+      this.entries.delete(oldest.value);
+    }
+  }
+  clear() {
+    this.entries.clear();
+  }
+  /** Current entry count — the LRU bound's observable state. */
+  get size() {
+    return this.entries.size;
+  }
+};
+var DEFAULT_MAX_ENTRIES = 64;
+function aggKey(a) {
+  return [a.agg, a.metric, a.filters, a.groupBy, a.rollup ?? null, a.window ?? null, a.displayUnit ?? null, a.join ?? null];
+}
+function findKey(f) {
+  return [f.target, f.filters, f.sourceScope ?? null, f.window ?? null, f.groupBy ?? null, f.displayUnit ?? null, f.pipes ?? null, f.join ?? null];
+}
+function computeCacheKey(parsed, context) {
+  const canonical = JSON.stringify([
+    parsed.family,
+    parsed.family === "aggregate" ? aggKey(parsed) : null,
+    parsed.family === "find" ? findKey(parsed) : null,
+    parsed.family === "pipeline" ? [
+      // Dataset/source identity participates like a query: a
+      // different registry binding or source content is a
+      // different query even with identical stages.
+      parsed.source.kind === "dataset" ? ["dataset", parsed.source.name] : ["query", parsed.source.query.family === "aggregate" ? aggKey(parsed.source.query) : findKey(parsed.source.query)],
+      parsed.transforms.map(aggKey),
+      parsed.sink ? [parsed.sink.head, parsed.sink.filters] : null
+    ] : null
+  ]);
+  return JSON.stringify([
+    canonical,
+    context.rangeStart ?? null,
+    context.rangeEnd ?? null,
+    context.timeZone ?? null,
+    context.instant ?? null,
+    context.generation,
+    context.unitDefaults ? JSON.stringify(Object.entries(context.unitDefaults).sort()) : null
+  ]);
+}
+function coalescingEventStore(inner) {
+  const inFlight = /* @__PURE__ */ new Map();
+  return {
+    ...inner,
+    getEventsByTimeRange(start, end) {
+      const key = `${start}:${end}`;
+      const existing = inFlight.get(key);
+      if (existing) return existing.promise;
+      const entry = {
+        promise: inner.getEventsByTimeRange(start, end).finally(() => {
+          if (inFlight.get(key) === entry) inFlight.delete(key);
+        })
+      };
+      inFlight.set(key, entry);
+      return entry.promise;
+    },
+    invalidateInFlight() {
+      inFlight.clear();
+    }
+  };
+}
+
 // src/version.ts
-var VERSION = "0.51.2196";
-var GIT_SHA = "817bc28";
-var BUILD_TIME = "2026-11-05T23:36:56.914Z";
+var VERSION = "0.52.2198";
+var GIT_SHA = "15e2fcb";
+var BUILD_TIME = "2026-11-11T15:07:53.492Z";
 var SEMVER = {
-  version: "0.51.2196",
-  gitSha: "817bc28",
-  buildTime: "2026-11-05T23:36:56.914Z"
+  version: "0.52.2198",
+  gitSha: "15e2fcb",
+  buildTime: "2026-11-11T15:07:53.492Z"
 };
 
-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, SOURCE_ID_SHAPES, 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_NOTE_HEAD_ALIASES, 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, buildDashboardFromScope, buildDashboardScaffold, buildDrillDownQuery, buildWidgetsForWqlScope, captureContext, chunkIdOfItem, civilDateAdd, civilDateDiff, civilDateOf, civilDatesCoveredByRange, civilMonday, consumesRollupFacts, convertDisplay, createBuiltinFormulaEvaluator, dashboardSlug, defaultTokenValues, disciplineFactorFor, duplicateWidget, eventsToStoredLogs, extractDashboardTokens, extractNoteWqlOverride, feedIdOfItem, feedOfItem, findTargetAdvisories, getUnitFamily, hasLegacyIdentity, inRange, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isItemSubscribed, isPipelineQuery, isProposedMetric, migrateLegacyChunkId, migrateLegacyDashboardBodies, migrateLegacyRouteId, migrateLegacyRow, migrateLegacySourceId, migrateLegacySourcePath, moveWidget, normalizeSummaryFacts, normalizeWql, notebookOfItem, notebookOriginOfItem, notebookSlugOfSourceId, parseDashboardNote, parseDocument, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, removeWidget, renderWidgetGroup, resizeWidget, resolveCanonicalMetricKey, resolveEntityScope, resolveOutputUnit, resolveWidgetType, resolveWindowRange, rowsParseError, serialize, serializeDocument, setDashboardTokenValue, sourceMatches, sourceShape, splitAtWhere, 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 { AnalyticsInvalidationBus, 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, QueryCache, QueryDocumentRunner, QueryService, SEMVER, SOURCE_ID_SHAPES, 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_NOTE_HEAD_ALIASES, 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, bindQueryParams, buildDashboardDocument, buildDashboardFromScope, buildDashboardScaffold, buildDrillDownQuery, buildWidgetsForWqlScope, captureContext, chunkIdOfItem, civilDateAdd, civilDateDiff, civilDateOf, civilDatesCoveredByRange, civilMonday, coalescingEventStore, collectQueryBlockParams, collectQueryParams, computeCacheKey, consumesRollupFacts, convertDisplay, createBuiltinFormulaEvaluator, dashboardSlug, defaultTokenValues, disciplineFactorFor, duplicateWidget, eventsToStoredLogs, extractDashboardTokens, extractNoteWqlOverride, feedIdOfItem, feedOfItem, findTargetAdvisories, getUnitFamily, hasLegacyIdentity, inRange, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isDefaultShorthandQueryBlock, isEffortDiscipline, isFindQuery, isItemSubscribed, isPipelineQuery, isProposedMetric, isYamlQueryBlockBody, matchesFactMetricKey, migrateLegacyChunkId, migrateLegacyDashboardBodies, migrateLegacyRouteId, migrateLegacyRow, migrateLegacySourceId, migrateLegacySourcePath, moveWidget, normalizeSummaryFacts, normalizeWql, notebookOfItem, notebookOriginOfItem, notebookSlugOfSourceId, notebooksOfItem, parseDashboardNote, parseDocument, parseFilterFragment, parseQuery, parseQueryBlock, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, queryBlockAttributes, queryBlockToDocumentText, referencedTokens, removeWidget, renderWidgetGroup, resizeWidget, resolveCanonicalMetricKey, resolveEntityScope, resolveOutputUnit, resolveQueryExecutionScope, resolveWidgetType, resolveWindowRange, resolveWqlCursorStage, rowsParseError, serialize, serializeDocument, serializeQueryBlock, serializeQueryBlockFence, setDashboardTokenValue, sourceMatches, sourceShape, splitAtWhere, substituteTokens, substituteTokens2 as substituteTokensRaw, supportsWqlFilterKey, systemTimeZone, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, updateWidget, widgetBodyLine, widgetFenceTag, widgetSpecToQueryObject, 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