@bitcobblers/wod-wiki-ui 0.50.2189 → 0.50.2190

package/dist/extensions/index.cjs

@@ -452,6 +452,7 @@ function deriveState(state, rawContent, sourceRevision, lineage, savedVersions,
       contentId: section.contentId,
       queryType: query?.type,
       queryError: query?.error,
+      queryAttributes: query?.attributes,
       embed: section.embed
     };
   });
@@ -4136,6 +4137,108 @@ function RowsResultsChrome({
     )
   ] });
 }
+
+// src/widgets/chartPalette.ts
+var SERIES_COLORS = [
+  "hsl(var(--metric-time))",
+  "hsl(var(--metric-effort))",
+  "hsl(var(--metric-rep))",
+  "hsl(var(--metric-rounds))",
+  "hsl(var(--metric-distance))",
+  "hsl(var(--metric-resistance))",
+  "hsl(var(--metric-action))",
+  "hsl(var(--primary))"
+];
+function createExecutorDocumentHost(executor, range = {}) {
+  return {
+    runAggregate: (queryText, overrides) => executor.runQuery(queryText, {
+      context: overrides.context,
+      rangeStart: range.rangeStart,
+      rangeEnd: range.rangeEnd,
+      preferredUnit: range.preferredUnit
+    }),
+    runFind: async (queryText, context) => {
+      const parsed = wodWikiWql.parseQuery(queryText);
+      if (!wodWikiWql.isFindQuery(parsed)) return { kind: "find", error: `not a content query: ${queryText}` };
+      const res = await executor.runFind(parsed, {
+        context,
+        range: range.rangeStart !== void 0 ? { start: range.rangeStart, end: range.rangeEnd ?? Number.MAX_SAFE_INTEGER, endExclusive: false } : void 0
+      });
+      return {
+        kind: "find",
+        notes: res.notes,
+        blocks: res.blocks,
+        efforts: res.efforts,
+        containers: res.containers,
+        runs: res.runs,
+        table: res.table
+      };
+    },
+    runPipeline: async (queryText, context) => {
+      const res = await executor.runPipeline?.(queryText, {
+        context,
+        rangeStart: range.rangeStart,
+        rangeEnd: range.rangeEnd,
+        preferredUnit: range.preferredUnit
+      });
+      return res ?? { error: "pipeline queries are not supported by this executor" };
+    },
+    rollupEnsure: range.rollupEnsure
+  };
+}
+function toChartResult(input) {
+  const parsed = input.parsed;
+  const series = input.series ?? [];
+  const scalar = series.length === 1 && series[0].points.length === 1 ? series[0].points[0].value : void 0;
+  return {
+    parsed,
+    series,
+    stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
+    matched: [],
+    ...scalar !== void 0 ? { scalar } : {},
+    ...input.unit !== void 0 ? { unit: input.unit } : {},
+    ...input.error ? { error: input.error } : {},
+    ...input.table ? { table: input.table } : {}
+  };
+}
+function outputToRunResult(parsed, out) {
+  const base = toChartResult({
+    parsed,
+    series: out.series,
+    unit: out.unit,
+    error: out.error,
+    table: out.table
+  });
+  return Object.assign(base, {
+    ...out.notes ? { notes: out.notes } : {},
+    ...out.blocks ? { blocks: out.blocks } : {},
+    ...out.efforts ? { efforts: out.efforts } : {},
+    ...out.containers ? { containers: out.containers } : {},
+    ...out.runs ? { runs: out.runs } : {},
+    ...out.chart ? { chart: out.chart } : {}
+  });
+}
+function mergeSeries(series) {
+  const map = /* @__PURE__ */ new Map();
+  for (const s of series) {
+    for (const p of s.points) {
+      if (!map.has(p.ts)) map.set(p.ts, { ts: p.ts });
+      map.get(p.ts)[s.label] = p.value;
+    }
+  }
+  return Array.from(map.values()).sort((a, b) => a.ts - b.ts);
+}
+function compactNumber(value) {
+  const n = typeof value === "number" ? value : Number(value);
+  if (Math.abs(n) >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
+  return String(n);
+}
+function formatTimestamp(ts) {
+  return new Date(ts).toLocaleDateString("en-US", { month: "short", day: "numeric" });
+}
+function tooltipTimestamp(ts) {
+  return new Date(ts).toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
+}
 function useChartShape(result) {
   return React2.useMemo(() => {
     if (!result) return { kind: "empty" };
@@ -4186,53 +4289,6 @@ function QueryValue({ result, unit: unitProp, label, thresholds }) {
     ] })
   ] });
 }
