@bitcobblers/wod-wiki-lang 0.10.42 → 0.35.2115

package/dist/index.cjs

@@ -74,8 +74,8 @@ function metricsOf(source) {
   if (Array.isArray(m)) return m;
   return m.rawMetrics ?? [];
 }
-function hintMetric(hint, origin = "dialect") {
-  return { type: wodWikiCore.MetricType.Hint, value: hint, image: hint, origin };
+function hintMetric(hint, origin = "dialect", icon) {
+  return { type: wodWikiCore.MetricType.Hint, value: hint, image: hint, origin, ...icon ? { icon } : {} };
 }
 function hintsToContainer(hints, existing, origin = "dialect") {
   const container = existing ?? wodWikiCore.MetricContainer.empty("dialect");
@@ -496,6 +496,19 @@ var ChoiceGroupMetric = class {
   value;
   image;
 };
+var IntensityMetric = class {
+  constructor(value, unit = "%") {
+    this.unit = unit;
+    this.value = { amount: value, unit };
+    this.image = value !== void 0 ? `${value}${unit}` : `?${unit}`;
+    this.origin = value === void 0 ? "hinted" : "parser";
+  }
+  unit;
+  value;
+  image;
+  origin;
+  type = wodWikiCore.MetricType.Intensity;
+};
 
 // src/dialects/units/fuseUnits.ts
 function isBareNumber(m) {
@@ -654,6 +667,17 @@ function fusePairs(pairs, units) {
         }
       }
     }
+    if (next && isBareNumber(cur.metric)) {
+      const text = effortText(next.metric);
+      if (text !== null && text.trim() === "%") {
+        out.push({
+          metric: new IntensityMetric(cur.metric.value),
+          meta: fusedMeta(cur.meta, next.meta, "%")
+        });
+        i++;
+        continue;
+      }
+    }
     if (next) {
       const fusable = isBareNumber(cur.metric) || hasEmptyUnit(cur.metric);
       if (fusable) {
@@ -1168,6 +1192,11 @@ var ClimbDialect = class {
   }
 };
 
+// src/logger.ts
+function langWarn(message) {
+  console.warn(message);
+}
+
 // src/dialects/DialectStack.ts
 var UNITS_DIALECT_ID = "units";
 var SPORT_ALIASES = {
@@ -1210,7 +1239,7 @@ var DialectStack = class {
     if (!all.some((d) => d.id === id)) {
       if (!warnedSports.has(sport)) {
         warnedSports.add(sport);
-        console.warn(
+        langWarn(
           `[DialectStack] Unknown :sport suffix "${sport}" \u2014 falling back to the full dialect stack. Known dialect ids: ${all.map((d) => d.id).join(", ")}.`
         );
       }
@@ -1392,8 +1421,20 @@ var PropertyMetric = class {
     this.image = options.image ?? `${key}: ${formatPropertyValue(value)}`;
     this.origin = options.origin ?? "parser";
     this.type = options.type ?? wodWikiCore.MetricType.Custom;
+    const kind = wodWikiCore.valueKindOf(value);
+    this.metadata = {
+      originalKey: key,
+      ...kind !== "object" && kind !== "undefined" ? {
+        fieldRef: {
+          path: wodWikiCore.normalizeFieldPath(key),
+          kind,
+          ...options.dimension ? { dimension: options.dimension } : {}
+        }
+      } : {}
+    };
   }
   type;
+  metadata;
 };
 var RepMetric = class {
   constructor(reps) {
@@ -1496,6 +1537,12 @@ function classifyPrimitive(primitive) {
       }
       return primitive.label ? [{ metrics: new RoundsMetric(primitive.label), meta: primitive.meta }] : [];
     }
+    case "round_scheme": {
+      return [
+        { metrics: new RoundsMetric(primitive.rounds), meta: primitive.meta },
+        { metrics: new RepMetric(primitive.reps), meta: primitive.meta }
+      ];
+    }
     case "action": {
       const actionText = primitive.hasColonPrefix ? primitive.raw.substring(2, primitive.raw.length - 1).trim() : primitive.raw.substring(1, primitive.raw.length - 1).trim();
       return [{ metrics: new ActionMetric(actionText, { raw: actionText }), meta: primitive.meta }];
@@ -1607,17 +1654,17 @@ function mergeFragments(pairs) {
 }
 var parser = lr.LRParser.deserialize({
   version: 14,
-  states: "(QQVQPOOO!dQPO'#C|O#qQPO'#CcOOQO'#Cc'#CcOOQO'#Cf'#CfOOQO'#Cg'#CgOOQO'#Ce'#CeO${QPO'#CeO%TQPO'#CiOOQO'#C|'#C|OOQO'#Cs'#CsO%]QPO'#CkOOQO'#Cl'#ClOOQO'#Cm'#CmOOQO'#Co'#CoOOQO'#Cp'#CpOOQO'#Cn'#CnO%bQPO'#CnOOQO'#Cq'#CqOOQO'#Cr'#CrO&XQPO'#CtOOQO'#Cd'#CdOOQO'#Cy'#CyO'gQPO'#CbO&`QPO'#CbOOQO'#Cx'#CxQVQPOOO'nQPO,58xOOQO,59P,59PO'yQPO'#CjOOQO'#Cz'#CzO(XQPO,59TOOQO-E6z-E6zO(dQPO,59VOOQO,59Y,59YOOQO'#C}'#C}O(oQPO,59`OOQO,59`,59`OOQO-E6w-E6wOOQO,58|,58|O(vQPO,58|OOQO-E6v-E6vOOQO1G.d1G.dO(}QPO'#C{O)SQPO,59UOOQO-E6x-E6xOOQO1G.o1G.oO)bQPO1G.qOOQO-E6{-E6{OOQO1G.z1G.zOOQO1G.h1G.hOOQO,59g,59gOOQO-E6y-E6yOOQO7+$]7+$]",
-  stateData: "*Z~OtOS~ORPOT`O[UOvQOwROxSOyVOzTO{WO}ZO!OXO!Q[O!R]O!S^O!T_O!UbO!VcO!WdO!ZiO~OukORpXTpX[pXvpXxpXypXzpX{pX}pX!OpX!QpX!RpX!SpX!TpX!UpX!VpX!WpX!ZpX~ORVXTVX[VXvVXxVXyVXzVX{VX}VX!OVX!QVX!RVX!SVX!TVX!UVX!VVX!WVX!ZpX~O[lOzTO~ORnOTmO~OuqO~OTrO!T_O~ORsOSsOTsOisOjsOksOusO!OsO!XsO~O!YuO~P%jORXOT`O[UOvXOxSOyVOzTO{WO}ZO!OXO!Q[O!R]O!S^O!T_O!UbO!VcO!WdO~O!ZwO~P&`ORzOSzOTzO~Ov{OR^XT^X|^X~ORnOTmO|!OO~ORXOvXO!OXO~O!Y!RO~P%jO!Z!SO~P&`OT!TO~Ov{OR^aT^a|^a~ORXOvXO!OXO!P!VO~O!Q!Rz[!Sxyu!U!V!O!W!Y!XijkRvwT!Zt!W~",
-  goto: "$TrPPsPPPsw{!S!Z!bP!S!l!S!S!S!S!p!w!S!S!S!SPPP#R#X#d#j#p#}TiOjThOjZfOghjxZeOghjxZVOghjxYUOghjxRlVTnWoZaOghjxY`OghjxRraQjORyjSgOjSvgxRxhQoWR}oQ|mR!U|YYOghjxQp!PR!PqQtdR!Qt",
-  nodeNames: "\u26A0 Program Property Identifier String Number Block Lap Fragment Duration Trend CollectibleTimer Timer Rounds Sequence Action Text Heading Quantity AtSign Question Slash Pipe Effort MetricObject True False Null",
-  maxTerm: 57,
+  states: "(WQVQPOOO!jQPO'#C}O#}QPO'#CcOOQO'#Cc'#CcOOQO'#Cf'#CfOOQO'#Cg'#CgOOQO'#Ce'#CeO%_QPO'#CeO%gQPO'#CiOOQO'#Ck'#CkOOQO'#C}'#C}OOQO'#Ct'#CtO%oQPO'#ClOOQO'#Cm'#CmOOQO'#Cn'#CnOOQO'#Cp'#CpOOQO'#Cq'#CqOOQO'#Co'#CoO%tQPO'#CoOOQO'#Cr'#CrOOQO'#Cs'#CsO&kQPO'#CuOOQO'#Cd'#CdOOQO'#Cz'#CzO(PQPO'#CbO&rQPO'#CbOOQO'#Cy'#CyQVQPOOO(WQPO,58xOOQO,59P,59PO(cQPO'#CjOOQO'#C{'#C{O(qQPO,59TOOQO-E6{-E6{O(|QPO,59WOOQO,59Z,59ZOOQO'#DO'#DOO)XQPO,59aOOQO,59a,59aOOQO-E6x-E6xOOQO,58|,58|O)`QPO,58|OOQO-E6w-E6wOOQO1G.d1G.dO)gQPO'#C|O)lQPO,59UOOQO-E6y-E6yOOQO1G.o1G.oO)zQPO1G.rOOQO-E6|-E6|OOQO1G.{1G.{OOQO1G.h1G.hOOQO,59h,59hOOQO-E6z-E6zOOQO7+$^7+$^",
+  stateData: "*u~OuOS~ORPOTaO[UOwQOxROySOzVO{TO|WO!OXO!PXO!Q[O!RYO!T]O!U^O!V_O!W`O!XcO!YdO!ZeO!^jO~OvlORqXTqX[qXwqXyqXzqX{qX|qX!OqX!PqX!QqX!RqX!TqX!UqX!VqX!WqX!XqX!YqX!ZqX!^qX~ORVXTVX[VXwVXyVXzVX{VX|VX!OVX!PVX!QVX!RVX!TVX!UVX!VVX!WVX!XVX!YVX!ZVX!^qX~O[mO{TO~ORoOTnO~OvrO~OTsO!W`O~ORtOStOTtOjtOktOltOvtO!RtO![tO~O!]vO~P%|ORYOTaO[UOwYOySOzVO{TO|WO!OXO!PXO!Q[O!RYO!T]O!U^O!V_O!W`O!XcO!YdO!ZeO~O!^xO~P&rOR{OS{OT{O~Ow|OR^XT^X}^X~ORoOTnO}!PO~ORYOwYO!RYO~O!]!SO~P%|O!^!TO~P&rOT!UO~Ow|OR^aT^a}^a~ORYOwYO!RYO!S!WO~O!T!U!O!P{[!Vyzv!X!Y!R!Z!]![jklRwxT!^u!R~",
+  goto: "$UsPPtPPPtx|!T![!cP!T!m!T!T!T!T!T!q!x!T!T!T!TPPP#S#Y#e#k#q$OTjOkTiOkZgOhikyZfOhikyZVOhikyYUOhikyRmVToWpZbOhikyYaOhikyRsbQkORzkShOkSwhyRyiQpWR!OpQ}nR!V}YZOhikyQq!QR!QrQueR!Ru",
+  nodeNames: "\u26A0 Program Property Identifier String Number Block Lap Fragment Duration Trend CollectibleTimer Timer Rounds Sequence RoundScheme Action Text Heading Quantity AtSign Question Slash Pipe Effort MetricObject True False Null",
+  maxTerm: 60,
   skippedNodes: [0],
   repeatNodeCount: 6,
-  tokenData: "5_~RvXY#iYZ#z]^$Ppq#iqr$Vrs$}st'dtu$Vuv$Vvw$Vxy(Oyz(Tz{(Y{|)S|})X}!O*R!O!P*W!P!Q+Z!Q![+}![!],t!_!`$V!a!b-^!b!c-c!c!}.]!}#O.k#O#P$V#P#Q.p#Q#R.u#T#Y.]#Y#Z/o#Z#b.]#b#c1p#c#h.]#h#i3`#i#o.]#o#p5O#p#q5T#q#r5Y~#nSt~XY#iYZ#z]^$Ppq#i~$PO!Z~~$SPYZ#z~$[Z!O~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~%QXOY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^<%lO$}~%rXS~OY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^<%lO$}~&bRO;'S$};'S;=`&k;=`O$}~&nYOY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^;=`<%l$}<%lO$}~'aP;=`<%l$}~'iT!R~OY'dZ]'d^;'S'd;'S;=`'x<%lO'd~'{P;=`<%l'd~(TO{~~(YO|~~(aZy~!O~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~)XOw~~)`Z!O~!X~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~*WOv~~*][!O~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!Q![+R!_!`$V!b!c$V#O#P$V#Q#R$V~+WPT~!Q![+R~+`P!U~!P!Q+c~+hT!Q~OY+cZ]+c^;'S+c;'S;=`+w<%lO+c~+zP;=`<%l+c~,SRT~!O!P,]!Q![+}![!],c~,`P!Q![+R~,fP!Q![,i~,nQ[~!Q![,i![!],c~,yQu~!Q![-P!a!b-X~-UP[~!Q![-P~-^Oz~~-cO!T~~-jZ!S~!O~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~.bRR~!Q![.]!c!}.]#T#o.]~.pO}~~.uO!P~~.|Zx~!O~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~/tSR~!Q![.]!c!}.]#T#U0Q#U#o.]~0VTR~!Q![.]!c!}.]#T#`.]#`#a0f#a#o.]~0kTR~!Q![.]!c!}.]#T#g.]#g#h0z#h#o.]~1PTR~!Q![.]!c!}.]#T#X.]#X#Y1`#Y#o.]~1gRj~R~!Q![.]!c!}.]#T#o.]~1uTR~!Q![.]!c!}.]#T#i.]#i#j2U#j#o.]~2ZTR~!Q![.]!c!}.]#T#`.]#`#a2j#a#o.]~2oTR~!Q![.]!c!}.]#T#`.]#`#a3O#a#o.]~3VRk~R~!Q![.]!c!}.]#T#o.]~3eTR~!Q![.]!c!}.]#T#f.]#f#g3t#g#o.]~3yTR~!Q![.]!c!}.]#T#i.]#i#j4Y#j#o.]~4_TR~!Q![.]!c!}.]#T#X.]#X#Y4n#Y#o.]~4uRi~R~!Q![.]!c!}.]#T#o.]~5TO!W~~5YO!V~~5_O!Y~",
+  tokenData: "6k~RvXY#iYZ#z]^$Ppq#iqr$Vrs$}st'dtu$Vuv$Vvw$Vxy(Oyz(Tz{(Y{|)S|})X}!O*R!O!P*W!P!Q+Z!Q![+}![!].Q!_!`$V!a!b.j!b!c.o!c!}/i!}#O/w#O#P$V#P#Q/|#Q#R0R#T#Y/i#Y#Z0{#Z#b/i#b#c2|#c#h/i#h#i4l#i#o/i#o#p6[#p#q6a#q#r6f~#nSu~XY#iYZ#z]^$Ppq#i~$PO!^~~$SPYZ#z~$[Z!R~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~%QXOY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^<%lO$}~%rXS~OY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^<%lO$}~&bRO;'S$};'S;=`&k;=`O$}~&nYOY$}Z]$}^r$}rs%ms#O$}#O#P&_#P;'S$};'S;=`'^;=`<%l$}<%lO$}~'aP;=`<%l$}~'iT!U~OY'dZ]'d^;'S'd;'S;=`'x<%lO'd~'{P;=`<%l'd~(TO|~~(YO}~~(aZz~!R~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~)XOx~~)`Z!R~![~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~*WOw~~*][!R~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!Q![+R!_!`$V!b!c$V#O#P$V#Q#R$V~+WPT~!Q![+R~+`P!X~!P!Q+c~+hT!T~OY+cZ]+c^;'S+c;'S;=`+w<%lO+c~+zP;=`<%l+c~,SUT~pq,f!O!P-Z!Q![+}![!]-a!z!{-r#l#m-r~,iRpq,f!z!{,r#l#m,r~,uPpq,x~,{Qpq,x!Q![-R~-WP!P~!Q![-R~-^P!Q![+R~-dP!Q![-g~-lQ[~!Q![-g![!]-a~-uP!Q![-x~-}P!O~!Q![-x~.VQv~!Q![.]!a!b.e~.bP[~!Q![.]~.jO{~~.oO!W~~.vZ!V~!R~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~/nRR~!Q![/i!c!}/i#T#o/i~/|O!Q~~0RO!S~~0YZy~!R~qr$Vtu$Vuv$Vvw$Vz{$V|}$V!O!P$V!_!`$V!b!c$V#O#P$V#Q#R$V~1QSR~!Q![/i!c!}/i#T#U1^#U#o/i~1cTR~!Q![/i!c!}/i#T#`/i#`#a1r#a#o/i~1wTR~!Q![/i!c!}/i#T#g/i#g#h2W#h#o/i~2]TR~!Q![/i!c!}/i#T#X/i#X#Y2l#Y#o/i~2sRk~R~!Q![/i!c!}/i#T#o/i~3RTR~!Q![/i!c!}/i#T#i/i#i#j3b#j#o/i~3gTR~!Q![/i!c!}/i#T#`/i#`#a3v#a#o/i~3{TR~!Q![/i!c!}/i#T#`/i#`#a4[#a#o/i~4cRl~R~!Q![/i!c!}/i#T#o/i~4qTR~!Q![/i!c!}/i#T#f/i#f#g5Q#g#o/i~5VTR~!Q![/i!c!}/i#T#i/i#i#j5f#j#o/i~5kTR~!Q![/i!c!}/i#T#X/i#X#Y5z#Y#o/i~6RRj~R~!Q![/i!c!}/i#T#o/i~6aO!Z~~6fO!Y~~6kO!]~",
   tokenizers: [0],
   topRules: { "Program": [0, 1] },
-  tokenPrec: 400
+  tokenPrec: 424
 });
 
 // src/grammar/parser.terms.ts
@@ -1625,14 +1672,15 @@ var Lap = 7;
 var Fragment = 8;
 var Duration = 9;
 var Rounds = 13;
-var Action = 15;
-var Text = 16;
-var Heading = 17;
-var Quantity = 18;
-var Slash = 21;
-var Pipe = 22;
-var Effort = 23;
-var MetricObject = 24;
+var RoundScheme = 15;
+var Action = 16;
+var Text = 17;
+var Heading = 18;
+var Quantity = 19;
+var Slash = 22;
+var Pipe = 23;
+var Effort = 24;
+var MetricObject = 25;
 
 // src/parser/syntax-parser.ts
 function createLineLocator(source) {
@@ -1681,7 +1729,7 @@ function extractSyntaxFacts(sourceOrState, treeArg) {
         if (primitive) {
           const meta2 = primitive.meta;
           statements.push({
-            id: meta2.line,
+            id: statements.length,
             line: meta2.line,
             meta: meta2,
             primitives: [primitive],
@@ -1696,7 +1744,7 @@ function extractSyntaxFacts(sourceOrState, treeArg) {
       lastProperty = null;
       const statementMeta = createMeta(locator, node.from, node.to, source.slice(node.from, node.to));
       const statement = {
-        id: statementMeta.line,
+        id: statements.length,
         line: statementMeta.line,
         meta: statementMeta,
         primitives: [],
@@ -1789,6 +1837,18 @@ function mapFragmentToPrimitive(locator, source, node) {
       };
       return primitive;
     }
+    case RoundScheme: {
+      const match = raw.match(/^(\d+)\s*[xX]\s*(\d+)$/);
+      if (!match) return null;
+      const primitive = {
+        kind: "round_scheme",
+        raw,
+        meta: meta2,
+        rounds: parseInt(match[1], 10),
+        reps: parseInt(match[2], 10)
+      };
+      return primitive;
+    }
     case Action: {
       const primitive = {
         kind: "action",
@@ -1923,23 +1983,22 @@ function createMeta(locator, from, to, raw) {
     raw
   };
 }
-
-// src/parser/lezer-mapper.ts
-function extractStatementsRaw(sourceOrTree, treeArg) {
-  let source;
-  let tree = treeArg;
+function resolveSourceInput(sourceOrTree, treeArg) {
   if (typeof sourceOrTree === "string") {
-    source = sourceOrTree;
-  } else if ("source" in sourceOrTree) {
-    source = sourceOrTree.source;
-    tree = tree ?? sourceOrTree.tree;
-  } else if ("doc" in sourceOrTree) {
-    source = sourceOrTree.doc.toString();
-  } else {
-    source = "";
+    return { source: sourceOrTree, tree: treeArg };
+  }
+  if ("source" in sourceOrTree) {
+    return { source: sourceOrTree.source, tree: treeArg ?? sourceOrTree.tree };
   }
+  if ("doc" in sourceOrTree) {
+    return { source: sourceOrTree.doc.toString(), tree: treeArg };
+  }
+  return { source: "" };
+}
+function extractStatementsRaw(sourceOrTree, treeArg) {
+  const { source, tree } = resolveSourceInput(sourceOrTree, treeArg);
   const facts = extractSyntaxFacts(source, tree);
-  return classifyStatements(facts);
+  return normalizeInlineRounds(classifyStatements(facts));
 }
 function extractStatements(sourceOrTree, sportOrTree, sportArg) {
   let sport;
@@ -1950,9 +2009,70 @@ function extractStatements(sourceOrTree, sportOrTree, sportArg) {
     tree = sportOrTree;
     sport = sportArg;
   }
-  const statements = extractStatementsRaw(sourceOrTree, tree);
+  const resolved = resolveSourceInput(sourceOrTree, tree);
+  const facts = extractSyntaxFacts(resolved.source, resolved.tree);
+  const statements = classifyStatements(facts);
   dialectStack.processAll(statements, sport);
-  return statements;
+  return normalizeInlineRounds(statements);
+}
+function isInlineRoundsPrescription(stmt) {
+  if (stmt.children.length > 0) return false;
+  return stmt.metrics.some((m) => m.type === wodWikiCore.MetricType.Rounds) && stmt.metrics.some((m) => m.type === wodWikiCore.MetricType.Rep) && !stmt.metrics.some((m) => m.type === wodWikiCore.MetricType.Duration);
+}
+function cloneStatement(stmt) {
+  const clone = Object.create(Object.getPrototypeOf(stmt));
+  Object.assign(clone, stmt);
+  return clone;
+}
+function normalizeInlineRounds(statements) {
+  if (!statements.some(isInlineRoundsPrescription)) return statements;
+  const out = [];
+  const oldToNew = /* @__PURE__ */ new Map();
+  const directParentOf = /* @__PURE__ */ new Map();
+  const childCloneOf = /* @__PURE__ */ new Map();
+  const splitOriginOf = /* @__PURE__ */ new Map();
+  for (const stmt of statements) {
+    if (!isInlineRoundsPrescription(stmt)) {
+      oldToNew.set(stmt.id, out.length);
+      out.push(stmt);
+      continue;
+    }
+    if (stmt.parent !== void 0) directParentOf.set(stmt.id, stmt.parent);
+    const parent = cloneStatement(stmt);
+    const child = cloneStatement(stmt);
+    const isScheme = (m) => m.type === wodWikiCore.MetricType.Rounds || m.type === wodWikiCore.MetricType.Rep;
+    parent.metrics = wodWikiCore.MetricContainer.from(stmt.metrics.filter(isScheme), parent.id);
+    child.metrics = wodWikiCore.MetricContainer.from(stmt.metrics.filter((m) => !isScheme(m)), child.id);
+    parent.metricMeta = new Map([...stmt.metricMeta].filter(([m]) => isScheme(m)));
+    child.metricMeta = new Map([...stmt.metricMeta].filter(([m]) => !isScheme(m)));
+    parent.isLeaf = false;
+    child.isLeaf = true;
+    parent.children = [];
+    child.children = [];
+    childCloneOf.set(child, parent);
+    splitOriginOf.set(parent, stmt.id);
+    oldToNew.set(stmt.id, out.length);
+    out.push(parent, child);
+  }
+  return out.map((stmt, id) => {
+    const oldId = stmt.id;
+    stmt.id = id;
+    stmt.metrics = wodWikiCore.MetricContainer.from(stmt.metrics, stmt.id);
+    const parentClone = childCloneOf.get(stmt);
+    if (parentClone) {
+      stmt.parent = id - 1;
+      return stmt;
+    }
+    if (splitOriginOf.has(stmt)) {
+      stmt.children = [[id + 1]];
+      const oldParent = directParentOf.get(splitOriginOf.get(stmt));
+      stmt.parent = oldParent === void 0 ? void 0 : oldToNew.get(oldParent);
+      return stmt;
+    }
+    stmt.parent = stmt.parent === void 0 ? void 0 : oldToNew.get(stmt.parent);
+    stmt.children = stmt.children.map((group) => group.filter((childId) => !directParentOf.has(childId) || directParentOf.get(childId) === oldId).map((childId) => oldToNew.get(childId) ?? childId)).filter((group) => group.length > 0);
+    return stmt;
+  });
 }
 
 // src/parser/WhiteboardScript.ts
@@ -2026,7 +2146,7 @@ function parseScript(inputText, options = {}) {
     const statements = options.withoutDialects ? extractStatementsRaw(inputText, tree) : extractStatements(inputText, tree, sport);
     return new WhiteboardScript(inputText, statements, []);
   } catch (error) {
-    const msg = error?.message || "Unknown parse error";
+    const msg = error instanceof Error ? error.message : "Unknown parse error";
     return new WhiteboardScript(inputText, [], [{ message: msg }]);
   }
 }
@@ -2687,6 +2807,7 @@ var whiteboardScriptLanguage = language.LRLanguage.define({
         Identifier: tags.variableName,
         String: tags.string,
         Number: tags.number,
+        "schemeNumber schemeSpaced": tags.number,
         Timer: tags.keyword,
         collectibleTimer: tags.keyword,
         textComment: tags.lineComment,
@@ -3059,6 +3180,7 @@ var BUNDLED_EFFORT_COUNT = bundledEfforts.length;
 var InMemoryEffortRegistry = class {
   efforts = /* @__PURE__ */ new Map();
   sourceFilter = null;
+  initialized = false;
   constructor(sourceFilter) {
     this.sourceFilter = sourceFilter ?? null;
   }
@@ -3069,6 +3191,10 @@ var InMemoryEffortRegistry = class {
         this.efforts.set(effort.slug, effort);
       }
     }
+    this.initialized = true;
+  }
+  isInitialized() {
+    return this.initialized;
   }
   /** Seed with arbitrary efforts (useful for tests) */
   seed(efforts) {
@@ -3079,10 +3205,21 @@ var InMemoryEffortRegistry = class {
   /** Clear all efforts */
   clear() {
     this.efforts.clear();
+    this.initialized = false;
   }
   resolve(slug) {
     return this.efforts.get(slug) ?? null;
   }
+  resolveByAlias(label) {
+    const normalized = normalizeForFuzzy(label);
+    for (const effort of this.efforts.values()) {
+      if (normalizeForFuzzy(effort.label) === normalized) return effort;
+      for (const alias of effort.aliases) {
+        if (normalizeForFuzzy(alias) === normalized) return effort;
+      }
+    }
+    return null;
+  }
   list() {
     return Array.from(this.efforts.values());
   }
@@ -3108,6 +3245,159 @@ var InMemoryEffortRegistry = class {
   }
 };
 
+// src/effort-registry/CompositeEffortRegistry.ts
+var CompositeEffortRegistry = class {
+  userEfforts = /* @__PURE__ */ new Map();
+  bundledEfforts = /* @__PURE__ */ new Map();
+  initialized = false;
+  initialBundled;
+  storage;
+  constructor(options) {
+    if (options) {
+      this.initialBundled = options.bundled;
+      this.storage = options.storage;
+    }
+  }
+  /**
+   * Initialize the registry:
+   * 1. Load bundled efforts into memory
+   * 2. Load user efforts from storage adapter into memory
+   */
+  async loadBundled(customBundled) {
+    const seed = customBundled ?? this.initialBundled ?? bundledEfforts;
+    for (const effort of seed) {
+      this.bundledEfforts.set(effort.slug, effort);
+    }
+    if (this.storage) {
+      try {
+        const userEfforts = await this.storage.load();
+        for (const effort of userEfforts) {
+          if (effort.registrySource === "user") {
+            this.userEfforts.set(effort.slug, effort);
+          }
+        }
+      } catch (err) {
+        console.warn("[CompositeEffortRegistry] Failed to load user efforts from storage adapter:", err);
+      }
+    }
+    this.initialized = true;
+  }
+  /** True after loadBundled() has resolved */
+  isInitialized() {
+    return this.initialized;
+  }
+  resolve(slug) {
+    return this.userEfforts.get(slug) ?? this.bundledEfforts.get(slug) ?? null;
+  }
+  resolveByAlias(label) {
+    const normalized = normalizeForFuzzy(label);
+    for (const effort of this.userEfforts.values()) {
+      if (normalizeForFuzzy(effort.label) === normalized) return effort;
+      for (const alias of effort.aliases) {
+        if (normalizeForFuzzy(alias) === normalized) return effort;
+      }
+    }
+    for (const effort of this.bundledEfforts.values()) {
+      if (this.userEfforts.has(effort.slug)) continue;
+      if (normalizeForFuzzy(effort.label) === normalized) return effort;
+      for (const alias of effort.aliases) {
+        if (normalizeForFuzzy(alias) === normalized) return effort;
+      }
+    }
+    return null;
+  }
+  list() {
+    const merged = new Map(this.bundledEfforts);
+    for (const [slug, effort] of this.userEfforts) {
+      merged.set(slug, effort);
+    }
+    return Array.from(merged.values());
+  }
+  listByOrigin(origin) {
+    if (origin === "user") {
+      return Array.from(this.userEfforts.values());
+    }
+    if (origin === "bundled") {
+      return Array.from(this.bundledEfforts.values());
+    }
+    return this.list().filter((e) => e.registrySource === origin);
+  }
+  async upsert(effort) {
+    if (effort.registrySource !== "user") {
+      throw new Error(
+        `CompositeEffortRegistry.upsert: only user efforts can be written. Received registrySource="${effort.registrySource}"`
+      );
+    }
+    this.userEfforts.set(effort.slug, effort);
+    if (this.storage) {
+      try {
+        await this.storage.save(effort);
+      } catch (err) {
+        console.warn("[CompositeEffortRegistry] Failed to persist effort to storage adapter:", err);
+      }
+    }
+  }
+  async delete(slug) {
+    const existing = this.resolve(slug);
+    if (existing && existing.registrySource !== "user") {
+      throw new Error(
+        `CompositeEffortRegistry.delete: cannot delete non-user effort "${slug}"`
+      );
+    }
+    this.userEfforts.delete(slug);
+    if (this.storage) {
+      try {
+        await this.storage.delete(slug);
+      } catch (err) {
+        console.warn("[CompositeEffortRegistry] Failed to delete effort from storage adapter:", err);
+      }
+    }
+  }
+};
+
+// src/effort-registry/aliasManagement.ts
+async function addAliasToEffort(registry, targetSlug, newAlias) {
+  const trimmed = newAlias.trim();
+  if (!trimmed) {
+    throw new Error("Alias cannot be empty");
+  }
+  const existing = registry.resolve(targetSlug);
+  if (!existing) {
+    throw new Error(`Effort "${targetSlug}" not found in registry`);
+  }
+  const normalizedNew = normalizeForFuzzy(trimmed);
+  const alreadyHas = normalizeForFuzzy(existing.label) === normalizedNew || existing.aliases.some((a) => normalizeForFuzzy(a) === normalizedNew);
+  if (alreadyHas) {
+    return existing;
+  }
+  const updatedAliases = [...existing.aliases, trimmed];
+  const now = (/* @__PURE__ */ new Date()).toISOString();
+  if (existing.registrySource === "bundled") {
+    const id = typeof crypto !== "undefined" && typeof crypto.randomUUID === "function" ? `effort-user-${crypto.randomUUID()}` : `effort-user-${Date.now()}`;
+    const userEffort = {
+      ...existing,
+      id,
+      registrySource: "user",
+      aliases: updatedAliases,
+      updatedAt: now,
+      derivation: existing.derivation ?? {
+        parentSlug: existing.slug,
+        coefficients: {},
+        hardOverrides: {}
+      }
+    };
+    await registry.upsert(userEffort);
+    return userEffort;
+  }
+  const updatedUserEffort = {
+    ...existing,
+    aliases: updatedAliases,
+    updatedAt: now
+  };
+  await registry.upsert(updatedUserEffort);
+  return updatedUserEffort;
+}
+
 // src/runtime/contracts/IRuntimeOptions.ts
 var DEFAULT_RUNTIME_OPTIONS = {
   debugMode: false,
@@ -3671,9 +3961,7 @@ var ExecutionContext = class {
     this._workList.push(initialAction);
     while (this._workList.length > 0) {
       if (this._iteration >= this._maxIterations) {
-        const errorMsg = `[ExecutionContext] Max iterations reached (${this._maxIterations}). Aborting to prevent infinite loop.`;
-        console.error(errorMsg);
-        throw new Error(errorMsg);
+        throw new Error(`[ExecutionContext] Max iterations reached (${this._maxIterations}). Aborting to prevent infinite loop.`);
       }
       const action = this._workList.shift();
       this._iteration++;
@@ -3736,6 +4024,7 @@ var OutputEmitter = class {
       return;
     }
     const processed = this._analyticsEngine ? this._analyticsEngine.run(output) : output;
+    this._propagateSourceLine(processed);
     this._outputStatements.push(processed);
     for (const listener of this._outputListeners) {
       try {
@@ -3994,11 +4283,25 @@ var OutputEmitter = class {
   // =========================================================================
   // Private helpers
   // =========================================================================
+  /** Options-built outputs carry only sourceStatementId — copy the source
+   *  statement's line/text/dialect so persisted logs stay joinable by line. */
+  _propagateSourceLine(output) {
+    if (output.sourceStatementId === void 0 || output.line !== void 0) return;
+    const src = this._script?.getId(output.sourceStatementId);
+    if (!src) return;
+    output.line = src.line;
+    output.text ??= src.text;
+    output.dialect ??= src.dialect;
+  }
 };
 
 // src/runtime/RuntimeObservers.ts
 var RuntimeObservers = class {
   _stackObservers = /* @__PURE__ */ new Set();
+  _logger;
+  constructor(logger) {
+    this._logger = logger;
+  }
   /**
    * Subscribe to stack snapshots. The collaborator does NOT emit an
    * `'initial'` snapshot automatically — the calling adapter is
@@ -4024,7 +4327,7 @@ var RuntimeObservers = class {
       try {
         observer(snapshot);
       } catch (err) {
-        console.error("[RuntimeObservers] Stack observer error:", err);
+        this._logger?.error?.("[RuntimeObservers] Stack observer error:", err);
       }
     }
   }
@@ -4069,6 +4372,10 @@ var RuntimeObservers = class {
 
 // src/runtime/RuntimeLogger.ts
 var RuntimeLoggerImpl = class {
+  // Console is this logger's designated output sink; all writes funnel
+  // through this single reference so the no-console rule is waived once.
+  // eslint-disable-next-line no-console
+  _console = console;
   _enabled = false;
   _history = [];
   _maxHistory = 500;
@@ -4091,7 +4398,8 @@ var RuntimeLoggerImpl = class {
   };
   constructor() {
     if (typeof window !== "undefined") {
-      this._enabled = !!window.__WOD_DEBUG__;
+      const debugWindow = window;
+      this._enabled = !!debugWindow.__WOD_DEBUG__;
     }
   }
   get enabled() {
@@ -4099,11 +4407,11 @@ var RuntimeLoggerImpl = class {
   }
   enable() {
     this._enabled = true;
-    console.log("%c[RT] \u{1F527} Runtime logging ENABLED", "color: #22c55e; font-weight: bold");
+    this._console.log("%c[RT] \u{1F527} Runtime logging ENABLED", "color: #22c55e; font-weight: bold");
   }
   disable() {
     this._enabled = false;
-    console.log("%c[RT] Runtime logging disabled", "color: #64748b");
+    this._console.log("%c[RT] Runtime logging disabled", "color: #64748b");
   }
   getHistory() {
     return [...this._history];
@@ -4121,18 +4429,18 @@ var RuntimeLoggerImpl = class {
     if (!this._enabled) return;
     const behaviors = this.getBehaviorNames(block);
     const memoryTypes = block.getAllMemory?.().map((loc) => loc.tag) ?? [];
-    console.groupCollapsed(
+    this._console.groupCollapsed(
       `%c[RT] \u25B6 PUSH %c${block.label || block.blockType || "Block"}%c [${block.key.toString().slice(0, 8)}]`,
       this.STYLES.push,
       "color: inherit; font-weight: bold",
       "color: #64748b; font-weight: normal"
     );
-    console.log("Key:", block.key.toString());
-    if (parentKey) console.log("Parent:", parentKey);
-    console.log("Source IDs:", block.sourceIds);
-    console.log("Behaviors:", behaviors);
-    if (memoryTypes.length > 0) console.log("Memory Types:", memoryTypes);
-    console.groupEnd();
+    this._console.log("Key:", block.key.toString());
+    if (parentKey) this._console.log("Parent:", parentKey);
+    this._console.log("Source IDs:", block.sourceIds);
+    this._console.log("Behaviors:", behaviors);
+    if (memoryTypes.length > 0) this._console.log("Memory Types:", memoryTypes);
+    this._console.groupEnd();
     this.addToHistory("info", "push", `PUSH ${block.label}`, {
       key: block.key.toString(),
       parentKey,
@@ -4145,7 +4453,7 @@ var RuntimeLoggerImpl = class {
    */
   logPop(block, reason) {
     if (!this._enabled) return;
-    console.log(
+    this._console.log(
       `%c[RT] \u25C0 POP  %c${block.label || block.blockType || "Block"}%c [${block.key.toString().slice(0, 8)}]${reason ? ` (${reason})` : ""}`,
       this.STYLES.pop,
       "color: inherit; font-weight: bold",
@@ -4165,15 +4473,15 @@ var RuntimeLoggerImpl = class {
     if (actions.length === 0) {
       return;
     }
-    console.groupCollapsed(
+    this._console.groupCollapsed(
       `%c[RT] \u2192 NEXT %c${block.label || "Block"}%c \u2192 ${actions.length} action(s)`,
       this.STYLES.next,
       "color: inherit; font-weight: bold",
       "color: #64748b; font-weight: normal"
     );
-    console.log("Block:", block.key.toString());
-    console.log("Actions:", actionNames);
-    console.groupEnd();
+    this._console.log("Block:", block.key.toString());
+    this._console.log("Actions:", actionNames);
+    this._console.groupEnd();
     this.addToHistory("info", "next", `NEXT ${block.label}`, {
       key: block.key.toString(),
       actions: actionNames
@@ -4186,15 +4494,15 @@ var RuntimeLoggerImpl = class {
     if (!this._enabled) return;
     if (actions.length === 0) return;
     const actionNames = actions.map((a) => a.type || a.constructor?.name || "Action");
-    console.groupCollapsed(
+    this._console.groupCollapsed(
       `%c[RT] \u26A1 EVENT %c${event.name}%c \u2192 ${actions.length} action(s)`,
       this.STYLES.event,
       "color: inherit; font-weight: bold",
       "color: #64748b; font-weight: normal"
     );
-    console.log("Event Data:", event.data);
-    console.log("Actions:", actionNames);
-    console.groupEnd();
+    this._console.log("Event Data:", event.data);
+    this._console.log("Actions:", actionNames);
+    this._console.groupEnd();
     this.addToHistory("info", "event", `EVENT ${event.name}`, {
       eventName: event.name,
       eventData: event.data,
@@ -4210,7 +4518,7 @@ var RuntimeLoggerImpl = class {
     if (typeof value === "object" && value !== null) {
       displayValue = this.summarizeObject(value);
     }
-    console.log(
+    this._console.log(
       `%c[RT] \u{1F4DD} MEMORY %c${memoryType}%c on [${blockKey.slice(0, 8)}]:`,
       this.STYLES.memory,
       "color: inherit; font-weight: bold",
@@ -4230,17 +4538,35 @@ var RuntimeLoggerImpl = class {
     if (!this._enabled) return;
     const indent = "  ".repeat(depth);
     const actionName = action.type || action.constructor?.name || "Action";
-    console.log(
+    this._console.log(
       `%c[RT] ${indent}\u2699 %c${actionName}`,
       this.STYLES.action,
       "color: inherit"
     );
   }
+  /**
+   * General-purpose message log for runtime consumers.
+   * Gates on _enabled; writes to the console sink and history.
+   */
+  logMessage(level, category, message, data) {
+    if (!this._enabled) return;
+    this._console.log(`%c[RT] ${category} %c${message}`, this.styleFor(level), "color: inherit");
+    this.addToHistory(level, category, message, data);
+  }
+  /**
+   * Always-on variant of `logMessage`. Use sparingly for errors/warnings that
+   * must be visible even when debug logging is disabled.
+   */
+  logAlways(level, category, message, data) {
+    this._console.log(`%c[RT] ${category} %c${message}`, this.styleFor(level), "color: inherit");
+    this.addToHistory(level, category, message, data);
+  }
   // ============================================================================
   // Helpers
   // ============================================================================
   getBehaviorNames(block) {
-    const behaviors = block.behaviors;
+    const blockWithBehaviors = block;
+    const behaviors = blockWithBehaviors.behaviors;
     if (!behaviors || !Array.isArray(behaviors)) return [];
     return behaviors.map((b) => b.constructor?.name || "Behavior");
   }
@@ -4257,6 +4583,18 @@ var RuntimeLoggerImpl = class {
     }
     return summary;
   }
+  styleFor(level) {
+    switch (level) {
+      case "error":
+        return "color: #ef4444; font-weight: bold";
+      case "warn":
+        return "color: #f59e0b; font-weight: bold";
+      case "info":
+        return "color: #3b82f6; font-weight: bold";
+      default:
+        return "color: #64748b";
+    }
+  }
   addToHistory(level, category, message, data) {
     this._history.push({
       timestamp: /* @__PURE__ */ new Date(),
@@ -4361,6 +4699,7 @@ var ScriptRuntime = class {
   constructor(script, compiler, dependencies, options = {}, now = wallClockNow) {
     this.script = script;
     this.options = { ...DEFAULT_RUNTIME_OPTIONS, ...options };
+    this._observers = new RuntimeObservers(this.options.logger);
     this.stack = dependencies.stack;
     this.clock = dependencies.clock;
     this.eventBus = dependencies.eventBus;
@@ -4401,7 +4740,7 @@ var ScriptRuntime = class {
   _output = new OutputEmitter();
   // Shared observer collaborator — owns the stack subscriber Set and the
   // post-mount snapshot contract. See `RuntimeObservers` for the seam.
-  _observers = new RuntimeObservers();
+  _observers;
   // The current execution context for the "turn"
   _activeContext = null;
   _now;
@@ -4548,12 +4887,12 @@ var ScriptRuntime = class {
       if (block) {
         try {
           block.unmount(this);
-        } catch (_e) {
+        } catch {
         }
         this.stack.pop();
         try {
           block.dispose(this);
-        } catch (_e) {
+        } catch {
         }
       } else {
         this.stack.pop();
@@ -4620,16 +4959,18 @@ var ScriptRuntime = class {
   }
 };
 var TypedMemoryReference = class {
-  constructor(_memory, ownerId, type, visibility = "private") {
+  constructor(_memory, ownerId, type, visibility = "private", _logger) {
     this._memory = _memory;
     this.ownerId = ownerId;
     this.type = type;
     this.visibility = visibility;
+    this._logger = _logger;
   }
   _memory;
   ownerId;
   type;
   visibility;
+  _logger;
   id = uuid.v7();
   _subscriptions = [];
   /**
@@ -4700,7 +5041,7 @@ var TypedMemoryReference = class {
       try {
         subscription.callback(newValue, oldValue);
       } catch (error) {
-        console.error(`Error in memory subscription callback:`, error);
+        this._logger?.error?.("Error in memory subscription callback:", error);
       }
     }
   }
@@ -5122,7 +5463,7 @@ var BehaviorContext = class {
       try {
         unsubscribe();
       } catch (err) {
-        console.error("[BehaviorContext] Unsubscribe error:", err);
+        this.runtime.options.logger?.error?.("[BehaviorContext] Unsubscribe error:", err);
       }
     }
     this.subscriptions = [];
@@ -5398,7 +5739,7 @@ var RuntimeBlock = class {
    */
   next(runtime, options) {
     if (!this._behaviorContext) {
-      console.warn("[RuntimeBlock] next() called before mount()");
+      RuntimeLogger.logAlways("warn", "RuntimeBlock", "next() called before mount()");
       return [];
     }
     const clock = options?.clock ?? this._behaviorContext.clock;
@@ -5448,7 +5789,7 @@ var RuntimeBlock = class {
       try {
         unsub();
       } catch (err) {
-        console.error("[RuntimeBlock] Error unsubscribing event handler:", err);
+        RuntimeLogger.logAlways("error", "RuntimeBlock", "Error unsubscribing event handler", { error: err });
       }
     }
     this._eventUnsubscribers = [];
@@ -5626,8 +5967,7 @@ var CompletionTimestampBehavior = class {
     return [];
   }
   onNext(ctx) {
-    const blockState = ctx.block.state;
-    if (blockState && blockState.isComplete && !this.wasComplete && !this.completionTime) {
+    if (ctx.block.isComplete && !this.wasComplete && !this.completionTime) {
       this.completionTime = new Date(ctx.clock.currentDate);
       this.wasComplete = true;
       const completionFragment = {
@@ -5810,7 +6150,10 @@ var ClearChildrenAction = class {
       iterations++;
     }
     if (iterations >= MAX_ITERATIONS) {
-      console.error(`[ClearChildrenAction] Max iterations reached, possible infinite loop`);
+      runtime.options.logger?.error?.(
+        "[ClearChildrenAction] Max iterations reached, possible infinite loop",
+        new Error(`Exceeded ${MAX_ITERATIONS} pop iterations for target ${this.targetBlockKey}`)
+      );
     }
     if (runtime.stack.current?.key.toString() === this.targetBlockKey) {
       actions.push(new NextAction(void 0, runtime.nowProvider));
@@ -5990,7 +6333,7 @@ var CountdownTimerBehavior = class {
       if (childLoc?.metrics[0]) {
         ctx.updateMemory("children:status", [{ ...childLoc.metrics[0], value: newChildStatus }]);
       } else {
-        ctx.pushMemory("children:status", [{ type: 0, image: "", origin: "runtime", value: newChildStatus }]);
+        ctx.pushMemory("children:status", [{ type: "status", image: "", origin: "runtime", value: newChildStatus }]);
       }
     }
   }
@@ -6394,6 +6737,7 @@ function resolveDominantOrigin(origins) {
 }
 
 // src/runtime/compiler/EffortEnrichmentPass.ts
+var logTrace = (message) => console.log(message);
 function applyEffortEnrichment(block, options) {
   const { resolver, overwrite = false, debug = false } = options;
   tryEnrichBlock(block, resolver, overwrite, debug);
@@ -6405,14 +6749,14 @@ function tryEnrichBlock(block, resolver, overwrite, debug) {
   }
   const label = block.label;
   if (!label) {
-    if (debug) console.log(`[EffortEnrichment] Skipping block with no label: ${block.key}`);
+    if (debug) logTrace(`[EffortEnrichment] Skipping block with no label: ${block.key}`);
     return;
   }
   const existingEffortData = block.getAllMemory().find(
     (loc) => loc.metrics.toArray().some((m) => m.type === EFFORT_DATA_METRIC_TYPE)
   );
   if (existingEffortData && !overwrite) {
-    if (debug) console.log(`[EffortEnrichment] Skipping block already enriched: ${label}`);
+    if (debug) logTrace(`[EffortEnrichment] Skipping block already enriched: ${label}`);
     return;
   }
   try {
@@ -6422,7 +6766,7 @@ function tryEnrichBlock(block, resolver, overwrite, debug) {
       block.mergeHints(effortHints);
     }
     if (debug) {
-      console.log(`[EffortEnrichment] Resolved effort: ${label} \u2192 ${resolved.label} (MET: ${resolved.met})`);
+      logTrace(`[EffortEnrichment] Resolved effort: ${label} \u2192 ${resolved.label} (MET: ${resolved.met})`);
     }
     const effortDataMetric = {
       type: EFFORT_DATA_METRIC_TYPE,
@@ -6478,7 +6822,7 @@ var CompileAndPushBlockAction = class {
       }
       return [new PushBlockAction(compiledBlock, this.options)];
     } catch (error) {
-      console.error(`CompileAndPushBlockAction: Compilation failed`, error);
+      runtime.options.logger?.error?.("CompileAndPushBlockAction: Compilation failed", error);
       return [];
     }
   }
@@ -6697,7 +7041,7 @@ var ChildSelectionBehavior = class _ChildSelectionBehavior {
     if (childLoc?.metrics[0]) {
       ctx.updateMemory("children:status", [{ ...childLoc.metrics[0], value: status }]);
     } else {
-      ctx.pushMemory("children:status", [{ type: 0, image: "", origin: "runtime", value: status }]);
+      ctx.pushMemory("children:status", [{ type: "status", image: "", origin: "runtime", value: status }]);
     }
   }
   /**
@@ -7245,7 +7589,7 @@ var WaitingToStartBlock = class _WaitingToStartBlock extends RuntimeBlock {
    */
   static buildBehaviors() {
     const behaviors = [];
-    behaviors.push(new ReportOutputBehavior({ label: "Ready to Start" }));
+    behaviors.push(new ReportOutputBehavior({ label: "Ready to Start", emitSegmentOnMount: true }));
     behaviors.push(new LabelingBehavior({
       mode: "clock",
       label: "Ready to Start"
@@ -7681,7 +8025,7 @@ var JitCompiler = class {
     const promotion = this._promotionResolver.resolvePromotions(parentBlock, runtime);
     if (promotion.hasPromotions) {
       const promotedFragments = promotion.promotedFragments;
-      effectiveNodes = nodes.map((node) => {
+      effectiveNodes = effectiveNodes.map((node) => {
         const clone = Object.create(Object.getPrototypeOf(node));
         Object.assign(clone, node);
         clone.metrics = node.metrics.clone(node.id).add(...promotedFragments);
@@ -7698,8 +8042,7 @@ var JitCompiler = class {
     }
     try {
       return builder.build();
-    } catch (e) {
-      console.error("Failed to build block from composition:", e);
+    } catch {
       return void 0;
     }
   }
@@ -11637,7 +11980,7 @@ var RuntimeAdapter = class {
         blocks: stackBlocks,
         activeIndex: activeIndex >= 0 ? activeIndex : 0,
         depth: stackBlocks.length,
-        rootBlockKey: stackBlocks.length > 0 ? stackBlocks[0].key : void 0
+        rootBlockKey: stackBlocks.at(-1)?.key
       },
       memory: {
         entries: memoryEntries,
@@ -11664,7 +12007,7 @@ var RuntimeAdapter = class {
     const blocks = runtime.stack.blocks;
     return blocks.map((block, index) => {
       const blockType = this.mapBlockType(block);
-      const isActive = index === blocks.length - 1;
+      const isActive = index === 0;
       const status = this.determineBlockStatus(isActive);
       const metrics = this.extractBlockFragments(runtime, block);
       const displayLocs = block.getMemoryByTag("metric:display");
@@ -11686,7 +12029,7 @@ var RuntimeAdapter = class {
         metrics,
         metricGroups,
         sourceIds: block.sourceIds,
-        lineNumber: block.sourceIds.length > 0 ? block.sourceIds[0] : void 0,
+        lineNumber: block.sourceIds.length > 0 ? runtime.script.getId(block.sourceIds[0])?.line : void 0,
         metadata: {
           mountTime: void 0,
           executionTime: void 0,
@@ -11713,9 +12056,8 @@ var RuntimeAdapter = class {
     const ownerLabelMap = /* @__PURE__ */ new Map();
     runtime.stack.blocks.forEach((block) => {
       const key = block.key.toString();
-      if (block.sourceIds && block.sourceIds.length > 0) {
-        ownerLineMap.set(key, block.sourceIds[0]);
-      }
+      const line = block.sourceIds.length > 0 ? runtime.script.getId(block.sourceIds[0])?.line : void 0;
+      if (line !== void 0) ownerLineMap.set(key, line);
       ownerLabelMap.set(key, block.label);
     });
     for (const block of runtime.stack.blocks) {
@@ -11853,8 +12195,7 @@ var RuntimeAdapter = class {
     return "pending";
   }
   findParentKey(blocks, currentIndex) {
-    if (currentIndex === 0) return void 0;
-    return blocks[currentIndex - 1].key.toString();
+    return blocks[currentIndex + 1]?.key.toString();
   }
   findChildrenKeys(_blocks, _parentKey) {
     return [];
@@ -12456,6 +12797,8 @@ function evaluateNode(node, context, row) {
           return right === 0 ? void 0 : left / right;
         case "^":
           return Math.pow(left, right);
+        default:
+          return void 0;
       }
     }
     case "call":
@@ -12796,8 +13139,6 @@ function compileLineForm(src, defaultScope) {
     const sc = SCOPE_RE.exec(line);
     if (sc && /^(on\s|when\s|:)/.test(line.slice(sc[0].length).trim())) {
       scope = sc[1];
-      fences = void 0;
-      defWhen = void 0;
       const header = parseSectionHeader(line.slice(sc[0].length).trim());
       fences = header.fences;
       defWhen = header.when;
@@ -13194,7 +13535,7 @@ function computeWorkloadRollups(loads, throughDay) {
   return rollups;
 }
 function toStoredOutputStatement(output) {
-  const metrics = output.metrics instanceof wodWikiCore.MetricContainer ? output.metrics.toArray() : Array.isArray(output.metrics) ? output.metrics : output.metrics?.toArray ? output.metrics.toArray() : [];
+  const metrics = output.metrics instanceof wodWikiCore.MetricContainer ? output.metrics.toArray() : Array.isArray(output.metrics) ? output.metrics : typeof output.metrics.toArray === "function" ? output.metrics.toArray() : [];
   const hints = getHints(output);
   return {
     id: output.id,
@@ -13213,15 +13554,194 @@ function toStoredOutputStatement(output) {
   };
 }
 
-// src/version.ts
-var VERSION = "0.10.42";
-var GIT_SHA = "79c6d18";
-var BUILD_TIME = "2026-08-26T04:44:54.356Z";
-var SEMVER = {
-  version: "0.10.42",
-  gitSha: "79c6d18",
-  buildTime: "2026-08-26T04:44:54.356Z"
-};
+// src/parser-fixture/metricLine.ts
+var TAIL_TOKEN_RE = /[\w-]+:(?:"(?:[^"\\]|\\.)*"|[^ ]+)/g;
+var FixtureSyntaxError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "FixtureSyntaxError";
+  }
+};
+function canonicalizeType(token) {
+  const kebab = token.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
+  return kebab;
+}
+var TIME_RE = /^\d{1,2}(:\d{2}){1,2}$/;
+var NUMBER_RE = /^\d+(\.\d+)?$/;
+var TAIL_RE = /^[\w-]+:([^ ]+)$/;
+function parseTimeToMs(token) {
+  const parts = token.split(":").map(Number);
+  return parts.reduce((acc, p) => acc * 60 + p, 0) * 1e3;
+}
+function parseTails(sequence, at) {
+  const fields = {};
+  TAIL_TOKEN_RE.lastIndex = 0;
+  let cursor = 0;
+  let m;
+  while ((m = TAIL_TOKEN_RE.exec(sequence)) !== null) {
+    if (sequence.slice(cursor, m.index).trim() !== "") {
+      at(`invalid object tail ${JSON.stringify(sequence.slice(cursor, m.index).trim())}`);
+    }
+    const sep = m[0].indexOf(":");
+    const k = m[0].slice(0, sep);
+    const raw = m[0].slice(sep + 1);
+    fields[k] = raw.startsWith('"') ? JSON.parse(raw) : NUMBER_RE.test(raw) ? Number(raw) : raw;
+    cursor = m.index + m[0].length;
+  }
+  if (sequence.slice(cursor).trim() !== "") {
+    at(`invalid object tail ${JSON.stringify(sequence.slice(cursor).trim())}`);
+  }
+  return fields;
+}
+function parseMetricLine(line, file, lineNo) {
+  const src = line.trim();
+  function at(detail) {
+    throw new FixtureSyntaxError(`${file} [line ${lineNo}]: ${detail}`);
+  }
+  if (!line.startsWith("- ")) {
+    at(`metric line must start with "- " (got: ${JSON.stringify(line)})`);
+  }
+  const body = line.slice(2).trim();
+  const tokens = body.split(/\s+/).filter(Boolean);
+  if (tokens.length === 0) {
+    at("metric line is empty");
+  }
+  const [typeToken, ...rest] = tokens;
+  const type = canonicalizeType(typeToken);
+  if (rest.length === 0) {
+    at(`metric "${typeToken}" is missing a value`);
+  }
+  let origin;
+  const lastToken = rest[rest.length - 1];
+  const beforeLast = rest.slice(0, -1).join(" ");
+  const quotesBeforeLast = (beforeLast.match(/"/g) ?? []).length;
+  if (lastToken.startsWith("@") && quotesBeforeLast % 2 === 0) {
+    origin = lastToken.slice(1);
+    rest.pop();
+    if (rest.length === 0) {
+      at(`metric "${typeToken}" is missing a value before @${origin}`);
+    }
+  }
+  const first = rest[0];
+  if (first.startsWith('"')) {
+    const joined = rest.join(" ");
+    const m = joined.match(/^"(?:[^"\\]|\\.)*"/);
+    if (!m) {
+      at(`unterminated quoted string in: ${joined}`);
+    }
+    let value;
+    try {
+      value = JSON.parse(m[0]);
+    } catch {
+      at(`invalid quoted string ${m[0]} (JSON escapes only)`);
+    }
+    const tailPart = joined.slice(m[0].length).trim();
+    if (tailPart) {
+      at(`quoted string cannot combine with object tails (${tailPart}) \u2014 assert fields on the object-valued form instead`);
+    }
+    return { type, kind: "string", value, source: src, ...origin ? { origin } : {} };
+  }
+  if (TIME_RE.test(first)) {
+    if (rest.length > 1) at(`unexpected tokens after time literal: ${rest.slice(1).join(" ")}`);
+    return { type, kind: "number", value: parseTimeToMs(first), source: src, ...origin ? { origin } : {} };
+  }
+  if (NUMBER_RE.test(first)) {
+    if (rest.length === 1) {
+      return { type, kind: "number", value: Number(first), source: src, ...origin ? { origin } : {} };
+    }
+    const second = rest[1];
+    if (!TAIL_RE.test(second)) {
+      if (rest.length > 2) at(`unexpected tokens after amount+unit: ${rest.slice(2).join(" ")}`);
+      return { type, kind: "amountUnit", amount: Number(first), unit: second, source: src, ...origin ? { origin } : {} };
+    }
+    at(`number literal followed by object tail is ambiguous: ${rest.join(" ")}`);
+  }
+  if (TAIL_RE.test(first)) {
+    return { type, kind: "object", fields: parseTails(rest.join(" "), at), source: src, ...origin ? { origin } : {} };
+  }
+  if (first === "?" && rest.length === 1) {
+    return { type, kind: "undefined", source: src, ...origin ? { origin } : {} };
+  }
+  if (rest.length === 1) {
+    return { type, kind: "string", value: first, source: src, ...origin ? { origin } : {} };
+  }
+  at(`unquoted string value with spaces \u2014 use quotes: ${rest.join(" ")}`);
+}
+
+// src/parser-fixture/compare.ts
+function renderMetric(m) {
+  const type = canonicalizeType(String(m.type));
+  const cap = type.charAt(0).toUpperCase() + type.slice(1);
+  const origin = m.origin ? ` @${m.origin}` : "";
+  if (m.value !== null && typeof m.value === "object") {
+    const inner = Object.entries(m.value).map(([k, v]) => `${k}:${String(v)}`).join(" ");
+    return `${cap} ${inner}${origin}`;
+  }
+  if (typeof m.value === "string") {
+    return m.value.includes(" ") ? `${cap} "${m.value}"${origin}` : `${cap} ${m.value}${origin}`;
+  }
+  return `${cap} ${String(m.value)}${origin}`;
+}
+function literalMatches(line, metric) {
+  const value = metric.value;
+  switch (line.kind) {
+    case "number":
+      return typeof value === "number" && value === line.value;
+    case "undefined":
+      return metric.value === void 0;
+    case "string":
+      return value === line.value;
+    case "amountUnit": {
+      if (value === null || typeof value !== "object") return false;
+      const v = value;
+      return v.amount === line.amount && v.unit === line.unit && metric.unit === line.unit;
+    }
+    case "object": {
+      if (value === null || typeof value !== "object") return false;
+      const obj = value;
+      return Object.entries(line.fields ?? {}).every(([k, expected]) => {
+        const actual = obj[k];
+        if (typeof actual === "number" && typeof expected === "number") {
+          return actual === expected;
+        }
+        return String(actual) === String(expected);
+      });
+    }
+  }
+}
+function lineMatches(line, metric) {
+  if (canonicalizeType(String(metric.type)) !== line.type) return false;
+  if (line.origin !== void 0 && metric.origin !== line.origin) return false;
+  return literalMatches(line, metric);
+}
+function diffStatement(expected, actual) {
+  const remaining = [...actual];
+  const matched = [];
+  const missingExpected = [];
+  for (const line of expected) {
+    const hit = remaining.findIndex((m) => lineMatches(line, m));
+    if (hit === -1) {
+      missingExpected.push(line);
+    } else {
+      matched.push({ expected: line, actual: remaining.splice(hit, 1)[0] });
+    }
+  }
+  return { matched, missingExpected, extraActual: remaining };
+}
+function compareStatement(expectations, actual, mode) {
+  const { missingExpected, extraActual } = diffStatement(expectations, actual);
+  const diffs = [];
+  const present = actual.map(renderMetric).join("; ") || "nothing";
+  for (const line of missingExpected) {
+    diffs.push(`unmatched expectation ${line.source} \u2014 statement carries: ${present}`);
+  }
+  if (mode === "closed" && missingExpected.length === 0) {
+    for (const m of extraActual) {
+      diffs.push(`unexpected metric ${renderMetric(m)} \u2014 not in the Expected block`);
+    }
+  }
+  return diffs;
+}
 
 exports.ABSENT = ABSENT;
 exports.AGGREGATE_BUILTINS = AGGREGATE_BUILTINS;
@@ -13230,7 +13750,6 @@ exports.AbortSessionAction = AbortSessionAction;
 exports.AmrapLogicStrategy = AmrapLogicStrategy;
 exports.AnalyticsEngine = AnalyticsEngine;
 exports.AnalyticsTransformer = AnalyticsTransformer;
-exports.BUILD_TIME = BUILD_TIME;
 exports.BUILTIN_CALCS = BUILTIN_CALCS;
 exports.BUNDLED_EFFORT_COUNT = BUNDLED_EFFORT_COUNT;
 exports.BehaviorContext = BehaviorContext;
@@ -13256,6 +13775,7 @@ exports.ClimbDialect = ClimbDialect;
 exports.ClimbMetricType = ClimbMetricType;
 exports.CompileAndPushBlockAction = CompileAndPushBlockAction;
 exports.CompletionTimestampBehavior = CompletionTimestampBehavior;
+exports.CompositeEffortRegistry = CompositeEffortRegistry;
 exports.CountdownTimerBehavior = CountdownTimerBehavior;
 exports.CountupTimerBehavior = CountupTimerBehavior;
 exports.CrossFitDialect = CrossFitDialect;
@@ -13283,7 +13803,7 @@ exports.ErrorAction = ErrorAction;
 exports.EventBus = EventBus;
 exports.ExecutionContext = ExecutionContext;
 exports.ExitBehavior = ExitBehavior;
-exports.GIT_SHA = GIT_SHA;
+exports.FixtureSyntaxError = FixtureSyntaxError;
 exports.GenericGroupStrategy = GenericGroupStrategy;
 exports.GenericLoopStrategy = GenericLoopStrategy;
 exports.GenericTimerStrategy = GenericTimerStrategy;
@@ -13328,7 +13848,6 @@ exports.RuntimeLogger = RuntimeLogger;
 exports.RuntimeMemory = RuntimeMemory;
 exports.RuntimeObservers = RuntimeObservers;
 exports.RuntimeStack = RuntimeStack;
-exports.SEMVER = SEMVER;
 exports.STANDARD_UNITS = STANDARD_UNITS;
 exports.STORE_CALCS = STORE_CALCS;
 exports.STREAM_ATOMS = STREAM_ATOMS;
@@ -13354,7 +13873,6 @@ exports.UnitSet = UnitSet;
 exports.UnitsDialect = UnitsDialect;
 exports.UnregisterEventHandlerAction = UnregisterEventHandlerAction;
 exports.UpdateNextPreviewAction = UpdateNextPreviewAction;
-exports.VERSION = VERSION;
 exports.VISIBILITY_ICONS = VISIBILITY_ICONS;
 exports.VISIBILITY_LABELS = VISIBILITY_LABELS;
 exports.WaitingToStartBlock = WaitingToStartBlock;
@@ -13362,16 +13880,19 @@ exports.WaitingToStartInjectorBehavior = WaitingToStartInjectorBehavior;
 exports.WhiteboardScript = WhiteboardScript;
 exports.WodDialect = WodDialect;
 exports.YogaDialect = YogaDialect;
+exports.addAliasToEffort = addAliasToEffort;
 exports.addDim = addDim;
 exports.buildStaticLookups = buildStaticLookups;
 exports.buildTooltip = buildTooltip;
 exports.bundledEfforts = bundledEfforts;
 exports.calculateElapsed = calculateElapsed;
+exports.canonicalizeType = canonicalizeType;
 exports.checkCalcLine = checkCalcLine;
 exports.classifyStatements = classifyStatements;
 exports.closeCurrentSpan = closeCurrentSpan;
 exports.collapseUnresolvedChoices = collapseUnresolvedChoices;
 exports.commonFixtureSet = commonFixtureSet;
+exports.compareStatement = compareStatement;
 exports.compileLineForm = compileLineForm;
 exports.composeDivUnit = composeDivUnit;
 exports.composeMulUnit = composeMulUnit;
@@ -13398,6 +13919,7 @@ exports.dailySessionLoads = dailySessionLoads;
 exports.dayBucket = dayBucket;
 exports.dialectRegistry = dialectRegistry;
 exports.dialectStack = dialectStack;
+exports.diffStatement = diffStatement;
 exports.dimEquals = dimEquals;
 exports.disciplineFactorFor = disciplineFactorFor;
 exports.evaluate = evaluate;
@@ -13452,10 +13974,12 @@ exports.outputNodeIds = outputNodeIds;
 exports.parseCalcLine = parseCalcLine;
 exports.parseCalculateBlock = parseCalculateBlock;
 exports.parseExpression = parseExpression;
+exports.parseMetricLine = parseMetricLine;
 exports.parseScript = parseScript;
 exports.printCalculation = printCalculation;
 exports.readTimer = readTimer;
 exports.realtimeProcessorRegistry = realtimeProcessorRegistry;
+exports.renderMetric = renderMetric;
 exports.resolveDominantOrigin = resolveDominantOrigin;
 exports.sharedParser = sharedParser;
 exports.startSpan = startSpan;