@bitcobblers/wod-wiki-wql 0.8.39 → 0.10.41

package/dist/index.mjs

@@ -53,7 +53,7 @@ var WQL_CALC_TARGETS = [
 var WQL_INTENSITY_TIERS = ["low", "moderate", "high"];
 var WQL_GRAINS = ["summary", "event"];
 var WQL_FIND_TARGETS = ["note", "block", "effort"];
-var WQL_SCOPES = ["journal", "collections", "feeds", "all"];
+var WQL_SOURCE_VALUES = ["journal", "collections", "feeds", "all"];
 var WQL_RESULT_PLANES = KNOWN_OUTPUT_TYPES;
 var WQL_ROWS_TARGETS = [...WQL_FIND_TARGETS, ...WQL_RESULT_PLANES, "all"];
 var WQL_ROWS_SCOPE_KEYS = ["result", "block", "note"];
@@ -152,6 +152,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 FROM_TO_RE = /\s+from\s+(\d{4}-\d{2}-\d{2})(?:\s+to\s+(\d{4}-\d{2}-\d{2}))?\s*$/i;
 var IN_SCOPE_RE = /\s+in\s+(\w+)\s*$/;
 function parseWqlSuffixes(raw) {
   const { primary, where } = splitAtWhere(raw);
@@ -159,8 +160,8 @@ function parseWqlSuffixes(raw) {
   let displayUnit;
   let rollup;
   let groupBy;
-  let last;
-  let scope;
+  let window;
+  let legacyScope;
   const conflicts = [];
   const isFind = text.startsWith("find:");
   const isRows = /^rows(?=[:{]|\s|$)/.test(text);
@@ -179,18 +180,40 @@ function parseWqlSuffixes(raw) {
       );
     }
   };
+  const froms = stripRepeated(FROM_TO_RE);
+  const lasts = stripRepeated(LAST_RE);
+  {
+    const windows = [
+      ...froms.map((m) => ({
+        kind: "range",
+        start: m[1],
+        end: m[2],
+        raw: m[0].trim(),
+        at: m.index
+      })),
+      ...lasts.map((m) => ({
+        kind: "relative",
+        size: parseInt(m[1], 10),
+        unit: m[2].toLowerCase(),
+        raw: m[0].trim(),
+        at: m.index
+      }))
+    ].sort((a, b) => a.at - b.at);
+    if (windows.length > 1) {
+      conflicts.push(
+        `Duplicate 'window' clause: '${windows[0].raw}' conflicts with '${windows[windows.length - 1].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 };
+    }
+  }
   if (isFind || isRows) {
-    const lasts = stripRepeated(LAST_RE);
-    conflictFrom("window", lasts);
-    if (lasts.length) {
-      const m = lasts[lasts.length - 1];
-      last = { size: parseInt(m[1], 10), unit: m[2].toLowerCase(), raw: m[0].trim() };
-    }
-    if (isFind) {
-      const scopes = stripRepeated(IN_SCOPE_RE);
-      conflictFrom("scope", scopes);
-      if (scopes.length) scope = scopes[scopes.length - 1][1];
-    } else {
+    const scopes = stripRepeated(IN_SCOPE_RE);
+    conflictFrom("scope", scopes);
+    if (scopes.length) legacyScope = scopes[scopes.length - 1][1];
+    if (isRows) {
       const rollups = stripRepeated(ROLLUP_RE);
       conflictFrom(".rollup", rollups);
       if (rollups.length) {
@@ -224,8 +247,8 @@ function parseWqlSuffixes(raw) {
     displayUnit,
     rollup,
     groupBy,
-    last,
-    scope,
+    window,
+    legacyScope,
     conflicts: conflicts.length ? conflicts : void 0,
     primaryText: text
   };
@@ -253,7 +276,13 @@ function parseJoinClause(where) {
   if (where.trimStart().startsWith("find:")) {
     const fp = parseFindQuery(where);
     if (fp.error) return { error: fp.error };
-    return { find: { target: fp.target, filters: fp.filters, scope: fp.scope, last: fp.last } };
+    if (fp.window?.kind === "range") {
+      return { error: "Range windows are not supported on join halves \u2014 use last <n>d|w" };
+    }
+    return {
+      find: { target: fp.target, filters: fp.filters, last: fp.window?.kind === "relative" ? { size: fp.window.size, unit: fp.window.unit } : void 0 },
+      advisories: fp.advisories
+    };
   }
   const m = CMP_RE.exec(where.trim());
   if (!m) return { error: cannotParseJoin(where) };
@@ -270,41 +299,119 @@ function parseJoinClause(where) {
   };
 }
 function parseQuery(raw) {
-  const trimmed = raw.trimStart();
+  const norm = normalizeWql(raw);
+  const trimmed = norm.query.trimStart();
+  let result;
   if (trimmed.startsWith("find:")) {
-    return parseFindQuery(raw);
+    result = parseFindQuery(norm.query);
+  } else if (/^rows(?=[:{]|\s|$)/.test(trimmed)) {
+    result = parseRowsQuery(norm.query);
+  } else {
+    result = parseAnalyticsQuery(norm.query);
   }
-  if (/^rows(?=[:{]|\s|$)/.test(trimmed)) {
-    return parseRowsQuery(raw);
+  if (norm.advisories.length) {
+    result.advisories = [...result.advisories ?? [], ...norm.advisories];
   }
-  return parseAnalyticsQuery(raw);
+  result.raw = raw;
+  return result;
+}
+function normalizeWql(raw) {
+  const advisories = [];
+  let text = raw.trim();
+  if (/^rows:?\s*[{]/.test(text)) {
+    text = text.replace(/^rows:?\s*[{]/, "rows:all{");
+    advisories.push("Bare 'rows:{...}' syntax is deprecated; use 'rows:all{...}' instead.");
+  }
+  const { primary, where } = splitAtWhere(text);
+  const isFind = primary.startsWith("find:");
+  const isRows = /^rows(?=[:{]|\s|$)/.test(primary);
+  if (isFind || isRows) {
+    const suffixes = parseWqlSuffixes(primary);
+    if (suffixes.legacyScope && !suffixes.conflicts?.length) {
+      advisories.push("Legacy 'in <scope>' syntax is deprecated; use 'source:<scope>' filter instead.");
+      const scope = suffixes.legacyScope;
+      let head = suffixes.primaryText.trim();
+      const braceOpen = head.indexOf("{");
+      const braceClose = head.lastIndexOf("}");
+      if (braceOpen !== -1 && braceClose !== -1 && braceClose > braceOpen) {
+        const beforeBrace = head.slice(0, braceOpen + 1);
+        const inside = head.slice(braceOpen + 1, braceClose).trim();
+        const afterBrace = head.slice(braceClose);
+        const newInside = inside ? `${inside},source:${scope}` : `source:${scope}`;
+        head = `${beforeBrace}${newInside}${afterBrace}`;
+      } else {
+        head = `${head}{source:${scope}}`;
+      }
+      const parts = [head];
+      if (suffixes.groupBy) {
+        parts.push(`by {${suffixes.groupBy.join(", ")}}`);
+      }
+      if (suffixes.rollup) {
+        parts.push(`.rollup(${suffixes.rollup.raw})`);
+      }
+      if (suffixes.window) {
+        parts.push(suffixes.window.raw);
+      }
+      if (where) {
+        parts.push(`where ${where}`);
+      }
+      text = parts.join(" ");
+    }
+  }
+  return { query: text, advisories };
 }
 function cannotParseRows(text) {
   return `Cannot parse "${text}". Expected rows:all{result:\u2026|block:\u2026|note:\u2026}, rows:<plane>{\u2026}, or rows:segment{\u2026} last 8w`;
 }
 function validateRowsFilters(filters) {
   const scopeKeys = new Set(WQL_ROWS_SCOPE_KEYS);
+  const allowedKeys = /* @__PURE__ */ new Set([...WQL_ROWS_SCOPE_KEYS, "source"]);
   const unsupported = filters.filter(
-    (f) => !scopeKeys.has(f.key) || f.negate || f.values.some((v) => v.wildcard)
+    (f) => !allowedKeys.has(f.key) || f.negate || f.values.some((v) => v.wildcard)
   );
   if (unsupported.length > 0) {
-    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")} values.`;
+    const allowed = [...WQL_ROWS_SCOPE_KEYS, "source"];
+    return `Unsupported rows filter(s): ${unsupported.map((f) => (f.negate ? "!" : "") + f.key).join(", ")}. Rows queries support exact ${allowed.map((k) => `${k}:`).join(", ")} values.`;
   }
   if (!filters.some((f) => scopeKeys.has(f.key))) {
     return `Rows query needs a scope: ${WQL_ROWS_SCOPE_KEYS.map((k) => `${k}:`).join(", ")}.`;
   }
   return void 0;
 }
+function validateSourceFilter(filters) {
+  const validSources = new Set(WQL_SOURCE_VALUES);
+  for (const f of filters) {
+    if (f.key !== "source") continue;
+    for (const v of f.values) {
+      const val = v.value;
+      if (validSources.has(val) || val === "collection" || val === "feed" || val.startsWith("collection:") || val.startsWith("feed:")) {
+        continue;
+      }
+      return `Unknown source "${val}". Try: ${WQL_SOURCE_VALUES.join(", ")} (or collection:<id>, feed:<id>)`;
+    }
+  }
+  return void 0;
+}
 var BARE_ROWS_RETIRED = 'Bare "rows:" is retired \u2014 name a target: rows:all{\u2026} for every output type, or a plane like rows:segment{\u2026}.';
 function parseRowsQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
-  const { where: whereText, last, groupBy, rollup, primaryText } = suffixes;
+  const { where: whereText, window: windowSuffix, legacyScope, groupBy, rollup, primaryText } = suffixes;
+  const win = toQueryWindow(windowSuffix);
+  const advisories = [];
+  if (legacyScope) {
+    advisories.push("Legacy 'in <scope>' syntax is deprecated; use 'source:<scope>' filter instead.");
+  }
   const result = {
     family: "rows",
     raw,
     filters: [],
-    last: last ? { size: last.size, unit: last.unit } : void 0
+    window: win.window,
+    ...advisories.length ? { advisories } : {}
   };
+  if (win.error) {
+    result.error = win.error;
+    return result;
+  }
   if (suffixes.conflicts?.length) {
     result.error = suffixes.conflicts.join("; ");
     return result;
@@ -347,6 +454,18 @@ function parseRowsQuery(raw) {
   }
   if (target !== "all") result.outputType = target;
   result.filters = extractFilters(query, text);
+  if (legacyScope) {
+    result.filters.push({
+      key: "source",
+      negate: false,
+      values: [{ value: legacyScope, wildcard: false }]
+    });
+  }
+  const sourceError = validateSourceFilter(result.filters);
+  if (sourceError) {
+    result.error = sourceError;
+    return result;
+  }
   const grainError = retiredGrainRollup(result.filters);
   if (grainError) {
     result.error = grainError;
@@ -359,6 +478,27 @@ function parseRowsQuery(raw) {
   }
   return result;
 }
+function isCivilDate(s) {
+  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(s);
+  if (!m) return false;
+  const y = Number(m[1]);
+  const mo = Number(m[2]);
+  const d = Number(m[3]);
+  const dt = new Date(y, mo - 1, d);
+  return dt.getFullYear() === y && dt.getMonth() === mo - 1 && dt.getDate() === d;
+}
+function toQueryWindow(w) {
+  if (!w) return {};
+  if (w.kind === "relative") {
+    return { window: { kind: "relative", size: w.size, 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` };
+    }
+  }
+  return { window: { kind: "range", start: w.start, end: w.end } };
+}
 function retiredGrainRollup(filters) {
   if (filters.some((f) => f.key === "grain" && f.values.some((v) => v.value === "rollup"))) {
     return "grain:rollup is retired \u2014 rollup grains are never stored; compute them with the .rollup suffix";
@@ -394,7 +534,8 @@ function extractFilters(query, text) {
 }
 function parseAnalyticsQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
-  const { where: whereText, displayUnit, groupBy, rollup, primaryText: text } = suffixes;
+  const { where: whereText, displayUnit, groupBy, rollup, window: windowSuffix, primaryText: text } = suffixes;
+  const win = toQueryWindow(windowSuffix);
   const base = {
     family: "aggregate",
     raw,
@@ -403,8 +544,13 @@ function parseAnalyticsQuery(raw) {
     filters: [],
     groupBy: groupBy ?? [],
     displayUnit,
-    rollup: rollup ? { size: rollup.size, unit: rollup.unit } : void 0
+    rollup: rollup ? { size: rollup.size, unit: rollup.unit } : void 0,
+    window: win.window
   };
+  if (win.error) {
+    base.error = win.error;
+    return base;
+  }
   if (suffixes.conflicts?.length) {
     base.error = suffixes.conflicts.join("; ");
     return base;
@@ -449,6 +595,9 @@ function parseAnalyticsQuery(raw) {
       base.error = join.error;
       return base;
     }
+    if (join.advisories?.length) {
+      base.advisories = [...base.advisories ?? [], ...join.advisories];
+    }
     if (!join.find) {
       base.error = `Cross-store join on an analytics query must be find:\u2026, got "${whereText}"`;
       return base;
@@ -458,19 +607,28 @@ function parseAnalyticsQuery(raw) {
   return base;
 }
 function cannotParseFind(text) {
-  return `Cannot parse "${text}". Expected find:target{filters} in scope last 8w`;
+  return `Cannot parse "${text}". Expected find:target{filters} last 8w`;
 }
 function parseFindQuery(raw) {
   const suffixes = parseWqlSuffixes(raw);
-  const { where: whereText, last, scope, primaryText: text } = suffixes;
+  const { where: whereText, window: windowSuffix, legacyScope, primaryText: text } = suffixes;
+  const win = toQueryWindow(windowSuffix);
+  const advisories = [];
+  if (legacyScope) {
+    advisories.push("Legacy 'in <scope>' syntax is deprecated; use 'source:<scope>' filter instead.");
+  }
   const result = {
     family: "find",
     raw,
     target: "",
     filters: [],
-    scope,
-    last: last ? { size: last.size, unit: last.unit } : void 0
+    window: win.window,
+    ...advisories.length ? { advisories } : {}
   };
+  if (win.error) {
+    result.error = win.error;
+    return result;
+  }
   if (suffixes.conflicts?.length) {
     result.error = suffixes.conflicts.join("; ");
     return result;
@@ -503,6 +661,18 @@ function parseFindQuery(raw) {
     return result;
   }
   result.filters = extractFilters(query, text);
+  if (legacyScope) {
+    result.filters.push({
+      key: "source",
+      negate: false,
+      values: [{ value: legacyScope, wildcard: false }]
+    });
+  }
+  const sourceError = validateSourceFilter(result.filters);
+  if (sourceError) {
+    result.error = sourceError;
+    return result;
+  }
   const findGrainError = retiredGrainRollup(result.filters);
   if (findGrainError) {
     result.error = findGrainError;
@@ -523,6 +693,64 @@ function parseFindQuery(raw) {
   return result;
 }
 
+// src/serialize.ts
+function serializeValue(value) {
+  if (/^[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)?$/.test(value)) return value;
+  return `"${value}"`;
+}
+function serializeFilters(filters) {
+  return filters.map((f) => `${f.negate ? "!" : ""}${f.key}:${f.values.map((v) => serializeValue(v.value) + (v.wildcard ? "*" : "")).join("|")}`).join(",");
+}
+function serializeAggHead(agg, metric, filters) {
+  return `${agg}:${metric}{${serializeFilters(filters)}}`;
+}
+function serializeAggregateHead(a) {
+  return serializeAggHead(a.agg, a.metric, a.filters);
+}
+function serializeFindHalf(target, filters, last) {
+  const head = `find:${target}${filters.length ? `{${serializeFilters(filters)}}` : ""}`;
+  return last ? `${head} last ${last.size}${last.unit}` : head;
+}
+function serializeMetricHalf(j) {
+  return `${serializeAggHead(j.agg, j.metric, j.filters)} ${j.operator} ${j.threshold}`;
+}
+function serializeFindHead(f) {
+  return serializeFindHalf(f.target, f.filters);
+}
+function serializeRowsHead(r) {
+  return `rows:${r.outputType ?? "all"}{${serializeFilters(r.filters)}}`;
+}
+function serializeWindow(w) {
+  if (!w) return "";
+  if (w.kind === "relative") return `last ${w.size}${w.unit}`;
+  return w.end ? `from ${w.start} to ${w.end}` : `from ${w.start}`;
+}
+function serialize(parsed) {
+  if (parsed.error) return parsed.raw;
+  if (parsed.family === "aggregate") {
+    const a = parsed;
+    let text = serializeAggregateHead(a);
+    if (a.groupBy.length) text += ` by {${a.groupBy.join(", ")}}`;
+    if (a.rollup) text += `.rollup(${a.rollup.size}${a.rollup.unit})`;
+    if (a.displayUnit) text += ` in ${a.displayUnit}`;
+    const win = serializeWindow(a.window);
+    if (win) text += ` ${win}`;
+    if (a.join) text += ` where ${serializeFindHalf(a.join.target, a.join.filters, a.join.last)}`;
+    return text;
+  }
+  if (parsed.family === "find") {
+    const parts = [serializeFindHead(parsed), serializeWindow(parsed.window)];
+    if (parsed.join) parts.push(`where ${serializeMetricHalf(parsed.join)}`);
+    return parts.filter(Boolean).join(" ");
+  }
+  if (parsed.family === "rows") {
+    const win = serializeWindow(parsed.window);
+    return [serializeRowsHead(parsed), win].filter(Boolean).join(" ");
+  }
+  const unhandled = parsed;
+  return unhandled.raw ?? "";
+}
+
 // src/disciplines.ts
 var EFFORT_DISCIPLINES = [
   "bodyweight",
@@ -627,6 +855,8 @@ function wqlCompletionSource(options_ = {}) {
         return options(WQL_GRAINS);
       case "metric":
         return metricOptions();
+      case "source":
+        return options(WQL_SOURCE_VALUES);
       default:
         return null;
     }
@@ -1121,7 +1351,10 @@ function staticTagIndexFromBlocks(blocks) {
 var DAY = 864e5;
 var ROWS_CONTENT_PLANES = new Set(WQL_FIND_TARGETS);
 function localDateString(ts) {
-  return new Date(ts).toLocaleDateString(void 0, { year: "numeric", month: "short", day: "numeric" });
+  const d = new Date(ts);
+  const mm = String(d.getMonth() + 1).padStart(2, "0");
+  const dd = String(d.getDate()).padStart(2, "0");
+  return `${d.getFullYear()}-${mm}-${dd}`;
 }
 function catalogOfItem(item) {
   if (item.catalog) return item.catalog;
@@ -1131,9 +1364,13 @@ function catalogOfItem(item) {
   return clean.split("/")[0];
 }
 function sourceMatches(sourceId, kind) {
+  if (kind === "all") return true;
   if (kind === "journal") return !sourceId || sourceId === "journal";
-  if (kind === "collection" || kind === "feed") {
-    return !!sourceId && sourceId.startsWith(`${kind}:`);
+  if (kind === "collection" || kind === "collections") {
+    return !!sourceId && sourceId.startsWith("collection:");
+  }
+  if (kind === "feed" || kind === "feeds") {
+    return !!sourceId && sourceId.startsWith("feed:");
   }
   return sourceId === kind;
 }
@@ -1148,12 +1385,26 @@ function applySourceFilter(items, filters) {
   }
   return items;
 }
-function effectiveTimeWindow(createdAt, last, range, anchorNow) {
-  if (range) return createdAt >= range.start && createdAt <= range.end;
-  if (last) {
-    const cutoff = (anchorNow ?? Date.now()) - last.size * (last.unit === "w" ? 7 : 1) * DAY;
-    return createdAt >= cutoff;
+function civilMidnight(iso) {
+  const [y, m, d] = iso.split("-").map(Number);
+  return new Date(y, m - 1, d).getTime();
+}
+function nextCivilMidnight(iso) {
+  const [y, m, d] = iso.split("-").map(Number);
+  return new Date(y, m - 1, d + 1).getTime();
+}
+function windowRange(w, anchorNow) {
+  if (!w) return void 0;
+  if (w.kind === "relative") {
+    return { start: (anchorNow ?? Date.now()) - w.size * (w.unit === "w" ? 7 : 1) * DAY, end: Number.MAX_SAFE_INTEGER };
   }
+  const start = civilMidnight(w.start);
+  const end = w.end !== void 0 ? nextCivilMidnight(w.end) - 1 : Number.MAX_SAFE_INTEGER;
+  return { start, end };
+}
+function effectiveTimeWindow(createdAt, window, range, anchorNow) {
+  const resolved = range ?? windowRange(window, anchorNow);
+  if (resolved) return createdAt >= resolved.start && createdAt <= resolved.end;
   return true;
 }
 function latestActivity(rows) {
@@ -1163,7 +1414,7 @@ function latestActivity(rows) {
 }
 function windowAnchor(selected, parsed, options2) {
   if (options2.anchorNow !== void 0) return options2.anchorNow;
-  if (options2.anchor === "latest-activity" && parsed.last) return latestActivity(selected);
+  if (options2.anchor === "latest-activity" && parsed.window?.kind === "relative") return latestActivity(selected);
   return void 0;
 }
 var defaultEventStore = {
@@ -1233,9 +1484,11 @@ function matchesFilters(row, filters, noteTags) {
     const negate = group[0].negate;
     const raw = factTagValue(row, key, noteTags);
     const rowValues = Array.isArray(raw) ? raw : raw !== void 0 ? [raw] : [];
-    const hit = group.some(
-      (f) => f.values.some(
-        (a) => rowValues.some((v) => a.wildcard ? v.startsWith(a.value) : v === a.value)
+    const hit = rowValues.some(
+      (value) => group.some(
+        (f) => f.values.some(
+          (a) => a.wildcard ? value.startsWith(a.value) : value === a.value
+        )
       )
     );
     return negate ? !hit : hit;
@@ -1245,8 +1498,8 @@ function dimValue(row, dim, noteTags) {
   if (dim === "day") return localDateString(row.timestamp);
   if (dim === "week") {
     const d = new Date(row.timestamp);
-    const monday = new Date(row.timestamp - (d.getDay() + 6) % 7 * DAY);
-    return `w/${monday.toISOString().slice(5, 10)}`;
+    const monday = new Date(d.getFullYear(), d.getMonth(), d.getDate() - (d.getDay() + 6) % 7);
+    return localDateString(monday.getTime());
   }
   if (dim === "session") return row.resultId;
   const raw = factTagValue(row, dim, noteTags);
@@ -1372,9 +1625,9 @@ var QueryService = class {
     for (const blockContentId of blockIds) collect(await this.store.getEventsByContent(blockContentId));
     for (const noteId of noteIds) collect(await this.store.getEventsForNote(noteId));
     let groups = [...byResult.entries()].filter(([, rows]) => rows.length > 0);
-    if (parsed.last) {
+    if (parsed.window) {
       groups = groups.filter(
-        ([, rows]) => effectiveTimeWindow(rows[0].timestamp, parsed.last, void 0, options2.anchorNow)
+        ([, rows]) => effectiveTimeWindow(rows[0].timestamp, parsed.window, void 0, options2.anchorNow)
       );
     }
     groups.sort((a, b) => b[1][0].timestamp - a[1][0].timestamp);
@@ -1402,19 +1655,13 @@ var QueryService = class {
       return this.runFindEffort(parsed);
     }
     let notes = [];
-    const scope = parsed.scope || "journal";
-    if (scope === "journal" || scope === "all") {
-      notes = notes.concat(await this.noteStore.getAllNotes());
-    }
-    if (scope === "collections" || scope === "feeds" || scope === "all") {
-      let sNotes = this.staticNoteStore ? await this.staticNoteStore.getAllNotes() : [];
-      if (scope === "collections") sNotes = sNotes.filter((n) => n.sourceId?.startsWith("collection:"));
-      if (scope === "feeds") sNotes = sNotes.filter((n) => n.sourceId?.startsWith("feed:"));
-      notes = notes.concat(sNotes);
+    notes = notes.concat(await this.noteStore.getAllNotes());
+    if (this.staticNoteStore) {
+      notes = notes.concat(await this.staticNoteStore.getAllNotes());
     }
+    notes = applySourceFilter(notes, parsed.filters);
     const selectedCount = notes.length;
     const anchorNow = windowAnchor(notes, parsed, options2);
-    notes = applySourceFilter(notes, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "tags" && !filter.negate) {
         const matchingIds = /* @__PURE__ */ new Set();
@@ -1456,8 +1703,8 @@ var QueryService = class {
         });
       }
     }
-    if (parsed.last || options2.range) {
-      notes = notes.filter((n) => effectiveTimeWindow(n.createdAt, parsed.last, options2.range, anchorNow));
+    if (parsed.window || options2.range) {
+      notes = notes.filter((n) => effectiveTimeWindow(n.createdAt, parsed.window, options2.range, anchorNow));
     }
     if (parsed.join) {
       const joined = await this.applyMetricJoin(parsed, notes, []);
@@ -1470,19 +1717,13 @@ var QueryService = class {
    */
   async runFindBlock(parsed, options2 = {}) {
     let blocks = [];
-    const scope = parsed.scope || "journal";
-    if (scope === "journal" || scope === "all") {
-      blocks = blocks.concat(await this.blockStore.getAllBlocks());
-    }
-    if (scope === "collections" || scope === "feeds" || scope === "all") {
-      let sBlocks = this.staticBlockStore ? await this.staticBlockStore.getAllBlocks() : [];
-      if (scope === "collections") sBlocks = sBlocks.filter((b) => b.sourceId?.startsWith("collection:"));
-      if (scope === "feeds") sBlocks = sBlocks.filter((b) => b.sourceId?.startsWith("feed:"));
-      blocks = blocks.concat(sBlocks);
+    blocks = blocks.concat(await this.blockStore.getAllBlocks());
+    if (this.staticBlockStore) {
+      blocks = blocks.concat(await this.staticBlockStore.getAllBlocks());
     }
+    blocks = applySourceFilter(blocks, parsed.filters);
     const selectedCount = blocks.length;
     const anchorNow = windowAnchor(blocks, parsed, options2);
-    blocks = applySourceFilter(blocks, parsed.filters);
     for (const filter of parsed.filters) {
       if (filter.key === "text" && !filter.negate) {
         const search = filter.values.map((v) => v.value).join(" ").toLowerCase();
@@ -1518,8 +1759,8 @@ var QueryService = class {
         blocks = blocks.filter((b) => matchingNoteIds.has(b.noteId));
       }
     }
-    if (parsed.last || options2.range) {
-      blocks = blocks.filter((b) => effectiveTimeWindow(b.createdAt, parsed.last, options2.range, anchorNow));
+    if (parsed.window || options2.range) {
+      blocks = blocks.filter((b) => effectiveTimeWindow(b.createdAt, parsed.window, options2.range, anchorNow));
     }
     if (parsed.join) {
       const joined = await this.applyMetricJoin(parsed, [], blocks);
@@ -1572,10 +1813,8 @@ var QueryService = class {
     };
     if (parsed.error) return empty;
     if (parsed.join) return this.runJoined(parsed, options2);
-    const windowed = options2.rangeStart !== void 0 || options2.rangeEnd !== void 0;
-    const start = options2.rangeStart ?? 0;
-    const end = options2.rangeEnd ?? Number.MAX_SAFE_INTEGER;
-    const eventRows = windowed ? await this.store.getEventsByTimeRange(start, end) : await this.store.scanAll();
+    const range = options2.rangeStart !== void 0 || options2.rangeEnd !== void 0 ? { start: options2.rangeStart ?? 0, end: options2.rangeEnd ?? Number.MAX_SAFE_INTEGER } : windowRange(parsed.window);
+    const eventRows = range ? await this.store.getEventsByTimeRange(range.start, range.end) : await this.store.scanAll();
     const candidates = eventRows.flatMap(projectEventToFacts).filter((row) => row.metricKey === parsed.metric);
     const touchesTags = parsed.filters.some((f) => f.key === "tags") || parsed.groupBy.includes("tags");
     const noteTags = await this.loadNoteTags(candidates, touchesTags);
@@ -1593,8 +1832,24 @@ var QueryService = class {
     const timeDim = parsed.groupBy.find((d) => d === "day" || d === "week");
     const tagDims = parsed.groupBy.filter((d) => d !== "day" && d !== "week");
     const bucketMs = timeDim ? (timeDim === "week" ? 7 : 1) * DAY : parsed.rollup ? parsed.rollup.size * (parsed.rollup.unit === "w" ? 7 : 1) * DAY : null;
-    const bucketKey = (ts) => bucketMs ? Math.floor(ts / bucketMs) : 0;
+    const civilDay = (ts) => {
+      const d = new Date(ts);
+      return Math.floor(Date.UTC(d.getFullYear(), d.getMonth(), d.getDate()) / DAY);
+    };
+    const bucketKey = (ts) => {
+      if (timeDim === "day") return civilDay(ts);
+      if (timeDim === "week") {
+        const d = new Date(ts);
+        return civilDay(ts) - (d.getDay() + 6) % 7;
+      }
+      return bucketMs ? Math.floor(ts / bucketMs) : 0;
+    };
     const bucketCount = bucketMs ? new Set(matched.map((p) => bucketKey(p.timestamp))).size : matched.length ? 1 : 0;
+    const civilBucketInstant = (anchor, dim) => {
+      const d = new Date(anchor);
+      const back = dim === "week" ? (d.getDay() + 6) % 7 : 0;
+      return new Date(d.getFullYear(), d.getMonth(), d.getDate() - back, 12).getTime();
+    };
     const { unit: targetUnit, convert: shouldConvert } = resolveDisplayUnit(matched, {
       directive: parsed.displayUnit,
       preferred: options2.preferredUnit
@@ -1619,7 +1874,7 @@ var QueryService = class {
           (m) => toDisplayValue(m.value, m.unit ?? m.metricUnit, shouldConvert ? targetUnit : void 0)
         );
         return {
-          ts: bucketMs ? b * bucketMs + bucketMs / 2 : Math.min(...members.map((m) => m.timestamp)),
+          ts: timeDim ? civilBucketInstant(members[0].timestamp, timeDim) : bucketMs ? b * bucketMs + bucketMs / 2 : Math.min(...members.map((m) => m.timestamp)),
           value: Math.round(aggregate(values, parsed.agg, members, shouldConvert ? targetUnit : void 0) * 100) / 100
         };
       });
@@ -1653,17 +1908,14 @@ var QueryService = class {
       raw: "",
       target: join.target,
       filters: join.filters,
-      scope: join.scope,
-      last: join.last
+      window: join.last ? { kind: "relative", size: join.last.size, unit: join.last.unit } : void 0
     });
     const contentIds = await this.contentIdsFromFindResult(findResult);
     if (contentIds.size === 0) return empty;
     let facts = await this.deriveMetricFacts(contentIds, parsed.metric);
-    if (facts.length === 0) return empty;
-    if (options2.rangeStart !== void 0 || options2.rangeEnd !== void 0) {
-      const start = options2.rangeStart ?? 0;
-      const end = options2.rangeEnd ?? Number.MAX_SAFE_INTEGER;
-      facts = facts.filter((f) => f.timestamp >= start && f.timestamp <= end);
+    const joinRange = options2.rangeStart !== void 0 || options2.rangeEnd !== void 0 ? { start: options2.rangeStart ?? 0, end: options2.rangeEnd ?? Number.MAX_SAFE_INTEGER } : windowRange(parsed.window);
+    if (joinRange) {
+      facts = facts.filter((f) => f.timestamp >= joinRange.start && f.timestamp <= joinRange.end);
     }
     const touchesTags = parsed.filters.some((f) => f.key === "tags") || parsed.groupBy.includes("tags");
     const noteTags = await this.loadNoteTags(facts, touchesTags);
@@ -2068,15 +2320,15 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.8.39";
-var GIT_SHA = "3c19185";
-var BUILD_TIME = "2026-08-26T00:07:31.934Z";
+var VERSION = "0.10.41";
+var GIT_SHA = "1b9b771";
+var BUILD_TIME = "2026-08-26T04:16:38.418Z";
 var SEMVER = {
-  version: "0.8.39",
-  gitSha: "3c19185",
-  buildTime: "2026-08-26T00:07:31.934Z"
+  version: "0.10.41",
+  gitSha: "1b9b771",
+  buildTime: "2026-08-26T04:16:38.418Z"
 };
 
-export { BUILD_TIME, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, KG_PER_LB, PLANNED_WIDGET_TYPES, QueryService, SEMVER, UNIT_FAMILIES, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SCOPES, WQL_SOURCES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms };
+export { BUILD_TIME, DASHBOARD_GRID_MAX_COLS, DASHBOARD_WIDGET_TYPES, DEFAULT_DASHBOARD_TITLE, DISCIPLINE_FACTORS, EFFORT_DISCIPLINES, GIT_SHA, KG_PER_LB, PLANNED_WIDGET_TYPES, QueryService, SEMVER, UNIT_FAMILIES, VERSION, WQL_AGGREGATORS, WQL_CALC_TARGETS, WQL_COMPARISON_OPS, WQL_CONTENT_FILTER_KEYS, WQL_DISPLAY_UNITS, WQL_FIND_TARGETS, WQL_GRAINS, WQL_INTENSITY_TIERS, WQL_KEYWORDS, WQL_METRIC_AGGREGATES, WQL_METRIC_FAMILIES, WQL_RESULT_PLANES, WQL_ROLLUP_PERIODS, WQL_ROWS_SCOPE_KEYS, WQL_ROWS_TARGETS, WQL_SOURCES, WQL_SOURCE_VALUES, WQL_TAG_KEYS, WQL_VIRTUAL_DIMS, buildDashboardDocument, buildDashboardScaffold, convert, dashboardSlug, defaultTokenValues, disciplineFactorFor, extractDashboardTokens, extractFrontmatterTags, getList, getScalar, getUnitFamily, isAggregateQuery, isDashboardMeta, isDashboardWidgetType, isEffortDiscipline, isFindQuery, isProposedMetric, isRowsQuery, normalizeSummaryFacts, normalizeWql, parseDashboardNote, parseFlatProperties, parseFrontmatter, parseFrontmatterBody, parseFrontmatterCategories, parseFrontmatterProps, parseQuery, parseQueryWidgetSuffix, parseWqlSuffixes, projectEventToFacts, referencedTokens, resolveCanonicalMetricKey, resolveDisplayUnit, resolveWidgetType, serialize, serializeFrontmatter, setDashboardTokenValue, splitAtWhere, splitWidgetBody, staticNotesFromBlocks, staticTagIndexFromBlocks, stripFrontmatter, substituteTokens, toEventRows, toSummaryEventRows, unknownTokensMessage, unknownWidgetTypeMessage, wql, wqlCompletion, wqlCompletionSource, wqlHighlightStyle, wqlLanguage, parser as wqlParser, wql_parser_terms_exports as wqlTerms };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map