-
-// src/widgets/chartData.ts
-function toChartResult(input) {
-  const parsed = input.parsed;
-  return {
-    parsed,
-    series: input.series ?? [],
-    stages: { selected: 0, buckets: 0, aggregated: 0, groups: 0 },
-    matched: [],
-    ...input.unit !== void 0 ? { unit: input.unit } : {},
-    ...input.error ? { error: input.error } : {},
-    ...input.table ? { table: input.table } : {}
-  };
-}
-function mergeSeries(series) {
-  const map = /* @__PURE__ */ new Map();
-  for (const s of series) {
-    for (const p of s.points) {
-      if (!map.has(p.ts)) map.set(p.ts, { ts: p.ts });
-      map.get(p.ts)[s.label] = p.value;
-    }
-  }
-  return Array.from(map.values()).sort((a, b) => a.ts - b.ts);
-}
-function compactNumber(value) {
-  const n = typeof value === "number" ? value : Number(value);
-  if (Math.abs(n) >= 1e3) return `${(n / 1e3).toFixed(1)}k`;
-  return String(n);
-}
-function formatTimestamp(ts) {
-  return new Date(ts).toLocaleDateString("en-US", { month: "short", day: "numeric" });
-}
-function tooltipTimestamp(ts) {
-  return new Date(ts).toLocaleDateString("en-US", { month: "short", day: "numeric", year: "numeric" });
-}
-
-// src/widgets/chartPalette.ts
-var SERIES_COLORS = [
-  "hsl(var(--metric-time))",
-  "hsl(var(--metric-effort))",
-  "hsl(var(--metric-rep))",
-  "hsl(var(--metric-rounds))",
-  "hsl(var(--metric-distance))",
-  "hsl(var(--metric-resistance))",
-  "hsl(var(--metric-action))",
-  "hsl(var(--primary))"
-];
 function WqlTimeseries({ result, unit: unitProp }) {
   const shape = useChartShape(result);
   const data2 = React2.useMemo(() => mergeSeries(result.series), [result]);
@@ -4812,16 +4868,52 @@ function ZoneDistribution({ result, params, attributes }) {
     }
   );
 }
-function WidgetChart({ type, result, label, unit, params, attributes }) {
+function inferChartTypeFromResult(result) {
+  if (!result || result.series.length === 0) return "table";
+  if (result.series.length === 1 && result.series[0].points.length === 1) return "value";
+  const hasTimeAxis = result.series.some((s) => s.points.length > 1);
+  return hasTimeAxis ? "timeseries" : "bar";
+}
+function WidgetChart({
+  type,
+  result,
+  label,
+  unit,
+  params,
+  attributes,
+  inferDefaultShape = false,
+  onOpenNote,
+  noteHref
+}) {
   if (type !== "" && !wodWikiWql.isDashboardWidgetType(type)) {
     return /* @__PURE__ */ jsxRuntime.jsx(WidgetProblemBadge, { message: wodWikiWql.unknownWidgetTypeMessage(type) });
   }
-  const resolved = wodWikiWql.resolveWidgetType(type);
-  if (resolved === "table" && result?.table) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(TabularTable, { table: result.table }) });
+  const resolved = type === "" && inferDefaultShape ? inferChartTypeFromResult(result) : wodWikiWql.resolveWidgetType(type);
+  const runResult = result;
+  const parsedFamily = runResult?.parsed?.family;
+  const hasContentItems = parsedFamily === "find" || Boolean(runResult?.notes?.length || runResult?.blocks?.length || runResult?.efforts?.length || runResult?.runs?.length);
+  if (resolved === "table" && runResult?.table) {
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(TabularTable, { table: runResult.table }) });
+  }
+  if (resolved === "table" && hasContentItems && (!result || !("series" in result) || result.series.length === 0)) {
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(
+      ContentRecordsTable,
+      {
+        result: runResult,
+        onOpenNote,
+        noteHref
+      }
+    ) });
   }
-  if (resolved === "list" && result?.parsed?.family === "find") {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(ThingList, { result }) });
+  if (resolved === "list" && hasContentItems) {
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-full min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(
+      ThingList,
+      {
+        result: runResult,
+        onOpenNote,
+        noteHref
+      }
+    ) });
   }
   if (!result || result.parsed.error || "series" in result && result.series.length === 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(WqlEmptyState, { result });
@@ -4935,9 +5027,138 @@ function TabularTable({ table }) {
     ] }, group.key)) : table.rows.map((row, i) => /* @__PURE__ */ jsxRuntime.jsx("tr", { className: "border-b border-border/40 hover:bg-muted/20", children: table.columns.map((c) => /* @__PURE__ */ jsxRuntime.jsx("td", { className: "py-1 px-2 whitespace-nowrap", children: String(row[c.name] ?? "") }, c.name)) }, i)) })
   ] }) });
 }
