@bitcobblers/wod-wiki-ui 0.10.42 → 0.11.43

package/dist/extensions/index.cjs

@@ -2820,7 +2820,6 @@ wodWikiWql.WQL_SOURCES.filter((s) => s !== "metrics");
 function sourcePlane(source) {
   return source === "metrics" ? "metrics" : "content";
 }
-var METRICS_ONLY_TYPES = /* @__PURE__ */ new Set(["agg", "metric", "groupby", "rollup", "unit"]);
 var SOURCE_OPTIONS = [
   { value: "journal", label: "Journal", description: "Find notes in the personal journal" },
   { value: "collections", label: "Collections", description: "Find notes in workout catalogs" },
@@ -2896,258 +2895,6 @@ function getClauseMeta(type) {
     description: ""
   };
 }
-function clauseToWql(clause) {
-  if (!clause.value.trim()) return {};
-  const val = clause.value.trim();
-  switch (clause.type) {
-    case "text": {
-      const needsQuotes = /\s/.test(val) && !(val.startsWith('"') && val.endsWith('"'));
-      return { filterStr: `text:${needsQuotes ? `"${val}"` : val}` };
-    }
-    case "catalog":
-      return { filterStr: `catalog:${val}` };
-    case "tag":
-      return { filterStr: `tags:${val}` };
-    case "effort":
-      return { filterStr: `effort:${val}` };
-    case "discipline":
-      return { filterStr: `discipline:${val}` };
-    case "intensity":
-      return { filterStr: `intensity:${val}` };
-    case "origin":
-      return { filterStr: `origin:${val}` };
-    case "type":
-      return { filterStr: `type:${val}` };
-    case "has":
-      return { filterStr: `has:${val}` };
-    case "result":
-      return { filterStr: `result:${val}` };
-    case "block":
-      return { filterStr: `block:${val}` };
-    case "note":
-      return { filterStr: `note:${val}` };
-    default: {
-      const def = composerRegistry.getSlot(clause.type);
-      if (!def) return {};
-      if (!def.parseValue) return {};
-      const value = def.parseValue(val);
-      if (value === void 0) return {};
-      const fragment = def.wqlGenerator(value);
-      return fragment.trim() ? { filterStr: fragment } : {};
-    }
-  }
-}
-function clausesToWql(clauses) {
-  const whereClause = clauses.find((c) => c.type === "where");
-  const whereStr = whereClause?.value?.trim() ? `where ${whereClause.value.trim()}` : "";
-  const filterParts = [];
-  for (const c of clauses) {
-    const res = clauseToWql(c);
-    if (res.filterStr) {
-      filterParts.push(res.filterStr);
-    }
-  }
-  const filterBraces = filterParts.length > 0 ? `{${filterParts.join(", ")}}` : "";
-  const source = clauseValue(clauses, "source", "notes");
-  if (source === "rows") {
-    const output = clauseValue(clauses, "output", "") || "all";
-    const timeClause2 = clauses.find((c) => c.type === "time");
-    let timeStr2 = "";
-    if (timeClause2 && timeClause2.value && timeClause2.value !== "all") {
-      const rawVal = timeClause2.value.trim();
-      timeStr2 = rawVal.startsWith("last") ? rawVal : `last ${rawVal}`;
-    }
-    return [
-      `rows:${output}${filterBraces}`,
-      timeStr2
-    ].filter(Boolean).join(" ").trim();
-  }
-  if (source === "metrics") {
-    const agg = clauseValue(clauses, "agg", "sum");
-    const metric = clauseValue(clauses, "metric", "");
-    const dims = clauses.filter((c) => c.type === "groupby" && c.value.trim()).map((c) => c.value.trim());
-    const rollup = clauseValue(clauses, "rollup", "");
-    const unit = clauseValue(clauses, "unit", "");
-    const byStr = dims.length ? `by {${dims.join(", ")}}` : "";
-    const rollupStr = rollup ? `.rollup(${rollup})` : "";
-    const head = byStr ? `${agg}:${metric}${filterBraces}` : `${agg}:${metric}${filterBraces}${rollupStr}`;
-    return [
-      head,
-      `${byStr}${byStr ? rollupStr : ""}`,
-      unit ? `in ${unit}` : "",
-      whereStr
-    ].filter(Boolean).join(" ").trim();
-  }
-  const target = source === "blocks" ? "block" : source === "efforts" ? "effort" : "note";
-  const scope = source === "notes" || source === "blocks" || source === "efforts" ? "all" : source;
-  const timeClause = clauses.find((c) => c.type === "time");
-  let timeStr = "";
-  if (timeClause && timeClause.value && timeClause.value !== "all") {
-    const rawVal = timeClause.value.trim();
-    timeStr = rawVal.startsWith("last") ? rawVal : `last ${rawVal}`;
-  }
-  return [
-    `find:${target}${filterBraces}`,
-    `in ${scope}`,
-    timeStr,
-    whereStr
-  ].filter(Boolean).join(" ").trim();
-}
-var POSITIONAL_CLAUSE_TYPES = /* @__PURE__ */ new Set(["source", "time", "where", "agg", "metric", "groupby", "rollup", "unit", "output"]);
-var FILTER_KEY_TO_CLAUSE_TYPE = Object.fromEntries(
-  Object.entries(CLAUSE_META).filter(([type]) => !POSITIONAL_CLAUSE_TYPES.has(type)).map(([type, meta]) => [meta.prefix.replace(/:$/, ""), type])
-);
-function splitTopLevel(body) {
-  const parts = [];
-  let depth = 0;
-  let inQuote = false;
-  let start = 0;
-  for (let i = 0; i < body.length; i++) {
-    const c = body[i];
-    if (c === '"') inQuote = !inQuote;
-    else if (!inQuote && c === "{") depth++;
-    else if (!inQuote && c === "}") depth = Math.max(0, depth - 1);
-    else if (!inQuote && c === "," && depth === 0) {
-      parts.push(body.slice(start, i));
-      start = i + 1;
-    }
-  }
-  parts.push(body.slice(start));
-  return parts;
-}
-var RESTORE_FIND_HEAD_RE = /^find:([a-zA-Z0-9_-]*)/;
-var RESTORE_AGG_HEAD_RE = /^([a-zA-Z0-9_-]+):([a-zA-Z0-9_.-]*)/;
-function restoreClause(id, type, value) {
-  return { id, type, ...getClauseMeta(type), value };
-}
-function filterFragmentToClause(fragment, index) {
-  if (fragment.startsWith("!")) return null;
-  const colon2 = fragment.indexOf(":");
-  if (colon2 <= 0) return null;
-  const key = fragment.slice(0, colon2);
-  const value = fragment.slice(colon2 + 1);
-  if (!value.trim()) return null;
-  if (key === "source") {
-    return restoreClause(`c-source-${index}`, "source", value);
-  }
-  const builtin = FILTER_KEY_TO_CLAUSE_TYPE[key];
-  if (builtin) {
-    const restoredValue = builtin === "text" && value.length >= 2 && value.startsWith('"') && value.endsWith('"') ? value.slice(1, -1) : value;
-    return restoreClause(`c-${builtin}-${index}`, builtin, restoredValue);
-  }
-  for (const slot of composerRegistry.getAllSlots()) {
-    if (!slot.parseValue || !slot.formatValue) continue;
-    const typed = slot.parseValue(value);
-    if (typed !== void 0 && slot.wqlGenerator(typed) === fragment) {
-      return restoreClause(`c-${slot.type}-${index}`, slot.type, slot.formatValue(typed));
-    }
-  }
-  return null;
-}
-function restoreFilters(rest) {
-  if (!rest) return [];
-  if (!rest.startsWith("{") || !rest.endsWith("}")) return null;
-  const body = rest.slice(1, -1);
-  const fragments = splitTopLevel(body).map((f) => f.trim()).filter(Boolean);
-  const clauses = [];
-  for (let i = 0; i < fragments.length; i++) {
-    const clause = filterFragmentToClause(fragments[i], i);
-    if (!clause) return null;
-    clauses.push(clause);
-  }
-  return clauses;
-}
-function wqlToClauses(wql2) {
-  const suffixes = wodWikiWql.parseWqlSuffixes(wql2.trim());
-  if (suffixes.conflicts?.length) return null;
-  const { where, displayUnit, groupBy, rollup, window: window2, legacyScope, primaryText } = suffixes;
-  if (window2?.kind === "range") return null;
-  const rowsMatch = /^rows(?:\:([a-zA-Z0-9_-]+))?\:?/.exec(primaryText);
-  if (rowsMatch) {
-    if (where || groupBy || rollup) return null;
-    const rest2 = primaryText.slice(rowsMatch[0].length).trim();
-    const filterClauses2 = restoreFilters(rest2);
-    if (!filterClauses2) return null;
-    const clauses2 = [
-      restoreClause("c-source", "source", "rows"),
-      restoreClause("c-time", "time", window2?.kind === "relative" ? `last ${window2.size}${window2.unit}` : "all"),
-      ...rowsMatch[1] ? [restoreClause("c-output", "output", rowsMatch[1])] : [],
-      ...filterClauses2
-    ];
-    return clauses2;
-  }
-  if (primaryText.startsWith("find:")) {
-    const headMatch2 = RESTORE_FIND_HEAD_RE.exec(primaryText);
-    if (!headMatch2) return null;
-    const targetValue = headMatch2[1];
-    if (!wodWikiWql.WQL_FIND_TARGETS.includes(targetValue)) return null;
-    const rest2 = primaryText.slice(headMatch2[0].length).trim();
-    const filterClauses2 = restoreFilters(rest2);
-    if (!filterClauses2) return null;
-    const timeValue = window2?.kind === "relative" ? `last ${window2.size}${window2.unit}` : "all";
-    const sourceClauseIdx = filterClauses2.findIndex((c) => c.type === "source");
-    const sourceFromFilter = sourceClauseIdx !== -1 ? filterClauses2[sourceClauseIdx].value : void 0;
-    const scopeValue = legacyScope ?? sourceFromFilter;
-    const remainingFilterClauses = sourceClauseIdx !== -1 ? filterClauses2.filter((_, idx) => idx !== sourceClauseIdx) : filterClauses2;
-    const sourceValue = targetValue === "block" ? "blocks" : targetValue === "effort" ? "efforts" : !scopeValue || scopeValue === "all" ? "notes" : scopeValue;
-    const clauses2 = [
-      restoreClause("c-source", "source", sourceValue),
-      restoreClause("c-time", "time", timeValue),
-      ...remainingFilterClauses
-    ];
-    if (where) clauses2.push(restoreClause("c-where", "where", where));
-    return clauses2;
-  }
-  if (window2) return null;
-  const headMatch = RESTORE_AGG_HEAD_RE.exec(primaryText);
-  if (!headMatch) return null;
-  const aggValue = headMatch[1];
-  const metricValue = headMatch[2] ?? "";
-  const rest = primaryText.slice(headMatch[0].length).trim();
-  const filterClauses = restoreFilters(rest);
-  if (!filterClauses) return null;
-  const dimValues = groupBy ?? [];
-  const rollupValue = rollup?.raw ?? "";
-  const unitValue = displayUnit ?? "";
-  const clauses = [
-    restoreClause("c-source", "source", "metrics"),
-    restoreClause("c-agg", "agg", aggValue),
-    restoreClause("c-metric", "metric", metricValue),
-    ...filterClauses,
-    ...dimValues.map((d, i) => restoreClause(`c-groupby-${i}`, "groupby", d))
-  ];
-  if (rollupValue) clauses.push(restoreClause("c-rollup", "rollup", rollupValue));
-  if (unitValue) clauses.push(restoreClause("c-unit", "unit", unitValue));
-  if (where) clauses.push(restoreClause("c-where", "where", where));
-  return clauses;
-}
-function pivotClauses(clauses, source) {
-  const next = clauses.filter((c) => !METRICS_ONLY_TYPES.has(c.type) && c.type !== "time" && c.type !== "where").map((c) => c.type === "source" ? { ...c, value: source } : c);
-  if (source === "metrics") {
-    const sourceIdx = next.findIndex((c) => c.type === "source");
-    const head = [];
-    if (!next.some((c) => c.type === "agg")) head.push(restoreClause("c-agg", "agg", "sum"));
-    if (!next.some((c) => c.type === "metric")) head.push(restoreClause("c-metric", "metric", ""));
-    next.splice(sourceIdx >= 0 ? sourceIdx + 1 : next.length, 0, ...head);
-  }
-  return next;
-}
-function defaultClauses() {
-  return [
-    { id: "c-source", type: "source", ...CLAUSE_META.source, value: "notes" },
-    { id: "c-time", type: "time", ...CLAUSE_META.time, value: "last 2w" }
-  ];
-}
-function defaultMetricsClauses() {
-  return [
-    { id: "c-source", type: "source", ...CLAUSE_META.source, value: "metrics" },
-    { id: "c-agg", type: "agg", ...CLAUSE_META.agg, value: "sum" },
-    { id: "c-metric", type: "metric", ...CLAUSE_META.metric, value: "" }
-  ];
-}
-function clauseValue(clauses, type, fallback = "") {
-  return clauses.find((c) => c.type === type)?.value?.trim() || fallback;
-}
 function TokenSlotPill({
   clause,
   isActive,
@@ -3599,6 +3346,247 @@ function AddCalcDropdown({
     )
   ] });
 }
