@bitcobblers/wod-wiki-wql 0.6.31 → 0.6.36

package/dist/index.cjs

@@ -55,7 +55,7 @@ var WQL_CALC_TARGETS = [
   "calc.sends"
 ];
 var WQL_INTENSITY_TIERS = ["low", "moderate", "high"];
-var WQL_GRAINS = ["segment", "summary", "rollup"];
+var WQL_GRAINS = ["summary", "event"];
 var WQL_FIND_TARGETS = ["note", "block", "effort"];
 var WQL_SCOPES = ["journal", "collections", "feeds", "all"];
 var WQL_CONTENT_FILTER_KEYS = ["type", "text", "has", "source", "catalog", ...WQL_TAG_KEYS];
@@ -316,9 +316,20 @@ function parseRowsQuery(raw) {
       return result;
     }
     result.filters = extractFilters(tree.topNode, synthetic);
+    const grainError = retiredGrainRollup(result.filters);
+    if (grainError) {
+      result.error = grainError;
+      return result;
+    }
   }
   return result;
 }
+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";
+  }
+  return void 0;
+}
 function extractFilters(query, text) {
   const out = [];
   const filters = query.getChild(Filters);
@@ -387,6 +398,11 @@ function parseAnalyticsQuery(raw) {
   base.agg = aggText;
   base.metric = text.slice(metricNode.from, metricNode.to);
   base.filters = extractFilters(query, text);
+  const grainError = retiredGrainRollup(base.filters);
+  if (grainError) {
+    base.error = grainError;
+    return base;
+  }
   if (whereText) {
     const join = parseJoinClause(whereText);
     if (join.error) {
@@ -438,6 +454,11 @@ function parseFindQuery(raw) {
   }
   result.target = text.slice(metricNode.from, metricNode.to);
   result.filters = extractFilters(query, text);
+  const findGrainError = retiredGrainRollup(result.filters);
+  if (findGrainError) {
+    result.error = findGrainError;
+    return result;
+  }
   if (whereText) {
     const join = parseJoinClause(whereText);
     if (join.error) {
@@ -723,9 +744,8 @@ function readGroupTags(metadata) {
   const entries = Object.entries(tags).filter((pair) => typeof pair[1] === "string" && pair[1].length > 0).sort(([a], [b]) => a < b ? -1 : 1);
   return entries.length > 0 ? Object.fromEntries(entries) : void 0;
 }
-function normalizeSummaryFacts(logs, identity) {
-  const now = Date.now();
-  const rowsByKey = /* @__PURE__ */ new Map();
+function foldSummaryOutputs(logs) {
+  const folded = /* @__PURE__ */ new Map();
   for (const output of logs) {
     if (output.outputType !== "analytics") continue;
     const label = output.metrics.find((m) => m.type === wodWikiCore.MetricType.Label);
@@ -740,32 +760,171 @@ function normalizeSummaryFacts(logs, identity) {
     const grade = metadataString(value.metadata, "grade");
     const groupTags = readGroupTags(value.metadata) ?? (effortSlug ? { effort: effortSlug } : void 0);
     const rowKey = groupTags ? `${metricKey}:${Object.entries(groupTags).map(([k, v]) => `${k}=${v}`).join(":")}` : metricKey;
-    rowsByKey.set(rowKey, {
-      id: `${identity.resultId}-${rowKey}-${now}`,
-      noteId: identity.noteId,
-      blockContentId: identity.blockContentId,
-      origin: identity.origin,
-      pageId: identity.pageId,
-      grain: "summary",
-      segmentId: identity.segmentId ?? "",
-      segmentVersion: identity.segmentVersion ?? 0,
-      resultId: identity.resultId,
-      type: metricKey,
+    folded.set(rowKey, {
+      projectionName,
+      metricKey,
       value: value.value,
       unit: value.unit,
-      label: projectionName,
-      metricKey,
-      metricLabel: projectionName,
-      metricUnit: value.unit,
-      ...effortSlug ? { effortSlug } : {},
-      ...discipline ? { discipline } : {},
-      ...intensityTier ? { intensityTier } : {},
-      ...grade ? { grade } : {},
-      timestamp: identity.workoutTimestamp ?? output.timeSpan?.started ?? now,
-      createdAt: now
+      effortSlug,
+      discipline,
+      intensityTier,
+      grade,
+      groupTags,
+      rowKey,
+      started: output.timeSpan?.started
     });
   }
-  return Array.from(rowsByKey.values());
+  return folded;
+}
+function normalizeSummaryFacts(logs, identity) {
+  const now = Date.now();
+  return Array.from(foldSummaryOutputs(logs).values(), (f) => ({
+    id: `${identity.resultId}-${f.rowKey}-${now}`,
+    noteId: identity.noteId,
+    blockContentId: identity.blockContentId,
+    origin: identity.origin,
+    pageId: identity.pageId,
+    grain: "summary",
+    segmentId: identity.segmentId ?? "",
+    segmentVersion: identity.segmentVersion ?? 0,
+    resultId: identity.resultId,
+    type: f.metricKey,
+    value: f.value,
+    unit: f.unit,
+    label: f.projectionName,
+    metricKey: f.metricKey,
+    metricLabel: f.projectionName,
+    metricUnit: f.unit,
+    ...f.effortSlug ? { effortSlug: f.effortSlug } : {},
+    ...f.discipline ? { discipline: f.discipline } : {},
+    ...f.intensityTier ? { intensityTier: f.intensityTier } : {},
+    ...f.grade ? { grade: f.grade } : {},
+    timestamp: identity.workoutTimestamp ?? f.started ?? now,
+    createdAt: now
+  }));
+}
+function firstEffortSlug(metrics) {
+  const loose = metrics;
+  for (const m of loose) {
+    const slug = metadataString(m.metadata, "effortSlug");
+    if (slug) return slug;
+  }
+  return void 0;
+}
+function toEventRows(logs, identity) {
+  return logs.map((output, seq) => ({
+    id: `${identity.resultId}:${seq}`,
+    resultId: identity.resultId,
+    noteId: identity.noteId,
+    blockContentId: identity.blockContentId,
+    pageId: identity.pageId,
+    origin: identity.origin,
+    timestamp: identity.workoutTimestamp ?? output.timeSpan?.started ?? Date.now(),
+    grain: "event",
+    outputType: output.outputType ?? "segment",
+    effortSlug: firstEffortSlug(output.metrics),
+    metrics: output.metrics,
+    timeSpan: output.timeSpan?.started !== void 0 ? { started: output.timeSpan.started, ended: output.timeSpan.ended } : void 0,
+    sourceBlockKey: output.sourceBlockKey,
+    stackLevel: output.stackLevel,
+    completionReason: output.completionReason,
+    segmentId: identity.segmentId,
+    segmentVersion: identity.segmentVersion
+  }));
+}
+function toSummaryEventRows(logs, identity) {
+  const now = Date.now();
+  return Array.from(foldSummaryOutputs(logs).values(), (f) => ({
+    id: `${identity.resultId}:summary:${f.rowKey}`,
+    resultId: identity.resultId,
+    noteId: identity.noteId,
+    blockContentId: identity.blockContentId,
+    pageId: identity.pageId,
+    origin: identity.origin,
+    timestamp: identity.workoutTimestamp ?? f.started ?? now,
+    grain: "summary",
+    outputType: "analytics",
+    effortSlug: f.effortSlug,
+    metrics: [{
+      type: f.metricKey,
+      value: f.value,
+      ...f.unit ? { unit: f.unit } : {},
+      metadata: {
+        canonicalKey: f.metricKey,
+        ...f.effortSlug ? { effortSlug: f.effortSlug } : {},
+        ...f.discipline ? { effortDiscipline: f.discipline } : {},
+        ...f.intensityTier ? { effortIntensityTier: f.intensityTier } : {},
+        ...f.groupTags ? { groupTags: f.groupTags } : {},
+        ...f.grade ? { grade: f.grade } : {}
+      }
+    }],
+    segmentId: identity.segmentId,
+    segmentVersion: identity.segmentVersion
+  }));
+}
+function projectEventToFacts(record) {
+  const metrics = record.metrics;
+  if (record.grain === "summary") {
+    const m = metrics[0];
+    if (!m || typeof m.value !== "number") return [];
+    const metricKey = metadataString(m.metadata, "canonicalKey") ?? (m.type ?? "");
+    return [{
+      id: `${record.id}:0`,
+      noteId: record.noteId,
+      blockContentId: record.blockContentId,
+      origin: record.origin,
+      pageId: record.pageId,
+      grain: "summary",
+      segmentId: record.segmentId ?? "",
+      segmentVersion: record.segmentVersion ?? 0,
+      resultId: record.resultId,
+      type: metricKey,
+      value: m.value,
+      unit: m.unit,
+      label: metricKey,
+      metricKey,
+      metricLabel: metricKey,
+      metricUnit: m.unit,
+      effortSlug: metadataString(m.metadata, "effortSlug") ?? record.effortSlug,
+      discipline: metadataString(m.metadata, "effortDiscipline"),
+      intensityTier: metadataString(m.metadata, "effortIntensityTier"),
+      grade: metadataString(m.metadata, "grade"),
+      timestamp: record.timestamp,
+      createdAt: record.timestamp
+    }];
+  }
+  const label = metrics.find((m) => m.type === wodWikiCore.MetricType.Label);
+  const labelName = label ? String(label.value ?? label.image ?? "") : "";
+  const facts = [];
+  metrics.forEach((m) => {
+    if (m.type === wodWikiCore.MetricType.Label || typeof m.value !== "number") return;
+    const metricKey = metadataString(m.metadata, "canonicalKey") ?? (labelName ? resolveCanonicalMetricKey(labelName) : m.type ?? "metric");
+    const ordinal = facts.length;
+    facts.push({
+      id: `${record.id}:${ordinal}`,
+      noteId: record.noteId,
+      blockContentId: record.blockContentId,
+      origin: record.origin,
+      pageId: record.pageId,
+      grain: "event",
+      segmentId: record.segmentId ?? "",
+      segmentVersion: record.segmentVersion ?? 0,
+      resultId: record.resultId,
+      type: metricKey,
+      value: m.value,
+      unit: m.unit,
+      label: labelName || metricKey,
+      metricKey,
+      metricLabel: labelName || metricKey,
+      metricUnit: m.unit,
+      effortSlug: metadataString(m.metadata, "effortSlug") ?? record.effortSlug,
+      intensityTier: metadataString(m.metadata, "effortIntensityTier"),
+      grade: metadataString(m.metadata, "grade"),
+      timestamp: record.timestamp,
+      createdAt: record.timestamp
+    });
+  });
+  return facts;
 }
 
 // src/dashboard/frontmatter.ts
@@ -957,23 +1116,27 @@ function windowAnchor(selected, parsed, options2) {
   if (options2.anchor === "latest-activity" && parsed.last) return latestActivity(selected);
   return void 0;
 }
-var defaultFactStore = {
-  getFactsByMetric: async () => [],
-  getFactsByTimeRange: async () => [],
-  getNoteTagLabels: async () => []
+var defaultEventStore = {
+  getEventsByTimeRange: async () => [],
+  getEventsByResult: async () => [],
+  getEventsForNote: async () => [],
+  getEventsByContent: async () => [],
+  scanAll: async () => [],
+  appendEvents: async () => {
+  },
+  finalizeSummaries: async () => {
+  },
+  deleteEvents: async () => {
+  }
 };
 var defaultNoteStore = {
   getAllNotes: async () => [],
-  getNoteIdsForTag: async () => /* @__PURE__ */ new Set()
+  getNoteIdsForTag: async () => /* @__PURE__ */ new Set(),
+  getNoteTagLabels: async () => []
 };
 var defaultBlockStore = {
   getAllBlocks: async () => []
 };
-var defaultResultStore = {
-  getResultsByContentId: async () => [],
-  getResultById: async () => void 0,
-  getResultsForNote: async () => []
-};
 var defaultEffortStore = {
   getAllEfforts: async () => []
 };
@@ -1085,32 +1248,31 @@ var QueryService = class {
   store;
   noteStore;
   blockStore;
-  resultStore;
   effortStore;
   staticNoteStore;
   staticBlockStore;
-  constructor(storesOrFactStore, noteStore, blockStore, resultStore, effortStore, staticNoteStore, staticBlockStore) {
-    if (storesOrFactStore && typeof storesOrFactStore === "object" && ("factStore" in storesOrFactStore || "noteStore" in storesOrFactStore || "blockStore" in storesOrFactStore || "resultStore" in storesOrFactStore || "effortStore" in storesOrFactStore || "staticNoteStore" in storesOrFactStore || "staticBlockStore" in storesOrFactStore)) {
-      const stores = storesOrFactStore;
-      this.store = stores.factStore ?? defaultFactStore;
+  constructor(storesOrEventStore, noteStore, blockStore, effortStore, staticNoteStore, staticBlockStore) {
+    if (storesOrEventStore && typeof storesOrEventStore === "object" && ("eventStore" in storesOrEventStore || "noteStore" in storesOrEventStore || "blockStore" in storesOrEventStore || "effortStore" in storesOrEventStore || "staticNoteStore" in storesOrEventStore || "staticBlockStore" in storesOrEventStore)) {
+      const stores = storesOrEventStore;
+      this.store = stores.eventStore ?? defaultEventStore;
       this.noteStore = stores.noteStore ?? defaultNoteStore;
       this.blockStore = stores.blockStore ?? defaultBlockStore;
-      this.resultStore = stores.resultStore ?? defaultResultStore;
       this.effortStore = stores.effortStore ?? defaultEffortStore;
       this.staticNoteStore = stores.staticNoteStore;
       this.staticBlockStore = stores.staticBlockStore;
     } else {
-      this.store = storesOrFactStore ?? defaultFactStore;
+      this.store = storesOrEventStore ?? defaultEventStore;
       this.noteStore = noteStore ?? defaultNoteStore;
       this.blockStore = blockStore ?? defaultBlockStore;
-      this.resultStore = resultStore ?? defaultResultStore;
       this.effortStore = effortStore ?? defaultEffortStore;
       this.staticNoteStore = staticNoteStore;
       this.staticBlockStore = staticBlockStore;
     }
   }
+  /** Windowed flat-fact fetch — the projected view over the event store. */
   async getFactsByTimeRange(start, end) {
-    return this.store.getFactsByTimeRange(start, end);
+    const rows = await this.store.getEventsByTimeRange(start, end);
+    return rows.flatMap(projectEventToFacts);
   }
   async runQuery(raw, options2 = {}) {
     const parsed = parseQuery(raw);
@@ -1134,8 +1296,8 @@ var QueryService = class {
   }
   /**
    * Execute a rows query (rows:{…}, #949) — the session results table plane.
-   * Re-derives output statements from raw WorkoutResult logs through the
-   * ResultLogStore seam ("logs win" — facts are never read for this path).
+   * Reads event rows directly over the unified store (ticket 003): no
+   * WorkoutResult blob parsing; outputType narrowing hits the promoted column.
    */
   async runRows(parsed, options2 = {}) {
     const empty = { parsed, runs: [] };
@@ -1157,28 +1319,30 @@ var QueryService = class {
     if (resultIds.length + blockIds.length + noteIds.length === 0) {
       return { ...empty, error: "Rows query needs a scope: result:, block:, or note:." };
     }
-    const byId = /* @__PURE__ */ new Map();
-    for (const id of resultIds) {
-      const r = await this.resultStore.getResultById(id);
-      if (r) byId.set(r.id, r);
-    }
-    for (const blockContentId of blockIds) {
-      for (const r of await this.resultStore.getResultsByContentId(blockContentId)) byId.set(r.id, r);
-    }
-    for (const noteId of noteIds) {
-      for (const r of await this.resultStore.getResultsForNote(noteId)) byId.set(r.id, r);
-    }
-    let results = [...byId.values()].filter((r) => r.data?.logs?.length);
+    const byResult = /* @__PURE__ */ new Map();
+    const collect = (rows) => {
+      for (const row of rows) {
+        const bucket = byResult.get(row.resultId);
+        if (bucket) bucket.push(row);
+        else byResult.set(row.resultId, [row]);
+      }
+    };
+    for (const id of resultIds) collect(await this.store.getEventsByResult(id));
+    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) {
-      results = results.filter(
-        (r) => effectiveTimeWindow(r.data.endTime ?? r.createdAt ?? 0, parsed.last, void 0, options2.anchorNow)
+      groups = groups.filter(
+        ([, rows]) => effectiveTimeWindow(rows[0].timestamp, parsed.last, void 0, options2.anchorNow)
       );
     }
-    results.sort((a, b) => (b.data.endTime ?? b.createdAt) - (a.data.endTime ?? a.createdAt));
-    const runs = results.map((result) => ({
-      result,
-      logs: parsed.outputType ? result.data.logs.filter((l) => l.outputType === parsed.outputType) : result.data.logs
-    })).filter((run) => run.logs.length > 0);
+    groups.sort((a, b) => b[1][0].timestamp - a[1][0].timestamp);
+    const runs = groups.map(([resultId, rows]) => ({
+      resultId,
+      noteId: rows[0].noteId,
+      timestamp: rows[0].timestamp,
+      events: parsed.outputType ? rows.filter((row) => row.outputType === parsed.outputType) : rows
+    })).filter((run) => run.events.length > 0);
     return { parsed, runs };
   }
   /**
@@ -1367,14 +1531,11 @@ var QueryService = class {
     };
     if (parsed.error) return empty;
     if (parsed.join) return this.runJoined(parsed, options2);
-    const byMetric = await this.store.getFactsByMetric(parsed.metric);
-    let candidates = byMetric;
-    if (options2.rangeStart !== void 0 || options2.rangeEnd !== void 0) {
-      const start = options2.rangeStart ?? 0;
-      const end = options2.rangeEnd ?? Number.MAX_SAFE_INTEGER;
-      const inRange = new Set((await this.store.getFactsByTimeRange(start, end)).map((row) => row.id));
-      candidates = candidates.filter((row) => inRange.has(row.id));
-    }
+    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 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);
     const matched = this.applyEffortScope(
@@ -1518,29 +1679,14 @@ var QueryService = class {
     }
     return matched.some((r) => r.effortSlug === void 0) ? matched.filter((r) => r.effortSlug === void 0) : matched;
   }
-  /** Re-derive summary facts for one Canonical Metric Key from RAW WorkoutResult
-   *  logs across the given content ids — the cross-store join source. One fact
-   *  row per result (normalizeSummaryFacts dedupes within a result). */
+  /** Summary facts for one Canonical Metric Key across the given content ids —
+   *  the cross-store join source. Reads finalize-written summary rows straight
+   *  off the content index (ticket 003: the store is authoritative; the old
+   *  freshness re-derivation is moot). One fact row per result × rowKey. */
   async deriveMetricFacts(contentIds, metricKey) {
-    const out = [];
     const ids = [...new Set(contentIds)];
-    await Promise.all(ids.map(async (blockContentId) => {
-      const results = await this.resultStore.getResultsByContentId(blockContentId);
-      for (const result of results) {
-        const facts = normalizeSummaryFacts(result.data.logs ?? [], {
-          noteId: result.noteId,
-          resultId: result.id,
-          segmentId: result.segmentId,
-          segmentVersion: result.segmentVersion,
-          blockContentId,
-          origin: result.origin,
-          pageId: result.pageId,
-          workoutTimestamp: result.createdAt
-        });
-        for (const f of facts) if (f.metricKey === metricKey) out.push(f);
-      }
-    }));
-    return out;
+    const rows = await Promise.all(ids.map((blockContentId) => this.store.getEventsByContent(blockContentId)));
+    return rows.flat().filter((row) => row.grain === "summary").flatMap(projectEventToFacts).filter((f) => f.metricKey === metricKey);
   }
   /** All content blocks across the journal + static corpus. */
   async allContentBlocks() {
@@ -1580,7 +1726,7 @@ var QueryService = class {
     const noteTags = /* @__PURE__ */ new Map();
     if (!touchesTags) return noteTags;
     const noteIds = [...new Set(rows.map((r) => r.noteId))];
-    await Promise.all(noteIds.map(async (id) => noteTags.set(id, await this.store.getNoteTagLabels(id))));
+    await Promise.all(noteIds.map(async (id) => noteTags.set(id, await this.noteStore.getNoteTagLabels(id))));
     return noteTags;
   }
 };
@@ -1880,13 +2026,13 @@ sum:$metric{} rollup:1w
 }
 
 // src/version.ts
-var VERSION = "0.6.31";
-var GIT_SHA = "d53a937";
-var BUILD_TIME = "2026-08-21T14:17:13.519Z";
+var VERSION = "0.6.36";
+var GIT_SHA = "c5ad2b0";
+var BUILD_TIME = "2026-08-24T20:14:33.951Z";
 var SEMVER = {
-  version: "0.6.31",
-  gitSha: "d53a937",
-  buildTime: "2026-08-21T14:17:13.519Z"
+  version: "0.6.36",
+  gitSha: "c5ad2b0",
+  buildTime: "2026-08-24T20:14:33.951Z"
 };
 
 exports.BUILD_TIME = BUILD_TIME;
@@ -1945,6 +2091,7 @@ exports.parseFrontmatterProps = parseFrontmatterProps;
 exports.parseQuery = parseQuery;
 exports.parseQueryWidgetSuffix = parseQueryWidgetSuffix;
 exports.parseWqlSuffixes = parseWqlSuffixes;
+exports.projectEventToFacts = projectEventToFacts;
 exports.referencedTokens = referencedTokens;
 exports.resolveCanonicalMetricKey = resolveCanonicalMetricKey;
 exports.resolveDisplayUnit = resolveDisplayUnit;
@@ -1957,6 +2104,8 @@ exports.staticNotesFromBlocks = staticNotesFromBlocks;
 exports.staticTagIndexFromBlocks = staticTagIndexFromBlocks;
 exports.stripFrontmatter = stripFrontmatter;
 exports.substituteTokens = substituteTokens;
+exports.toEventRows = toEventRows;
+exports.toSummaryEventRows = toSummaryEventRows;
 exports.unknownTokensMessage = unknownTokensMessage;
 exports.unknownWidgetTypeMessage = unknownWidgetTypeMessage;
 exports.wql = wql;