-function ThingList({ result }) {
-  const items = result.notes?.length ? result.notes : result.blocks?.length ? result.blocks : result.efforts?.length ? result.efforts : result.runs ?? [];
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full overflow-auto space-y-1", "data-testid": "thing-list", children: items.map((item, i) => /* @__PURE__ */ jsxRuntime.jsx("div", { className: "py-1 px-2 text-xs border-b border-border/40 truncate", children: item.title ?? item.label ?? item.noteTitle ?? item.id ?? item.resultId }, item.id ?? item.resultId ?? i)) });
+function containerPageHref(container) {
+  if (!container || container.kind !== "page") return void 0;
+  const { slug, date } = container;
+  if (slug) return `/page/${encodeURIComponent(slug)}`;
+  if (date) return `/day/${encodeURIComponent(date)}`;
+  return void 0;
+}
+function formatItemDate(item) {
+  const raw = item.date ?? item.timestamp ?? item.createdAt;
+  if (raw === void 0 || raw === null || raw === "") return "\u2014";
+  if (typeof raw === "string" && /^\d{4}-\d{2}-\d{2}/.test(raw)) return raw.slice(0, 10);
+  const ms = typeof raw === "number" ? raw : Date.parse(String(raw));
+  if (!Number.isFinite(ms) || ms <= 0) return "\u2014";
+  return new Date(ms).toISOString().slice(0, 10);
+}
+function ContentRecordsTable({
+  result,
+  onOpenNote,
+  noteHref
+}) {
+  const parsed = result?.parsed;
+  const target = parsed?.target ?? (parsed?.source?.kind === "query" && parsed?.source?.query?.family === "find" ? parsed.source.query.target ?? "note" : result?.blocks?.length ? "block" : "note");
+  const isBlock = target === "block" || Boolean(result?.blocks?.length && !result?.notes?.length);
+  const rawItems = result?.notes?.length ? result.notes : result?.blocks?.length ? result.blocks : result?.efforts?.length ? result.efforts : result?.runs ?? [];
+  const items = rawItems;
+  if (items.length === 0) {
+    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-muted-foreground py-4 text-center", "data-testid": "content-records-table-empty", children: [
+      "No ",
+      target,
+      "s matched this query."
+    ] });
+  }
+  const containers = result?.containers;
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full overflow-auto border-y border-border/60 bg-card/40", "data-testid": "content-records-table", children: /* @__PURE__ */ jsxRuntime.jsxs("table", { className: "w-full text-left border-collapse text-xs", children: [
+    /* @__PURE__ */ jsxRuntime.jsx("thead", { children: /* @__PURE__ */ jsxRuntime.jsxs("tr", { className: "border-b border-border bg-muted/30 text-[11px] font-semibold uppercase tracking-wider text-muted-foreground", children: [
+      /* @__PURE__ */ jsxRuntime.jsx("th", { className: "py-2 px-3", children: "Title" }),
+      /* @__PURE__ */ jsxRuntime.jsx("th", { className: "py-2 px-3", children: "Kind" }),
+      /* @__PURE__ */ jsxRuntime.jsx("th", { className: "py-2 px-3", children: "Tags / Details" }),
+      /* @__PURE__ */ jsxRuntime.jsx("th", { className: "py-2 px-3 text-right", children: "Date" })
+    ] }) }),
+    /* @__PURE__ */ jsxRuntime.jsx("tbody", { className: "divide-y divide-border/40", children: items.map((item, i) => {
+      const id = item.id ?? item.resultId ?? String(i);
+      const typedItem = { ...item, id, title: item.title ?? item.label ?? item.noteTitle };
+      const title = isBlock ? typedItem.title || typedItem.blockContentId || id : typedItem.title || id;
+      const href = containers ? containerPageHref(containers[id]) ?? (noteHref ? noteHref(typedItem) : void 0) : noteHref ? noteHref(typedItem) : void 0;
+      const kindLabel = item.type ?? item.dataType ?? item.baseAttributes?.discipline ?? target;
+      const detail = Array.isArray(item.tags) && item.tags.length > 0 ? item.tags.map((t) => `#${t}`).join(" ") : item.baseAttributes?.met ? `MET ${item.baseAttributes.met}` : item.sourceId ?? "\u2014";
+      return /* @__PURE__ */ jsxRuntime.jsxs("tr", { className: "hover:bg-muted/30 transition-colors", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("td", { className: "py-2 px-3 font-medium truncate max-w-[260px]", children: href ? /* @__PURE__ */ jsxRuntime.jsx(
+          "a",
+          {
+            href,
+            onClick: (e) => {
+              if (onOpenNote) {
+                e.preventDefault();
+                onOpenNote(typedItem);
+              }
+            },
+            className: "text-primary hover:underline",
+            children: title
+          }
+        ) : onOpenNote ? /* @__PURE__ */ jsxRuntime.jsx(
+          "button",
+          {
+            type: "button",
+            onClick: () => onOpenNote(typedItem),
+            className: "text-left text-primary hover:underline",
+            children: title
+          }
+        ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "text-foreground", children: title }) }),
+        /* @__PURE__ */ jsxRuntime.jsx("td", { className: "py-2 px-3 font-mono text-[11px] text-muted-foreground", children: kindLabel }),
+        /* @__PURE__ */ jsxRuntime.jsx("td", { className: "py-2 px-3 font-mono text-[11px] text-muted-foreground truncate max-w-[200px]", children: detail }),
+        /* @__PURE__ */ jsxRuntime.jsx("td", { className: "py-2 px-3 font-mono text-[11px] text-muted-foreground text-right tabular-nums", children: formatItemDate(item) })
+      ] }, id);
+    }) })
+  ] }) });
+}
+function ThingList({
+  result,
+  onOpenNote,
+  noteHref
+}) {
+  const parsed = result?.parsed;
+  const target = parsed?.target ?? (parsed?.source?.kind === "query" && parsed?.source?.query?.family === "find" ? parsed.source.query.target ?? "note" : result?.blocks?.length ? "block" : "note");
+  const isBlock = target === "block" || Boolean(result?.blocks?.length && !result?.notes?.length);
+  const rawItems = result?.notes?.length ? result.notes : result?.blocks?.length ? result.blocks : result?.efforts?.length ? result.efforts : result?.runs ?? [];
+  const items = rawItems;
+  if (items.length === 0) {
+    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-muted-foreground py-2", "data-testid": "thing-list", children: [
+      "No ",
+      target,
+      "s matched this query."
+    ] });
+  }
+  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full overflow-auto space-y-1", "data-testid": "thing-list", children: [
+    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-[11px] font-medium text-muted-foreground mb-1", children: [
+      items.length,
+      " ",
+      target,
+      items.length === 1 ? "" : "s",
+      " matched"
+    ] }),
+    /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "space-y-0.5 max-h-48 overflow-y-auto font-mono text-xs", children: items.map((item, i) => {
+      const id = item.id ?? item.resultId ?? String(i);
+      const typedItem = { ...item, id, title: item.title ?? item.label ?? item.noteTitle };
+      const title = isBlock ? typedItem.title || typedItem.blockContentId || id : typedItem.title || id;
+      const containers = result?.containers;
+      const href = containers ? containerPageHref(containers[id]) ?? (noteHref ? noteHref(typedItem) : void 0) : noteHref ? noteHref(typedItem) : void 0;
+      return /* @__PURE__ */ jsxRuntime.jsx("li", { className: "rounded hover:bg-muted/50 truncate", children: href ? /* @__PURE__ */ jsxRuntime.jsx(
+        "a",
+        {
+          href,
+          onClick: (e) => {
+            if (onOpenNote) {
+              e.preventDefault();
+              onOpenNote(typedItem);
+            }
+          },
+          className: "block py-0.5 px-1.5 text-primary hover:underline truncate",
+          children: title
+        }
+      ) : onOpenNote ? /* @__PURE__ */ jsxRuntime.jsx(
+        "button",
+        {
+          type: "button",
+          onClick: () => onOpenNote(typedItem),
+          className: "w-full text-left py-0.5 px-1.5 text-primary hover:underline truncate",
+          children: title
+        }
+      ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "block py-0.5 px-1.5 text-foreground truncate", children: title }) }, id);
+    }) })
+  ] });
 }
 
 // src/utils/blockQueryPatcher.ts