+var PILL_KEY = {
+  text: "text",
+  catalog: "catalog",
+  tag: "tags",
+  effort: "effort",
+  discipline: "discipline",
+  intensity: "intensity",
+  origin: "origin",
+  type: "type",
+  has: "has",
+  result: "result",
+  block: "block",
+  note: "note"
+};
+var KEY_PILL = Object.fromEntries(
+  Object.entries(PILL_KEY).map(([pill, key]) => [key, pill])
+);
+function pillValueToFilter(type, rawValue) {
+  const key = PILL_KEY[type];
+  if (!key) return null;
+  const values2 = rawValue.split("|").map((v) => v.trim()).filter(Boolean).map((v) => ({
+    value: v.endsWith("*") ? v.slice(0, -1) : v,
+    wildcard: v.endsWith("*")
+  }));
+  if (values2.length === 0) return null;
+  return { key, negate: false, values: values2 };
+}
+function filterFragment(f) {
+  const render = (v) => {
+    const bare = /^[a-zA-Z0-9_-]+(:[a-zA-Z0-9_-]+)?$/.test(v.value);
+    return `${bare ? v.value : `"${v.value}"`}${v.wildcard ? "*" : ""}`;
+  };
+  return `${f.negate ? "!" : ""}${f.key}:${f.values.map(render).join("|")}`;
+}
+function filterToPill(f, index) {
+  if (f.negate) return null;
+  const pillValue2 = f.values.map((v) => `${v.value}${v.wildcard ? "*" : ""}`).join("|");
+  if (!pillValue2.trim()) return null;
+  if (f.key === "source") {
+    return restorePill(`c-source-${index}`, "source", pillValue2);
+  }
+  const builtin = KEY_PILL[f.key];
+  if (builtin) {
+    const value = builtin === "text" && f.values.length === 1 && /\s/.test(f.values[0].value) ? f.values[0].value : pillValue2;
+    return restorePill(`c-${builtin}-${index}`, builtin, value);
+  }
+  const fragment = filterFragment(f);
+  for (const slot of composerRegistry.getAllSlots()) {
+    if (!slot.parseValue || !slot.formatValue) continue;
+    const typed = slot.parseValue(pillValue2);
+    if (typed !== void 0 && slot.wqlGenerator(typed) === fragment) {
+      return restorePill(`c-${slot.type}-${index}`, slot.type, slot.formatValue(typed));
+    }
+  }
+  return null;
+}
+function restorePill(id, type, value) {
+  return { id, type, ...getClauseMeta(type), value };
+}
+function astToPills(ast) {
+  if (ast.error) return null;
+  if (wodWikiWql.isRowsQuery(ast)) {
+    if (ast.window?.kind === "range") return null;
+    if (ast.filters.some((f) => f.key === "source")) return null;
+    const filterPills = [];
+    for (let i = 0; i < ast.filters.length; i++) {
+      const p = filterToPill(ast.filters[i], i);
+      if (!p) return null;
+      filterPills.push(p);
+    }
+    return [
+      restorePill("c-source", "source", "rows"),
+      restorePill("c-time", "time", windowPillValue(ast.window)),
+      restorePill("c-output", "output", ast.outputType ?? "all"),
+      ...filterPills
+    ];
+  }
+  if (wodWikiWql.isFindQuery(ast)) {
+    if (ast.window?.kind === "range") return null;
+    const sourceFilter = ast.filters.find((f) => f.key === "source" && !f.negate);
+    const nonIdentitySource = sourceFilter && !sourceFilter.values.every((v) => v.value === "all");
+    if ((ast.target === "block" || ast.target === "effort") && nonIdentitySource) return null;
+    const sourceValue = ast.target === "block" ? "blocks" : ast.target === "effort" ? "efforts" : !sourceFilter || sourceFilter.values.every((v) => v.value === "all") ? "notes" : sourceFilter.values.map((v) => v.value).join("|");
+    const rest = ast.filters.filter((f) => f !== sourceFilter);
+    const filterPills = [];
+    for (let i = 0; i < rest.length; i++) {
+      const p = filterToPill(rest[i], i);
+      if (!p) return null;
+      filterPills.push(p);
+    }
+    const pills = [
+      restorePill("c-source", "source", sourceValue),
+      restorePill("c-time", "time", windowPillValue(ast.window)),
+      ...filterPills
+    ];
+    if (ast.join) {
+      const j = ast.join;
+      const head = wodWikiWql.serialize({
+        family: "aggregate",
+        raw: "",
+        agg: j.agg,
+        metric: j.metric,
+        filters: j.filters,
+        groupBy: []
+      });
+      pills.push(restorePill("c-where", "where", `${head} ${j.operator} ${j.threshold}`));
+    }
+    return pills;
+  }
+  if (wodWikiWql.isAggregateQuery(ast)) {
+    if (ast.window?.kind === "range") return null;
+    const filterPills = [];
+    for (let i = 0; i < ast.filters.length; i++) {
+      const p = filterToPill(ast.filters[i], i);
+      if (!p) return null;
+      filterPills.push(p);
+    }
+    const pills = [
+      restorePill("c-source", "source", "metrics"),
+      restorePill("c-agg", "agg", ast.agg),
+      restorePill("c-metric", "metric", ast.metric),
+      ...filterPills,
+      ...ast.groupBy.map((d, i) => restorePill(`c-groupby-${i}`, "groupby", d))
+    ];
+    if (ast.rollup) pills.push(restorePill("c-rollup", "rollup", `${ast.rollup.size}${ast.rollup.unit}`));
+    if (ast.displayUnit) pills.push(restorePill("c-unit", "unit", ast.displayUnit));
+    if (ast.window) pills.push(restorePill("c-time", "time", windowPillValue(ast.window)));
+    if (ast.join) {
+      pills.push(
+        restorePill(
+          "c-where",
+          "where",
+          wodWikiWql.serialize({
+            family: "find",
+            raw: "",
+            target: ast.join.target,
+            filters: ast.join.filters,
+            window: ast.join.last ? { kind: "relative", size: ast.join.last.size, unit: ast.join.last.unit } : void 0
+          })
+        )
+      );
+    }
+    return pills;
+  }
+  return null;
+}
+function windowPillValue(w) {
+  if (!w) return "all";
+  return `last ${w.size}${w.unit}`;
+}
+function wqlToPills(wql2) {
+  const direct = astToPills(wodWikiWql.parseQuery(wql2.trim()));
+  if (direct) return direct;
+  const probed = wql2.trim().replace(/^([a-zA-Z_]\w*):(\s*\{)/, "$1:__placeholder__$2");
+  if (probed === wql2.trim()) return null;
+  const salvaged = astToPills(wodWikiWql.parseQuery(probed));
+  if (!salvaged) return null;
+  return salvaged.map((p) => p.type === "metric" ? { ...p, value: "" } : p);
+}
+function timePillText(raw) {
+  const v = raw.trim();
+  if (!v || v === "all") return "";
+  if (v.startsWith("last") || v.startsWith("from")) return v;
+  return `last ${v}`;
+}
+function buildCandidateText(pills) {
+  const source = pillValue(pills, "source", "notes");
+  const filterParts = [];
+  for (const pill of pills) {
+    const v = pill.value.trim();
+    if (!v) continue;
+    const builtin = pillValueToFilter(pill.type, v);
+    if (builtin) {
+      filterParts.push(filterFragment(builtin));
+      continue;
+    }
+    const def = composerRegistry.getSlot(pill.type);
+    if (!def?.parseValue) continue;
+    const typed = def.parseValue(v);
+    if (typed === void 0) continue;
+    const fragment = def.wqlGenerator(typed).trim();
+    if (fragment) filterParts.push(fragment);
+  }
+  const timePill = pills.find((c) => c.type === "time");
+  const timeText = timePill ? timePillText(timePill.value) : "";
+  const wherePill = pills.find((c) => c.type === "where");
+  const whereText = wherePill?.value.trim() ? `where ${wherePill.value.trim()}` : "";
+  if (source === "rows") {
+    const output = pillValue(pills, "output", "all") || "all";
+    return [`rows:${output}{${filterParts.join(",")}}`, timeText].filter(Boolean).join(" ").trim();
+  }
+  if (sourcePlane(source) === "metrics") {
+    const agg = pillValue(pills, "agg", "sum");
+    const metric = pillValue(pills, "metric", "");
+    const dims = pills.filter((c) => c.type === "groupby" && c.value.trim()).map((c) => c.value.trim());
+    const rollup = pillValue(pills, "rollup", "");
+    const unit = pillValue(pills, "unit", "");
+    return [
+      `${agg}:${metric}{${filterParts.join(",")}}`,
+      dims.length ? `by {${dims.join(", ")}}` : "",
+      rollup ? `.rollup(${rollup})` : "",
+      unit ? `in ${unit}` : "",
+      timeText,
+      whereText
+    ].filter(Boolean).join(" ").trim();
+  }
+  const target = source === "blocks" ? "block" : source === "efforts" ? "effort" : "note";
+  const withSource = source === "notes" || source === "blocks" || source === "efforts" ? filterParts : [`source:${source}`, ...filterParts];
+  const braces = withSource.length ? `{${withSource.join(",")}}` : "";
+  return [`find:${target}${braces}`, timeText, whereText].filter(Boolean).join(" ").trim();
+}
+function pillsToAst(pills) {
+  return wodWikiWql.parseQuery(buildCandidateText(pills));
+}
+var METRICS_HEAD_TYPES = /* @__PURE__ */ new Set(["agg", "metric", "groupby", "rollup", "unit"]);
+function pivotPills(pills, source) {
+  const next = pills.filter((c) => !METRICS_HEAD_TYPES.has(c.type) && c.type !== "where").map((c) => c.type === "source" ? { ...c, value: source } : c);
+  if (source === "metrics") {
+    const sourceIdx = next.findIndex((c) => c.type === "source");
+    const head = [];
+    if (!next.some((c) => c.type === "agg")) head.push(restorePill("c-agg", "agg", "sum"));
+    if (!next.some((c) => c.type === "metric")) head.push(restorePill("c-metric", "metric", ""));
+    next.splice(sourceIdx >= 0 ? sourceIdx + 1 : next.length, 0, ...head);
+  }
+  if (source === "rows" && !next.some((c) => c.type === "output")) {
+    const sourceIdx = next.findIndex((c) => c.type === "source");
+    next.splice(sourceIdx >= 0 ? sourceIdx + 1 : next.length, 0, restorePill("c-output", "output", "all"));
+  }
+  return next;
+}
+function defaultPills() {
+  return [
+    restorePill("c-source", "source", "notes"),
+    restorePill("c-time", "time", "last 2w")
+  ];
+}
+function pillValue(pills, type, fallback = "") {
+  return pills.find((c) => c.type === type)?.value?.trim() || fallback;
+}
+
+// src/composer/diagnostics.ts
 function summarizeFind(ast) {
   const sourceFilter = ast.filters.find((f) => f.key === "source");
   const scope = sourceFilter ? sourceFilter.values.map((v) => v.value).join(",") : "all";
@@ -3630,21 +3618,21 @@ function customSlotError(clause) {
   if (parsed === void 0) return `Invalid ${custom.label} value`;
   return custom.validate ? custom.validate(parsed) : null;
 }
-function diagnoseClauses(clauses) {
-  for (const clause of clauses) {
-    const error = customSlotError(clause);
+function diagnosePills(pills) {
+  for (const pill of pills) {
+    const error = customSlotError(pill);
     if (error) {
       return {
         valid: false,
-        wql: clausesToWql(clauses),
+        wql: wodWikiWql.serialize(pillsToAst(pills)),
         ast: { family: "aggregate", raw: "", agg: "sum", metric: "", filters: [], groupBy: [], error },
         error,
-        offendingClauseId: clause.id
+        offendingClauseId: pill.id
       };
     }
   }
-  const wql2 = clausesToWql(clauses);
-  const ast = wodWikiWql.parseQuery(wql2);
+  const ast = pillsToAst(pills);
+  const wql2 = wodWikiWql.serialize(ast);
   if (ast.error) {
     return {
       valid: false,
@@ -3772,10 +3760,9 @@ function useWqlStageCounts(ast, valid, execute, debounceMs = DEFAULT_DIAGNOSTICS
   return runnable ? stages : void 0;
 }
 function WqlComposer({
-  initialClauses,
-  clauses: controlledClauses,
-  onClausesChange,
-  onWqlChange,
+  initialQuery,
+  query: controlledQuery,
+  onQueryChange,
   onValidationChange,
   onAstChange,
   onSubmit,
@@ -3789,52 +3776,91 @@ function WqlComposer({
   placeholder = "Type search term and press Enter...",
   className
 }) {
-  const [internalClauses, setInternalClauses] = React.useState(
-    () => initialClauses ?? defaultClauses()
+  const [internalPills, setInternalPills] = React.useState(
+    () => wqlToPills(initialQuery ?? "") ?? defaultPills()
+  );
+  const controlledPills = React.useMemo(
+    () => controlledQuery === void 0 ? void 0 : wqlToPills(controlledQuery),
+    [controlledQuery]
   );
-  const clauses = controlledClauses ?? internalClauses;
+  const pills = controlledPills ?? internalPills;
   const hiddenTypes = React.useMemo(() => new Set(hiddenClauseTypes), [hiddenClauseTypes]);
   const [activeSlotIdx, setActiveSlotIdx] = React.useState(null);
   const [freeText, setFreeText] = React.useState("");
   const inputRef = React.useRef(null);
+  const freeTextInitRef = React.useRef(null);
+  React.useEffect(() => {
+    if (controlledQuery === void 0) return;
+    if (controlledPills === null) {
+      if (freeTextInitRef.current !== controlledQuery) {
+        freeTextInitRef.current = controlledQuery;
+        setFreeText(controlledQuery);
+      }
+    } else if (freeTextInitRef.current !== null) {
+      freeTextInitRef.current = null;
+      setFreeText("");
+    }
+  }, [controlledQuery, controlledPills]);
   React.useEffect(() => {
     if (!autoFocus) return;
     const t = setTimeout(() => inputRef.current?.focus(), 0);
     return () => clearTimeout(t);
   }, [autoFocus]);
-  const setClauses = React.useCallback(
+  const setPills = React.useCallback(
     (next) => {
-      if (controlledClauses === void 0) setInternalClauses(next);
-      onClausesChange?.(next);
+      if (controlledQuery === void 0) setInternalPills(next);
     },
-    [controlledClauses, onClausesChange]
+    [controlledQuery]
   );
   const registeredSlots = useComposerSlots();
-  const diagnostics = React.useMemo(() => diagnoseClauses(clauses), [clauses, registeredSlots]);
-  const callbacksRef = React.useRef({ onWqlChange, onValidationChange, onAstChange });
-  callbacksRef.current = { onWqlChange, onValidationChange, onAstChange };
+  const rawEscape = controlledQuery !== void 0 && controlledPills === null;
+  const diagnostics = React.useMemo(() => {
+    if (rawEscape) {
+      const ast = wodWikiWql.parseQuery(controlledQuery);
+      return {
+        valid: !ast.error,
+        wql: controlledQuery,
+        ast,
+        error: ast.error
+      };
+    }
+    return diagnosePills(pills);
+  }, [rawEscape, controlledQuery, pills, registeredSlots]);
+  const callbacksRef = React.useRef({ onQueryChange, onValidationChange, onAstChange });
+  callbacksRef.current = { onQueryChange, onValidationChange, onAstChange };
   React.useEffect(() => {
     const validation = diagnostics.valid ? { valid: true } : { valid: false, error: diagnostics.error };
-    callbacksRef.current.onWqlChange?.(diagnostics.wql);
+    if (controlledQuery === void 0) callbacksRef.current.onQueryChange?.(diagnostics.wql);
     callbacksRef.current.onAstChange?.(diagnostics.ast);
     callbacksRef.current.onValidationChange?.(validation);
   }, [diagnostics]);
   const stages = useWqlStageCounts(diagnostics.ast, diagnostics.valid, execute, debounceMs);
-  const offendingClause = diagnostics.offendingClauseId ? clauses.find((c) => c.id === diagnostics.offendingClauseId) : void 0;
-  const offendingLabel = offendingClause ? getClauseMeta(offendingClause.type).label : void 0;
-  const updateClause = (idx, patch) => {
-    const updated = clauses.map((c, i) => i === idx ? { ...c, ...patch } : c);
-    const edited = clauses[idx];
+  const offendingPill = diagnostics.offendingClauseId ? pills.find((c) => c.id === diagnostics.offendingClauseId) : void 0;
+  const offendingLabel = offendingPill ? getClauseMeta(offendingPill.type).label : void 0;
+  const updatePill = (idx, patch) => {
+    const updated = pills.map((c, i) => i === idx ? { ...c, ...patch } : c);
+    const edited = pills[idx];
     if (edited?.type === "source" && patch.value !== void 0 && patch.value !== edited.value) {
-      setClauses(pivotClauses(updated, patch.value));
+      setPills(pivotPills(updated, patch.value));
+      emitIfControlled(pivotPills(updated, patch.value));
       return;
     }
-    setClauses(updated);
+    setPills(updated);
+    emitIfControlled(updated);
   };
-  const removeClause = (idx) => {
-    setClauses(clauses.filter((_, i) => i !== idx));
+  const removePill = (idx) => {
+    const next = pills.filter((_, i) => i !== idx);
+    setPills(next);
+    emitIfControlled(next);
   };
-  const makeClause = (type, value) => {
+  const emitIfControlled = (next) => {
+    if (controlledQuery !== void 0) {
+      const nextAst = pillsToAst(next);
+      const nextWql = wodWikiWql.serialize(nextAst);
+      if (nextWql !== controlledQuery) callbacksRef.current.onQueryChange?.(nextWql);
+    }
+  };
+  const makePill = (type, value) => {
     const meta = getClauseMeta(type);
     return {
       id: `c-${Date.now()}-${Math.random()}`,
@@ -3848,10 +3874,13 @@ function WqlComposer({
   const pending = React.useMemo(() => {
     const raw = freeText.trim();
     if (!raw) return null;
-    const restored = wqlToClauses(raw);
-    if (restored) {
-      const parsed = wodWikiWql.parseQuery(raw);
-      if (!("error" in parsed && parsed.error)) return { kind: "query", clauses: restored };
+    const restored = wqlToPills(raw);
+    if (restored) return { kind: "query", pills: restored };
+    const parsed = wodWikiWql.parseQuery(raw);
+    if (!parsed.error && /[:{]/.test(raw)) {
+      return { kind: "raw", value: raw };
+    }
+    if (parsed.error && /[:{]/.test(raw)) {
       return { kind: "invalid", reason: String(parsed.error) };
     }
     const words = raw.match(/[a-zA-Z0-9_-]+/g);
@@ -3863,42 +3892,48 @@ function WqlComposer({
     }
     return { kind: "text", value: words[0] };
   }, [freeText]);
-  const addClause = (clause) => {
-    const type = clause.type;
-    const seed = type === "time" ? "last 2w" : type === "where" ? "sum:totalVolume{} > 5000" : type === "agg" ? "sum" : type === "groupby" ? "week" : type === "rollup" ? "1w" : clause.value;
-    setClauses([...clauses, { ...clause, value: seed }]);
+  const addPill = (pill) => {
+    const type = pill.type;
+    const seed = type === "time" ? "last 2w" : type === "where" ? "sum:totalVolume{} > 5000" : type === "agg" ? "sum" : type === "groupby" ? "week" : type === "rollup" ? "1w" : pill.value;
+    const next = [...pills, { ...pill, value: seed }];
+    setPills(next);
+    emitIfControlled(next);
   };
-  const addCalc = (clause) => {
-    const { type, value } = clause;
+  const addCalc = (pill) => {
+    const { type, value } = pill;
     if (type === "metric") {
-      if (clauses.some((c) => c.type === "metric")) return;
+      if (pills.some((c) => c.type === "metric")) return;
       const afterIdx = Math.max(
-        clauses.findIndex((c) => c.type === "agg"),
-        clauses.findIndex((c) => c.type === "source")
+        pills.findIndex((c) => c.type === "agg"),
+        pills.findIndex((c) => c.type === "source")
       );
-      const next2 = [...clauses];
-      next2.splice(afterIdx + 1, 0, makeClause("metric", value));
-      setClauses(next2);
+      const next2 = [...pills];
+      next2.splice(afterIdx + 1, 0, makePill("metric", value));
+      setPills(next2);
+      emitIfControlled(next2);
       return;
     }
     if (type !== "agg") {
-      addClause(clause);
+      addPill(pill);
       return;
     }
     const agg = value || "sum";
-    const existingIdx = clauses.findIndex((c) => c.type === "agg");
+    const existingIdx = pills.findIndex((c) => c.type === "agg");
     if (existingIdx >= 0) {
-      updateClause(existingIdx, { value: agg });
+      updatePill(existingIdx, { value: agg });
       return;
     }
-    if (sourcePlane(clauseValue(clauses, "source", "notes")) !== "metrics") {
-      setClauses(pivotClauses(clauses, "metrics").map((c) => c.type === "agg" ? { ...c, value: agg } : c));
+    if (sourcePlane(pillValue(pills, "source", "notes")) !== "metrics") {
+      const next2 = pivotPills(pills, "metrics").map((c) => c.type === "agg" ? { ...c, value: agg } : c);
+      setPills(next2);
+      emitIfControlled(next2);
       return;
     }
-    const sourceIdx = clauses.findIndex((c) => c.type === "source");
-    const next = [...clauses];
-    next.splice(sourceIdx + 1, 0, makeClause("agg", agg));
-    setClauses(next);
+    const sourceIdx = pills.findIndex((c) => c.type === "source");
+    const next = [...pills];
+    next.splice(sourceIdx + 1, 0, makePill("agg", agg));
+    setPills(next);
+    emitIfControlled(next);
   };
   const handleKeyDown = (e) => {
     if (e.key !== "Enter") return;
@@ -3906,10 +3941,15 @@ function WqlComposer({
       e.preventDefault();
       e.stopPropagation();
       if (pending?.kind === "query") {
-        setClauses(pending.clauses);
+        setPills(pending.pills);
+        emitIfControlled(pending.pills);
         setFreeText("");
+      } else if (pending?.kind === "raw") {
+        onSubmit?.(pending.value);
       } else if (pending?.kind === "text") {
-        setClauses([...clauses, makeClause("text", pending.value)]);
+        const next = [...pills, makePill("text", pending.value)];
+        setPills(next);
+        emitIfControlled(next);
         setFreeText("");
       }
       return;
@@ -3932,20 +3972,20 @@ function WqlComposer({
         "data-testid": "wql-composer",
         children: [
           /* @__PURE__ */ jsxRuntime.jsx(lucideReact.Command, { className: "size-4 text-amber-500 shrink-0 mr-0.5" }),
-          clauses.map(
-            (clause, idx) => hiddenTypes.has(clause.type) ? null : /* @__PURE__ */ jsxRuntime.jsx(
+          pills.map(
+            (pill, idx) => hiddenTypes.has(pill.type) ? null : /* @__PURE__ */ jsxRuntime.jsx(
               TokenSlotPill,
               {
-                clause,
+                clause: pill,
                 isActive: activeSlotIdx === idx,
-                invalid: diagnostics.offendingClauseId === clause.id,
-                invalidReason: diagnostics.offendingClauseId === clause.id ? diagnostics.error : void 0,
+                invalid: diagnostics.offendingClauseId === pill.id,
+                invalidReason: diagnostics.offendingClauseId === pill.id ? diagnostics.error : void 0,
                 onClick: () => setActiveSlotIdx(idx),
-                onChange: (patch) => updateClause(idx, patch),
-                onRemove: () => removeClause(idx),
+                onChange: (patch) => updatePill(idx, patch),
+                onRemove: () => removePill(idx),
                 compact: true
               },
-              clause.id
+              pill.id
             )
           ),
           /* @__PURE__ */ jsxRuntime.jsx(
@@ -3976,6 +4016,7 @@ function WqlComposer({
         role: pending.kind === "invalid" ? "alert" : void 0,
         children: [
           pending.kind === "query" && "\u21B5 Use as query",
+          pending.kind === "raw" && "\u21B5 Run query",
           pending.kind === "text" && `\u21B5 Search text: ${pending.value}`,
           pending.kind === "invalid" && pending.reason
         ]
@@ -3988,14 +4029,14 @@ function WqlComposer({
         offendingLabel,
         stages,
         actions: /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
-          /* @__PURE__ */ jsxRuntime.jsx(AddCalcDropdown, { clauses, onAdd: addCalc }),
-          /* @__PURE__ */ jsxRuntime.jsx(AddFilterDropdown, { clauses, onAdd: addClause }),
+          /* @__PURE__ */ jsxRuntime.jsx(AddCalcDropdown, { clauses: pills, onAdd: addCalc }),
+          /* @__PURE__ */ jsxRuntime.jsx(AddFilterDropdown, { clauses: pills, onAdd: addPill }),
           diagnosticsActions
         ] })
       }
     ) : /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-end gap-1.5 px-1.5", "data-testid": "wql-add-row", children: [
-      /* @__PURE__ */ jsxRuntime.jsx(AddCalcDropdown, { clauses, onAdd: addCalc }),
-      /* @__PURE__ */ jsxRuntime.jsx(AddFilterDropdown, { clauses, onAdd: addClause }),
+      /* @__PURE__ */ jsxRuntime.jsx(AddCalcDropdown, { clauses: pills, onAdd: addCalc }),
+      /* @__PURE__ */ jsxRuntime.jsx(AddFilterDropdown, { clauses: pills, onAdd: addPill }),
       diagnosticsActions
     ] })
   ] });
@@ -4009,13 +4050,10 @@ function WqlQueryInspectorModal({
   subtitle = "Use the Omni-Composer to edit this block query.",
   executor
 }) {
-  const [clauses, setClauses] = React.useState([]);
+  const [wql2, setWql] = React.useState(initialQuery);
   const [isValid, setIsValid] = React.useState(true);
   React.useEffect(() => {
-    if (isOpen) {
-      const restored = wqlToClauses(initialQuery);
-      setClauses(restored ?? defaultMetricsClauses());
-    }
+    if (isOpen) setWql(initialQuery);
   }, [isOpen, initialQuery]);
   const diagnosticsExecutor = React.useCallback(
     (ast) => {
@@ -4033,8 +4071,7 @@ function WqlQueryInspectorModal({
   );
   const handleApply = () => {
     if (!isValid) return;
-    const nextWql = clausesToWql(clauses);
-    onApply(nextWql);
+    onApply(wql2);
     onClose();
   };
   if (!isOpen) return null;
@@ -4065,15 +4102,15 @@ function WqlQueryInspectorModal({
         /* @__PURE__ */ jsxRuntime.jsx("div", { className: "p-6 overflow-y-auto space-y-4", children: /* @__PURE__ */ jsxRuntime.jsx(
           WqlComposer,
           {
-            clauses,
-            onClausesChange: setClauses,
+            query: wql2,
+            onQueryChange: setWql,
             onValidationChange: (v) => setIsValid(v.valid),
             execute: diagnosticsExecutor,
             showDiagnostics: true
           }
         ) }),
         /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center justify-between px-6 py-3 border-t border-border/80 bg-muted/10", children: [
-          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-muted-foreground font-mono", children: clausesToWql(clauses) }),
+          /* @__PURE__ */ jsxRuntime.jsx("div", { className: "text-xs text-muted-foreground font-mono", children: wql2 }),
           /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex items-center gap-2", children: [
             /* @__PURE__ */ jsxRuntime.jsx(
               "button",