@@ -7186,21 +7407,31 @@ function QueryBlockView({
   widgetError,
   tokenValues,
   attributes,
+  onAddToDashboard,
   onCaptureRpe,
   onOpenNote,
   noteHref
 }) {
   const [isModalOpen, setIsModalOpen] = React2.useState(false);
   const extracted = React2.useMemo(() => extractBlockQueries(query), [query]);
+  const rawBody = React2.useMemo(() => {
+    const trimmed = query.trim();
+    if (trimmed.includes("\n")) {
+      const docParsed = wodWikiWql.parseDocument(trimmed);
+      if (!docParsed.doc.degenerate && docParsed.diagnostics.length === 0 && docParsed.doc.assignments.length > 0) {
+        return trimmed;
+      }
+    }
+    return extracted.length > 0 ? extracted[0].query : query;
+  }, [extracted, query]);
   const { query: effectiveQuery, missing } = React2.useMemo(() => {
-    const raw = extracted.length > 0 ? extracted[0].query : query;
-    const subQuery = wodWikiWql.substituteTokens(raw, tokenValues ?? {});
+    const subQuery = wodWikiWql.substituteTokens(rawBody, tokenValues ?? {});
     const missingSet = new Set(subQuery.missing);
     for (const value of Object.values(attributes ?? {})) {
       for (const m of wodWikiWql.substituteTokens(value, tokenValues ?? {}).missing) missingSet.add(m);
     }
     return { query: subQuery.query, missing: [...missingSet] };
-  }, [extracted, query, tokenValues, attributes]);
+  }, [rawBody, tokenValues, attributes]);
   const resolvedAttributes = React2.useMemo(() => {
     const out = {};
     for (const [key, value] of Object.entries(attributes ?? {})) {
@@ -7208,11 +7439,12 @@ function QueryBlockView({
     }
     return out;
   }, [attributes, tokenValues]);
+  const docParse = React2.useMemo(() => wodWikiWql.parseDocument(effectiveQuery), [effectiveQuery]);
+  const isMultiLineDoc = !docParse.doc.degenerate && docParse.doc.assignments.length > 0;
   const parsed = React2.useMemo(() => wodWikiWql.parseQuery(effectiveQuery), [effectiveQuery]);
+  const syntaxError = isMultiLineDoc ? docParse.diagnostics[0] : parsed.error;
   const unknownType = widgetType != null && widgetType !== "" && !wodWikiWql.isDashboardWidgetType(widgetType);
-  const [result, setResult] = React2.useState(void 0);
-  const [findResult, setFindResult] = React2.useState(void 0);
-  const [pipelineResult, setPipelineResult] = React2.useState(void 0);
+  const [runResult, setRunResult] = React2.useState(void 0);
   const [runError, setRunError] = React2.useState(void 0);
   const [rowsRefreshKey, setRowsRefreshKey] = React2.useState(0);
   React2.useEffect(() => {
@@ -7227,59 +7459,45 @@ function QueryBlockView({
   }, [onResultSaved]);
   React2.useEffect(() => {
     let cancelled = false;
+    let retryTimer;
     setRunError(void 0);
-    setResult(void 0);
-    setFindResult(void 0);
-    setPipelineResult(void 0);
-    if (parsed.error) return;
-    if (widgetError || unknownType || missing.length > 0) return;
-    if (!executor) return;
-    if (wodWikiWql.isFindQuery(parsed)) {
-      let retryTimer;
-      const isSession = parsed.target === "session";
-      const executeFind = (attemptCount) => {
-        void executor.runFind(parsed).then((res) => {
-          if (cancelled) return;
-          setFindResult(res);
-          if (isSession && (res.runs ?? []).length === 0 && attemptCount < 4) {
-            const delays = [50, 150, 350, 750];
-            retryTimer = setTimeout(() => {
-              if (!cancelled) executeFind(attemptCount + 1);
-            }, delays[attemptCount] ?? 500);
-          }
-        }).catch((err) => {
-          if (!cancelled) setRunError(err instanceof Error ? err.message : String(err));
-        });
-      };
-      executeFind(0);
-      return () => {
-        cancelled = true;
-        clearTimeout(retryTimer);
-      };
-    }
-    if (wodWikiWql.isPipelineQuery(parsed)) {
-      if (!executor.runPipeline) {
-        setRunError("pipeline queries are not supported by this executor");
-        return;
-      }
-      void executor.runPipeline(effectiveQuery).then((res) => {
-        if (!cancelled) setPipelineResult(res);
+    setRunResult(void 0);
+    if (syntaxError || widgetError || unknownType || missing.length > 0 || !executor) return;
+    const isSessionFind = !isMultiLineDoc && wodWikiWql.isFindQuery(parsed) && parsed.target === "session";
+    const host = createExecutorDocumentHost(executor);
+    const executeRun = (attemptCount) => {
+      const runner = new wodWikiWql.SharedQueryDocumentRunner(host);
+      void runner.run(effectiveQuery).then((res) => {
+        if (cancelled) return;
+        const out = res.outputs[0];
+        if (!out) {
+          setRunError(res.diagnostics[0] ?? "widget produced no output");
+          return;
+        }
+        const err = out.error ?? res.diagnostics[0];
+        if (err) {
+          setRunError(err);
+          return;
+        }
+        const effectiveParsed = isMultiLineDoc ? out.kind === "find" ? { family: "find", raw: effectiveQuery, target: "note", filters: [] } : { family: "aggregate", raw: effectiveQuery, agg: "sum", metric: out.name, filters: [], groupBy: out.groupBy ?? [] } : parsed;
+        const shaped = outputToRunResult(effectiveParsed, out);
+        setRunResult(shaped);
+        if (isSessionFind && (shaped.runs ?? []).length === 0 && attemptCount < 4) {
+          const delays = [50, 150, 350, 750];
+          retryTimer = setTimeout(() => {
+            if (!cancelled) executeRun(attemptCount + 1);
+          }, delays[attemptCount] ?? 500);
+        }
       }).catch((err) => {
         if (!cancelled) setRunError(err instanceof Error ? err.message : String(err));
       });
-      return () => {
-        cancelled = true;
-      };
-    }
-    void executor.runQuery(effectiveQuery).then((res) => {
-      if (!cancelled) setResult(res);
-    }).catch((err) => {
-      if (!cancelled) setRunError(err instanceof Error ? err.message : String(err));
-    });
+    };
+    executeRun(0);
     return () => {
       cancelled = true;
+      clearTimeout(retryTimer);
     };
-  }, [effectiveQuery, parsed, widgetError, unknownType, missing, executor, rowsRefreshKey]);
+  }, [effectiveQuery, parsed, isMultiLineDoc, syntaxError, widgetError, unknownType, missing, executor, rowsRefreshKey]);
   const canEdit = onSaveQuery !== void 0 && !readOnly;
   const onEdit = canEdit ? () => setIsModalOpen(true) : void 0;
   const resultId = React2.useMemo(() => {
@@ -7287,50 +7505,32 @@ function QueryBlockView({
     const resultFilter = parsed.filters.find((f) => f.key === "result");
     return resultFilter?.values[0]?.value;
   }, [parsed]);
+  const fallbackLabel = React2.useMemo(() => {
+    if (!wodWikiWql.isFindQuery(parsed) && !wodWikiWql.isPipelineQuery(parsed)) return parsed.metric;
+    return parsed.raw;
+  }, [parsed]);
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { "data-testid": "query-block-view", children: [
-    widgetError ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: widgetError }) }) : unknownType ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsx(WidgetProblemBadge, { message: wodWikiWql.unknownWidgetTypeMessage(widgetType) }) }) : missing.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsx(WidgetProblemBadge, { message: wodWikiWql.unknownTokensMessage(missing) }) }) : parsed.error ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: [
+    widgetError ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: widgetError }) }) : unknownType ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsx(WidgetProblemBadge, { message: wodWikiWql.unknownWidgetTypeMessage(widgetType) }) }) : missing.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsx(WidgetProblemBadge, { message: wodWikiWql.unknownTokensMessage(missing) }) }) : syntaxError ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: [
       "Query syntax error: ",
-      parsed.error
-    ] }) }) : runError ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: [
+      syntaxError
+    ] }) }) : runError ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: [
       "Query execution error: ",
       runError
-    ] }) }) : wodWikiWql.isFindQuery(parsed) ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: findResult?.table ? /* @__PURE__ */ jsxRuntime.jsx(WidgetChart, { type: "table", result: findResult }) : resultId && findResult?.runs && findResult.runs.length > 0 ? /* @__PURE__ */ jsxRuntime.jsx(
-      RowsResultsChrome,
+    ] }) }) : /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, onAddToDashboard, children: /* @__PURE__ */ jsxRuntime.jsx(
+      QueryBlockBody,
       {
+        parsed,
+        result: runResult,
         resultId,
-        sessionResult: findResult,
+        widgetType,
+        attributes: resolvedAttributes,
+        fallbackLabel,
         executor,
         onCaptureRpe,
-        onCaptured: () => setRowsRefreshKey((k) => k + 1)
-      }
-    ) : findResult?.runs ? /* @__PURE__ */ jsxRuntime.jsx(RowsTable, { result: findResult }) : findResult ? /* @__PURE__ */ jsxRuntime.jsx(
-      FindResultList,
-      {
-        target: parsed.target,
-        notes: findResult.notes,
-        blocks: findResult.blocks,
-        containers: findResult.containers,
+        onCaptured: () => setRowsRefreshKey((k) => k + 1),
         onOpenNote,
         noteHref
       }
-    ) : /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-muted-foreground py-2", children: "Loading rows\u2026" }) }) : wodWikiWql.isPipelineQuery(parsed) ? /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsx(
-      PipelineResultView,
-      {
-        result: pipelineResult,
-        onOpenNote,
-        noteHref,
-        widgetType,
-        attributes: resolvedAttributes,
-        fallbackLabel: parsed.raw
-      }
-    ) }) : /* @__PURE__ */ jsxRuntime.jsx(QueryBlockShell, { onEdit, readOnly, children: /* @__PURE__ */ jsxRuntime.jsx(
-      AnalyticsChart,
-      {
-        result,
-        metric: parsed.metric,
-        widgetType,
-        attributes: resolvedAttributes
-      }
     ) }),
     canEdit && /* @__PURE__ */ jsxRuntime.jsx(
       WqlQueryInspectorModal,
@@ -7344,179 +7544,127 @@ function QueryBlockView({
     )
   ] });
 }
-function AnalyticsChart({
+function QueryBlockBody({
+  parsed,
   result,
-  metric,
+  resultId,
   widgetType,
-  attributes
-}) {
-  const shape = useChartShape(result);
-  if (widgetType != null && widgetType !== "") {
-    return /* @__PURE__ */ jsxRuntime.jsx(WidgetChart, { type: widgetType, result, label: metric, attributes });
-  }
-  if (shape.kind === "scalar") {
-    return /* @__PURE__ */ jsxRuntime.jsx(QueryValue, { result, label: metric });
-  }
-  if (shape.kind === "timeseries") {
-    return /* @__PURE__ */ jsxRuntime.jsx(WqlTimeseries, { result });
-  }
-  if (shape.kind === "bars") {
-    return /* @__PURE__ */ jsxRuntime.jsx(WqlBars, { result });
-  }
-  return /* @__PURE__ */ jsxRuntime.jsx(WqlEmptyState, { result });
-}
-function containerPageHref(container) {
-  if (!container || container.kind !== "page") return void 0;
-  const { slug, date } = container;
-  if (slug) return `/page/${encodeURIComponent(slug)}`;
-  if (date) return `/day/${encodeURIComponent(date)}`;
-  return void 0;
-}
-function FindResultList({
-  target,
-  notes,
-  blocks,
-  containers,
+  attributes,
+  fallbackLabel,
+  executor,
+  onCaptureRpe,
+  onCaptured,
   onOpenNote,
   noteHref
-}) {
-  const isBlock = target === "block";
-  const items = isBlock ? blocks : notes;
-  if (items.length === 0) {
-    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-muted-foreground py-2", children: [
-      "No ",
-      target,
-      "s matched this query."
-    ] });
-  }
-  return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "space-y-1", children: [
-    /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-[11px] font-medium text-muted-foreground mb-1", children: [
-      items.length,
-      " ",
-      target,
-      items.length === 1 ? "" : "s",
-      " matched"
-    ] }),
-    /* @__PURE__ */ jsxRuntime.jsx("ul", { className: "space-y-0.5 max-h-48 overflow-y-auto font-mono text-xs", children: items.map((item) => {
-      const typedItem = item;
-      const title = isBlock ? typedItem.title || typedItem.blockContentId || item.id : typedItem.title || item.id;
-      const href = containers ? containerPageHref(containers[item.id]) ?? (noteHref ? noteHref(typedItem) : void 0) : noteHref ? noteHref(typedItem) : void 0;
-      return /* @__PURE__ */ jsxRuntime.jsx("li", { className: "rounded hover:bg-muted/50 truncate", children: href ? /* @__PURE__ */ jsxRuntime.jsx(
-        "a",
-        {
-          href,
-          onClick: (e) => {
-            if (onOpenNote) {
-              e.preventDefault();
-              onOpenNote(typedItem);
-            }
-          },
-          className: "block py-0.5 px-1.5 text-primary hover:underline truncate",
-          children: title
-        }
-      ) : onOpenNote ? /* @__PURE__ */ jsxRuntime.jsx(
-        "button",
-        {
-          type: "button",
-          onClick: () => onOpenNote(typedItem),
-          className: "w-full text-left py-0.5 px-1.5 text-primary hover:underline truncate",
-          children: title
-        }
-      ) : /* @__PURE__ */ jsxRuntime.jsx("span", { className: "block py-0.5 px-1.5 text-foreground truncate", children: title }) }, item.id);
-    }) })
-  ] });
-}
-function PipelineResultView({
-  result,
-  onOpenNote,
-  noteHref,
-  widgetType,
-  attributes,
-  fallbackLabel
 }) {
   if (!result) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-muted-foreground py-2", children: "Loading\u2026" });
+    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-muted-foreground py-2", children: wodWikiWql.isFindQuery(parsed) ? "Loading rows\u2026" : "Loading\u2026" });
   }
-  if (result.error) {
-    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "text-xs text-destructive bg-destructive/10 border border-destructive/20 rounded p-2", children: [
-      "Query execution error: ",
-      result.error
-    ] });
+  if (result.table && (widgetType == null || widgetType === "" || widgetType === "table")) {
+    return /* @__PURE__ */ jsxRuntime.jsx(WidgetChart, { type: "table", result });
   }
-  const listTarget = result.parsed.source.kind === "query" && result.parsed.source.query.family === "find" ? result.parsed.source.query.target : "note";
-  if ((result.notes?.length ?? 0) + (result.blocks?.length ?? 0) > 0) {
+  if (resultId && result.runs && result.runs.length > 0) {
     return /* @__PURE__ */ jsxRuntime.jsx(
-      FindResultList,
+      RowsResultsChrome,
       {
-        target: listTarget,
-        notes: result.notes ?? [],
-        blocks: result.blocks ?? [],
-        containers: result.containers,
-        onOpenNote,
-        noteHref
+        resultId,
+        sessionResult: result,
+        executor,
+        onCaptureRpe,
+        onCaptured
       }
     );
   }
-  if (result.runs && result.runs.length > 0) {
-    const rowsResult = { parsed: result.parsed, runs: result.runs, table: result.table };
-    return /* @__PURE__ */ jsxRuntime.jsx(RowsTable, { result: rowsResult });
+  if (result.runs && (wodWikiWql.isFindQuery(parsed) || result.runs.length > 0)) {
+    return /* @__PURE__ */ jsxRuntime.jsx(RowsTable, { result });
   }
-  const chartHead = widgetType != null && widgetType !== "" ? widgetType : result.chart?.head;
-  if (chartHead) {
-    const sinkAttributes = Object.fromEntries(
-      (result.chart?.filters ?? []).map((f) => [f.key, f.values.map((v) => v.value).join(",")])
-    );
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-[220px] min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(
+  if (wodWikiWql.isFindQuery(parsed) || (result.notes?.length ?? 0) + (result.blocks?.length ?? 0) + (result.efforts?.length ?? 0) > 0 && (!result.series || result.series.length === 0)) {
+    return /* @__PURE__ */ jsxRuntime.jsx(
       WidgetChart,
       {
-        type: chartHead,
-        result: toChartResult(result),
-        label: fallbackLabel,
-        attributes: { ...sinkAttributes, ...attributes }
+        type: "list",
+        result,
+        onOpenNote,
+        noteHref
       }
-    ) });
-  }
-  if (result.series && result.series.length > 0) {
-    return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-full h-[220px] min-h-[160px]", children: /* @__PURE__ */ jsxRuntime.jsx(AnalyticsChart, { result: toChartResult(result), metric: fallbackLabel }) });
+    );
   }
-  return /* @__PURE__ */ jsxRuntime.jsx(WqlEmptyState, { result: toChartResult(result) });
+  const sinkHead = result.chart?.head;
+  const effectiveType = widgetType != null && widgetType !== "" ? widgetType : sinkHead ?? "";
+  const sinkAttributes = Object.fromEntries(
+    (result.chart?.filters ?? []).map((f) => [f.key, f.values.map((v) => v.value).join(",")])
+  );
+  const mergedAttributes = { ...sinkAttributes, ...attributes };
+  const needsChartHeight = wodWikiWql.isPipelineQuery(parsed) && (Boolean(effectiveType) || (result.series?.length ?? 0) > 0);
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: needsChartHeight ? "w-full h-[220px] min-h-[160px]" : void 0, children: /* @__PURE__ */ jsxRuntime.jsx(
+    WidgetChart,
+    {
+      type: effectiveType,
+      result,
+      label: fallbackLabel,
+      attributes: mergedAttributes,
+      inferDefaultShape: effectiveType === "",
+      onOpenNote,
+      noteHref
+    }
+  ) });
 }
 function QueryBlockShell({
   children,
   onEdit,
-  readOnly
+  readOnly,
+  onAddToDashboard
 }) {
   return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "relative group/block my-2 p-3 rounded-lg border border-border/80 bg-card/60 shadow-sm", children: [
-    onEdit && !readOnly && /* @__PURE__ */ jsxRuntime.jsx(
-      "button",
-      {
-        type: "button",
-        onClick: onEdit,
-        title: "Edit query in Omni-Composer",
-        className: "absolute top-2 right-2 p-1 rounded bg-muted/80 text-muted-foreground hover:text-foreground opacity-0 group-hover/block:opacity-100 focus-visible:opacity-100 [@media(pointer:coarse)]:opacity-100 transition-opacity z-10",
-        children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit3, { className: "w-3.5 h-3.5" })
-      }
-    ),
+    (onAddToDashboard || onEdit && !readOnly) && /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "absolute top-2 right-2 z-10 flex items-center gap-1", children: [
+      onAddToDashboard && /* @__PURE__ */ jsxRuntime.jsx(
+        "button",
+        {
+          type: "button",
+          onClick: onAddToDashboard,
+          "aria-label": "Add to dashboard",
+          title: "Add to dashboard",
+          "data-testid": "query-add-dashboard",
+          className: "p-1 rounded bg-muted/80 text-muted-foreground hover:text-foreground",
+          children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.ChartBar, { className: "w-3.5 h-3.5" })
+        }
+      ),
+      onEdit && !readOnly && /* @__PURE__ */ jsxRuntime.jsx(
+        "button",
+        {
+          type: "button",
+          onClick: onEdit,
+          "aria-label": "Edit query in Omni-Composer",
+          title: "Edit query in Omni-Composer",
+          className: "p-1 rounded bg-muted/80 text-muted-foreground hover:text-foreground opacity-0 group-hover/block:opacity-100 focus-visible:opacity-100 [@media(pointer:coarse)]:opacity-100 transition-opacity",
+          children: /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Edit3, { className: "w-3.5 h-3.5" })
+        }
+      )
+    ] }),
     children
   ] });
 }
 var ReactQueryBlock = class extends view.WidgetType {
-  constructor(queryText, sectionId, widgetType, widgetError, options) {
+  constructor(queryText, sectionId, widgetType, widgetError, attributes, tokenValues, options) {
     super();
     this.queryText = queryText;
     this.sectionId = sectionId;
     this.widgetType = widgetType;
     this.widgetError = widgetError;
+    this.attributes = attributes;
+    this.tokenValues = tokenValues;
     this.options = options;
   }
   queryText;
   sectionId;
   widgetType;
   widgetError;
+  attributes;
+  tokenValues;
   options;
   root = null;
   eq(other) {
-    return this.queryText === other.queryText && this.sectionId === other.sectionId && this.widgetType === other.widgetType && this.widgetError === other.widgetError && this.options?.readOnly === other.options?.readOnly && this.options?.executor === other.options?.executor && this.options?.onOpenNote === other.options?.onOpenNote && this.options?.noteHref === other.options?.noteHref;
+    return this.queryText === other.queryText && this.sectionId === other.sectionId && this.widgetType === other.widgetType && this.widgetError === other.widgetError && JSON.stringify(this.attributes ?? {}) === JSON.stringify(other.attributes ?? {}) && JSON.stringify(this.tokenValues ?? {}) === JSON.stringify(other.tokenValues ?? {}) && this.options?.readOnly === other.options?.readOnly && this.options?.executor === other.options?.executor && this.options?.onOpenNote === other.options?.onOpenNote && this.options?.noteHref === other.options?.noteHref;
   }
   toDOM(view) {
     const container = document.createElement("div");
@@ -7537,6 +7685,8 @@ var ReactQueryBlock = class extends view.WidgetType {
           query: this.queryText,
           widgetType: this.widgetType,
           widgetError: this.widgetError,
+          attributes: this.attributes,
+          tokenValues: this.tokenValues,
           readOnly: this.options?.readOnly,
           executor: this.options?.executor,
           onResultSaved: this.options?.onResultSaved,
@@ -7564,6 +7714,8 @@ var ReactQueryBlock = class extends view.WidgetType {
           query: this.queryText,
           widgetType: this.widgetType,
           widgetError: this.widgetError,
+          attributes: this.attributes,
+          tokenValues: this.tokenValues,
           readOnly: this.options?.readOnly,
           executor: this.options?.executor,
           onResultSaved: this.options?.onResultSaved,
@@ -7591,8 +7743,11 @@ var ReactQueryBlock = class extends view.WidgetType {
 };
 function buildQueryBlockDecos(state$1, options) {
   const builder = new state.RangeSetBuilder();
-  const { sections } = state$1.field(sectionField);
+  const { sections, rawContent: fullRawContent } = state$1.field(sectionField);
   const cursor2 = state$1.selection.main.head;
+  const fmMeta = wodWikiCore.parseFrontmatter(fullRawContent).meta;
+  const fmTokens = wodWikiWql.defaultTokenValues(wodWikiWql.extractDashboardTokens(fmMeta));
+  const mergedTokens = { ...fmTokens, ...options?.tokenValues };
   for (const section of sections) {
     if (section.type !== "query") continue;
     if (cursor2 >= section.from && cursor2 <= section.to) continue;
@@ -7607,6 +7762,8 @@ function buildQueryBlockDecos(state$1, options) {
           section.id,
           section.queryType,
           section.queryError,
+          section.queryAttributes,
+          mergedTokens,
           options
         ),
         block: true