parseman 0.25.0 → 0.26.1

package/dist/index.js

@@ -253,7 +253,13 @@ function saveCstMark(ctx) {
     raw: cstRawLen(ctx),
     tlog: cstTlLen(ctx),
     leaves: cstLeavesLen(ctx),
-    fields: ctx._fields?.length ?? 0
+    fields: ctx._fields?.length ?? 0,
+    // Speculative rollback must truncate the flat recovery-error sink in lockstep
+    // with the CST leaves: a branch that recovered (pushing a ParseError to
+    // ctx._errors AND embedding it as a CST child via captureError) then failed
+    // must remove BOTH, or the flat error survives as a GHOST that a tree walk
+    // can't see (flat run().errors would disagree with the embedded set).
+    errors: ctx._errors?.length ?? 0
   };
 }
 function rollbackBufList(b, keyMulti, keySingle, len) {
@@ -269,6 +275,7 @@ function rollbackBufList(b, keyMulti, keySingle, len) {
   if (len === 0) b[keySingle] = void 0;
 }
 function rollbackCstCapture(ctx, mark) {
+  if (ctx._errors && mark.errors !== void 0) ctx._errors.length = mark.errors;
   const b = ctx._cstBuf;
   if (b) {
     rollbackBufList(b, "raw", "rawSingle", mark.raw);
@@ -829,12 +836,163 @@ function keywords(words, opts = {}) {
   };
 }
 
+// src/recovery/scan.ts
+function probeAt(sentinel, input, pos, ctx) {
+  const s = {
+    _probe: ctx._probe,
+    _errors: ctx._errors,
+    _cstLeaves: ctx._cstLeaves,
+    _cstChildren: ctx._cstChildren,
+    _cstRawChildren: ctx._cstRawChildren,
+    _cstTriviaLog: ctx._cstTriviaLog,
+    _triviaLog: ctx._triviaLog,
+    _fields: ctx._fields,
+    _cstBuf: ctx._cstBuf,
+    _tolerant: ctx._tolerant,
+    _sync: ctx._sync
+  };
+  ctx._probe = void 0;
+  ctx._errors = void 0;
+  ctx._cstLeaves = void 0;
+  ctx._cstChildren = void 0;
+  ctx._cstRawChildren = void 0;
+  ctx._cstTriviaLog = void 0;
+  ctx._triviaLog = void 0;
+  ctx._fields = void 0;
+  ctx._cstBuf = void 0;
+  ctx._tolerant = void 0;
+  ctx._sync = void 0;
+  try {
+    return sentinel.parse(input, pos, ctx).ok;
+  } finally {
+    ctx._probe = s._probe;
+    ctx._errors = s._errors;
+    ctx._cstLeaves = s._cstLeaves;
+    ctx._cstChildren = s._cstChildren;
+    ctx._cstRawChildren = s._cstRawChildren;
+    ctx._cstTriviaLog = s._cstTriviaLog;
+    ctx._triviaLog = s._triviaLog;
+    ctx._fields = s._fields;
+    ctx._cstBuf = s._cstBuf;
+    ctx._tolerant = s._tolerant;
+    ctx._sync = s._sync;
+  }
+}
+function orSentinel(a, b) {
+  if (b === void 0) return a;
+  return {
+    _tag: "orSentinel",
+    _meta: { firstSet: { kind: "any" }, canMatchNewline: false, isTrivia: false },
+    _def: { tag: "unknown" },
+    parse(input, pos, ctx) {
+      const ra = a.parse(input, pos, ctx);
+      if (ra.ok) return ra;
+      return b.parse(input, pos, ctx);
+    }
+  };
+}
+function firstSetSentinel(fs) {
+  if (fs.kind !== "ranges" || fs.ranges.length === 0) return null;
+  const ranges = fs.ranges;
+  return {
+    _tag: "firstSetSentinel",
+    _meta: { firstSet: fs, canMatchNewline: false, isTrivia: false },
+    _def: { tag: "unknown" },
+    parse(input, pos) {
+      const code = pos < input.length ? input.codePointAt(pos) : void 0;
+      if (code !== void 0) {
+        for (const r of ranges) {
+          if (code >= r.lo && code <= r.hi) return { ok: true, value: null, span: { start: pos, end: pos } };
+        }
+      }
+      return { ok: false, expected: [], span: { start: pos, end: pos } };
+    }
+  };
+}
+function recoverScan(input, from, ctx, sync, expected) {
+  let scanPos = from;
+  while (scanPos < input.length && !probeAt(sync, input, scanPos, ctx)) scanPos++;
+  const error = { _tag: "parseError", span: { start: from, end: scanPos }, expected };
+  ctx._errors?.push(error);
+  return { error, end: scanPos };
+}
+function matchesAt(sentinel, input, pos, ctx) {
+  return probeAt(sentinel, input, pos, ctx);
+}
+function captureError(ctx, error) {
+  if (cstCaptureActive(ctx)) pushCstChild(ctx, error, error);
+}
+var REC = { scan: recoverScan, at: matchesAt, or: orSentinel, sentinel: firstSetSentinel, capture: captureError };
+
+// src/combinators/expect.ts
+function deriveExpected(c) {
+  const def = c._def;
+  switch (def.tag) {
+    case "literal":
+      return [JSON.stringify(def.value)];
+    case "regex":
+      return [`/${def.source}/`];
+    case "keywords":
+      return def.words.map((w) => JSON.stringify(w));
+    case "label":
+      return [def.label];
+    case "choice":
+      return def.parsers.flatMap(deriveExpected);
+    case "sequence":
+      return def.parsers.length > 0 ? deriveExpected(def.parsers[0]) : [];
+    case "node":
+    case "grammar":
+    case "trivia":
+    case "token":
+    case "optional":
+    case "many":
+    case "oneOrMore":
+    case "transform":
+    case "not":
+      return deriveExpected(def.parser);
+    case "lazy": {
+      const name = c._ruleName;
+      try {
+        return deriveExpected(def.thunk());
+      } catch {
+        return name ? [name] : [];
+      }
+    }
+    default:
+      return [];
+  }
+}
+function expect(combinator, label2) {
+  const expected = label2 !== void 0 ? [label2] : deriveExpected(combinator);
+  const meta = {
+    firstSet: combinator._meta.firstSet,
+    canMatchNewline: combinator._meta.canMatchNewline,
+    isTrivia: false
+  };
+  return {
+    _tag: "expect",
+    _meta: meta,
+    _def: { tag: "expect", parser: combinator, label: label2, expected },
+    parse(input, pos, ctx) {
+      const result = combinator.parse(input, pos, ctx);
+      if (result.ok) return result;
+      const error = { _tag: "parseError", span: { start: pos, end: pos }, expected };
+      ctx._errors?.push(error);
+      if (ctx._tolerant) captureError(ctx, error);
+      return { ok: true, value: error, span: { start: pos, end: pos } };
+    }
+  };
+}
+function isParseError(value) {
+  return typeof value === "object" && value !== null && value._tag === "parseError";
+}
+
 // src/combinators/choice.ts
 function choice(...args) {
   const parsers = args.map((a) => "gate" in a ? a.combinator : a);
   const gates = args.map((a) => "gate" in a ? a.gate : null);
   const hasGates = gates.some((g) => g !== null);
-  const disjoint = !hasGates && areDisjoint(parsers.map((p) => p._meta.firstSet));
+  const disjoint = areDisjoint(parsers.map((p) => p._meta.firstSet)) && parsers.every((p) => !matchesEmpty(p));
   let combined = { kind: "empty" };
   for (const p of parsers) combined = union(combined, p._meta.firstSet);
   const meta = {
@@ -873,17 +1031,21 @@ function choice(...args) {
       const expected = [];
       if (disjoint && pos < input.length) {
         const code = input.codePointAt(pos);
-        let parser2 = code < 128 ? asciiDispatch?.[code] ?? null : null;
-        if (!parser2) {
-          for (const p of parsers) {
-            if (inFirstSet(code, p._meta.firstSet)) {
-              parser2 = p;
+        let idx = code < 128 ? asciiDispatch[code] : -1;
+        if (idx < 0) {
+          for (let i = 0; i < parsers.length; i++) {
+            if (inFirstSet(code, parsers[i]._meta.firstSet)) {
+              idx = i;
               break;
             }
           }
         }
-        if (parser2) {
-          const result = parser2.parse(input, pos, ctx);
+        if (idx >= 0) {
+          const gate = gates[idx];
+          if (gate && !gate(ctx.state)) {
+            return { ok: false, expected: deriveExpected(parsers[idx]), span: { start: pos, end: pos } };
+          }
+          const result = parsers[idx].parse(input, pos, ctx);
           if (result.ok) return result;
           expected.push(...result.expected);
           return { ok: false, expected, span: { start: pos, end: pos } };
@@ -1064,13 +1226,13 @@ function areDisjoint(sets) {
   return true;
 }
 function buildAsciiDispatch(parsers) {
-  const table = Array(128).fill(null);
-  for (const parser2 of parsers) {
-    const fs = parser2._meta.firstSet;
+  const table = Array(128).fill(-1);
+  for (let i = 0; i < parsers.length; i++) {
+    const fs = parsers[i]._meta.firstSet;
     if (fs.kind !== "ranges") continue;
     for (const { lo, hi } of fs.ranges) {
       for (let code = Math.max(0, lo); code <= Math.min(127, hi); code++) {
-        table[code] = parser2;
+        table[code] = i;
       }
     }
   }
@@ -1215,10 +1377,10 @@ function needsDeferredTriviaCommit(ctx) {
 }
 function saveTriviaMark(ctx) {
   const m = saveCstMark(ctx);
-  return { raw: m.raw, tlog: m.tlog, leaves: m.leaves, fields: m.fields, log: ctx._triviaLog ? ctx._triviaLog.length : 0 };
+  return { raw: m.raw, tlog: m.tlog, leaves: m.leaves, fields: m.fields, errors: m.errors, log: ctx._triviaLog ? ctx._triviaLog.length : 0 };
 }
 function rollbackTrivia(ctx, mark) {
-  rollbackCstCapture(ctx, { raw: mark.raw, tlog: mark.tlog, leaves: mark.leaves, fields: mark.fields });
+  rollbackCstCapture(ctx, { raw: mark.raw, tlog: mark.tlog, leaves: mark.leaves, fields: mark.fields, errors: mark.errors });
   if (ctx._triviaLog) ctx._triviaLog.length = mark.log;
 }
 function scanWithLabels(input, cur, ctx) {
@@ -1462,11 +1624,59 @@ function sequence(...parsers) {
     isTrivia: false
   };
   const def = { tag: "sequence", parsers };
+  let followSentinels;
+  function parseTolerant(input, pos, ctx) {
+    followSentinels ??= parsers.map((_, i) => {
+      const fs = parsers.slice(i + 1).reduce(
+        (acc, p) => union(acc, firstSetOf(p)),
+        { kind: "empty" }
+      );
+      return firstSetSentinel(fs);
+    });
+    const values = def.valueUnused ? void 0 : [];
+    let cur = pos;
+    const inheritedSync = ctx._sync;
+    try {
+      for (let i = 0; i < parsers.length; i++) {
+        ctx._sync = followSentinels[i] ?? inheritedSync;
+        if (ctx.trivia && i > 0) {
+          const mark = saveTriviaMark(ctx);
+          let scanEnd;
+          if (needsDeferredTriviaCommit(ctx)) {
+            const scan = scanTrivia(input, cur, ctx);
+            scan.commit();
+            scanEnd = scan.end;
+          } else {
+            scanEnd = advanceTrivia(input, cur, ctx);
+          }
+          const result2 = parsers[i].parse(input, scanEnd, ctx);
+          if (!result2.ok) return result2;
+          if (result2.span.end > scanEnd) cur = result2.span.end;
+          else rollbackTrivia(ctx, mark);
+          if (values !== void 0) values.push(result2.value);
+          continue;
+        }
+        const result = parsers[i].parse(input, cur, ctx);
+        if (!result.ok) return result;
+        if (values !== void 0) values.push(result.value);
+        cur = result.span.end;
+      }
+    } finally {
+      ctx._sync = inheritedSync;
+    }
+    return {
+      ok: true,
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
+      value: values ?? void 0,
+      span: { start: pos, end: cur }
+    };
+  }
   return {
     _tag: "sequence",
     _meta: meta,
     _def: def,
     parse(input, pos, ctx) {
+      if (ctx._tolerant) return parseTolerant(input, pos, ctx);
       const values = def.valueUnused ? void 0 : [];
       let cur = pos;
       for (let i = 0; i < parsers.length; i++) {
@@ -1525,7 +1735,7 @@ function repItem(combinator, input, cur, ctx) {
   const result = combinator.parse(input, pos, ctx);
   if (!result.ok) {
     rollbackTrivia(ctx, mark);
-    return { fail: result };
+    return { fail: result, failPos: pos };
   }
   if (result.span.end === pos) {
     rollbackTrivia(ctx, mark);
@@ -1540,6 +1750,7 @@ function many(combinator) {
     isTrivia: false
   };
   const def = { tag: "many", parser: combinator, min: 0 };
+  let expected;
   return {
     _tag: "many",
     _meta: meta,
@@ -1549,7 +1760,18 @@ function many(combinator) {
       let cur = pos;
       while (cur < input.length) {
         const item = repItem(combinator, input, cur, ctx);
-        if (item === "stop" || "fail" in item) break;
+        if (item === "stop") break;
+        if ("fail" in item) {
+          const sync = ctx._tolerant ? ctx._sync : void 0;
+          if (sync === void 0) break;
+          if (matchesAt(sync, input, item.failPos, ctx)) break;
+          expected ??= deriveExpected(combinator);
+          const { error, end } = recoverScan(input, item.failPos, ctx, sync, expected);
+          if (values !== void 0) values.push(error);
+          captureError(ctx, error);
+          cur = end;
+          continue;
+        }
         if (values !== void 0) values.push(item.value);
         cur = item.end;
       }
@@ -1564,6 +1786,7 @@ function oneOrMore(combinator) {
     isTrivia: false
   };
   const def = { tag: "oneOrMore", parser: combinator, min: 1 };
+  let expected;
   return {
     _tag: "oneOrMore",
     _meta: meta,
@@ -1575,7 +1798,18 @@ function oneOrMore(combinator) {
       let cur = first.span.end;
       while (cur < input.length) {
         const item = repItem(combinator, input, cur, ctx);
-        if (item === "stop" || "fail" in item) break;
+        if (item === "stop") break;
+        if ("fail" in item) {
+          const sync = ctx._tolerant ? ctx._sync : void 0;
+          if (sync === void 0) break;
+          if (matchesAt(sync, input, item.failPos, ctx)) break;
+          expected ??= deriveExpected(combinator);
+          const { error, end } = recoverScan(input, item.failPos, ctx, sync, expected);
+          if (values !== void 0) values.push(error);
+          captureError(ctx, error);
+          cur = end;
+          continue;
+        }
         if (values !== void 0) values.push(item.value);
         cur = item.end;
       }
@@ -1621,15 +1855,29 @@ function sepBy(combinator, separator) {
     canMatchNewline: combinator._meta.canMatchNewline || separator._meta.canMatchNewline,
     isTrivia: false
   };
+  let expected;
   return {
     _tag: "sepBy",
     _meta: meta,
     _def: { tag: "sepBy", parser: combinator, separator },
     parse(input, pos, ctx) {
       const first = combinator.parse(input, pos, ctx);
-      if (!first.ok) return { ok: true, value: [], span: { start: pos, end: pos } };
-      const values = [first.value];
-      let cur = first.span.end;
+      const values = [];
+      let cur;
+      if (first.ok) {
+        values.push(first.value);
+        cur = first.span.end;
+      } else {
+        const term = ctx._tolerant ? ctx._sync : void 0;
+        if (term === void 0 || matchesAt(term, input, pos, ctx)) {
+          return { ok: true, value: [], span: { start: pos, end: pos } };
+        }
+        expected ??= deriveExpected(combinator);
+        const rec = recoverScan(input, pos, ctx, orSentinel(separator, term), expected);
+        values.push(rec.error);
+        captureError(ctx, rec.error);
+        cur = rec.end;
+      }
       while (cur < input.length) {
         const loopMark = saveTriviaMark(ctx);
         let sepPos = cur;
@@ -1659,6 +1907,15 @@ function sepBy(combinator, separator) {
         }
         const next = combinator.parse(input, nextPos, ctx);
         if (!next.ok) {
+          const term = ctx._tolerant ? ctx._sync : void 0;
+          if (term !== void 0 && !matchesAt(term, input, nextPos, ctx)) {
+            expected ??= deriveExpected(combinator);
+            const rec = recoverScan(input, nextPos, ctx, orSentinel(separator, term), expected);
+            values.push(rec.error);
+            captureError(ctx, rec.error);
+            cur = rec.end;
+            continue;
+          }
           rollbackTrivia(ctx, loopMark);
           break;
         }
@@ -1832,7 +2089,7 @@ function rules(a, b) {
       cache[key] = parser2;
     }
   }
-  if (options?.trivia !== void 0) {
+  if (options?.trivia != null) {
     for (const key of Object.keys(definitions)) {
       const rule = cache[key];
       if (rule && !rule._meta.isTrivia) rule._meta.grammarTrivia = options.trivia;
@@ -1862,7 +2119,9 @@ function not(combinator) {
     _meta: meta,
     _def: { tag: "not", parser: combinator },
     parse(input, pos, ctx) {
+      const mark = saveCstMark(ctx);
       const result = combinator.parse(input, pos, ctx);
+      rollbackCstCapture(ctx, mark);
       if (result.ok) {
         return { ok: false, expected: [`not(${combinator._tag})`], span: { start: pos, end: pos } };
       }
@@ -1976,7 +2235,7 @@ function unwrapChild(child) {
   return child !== null && typeof child === "object" && child._tag === "leaf" ? child.value : child;
 }
 function isCstChild(value) {
-  return typeof value === "object" && value !== null && (value._tag === "node" || value._tag === "leaf" || value._tag === "error");
+  return typeof value === "object" && value !== null && (value._tag === "node" || value._tag === "leaf" || value._tag === "parseError");
 }
 function missingInferredType() {
   throw new Error('node(): inferred node type requires a rules() key; pass node("Type", parser) outside rules()');
@@ -2254,65 +2513,6 @@ function token(root) {
   };
 }
 
-// src/combinators/expect.ts
-function deriveExpected(c) {
-  const def = c._def;
-  switch (def.tag) {
-    case "literal":
-      return [JSON.stringify(def.value)];
-    case "regex":
-      return [`/${def.source}/`];
-    case "keywords":
-      return def.words.map((w) => JSON.stringify(w));
-    case "label":
-      return [def.label];
-    case "choice":
-      return def.parsers.flatMap(deriveExpected);
-    case "sequence":
-      return def.parsers.length > 0 ? deriveExpected(def.parsers[0]) : [];
-    case "node":
-    case "grammar":
-    case "trivia":
-    case "token":
-    case "optional":
-    case "many":
-    case "oneOrMore":
-    case "transform":
-    case "not":
-      return deriveExpected(def.parser);
-    case "lazy": {
-      const name = c._ruleName;
-      try {
-        return deriveExpected(def.thunk());
-      } catch {
-        return name ? [name] : [];
-      }
-    }
-    default:
-      return [];
-  }
-}
-function expect(combinator, label2) {
-  const expected = label2 !== void 0 ? [label2] : deriveExpected(combinator);
-  const meta = {
-    firstSet: combinator._meta.firstSet,
-    canMatchNewline: combinator._meta.canMatchNewline,
-    isTrivia: false
-  };
-  return {
-    _tag: "expect",
-    _meta: meta,
-    _def: { tag: "expect", parser: combinator, label: label2, expected },
-    parse(input, pos, ctx) {
-      const result = combinator.parse(input, pos, ctx);
-      if (result.ok) return result;
-      const error = { _tag: "parseError", span: { start: pos, end: pos }, expected };
-      ctx._errors?.push(error);
-      return { ok: true, value: error, span: { start: pos, end: pos } };
-    }
-  };
-}
-
 // src/compiler/scannable-run.ts
 var BACKSLASH = 92;
 var META = new Set("()[]{}*+?|^$.".split(""));
@@ -2384,20 +2584,39 @@ function parseSeqParts(source) {
       lit = [];
     }
   };
-  const runFrom = (ranges, negated, q) => {
+  const braceQuant = (at) => {
+    const close = source.indexOf("}", at);
+    if (close === -1) return null;
+    const body = source.slice(at + 1, close);
+    const m = /^(\d+)(,(\d*)?)?$/.exec(body);
+    if (!m) return null;
+    const min = Number(m[1]);
+    const max = m[2] === void 0 ? min : m[3] ? Number(m[3]) : Infinity;
+    if (max < 1 || min > max) return null;
+    return { min, max, len: close - at + 1 };
+  };
+  const runFrom = (ranges, negated, at) => {
+    const q = source[at];
     if (q === "+") {
-      parts.push({ part: "run", ranges, negated, min: 1, unbounded: true });
+      parts.push({ part: "run", ranges, negated, min: 1, max: Infinity });
       return 1;
     }
     if (q === "*") {
-      parts.push({ part: "run", ranges, negated, min: 0, unbounded: true });
+      parts.push({ part: "run", ranges, negated, min: 0, max: Infinity });
       return 1;
     }
     if (q === "?") {
-      parts.push({ part: "run", ranges, negated, min: 0, unbounded: false });
+      parts.push({ part: "run", ranges, negated, min: 0, max: 1 });
       return 1;
     }
-    parts.push({ part: "run", ranges, negated, min: 1, unbounded: false });
+    if (q === "{") {
+      const b = braceQuant(at);
+      if (b) {
+        parts.push({ part: "run", ranges, negated, min: b.min, max: b.max });
+        return b.len;
+      }
+    }
+    parts.push({ part: "run", ranges, negated, min: 1, max: 1 });
     return 0;
   };
   let i = 0;
@@ -2422,7 +2641,7 @@ function parseSeqParts(source) {
       if (!ranges) return null;
       flush();
       i = k + 1;
-      i += runFrom(ranges, neg, source[i]);
+      i += runFrom(ranges, neg, i);
       continue;
     }
     if (ch === "\\") {
@@ -2430,7 +2649,7 @@ function parseSeqParts(source) {
       if (e === "d" || e === "w" || e === "s") {
         flush();
         i += 2;
-        i += runFrom(shorthandRanges(e), false, source[i]);
+        i += runFrom(shorthandRanges(e), false, i);
         continue;
       }
       const uni = readUnicodeEscape(source, i);
@@ -2519,7 +2738,7 @@ function seqIsUnambiguous(parts) {
   let hasMandatory = false;
   for (let k = 0; k < parts.length; k++) {
     const p = parts[k];
-    const mandatory = p.part === "lit" ? !p.optional : p.min === 1;
+    const mandatory = p.part === "lit" ? !p.optional : p.min >= 1;
     if (mandatory) hasMandatory = true;
     if (p.part === "group") {
       const exposure = groupPartExposure(p);
@@ -2530,9 +2749,8 @@ function seqIsUnambiguous(parts) {
         if (!firstSetsDisjoint(exposure, seqFirstAccept(parts.slice(k + 1)))) return false;
       }
     }
-    const skippableSingle = p.part === "lit" && p.optional || p.part !== "lit" && !p.unbounded && p.min === 0;
-    const isUnboundedRepeat = p.part !== "lit" && p.unbounded;
-    if (skippableSingle || isUnboundedRepeat) {
+    const needsDisjoint = p.part === "lit" ? p.optional : p.part === "run" ? p.max > p.min : p.unbounded || p.min === 0;
+    if (needsDisjoint) {
       const rest = seqFirstAccept(parts.slice(k + 1));
       if (!firstSetsDisjoint(partFirstAccept(p), rest)) return false;
     }
@@ -2589,8 +2807,8 @@ function fixedClassSeq(shape) {
     if (p.part === "lit") {
       if (p.optional) return null;
       for (const cp of p.cps) out.push({ ranges: [[cp, cp]], negated: false });
-    } else if (p.part === "run" && !p.unbounded && p.min === 1) {
-      out.push({ ranges: p.ranges, negated: p.negated });
+    } else if (p.part === "run" && p.max === p.min && Number.isFinite(p.max)) {
+      for (let c = 0; c < p.max; c++) out.push({ ranges: p.ranges, negated: p.negated });
     } else {
       return null;
     }
@@ -2642,7 +2860,7 @@ function trailingBacktrackClass(shape) {
     const last = shape.parts[shape.parts.length - 1];
     if (last.part === "lit") return null;
     if (last.part === "run") {
-      if (last.unbounded || last.min === 0) return { ranges: last.ranges, negated: last.negated };
+      if (last.max > last.min) return { ranges: last.ranges, negated: last.negated };
       return null;
     }
     return groupPartExposure(last);
@@ -2779,7 +2997,7 @@ function partFirstAccept(part) {
 function seqFirstAccept(parts) {
   const sets = [];
   for (const p of parts) {
-    const mandatory = p.part === "lit" ? !p.optional : p.min === 1;
+    const mandatory = p.part === "lit" ? !p.optional : p.min >= 1;
     sets.push(partFirstAccept(p));
     if (mandatory) break;
   }
@@ -3194,7 +3412,13 @@ function emitShapeMatch(shape, start, mint, ind2, firstChar) {
           lines.push(`${ind2}  if (!(${endV2} + ${L} <= input.length && (${cond}))) break`);
           lines.push(`${ind2}  ${endV2} += ${L}`);
         }
-      } else if (p.part === "run" && !p.unbounded) {
+      } else if (p.part === "run" && p.max === Infinity) {
+        const s = mint("_s");
+        lines.push(`${ind2}  const ${s} = ${endV2}`);
+        lines.push(`${ind2}  while (${endV2} < input.length && ${runCond(p, endV2)}) ${endV2}++`);
+        if (p.min === 1) lines.push(`${ind2}  if (${endV2} === ${s}) break`);
+        else if (p.min > 1) lines.push(`${ind2}  if (${endV2} - ${s} < ${p.min}) break`);
+      } else if (p.part === "run" && p.max === 1) {
         if (p.min === 1) {
           lines.push(`${ind2}  if (!(${endV2} < input.length && ${runCond(p, endV2)})) break`);
           lines.push(`${ind2}  ${endV2}++`);
@@ -3204,8 +3428,8 @@ function emitShapeMatch(shape, start, mint, ind2, firstChar) {
       } else if (p.part === "run") {
         const s = mint("_s");
         lines.push(`${ind2}  const ${s} = ${endV2}`);
-        lines.push(`${ind2}  while (${endV2} < input.length && ${runCond(p, endV2)}) ${endV2}++`);
-        if (p.min === 1) lines.push(`${ind2}  if (${endV2} === ${s}) break`);
+        lines.push(`${ind2}  while (${endV2} - ${s} < ${p.max} && ${endV2} < input.length && ${runCond(p, endV2)}) ${endV2}++`);
+        if (p.min > 0) lines.push(`${ind2}  if (${endV2} - ${s} < ${p.min}) break`);
       } else {
         const inner = emitShapeMatch(p.inner, endV2, mint, `${ind2}  `, first ? firstChar : void 0);
         if (!p.unbounded) {
@@ -3664,21 +3888,29 @@ function hoistExpected(ctx, constArrSource) {
   }
   return name;
 }
+function probeUpdate(ctx, expectedArr, posExpr, constant = true) {
+  if (!ctx.recovery) return "";
+  const fx = constant ? hoistExpected(ctx, expectedArr) : expectedArr;
+  const pb = v(ctx, "_pb");
+  return `if (_ctx._probe !== undefined && ${posExpr} <= _ctx._probe.offset) { const ${pb} = _ctx._probe.best; if (${pb} === null || ${posExpr} > ${pb}.span.start) _ctx._probe.best = { ok: false, expected: [...${fx}], span: { start: ${posExpr}, end: ${posExpr} } }; else if (${posExpr} === ${pb}.span.start) _ctx._probe.best = { ok: false, expected: [...${pb}.expected, ...${fx}], span: { start: ${posExpr}, end: ${posExpr} } } } `;
+}
 function failBody(ctx, expected, posExpr) {
+  const probe = probeUpdate(ctx, `[${expected}]`, posExpr);
   if (ctx.failLabel) {
-    if (!ctx.recordFail) return `break ${ctx.failLabel}`;
-    return `{ _ctx._fe = ${posExpr}; _ctx._fx = ${hoistExpected(ctx, `[${expected}]`)}; break ${ctx.failLabel} }`;
+    if (!ctx.recordFail) return probe ? `{ ${probe}break ${ctx.failLabel} }` : `break ${ctx.failLabel}`;
+    return `{ ${probe}_ctx._fe = ${posExpr}; _ctx._fx = ${hoistExpected(ctx, `[${expected}]`)}; break ${ctx.failLabel} }`;
   }
-  return failReturn(expected, posExpr);
+  return probe + failReturn(expected, posExpr);
 }
 function failArrBody(ctx, expectedArr, posExpr, constant = true) {
+  const probe = probeUpdate(ctx, expectedArr, posExpr, constant);
   if (ctx.failLabel) {
-    if (!ctx.recordFail) return `break ${ctx.failLabel}`;
+    if (!ctx.recordFail) return probe ? `{ ${probe}break ${ctx.failLabel} }` : `break ${ctx.failLabel}`;
     const fx = constant ? hoistExpected(ctx, expectedArr) : expectedArr;
-    return `{ _ctx._fe = ${posExpr}; _ctx._fx = ${fx}; break ${ctx.failLabel} }`;
+    return `{ ${probe}_ctx._fe = ${posExpr}; _ctx._fx = ${fx}; break ${ctx.failLabel} }`;
   }
-  if (!constant) return `return { ok: false, expected: [...${expectedArr}], span: { start: ${posExpr}, end: ${posExpr} } }`;
-  return failReturnArr(expectedArr, posExpr);
+  if (!constant) return `${probe}return { ok: false, expected: [...${expectedArr}], span: { start: ${posExpr}, end: ${posExpr} } }`;
+  return probe + failReturnArr(expectedArr, posExpr);
 }
 function resultFromRecorded(feExpr = "_ctx._fe", fxExpr = "_ctx._fx") {
   return `return { ok: false, expected: [...${fxExpr}], span: { start: ${feExpr}, end: ${feExpr} } }`;
@@ -4178,6 +4410,10 @@ function emitRegex(def, ctx, pos) {
   stmts.push(...emitLeafCapture(ctx, vv, pos, endVar));
   return { stmts, valueVar: vv, endVar };
 }
+function syncSentinelExpr(fs) {
+  if (fs.kind !== "ranges" || fs.ranges.length === 0) return null;
+  return `_ctx._rec.sentinel({ kind: 'ranges', ranges: ${JSON.stringify(fs.ranges)} })`;
+}
 function emitSeqValues(def, ctx, pos) {
   const startV = v(ctx, "_start");
   const curV = v(ctx, "_cur");
@@ -4186,7 +4422,17 @@ function emitSeqValues(def, ctx, pos) {
     `${ind(ctx)}let ${curV} = ${pos}`
   ];
   const valueVars = [];
+  const syncInV = ctx.recovery ? v(ctx, "_syncIn") : "";
+  if (ctx.recovery) stmts.push(`${ind(ctx)}const ${syncInV} = _ctx._sync`);
+  const publishSync = (i) => {
+    if (!ctx.recovery) return "";
+    const fs = def.parsers.slice(i + 1).reduce((acc, p) => union(acc, firstSetOf(p)), { kind: "empty" });
+    const ref2 = syncSentinelExpr(fs);
+    return `${ind(ctx)}if (_ctx._tolerant) _ctx._sync = ${ref2 ?? syncInV}`;
+  };
   for (let i = 0; i < def.parsers.length; i++) {
+    const syncPub = publishSync(i);
+    if (syncPub) stmts.push(syncPub);
     if (i > 0 && ctx.activeTrivia) {
       if (ctx.capturing) {
         const capFn = ensureTriviaCaptureFn(ctx);
@@ -4211,7 +4457,17 @@ function emitSeqValues(def, ctx, pos) {
         continue;
       } else {
         const trivFn = ensureTriviaFn(ctx);
-        stmts.push(`${ind(ctx)}${curV} = ${trivFn}(input, ${curV}, _ctx)`);
+        const scanEndV = v(ctx, "_sne");
+        stmts.push(`${ind(ctx)}const ${scanEndV} = ${trivFn}(input, ${curV}, _ctx)`);
+        const r2 = emit(def.parsers[i], ctx, scanEndV);
+        stmts.push(...r2.stmts);
+        const endAfterV = v(ctx, "_sea");
+        stmts.push(
+          `${ind(ctx)}const ${endAfterV} = ${r2.endVar}`,
+          `${ind(ctx)}if (${endAfterV} > ${scanEndV}) ${curV} = ${endAfterV}`
+        );
+        valueVars.push(r2.valueVar);
+        continue;
       }
     }
     const r = emit(def.parsers[i], ctx, curV);
@@ -4289,6 +4545,21 @@ function emitDisjointArm(p, ctx, pos, valV, endV) {
     `${ind(ctx)}${endV} = ${endVar}`
   ];
 }
+function emitDisjointArmGated(def, i, ctx, pos, valV, endV) {
+  const p = def.parsers[i];
+  const gate = def.gates[i];
+  if (!gate) return emitDisjointArm(p, ctx, pos, valV, endV);
+  const gateIdx = ctx.mapFns.length;
+  ctx.mapFns.push(gate);
+  ctx.mapFnSrcs.push(def.gateSrcs?.[i] ?? null);
+  const gateCond = `${mfRef(ctx)}[${gateIdx}](_ctx.state)`;
+  const stmts = [`${ind(ctx)}if (${gateCond}) {`];
+  ctx.indent++;
+  stmts.push(...emitDisjointArm(p, ctx, pos, valV, endV));
+  ctx.indent--;
+  stmts.push(`${ind(ctx)}} else { ${failArrBody(ctx, deriveExpectedArr([p]), pos)} }`);
+  return stmts;
+}
 function emitChoice(def, ctx, pos) {
   const allExpected = deriveExpectedArr(def.parsers);
   if (def.disjoint) {
@@ -4304,12 +4575,11 @@ function emitChoice(def, ctx, pos) {
       stmts.push(`${ind(ctx)}switch (${codeV}) {`);
       ctx.indent++;
       for (let i = 0; i < def.parsers.length; i++) {
-        const p = def.parsers[i];
         for (const cp of plan.cases[i]) stmts.push(`${ind(ctx)}case ${cp}:`);
         stmts.push(`${ind(ctx)}{`);
         ctx.indent++;
         stmts.push(
-          ...emitDisjointArm(p, ctx, pos, valV, endV),
+          ...emitDisjointArmGated(def, i, ctx, pos, valV, endV),
           `${ind(ctx)}break`
         );
         ctx.indent--;
@@ -4321,13 +4591,14 @@ function emitChoice(def, ctx, pos) {
       return { stmts, valueVar: valV, endVar: endV };
     }
     let first = true;
-    for (const p of def.parsers) {
+    for (let i = 0; i < def.parsers.length; i++) {
+      const p = def.parsers[i];
       const cond = firstSetCond(codeV, p._meta.firstSet);
       const kw = first ? "if" : "else if";
       first = false;
       stmts.push(`${ind(ctx)}${kw} (${cond}) {`);
       ctx.indent++;
-      stmts.push(...emitDisjointArm(p, ctx, pos, valV, endV));
+      stmts.push(...emitDisjointArmGated(def, i, ctx, pos, valV, endV));
       ctx.indent--;
       stmts.push(`${ind(ctx)}}`);
     }
@@ -4441,7 +4712,7 @@ function emitFirstMatch(def, ctx, pos) {
     if (gate) {
       const gateIdx = ctx.mapFns.length;
       ctx.mapFns.push(gate);
-      ctx.mapFnSrcs.push(null);
+      ctx.mapFnSrcs.push(def.gateSrcs?.[i] ?? null);
       gateCond = `${mfRef(ctx)}[${gateIdx}](_ctx.state)`;
     }
     const skipCond = gateCond ? `!${resOkV} && ${gateCond}` : `!${resOkV}`;
@@ -4546,6 +4817,8 @@ function emitMany(def, ctx, pos) {
     ...wantValue ? [`${ind(ctx)}const ${arrV} = []`] : [],
     `${ind(ctx)}let ${curV} = ${pos}`
   ];
+  const mySyncV = ctx.recovery ? v(ctx, "_mysy") : "";
+  if (ctx.recovery) stmts.push(`${ind(ctx)}const ${mySyncV} = _ctx._sync`);
   if (def.min === 1) {
     const firstR = emit(def.parser, ctx, curV);
     stmts.push(...firstR.stmts);
@@ -4579,10 +4852,26 @@ function emitMany(def, ctx, pos) {
     }
   }
   const { stmts: iterStmts, okVar: iterOk, valVar: iterVal, endVar: iterEnd } = emitFallible(def.parser, ctx, itemPos, true);
-  stmts.push(
-    ...iterStmts,
-    `${ind(ctx)}if (!${iterOk} || ${iterEnd} <= ${itemPos}) { ${rollback}break }`
-  );
+  stmts.push(...iterStmts);
+  if (ctx.recovery) {
+    const rrV = v(ctx, "_rr");
+    const exp = hoistExpected(ctx, deriveExpectedArr([def.parser]));
+    stmts.push(
+      `${ind(ctx)}if (!${iterOk}) {`,
+      `${ind(ctx)}  ${rollback}if (_ctx._tolerant && ${mySyncV} !== undefined && !_ctx._rec.at(${mySyncV}, input, ${itemPos}, _ctx)) {`,
+      `${ind(ctx)}    const ${rrV} = _ctx._rec.scan(input, ${itemPos}, _ctx, ${mySyncV}, ${exp})`,
+      ...wantValue ? [`${ind(ctx)}    ${arrV}.push(${rrV}.error)`] : [],
+      `${ind(ctx)}    _ctx._rec.capture(_ctx, ${rrV}.error)`,
+      `${ind(ctx)}    ${curV} = ${rrV}.end`,
+      `${ind(ctx)}    continue`,
+      `${ind(ctx)}  }`,
+      `${ind(ctx)}  break`,
+      `${ind(ctx)}}`,
+      `${ind(ctx)}if (${iterEnd} <= ${itemPos}) { ${rollback}break }`
+    );
+  } else {
+    stmts.push(`${ind(ctx)}if (!${iterOk} || ${iterEnd} <= ${itemPos}) { ${rollback}break }`);
+  }
   if (wantValue) stmts.push(`${ind(ctx)}${arrV}.push(${iterVal})`);
   stmts.push(`${ind(ctx)}${curV} = ${iterEnd}`);
   ctx.indent--;
@@ -4604,20 +4893,56 @@ function emitOptional(def, ctx, pos) {
 function emitSepBy(_p, def, ctx, pos) {
   const arrV = v(ctx, "_arr");
   const curV = v(ctx, "_cur");
+  const rec = !!ctx.recovery;
+  const mySyncV = rec ? v(ctx, "_mysy") : "";
+  const exp = rec ? hoistExpected(ctx, deriveExpectedArr([def.parser])) : "";
+  const sepSent = rec ? syncSentinelExpr(firstSetOf(def.separator)) : null;
+  const scanSync = sepSent ? `_ctx._rec.or(${sepSent}, ${mySyncV})` : mySyncV;
   const { stmts: firstStmts, okVar: firstOk, valVar: firstVal, endVar: firstEnd } = emitFallible(def.parser, ctx, pos, true);
   const stmts = [
     `${ind(ctx)}const ${arrV} = []`,
     `${ind(ctx)}let ${curV} = ${pos}`,
-    ...firstStmts,
-    `${ind(ctx)}if (${firstOk}) {`
+    ...rec ? [`${ind(ctx)}const ${mySyncV} = _ctx._sync`] : [],
+    ...firstStmts
   ];
-  ctx.indent++;
-  stmts.push(
-    `${ind(ctx)}${arrV}.push(${firstVal})`,
-    `${ind(ctx)}${curV} = ${firstEnd}`,
-    `${ind(ctx)}while (${curV} < input.length) {`
-  );
-  ctx.indent++;
+  const failItem = (nextOkVar, itemPosVar, rb, originalFail) => {
+    if (!rec) return [originalFail];
+    const rr = v(ctx, "_rr");
+    return [
+      `${ind(ctx)}if (!${nextOkVar}) {`,
+      `${ind(ctx)}  if (_ctx._tolerant && ${mySyncV} !== undefined && !_ctx._rec.at(${mySyncV}, input, ${itemPosVar}, _ctx)) {`,
+      `${ind(ctx)}    const ${rr} = _ctx._rec.scan(input, ${itemPosVar}, _ctx, ${scanSync}, ${exp})`,
+      `${ind(ctx)}    ${arrV}.push(${rr}.error); _ctx._rec.capture(_ctx, ${rr}.error); ${curV} = ${rr}.end; continue`,
+      `${ind(ctx)}  }`,
+      `${ind(ctx)}  ${rb}break`,
+      `${ind(ctx)}}`
+    ];
+  };
+  if (rec) {
+    const rr0 = v(ctx, "_rr0");
+    const didV = v(ctx, "_did");
+    stmts.push(
+      `${ind(ctx)}let ${didV} = false`,
+      `${ind(ctx)}if (${firstOk}) { ${arrV}.push(${firstVal}); ${curV} = ${firstEnd}; ${didV} = true }`,
+      `${ind(ctx)}else if (_ctx._tolerant && ${mySyncV} !== undefined && !_ctx._rec.at(${mySyncV}, input, ${pos}, _ctx)) {`,
+      `${ind(ctx)}  const ${rr0} = _ctx._rec.scan(input, ${pos}, _ctx, ${scanSync}, ${exp})`,
+      `${ind(ctx)}  ${arrV}.push(${rr0}.error); _ctx._rec.capture(_ctx, ${rr0}.error); ${curV} = ${rr0}.end; ${didV} = true`,
+      `${ind(ctx)}}`,
+      `${ind(ctx)}if (${didV}) {`
+    );
+    ctx.indent++;
+    stmts.push(`${ind(ctx)}while (${curV} < input.length) {`);
+    ctx.indent++;
+  } else {
+    stmts.push(`${ind(ctx)}if (${firstOk}) {`);
+    ctx.indent++;
+    stmts.push(
+      `${ind(ctx)}${arrV}.push(${firstVal})`,
+      `${ind(ctx)}${curV} = ${firstEnd}`,
+      `${ind(ctx)}while (${curV} < input.length) {`
+    );
+    ctx.indent++;
+  }
   let sepAtPos = curV;
   if (ctx.activeTrivia) {
     if (ctx.capturing) {
@@ -4643,8 +4968,7 @@ function emitSepBy(_p, def, ctx, pos) {
       const { stmts: nextStmts, okVar: nextOk, valVar: nextVal, endVar: nextEnd } = emitFallible(def.parser, ctx, npV, true);
       stmts.push(
         ...nextStmts,
-        // item failed → unwind the separator too, back to the end of the last item
-        `${ind(ctx)}if (!${nextOk}) { ${rollbackToSep}break }`,
+        ...failItem(nextOk, npV, rollbackToSep, `${ind(ctx)}if (!${nextOk}) { ${rollbackToSep}break }`),
         `${ind(ctx)}${arrV}.push(${nextVal})`,
         `${ind(ctx)}${curV} = ${nextEnd}`
       );
@@ -4660,7 +4984,7 @@ function emitSepBy(_p, def, ctx, pos) {
       const { stmts: nextStmts, okVar: nextOk, valVar: nextVal, endVar: nextEnd } = emitFallible(def.parser, ctx, npV, true);
       stmts.push(
         ...nextStmts,
-        `${ind(ctx)}if (!${nextOk}) break`,
+        ...failItem(nextOk, npV, "", `${ind(ctx)}if (!${nextOk}) break`),
         `${ind(ctx)}${arrV}.push(${nextVal})`,
         `${ind(ctx)}${curV} = ${nextEnd}`
       );
@@ -4680,7 +5004,7 @@ function emitSepBy(_p, def, ctx, pos) {
     const { stmts: nextStmts, okVar: nextOk, valVar: nextVal, endVar: nextEnd } = emitFallible(def.parser, ctx, sepEnd, true);
     stmts.push(
       ...nextStmts,
-      `${ind(ctx)}if (!${nextOk}) { ${nextRb}break }`,
+      ...failItem(nextOk, sepEnd, nextRb, `${ind(ctx)}if (!${nextOk}) { ${nextRb}break }`),
       `${ind(ctx)}${arrV}.push(${nextVal})`,
       `${ind(ctx)}${curV} = ${nextEnd}`
     );
@@ -4937,7 +5261,7 @@ ${i}const ${chV} = [], ${rawV} = [], ${tlV} = ${capTLv} ? [] : _EMPTY_TL` : capt
   stmts.push(
     `${i}const ${ndV} = ${finalExpr}`,
     `${i}if (${sc}) ${sc}.push(${ndV})`,
-    `${i}if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'error')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : '', span: { start: ${pos}, end: ${endVar} } })`
+    `${i}if (${sr}) ${sr}.push((typeof ${ndV} === 'object' && ${ndV} !== null && (${ndV}._tag === 'node' || ${ndV}._tag === 'leaf' || ${ndV}._tag === 'parseError')) ? ${ndV} : { _tag: 'leaf', value: typeof ${ndV} === 'string' ? ${ndV} : '', span: { start: ${pos}, end: ${endVar} } })`
   );
   return { stmts, valueVar: ndV, endVar };
 }
@@ -5027,6 +5351,10 @@ function emitExpect(def, ctx, pos) {
     `${ind0}if (!${okVar}) {`,
     `${ind0}  const ${errV} = { _tag: 'parseError', span: { start: ${pos}, end: ${pos} }, expected: ${JSON.stringify(def.expected)} }`,
     `${ind0}  if (_ctx._errors) _ctx._errors.push(${errV})`,
+    // Embed the missing-token error as a `parseError` CST child, mirroring the
+    // interpreter (expect.ts) and the list-recovery emit sites — guarded on
+    // `_ctx._tolerant`, under which the driver always installs `_ctx._rec`.
+    `${ind0}  if (_ctx._tolerant) _ctx._rec.capture(_ctx, ${errV})`,
     `${ind0}  ${valVar} = ${errV}`,
     `${ind0}  ${endVar} = ${pos}`,
     `${ind0}  ${okVar} = true`,
@@ -5193,7 +5521,7 @@ function emitDispatch(p, ctx, pos) {
     case "guard": {
       const fnIdx = ctx.mapFns.length;
       ctx.mapFns.push(def.predicate);
-      ctx.mapFnSrcs.push(null);
+      ctx.mapFnSrcs.push(def.predSrc ?? null);
       const vv = v(ctx);
       return {
         stmts: [
@@ -5208,7 +5536,7 @@ function emitDispatch(p, ctx, pos) {
       const evIdx = ctx.mapFns.length;
       const extra = def.extra;
       ctx.mapFns.push((() => extra));
-      ctx.mapFnSrcs.push(null);
+      ctx.mapFnSrcs.push(def.extraSrc !== void 0 ? `() => (${def.extraSrc})` : null);
       const innerParser = def.parser;
       if (!ctx.namedParsers.has(innerParser)) {
         const fnName = `_wcf${ctx.namedParsers.size}`;
@@ -5452,7 +5780,7 @@ function ruleDependencies(ruleMap) {
   }
   return deps;
 }
-function compile(combinator, mapFnSources) {
+function compile(combinator, mapFnSources, opts) {
   markUnusedValues(combinator);
   const grammarTrivia = combinator._meta.grammarTrivia;
   const ctx = {
@@ -5473,6 +5801,7 @@ function compile(combinator, mapFnSources) {
     triviaFnNames: /* @__PURE__ */ new Map(),
     namedFnDecls: [],
     capturing: hasNodeDef(combinator),
+    recovery: opts?.recovery ?? false,
     lazyUsage: analyzeLazyUsage(combinator),
     ...grammarTrivia ? { activeTrivia: grammarTrivia, triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {}
   };
@@ -5525,7 +5854,7 @@ function compile(combinator, mapFnSources) {
     parseWithContext(input, parseCtx, pos = 0) {
       return fn(input, pos, ctx.runtimeParsers, ctx.mapFns, ctx.buildFns, parseCtx);
     },
-    // Note: collects recover()/expect() errors via _errors. Unlike interpreter
+    // Note: collects expect() errors via _errors. Unlike interpreter
     // parse({recover:true}) it does NOT populate furthestFail — the compiled path
     // inlines failures for throughput and deliberately skips _probe bookkeeping.
     // Callers wanting a furthest-position diagnostic detect unconsumed input
@@ -5582,6 +5911,7 @@ function compileLinkable(ruleMapArg, ns, opts) {
     triviaFnNames: /* @__PURE__ */ new Map(),
     namedFnDecls: [],
     capturing: ruleMap.some(([, rule]) => hasNodeDef(rule)),
+    recovery: opts?.recovery ?? false,
     lazyUsage: analyzeLazyUsageMulti(ruleMap.map(([, rule]) => rule)),
     ns,
     deferFirstSetRefs: true,
@@ -6327,46 +6657,13 @@ function withCtx(extra, combinator) {
   };
 }
 
-// src/combinators/recover.ts
-function recover(combinator, sentinel) {
-  const meta = {
-    firstSet: { kind: "any" },
-    canMatchNewline: true,
-    isTrivia: false
-  };
-  const expected = deriveExpected(combinator);
-  return {
-    _tag: "recover",
-    _meta: meta,
-    _def: { tag: "recover", parser: combinator, sentinel },
-    parse(input, pos, ctx) {
-      const result = combinator.parse(input, pos, ctx);
-      if (result.ok) return result;
-      let scanPos = pos;
-      while (scanPos < input.length) {
-        if (sentinel.parse(input, scanPos, ctx).ok) break;
-        scanPos++;
-      }
-      const error = {
-        _tag: "parseError",
-        span: { start: pos, end: scanPos },
-        expected
-      };
-      ctx._errors?.push(error);
-      return { ok: true, value: error, span: { start: pos, end: scanPos } };
-    }
-  };
-}
-function isParseError(value) {
-  return typeof value === "object" && value !== null && value._tag === "parseError";
-}
-
 // src/combinators/completions.ts
-function completionsAt(combinator, input, offset) {
+function completionsAt(target, input, offset, options = {}) {
   const probe = { offset, best: null };
-  const ctx = { trackLines: false, _probe: probe };
-  const result = combinator.parse(input.slice(0, offset), 0, ctx);
-  if (result.ok) return [];
+  const ctx = { trackLines: false, _probe: probe, ...options.tolerant ? { _tolerant: true, _rec: REC } : {} };
+  const sliced = input.slice(0, offset);
+  const result = "parseWithContext" in target ? target.parseWithContext(sliced, ctx, 0) : target.parse(sliced, 0, ctx);
+  if (result.ok) return options.tolerant ? probe.best?.expected ?? [] : [];
   const best = deeperFail(probe.best, result);
   return best?.expected ?? [];
 }
@@ -6376,23 +6673,6 @@ function deeperFail(a, b) {
   return a.span.start >= b.span.start ? a : b;
 }
 
-// src/combinators/recover-list.ts
-function tolerantElement(item, sentinel, until) {
-  const el = transform(
-    sequence(not(until), recover(item, sentinel)),
-    ([, value]) => value
-  );
-  if (el._def.tag === "transform") el._def.fnSrc = "([, value]) => value";
-  return el;
-}
-function sepByRecover(item, separator, until) {
-  const sentinel = choice(separator, until);
-  return sepBy(tolerantElement(item, sentinel, until), separator);
-}
-function manyRecover(item, until) {
-  return many(tolerantElement(item, until, until));
-}
-
 // src/cst/relative-spans.ts
 function relativize(node2, parentBase = 0) {
   return {
@@ -6487,6 +6767,9 @@ function editNode(node2, at, delta, parentBase, parentShift, stats) {
 }
 
 // src/functional/doc.ts
+function mkCtx(state, build, tolerant) {
+  return tolerant ? { trackLines: false, state, build, _tolerant: true, _rec: REC, _errors: [] } : { trackLines: false, state, build };
+}
 function asRuleFn(entry) {
   return typeof entry === "function" ? entry : (input, pos, ctx) => entry.parse(input, pos, ctx);
 }
@@ -6593,8 +6876,8 @@ function graftRelative(root, path, newNode, delta) {
     children: newChildren
   };
 }
-function parseMiddle(input, reStart, reEnd, cStart, ruleFn, separator, build) {
-  const ctx = { trackLines: false, state: null, build };
+function parseMiddle(input, reStart, reEnd, cStart, ruleFn, separator, build, tolerant) {
+  const ctx = mkCtx(null, build, tolerant);
   const out = [];
   let pos = reStart;
   let guard2 = 0;
@@ -6618,7 +6901,7 @@ function parseMiddle(input, reStart, reEnd, cStart, ruleFn, separator, build) {
   }
   return pos === reEnd ? out : null;
 }
-function tryListSplice(root, path, C, cStart, newInput, from, to, delta, registry, build) {
+function tryListSplice(root, path, C, cStart, newInput, from, to, delta, registry, build, tolerant) {
   const kids = C.children;
   if (kids.length === 0) return null;
   let h = 0;
@@ -6659,7 +6942,7 @@ function tryListSplice(root, path, C, cStart, newInput, from, to, delta, registr
   const reStart = h > 0 ? cStart + kids[h - 1].span.end : cStart;
   const reEnd = cStart + kids[t].span.start + delta;
   if (reEnd < reStart) return null;
-  const middle = parseMiddle(newInput, reStart, reEnd, cStart, ruleFn, separator, build);
+  const middle = parseMiddle(newInput, reStart, reEnd, cStart, ruleFn, separator, build, tolerant);
   if (!middle) return null;
   if (middle.length > 0) {
     const last2 = middle[middle.length - 1];
@@ -6669,7 +6952,7 @@ function tryListSplice(root, path, C, cStart, newInput, from, to, delta, registr
     for (const sentinel of [" ", "\uFFFF"]) {
       if (newInput[reEnd] === sentinel) continue;
       const probed = newInput.slice(0, reEnd) + sentinel.repeat(newInput.length - reEnd);
-      const probe = parseMiddle(probed, reStart, reEnd, cStart, ruleFn, separator, build);
+      const probe = parseMiddle(probed, reStart, reEnd, cStart, ruleFn, separator, build, tolerant);
       if (!probe || probe.length !== middle.length) return null;
       for (let i = 0; i < middle.length; i++) if (!structurallyEqual(probe[i], middle[i])) return null;
     }
@@ -6697,6 +6980,11 @@ function structurallyEqual(a, b) {
   if (at === "leaf" || at === "trivia") {
     return a.value === b.value;
   }
+  if (at === "parseError") {
+    const ae = a.expected ?? [];
+    const be = b.expected ?? [];
+    return ae.length === be.length && ae.every((x, i) => x === be[i]);
+  }
   if (a.type !== b.type) return false;
   const ac = a.children;
   const bc = b.children;
@@ -6706,13 +6994,13 @@ function structurallyEqual(a, b) {
   }
   return true;
 }
-function boundaryIsSafe(ruleFn, newInput, start, boundary, state, build, produced) {
+function boundaryIsSafe(ruleFn, newInput, start, boundary, state, build, produced, tolerant) {
   if (!produced.ok) return false;
   if (boundary >= newInput.length) return true;
   for (const sentinel of [" ", "\uFFFF"]) {
     if (newInput[boundary] === sentinel) continue;
     const probed = newInput.slice(0, boundary) + sentinel.repeat(newInput.length - boundary);
-    const ctx = { trackLines: false, state, build };
+    const ctx = mkCtx(state, build, tolerant);
     let r;
     try {
       r = ruleFn(probed, start, ctx);
@@ -6744,8 +7032,9 @@ var ParseDocImpl = class _ParseDocImpl {
   _abs;
   _rel;
   errors;
+  unconsumedFrom;
   input;
-  constructor(registry, rootRule, opts, trees, errors, input) {
+  constructor(registry, rootRule, opts, trees, errors, unconsumedFrom, input) {
     this._registry = registry;
     this._fns = {};
     this._reps = /* @__PURE__ */ new Set();
@@ -6758,6 +7047,7 @@ var ParseDocImpl = class _ParseDocImpl {
     this._abs = trees.abs;
     this._rel = trees.rel;
     this.errors = errors;
+    this.unconsumedFrom = unconsumedFrom;
     this.input = input;
   }
   /**
@@ -6780,6 +7070,19 @@ var ParseDocImpl = class _ParseDocImpl {
     if (!rel) throw new Error("spanAt on a failed parse (tree is null)");
     return absoluteSpanCST(rel, path);
   }
+  /**
+   * Wrap a reused (grafted/spliced) RELATIVE tree, recomputing `errors` and
+   * `unconsumedFrom` from it so both stay consistent with the tree across the
+   * edit (the flat errors are recovered errors embedded in the reused subtrees;
+   * unconsumedFrom re-derives trailing junk over the new input).
+   */
+  wrapReuse(newTree, newInput) {
+    const trivia2 = triviaOf(this._registry[this._rootRule], this._opts);
+    const end = newTree.span.end;
+    const errors = collectEmbeddedErrors(newTree, 0, []);
+    const unconsumedFrom = unconsumedAfter(end, newInput, trivia2);
+    return new _ParseDocImpl(this._registry, this._rootRule, this._opts, { rel: newTree }, errors, unconsumedFrom, newInput);
+  }
   edit(from, to, replacement) {
     const newInput = this.input.slice(0, from) + replacement + this.input.slice(to);
     const reparse = () => parseDoc(this._registry, this._rootRule, newInput, this._opts);
@@ -6801,22 +7104,22 @@ var ParseDocImpl = class _ParseDocImpl {
       const ruleFn = this._fns[node2.type];
       if (!ruleFn) continue;
       if (!(absStart <= from && to <= absEnd)) continue;
-      const ctx = { trackLines: false, state: node2.state, build: this._opts.build };
+      const ctx = mkCtx(node2.state, this._opts.build, !!this._opts.tolerant);
       const r = ruleFn(newInput, absStart, ctx);
       if (!r.ok) continue;
       if (r.span.end !== absEnd + delta) continue;
-      if (!boundaryIsSafe(ruleFn, newInput, absStart, absEnd + delta, node2.state, this._opts.build, r)) {
+      if (!boundaryIsSafe(ruleFn, newInput, absStart, absEnd + delta, node2.state, this._opts.build, r, !!this._opts.tolerant)) {
         continue;
       }
       const parentBase = absStart - node2.span.start;
       const newRel = relativizeCST(r.value, parentBase);
       if (delta === 0) {
         const newTree2 = replaceAtPath(rebuild, root, path, newRel);
-        return new _ParseDocImpl(this._registry, this._rootRule, this._opts, { rel: newTree2 }, [], newInput);
+        return this.wrapReuse(newTree2, newInput);
       }
       if (this._opts.rebuild) return reparse();
       const newTree = graftRelative(root, path, newRel, delta);
-      return new _ParseDocImpl(this._registry, this._rootRule, this._opts, { rel: newTree }, [], newInput);
+      return this.wrapReuse(newTree, newInput);
     }
     if (this._opts.structuralReuse && delta !== 0 && !this._opts.rebuild) {
       const spliceCandidates = [...candidates, { node: root, path: [] }];
@@ -6824,22 +7127,50 @@ var ParseDocImpl = class _ParseDocImpl {
         if (!this._reps.has(node2.type)) continue;
         const { start: cStart, end: cEnd } = absoluteSpanCST(root, path);
         if (!(cStart <= from && to <= cEnd)) continue;
-        const spliced = tryListSplice(root, path, node2, cStart, newInput, from, to, delta, this._fns, this._opts.build);
-        if (spliced) return new _ParseDocImpl(this._registry, this._rootRule, this._opts, { rel: spliced }, [], newInput);
+        const spliced = tryListSplice(root, path, node2, cStart, newInput, from, to, delta, this._fns, this._opts.build, !!this._opts.tolerant);
+        if (spliced) return this.wrapReuse(spliced, newInput);
       }
     }
     return reparse();
   }
 };
+function triviaOf(entry, opts) {
+  if (opts.trivia) return opts.trivia;
+  if (entry === void 0 || typeof entry === "function") return void 0;
+  const meta = entry._meta;
+  return meta ? meta.grammarTrivia : void 0;
+}
+function unconsumedAfter(end, input, trivia2) {
+  let pos = end;
+  if (trivia2 && pos < input.length) {
+    const t = trivia2.parse(input, pos, { trackLines: false });
+    if (t.ok && t.span.end > pos) pos = t.span.end;
+  }
+  return pos < input.length ? pos : null;
+}
+function collectEmbeddedErrors(node2, base, out) {
+  const c = node2;
+  if (!c || typeof c !== "object" || !c.span) return out;
+  const start = base + c.span.start;
+  if (c._tag === "parseError") {
+    out.push({ _tag: "parseError", span: { start, end: base + c.span.end }, expected: c.expected ?? [] });
+    return out;
+  }
+  if (Array.isArray(c.children)) for (const k of c.children) collectEmbeddedErrors(k, start, out);
+  return out;
+}
 function parseDoc(registry, rootRule, input, opts = {}) {
   const entry = registry[rootRule];
   if (!entry) throw new Error(`No rule '${rootRule}' in registry`);
-  const ctx = { trackLines: false, state: opts.state, build: opts.build };
+  const ctx = mkCtx(opts.state, opts.build, !!opts.tolerant);
   const r = asRuleFn(entry)(input, 0, ctx);
   if (r.ok) {
-    return new ParseDocImpl(registry, rootRule, opts, { abs: r.value }, [], input);
+    const errors = ctx._errors ? [...ctx._errors] : [];
+    const unconsumedFrom = unconsumedAfter(r.span.end, input, triviaOf(entry, opts));
+    return new ParseDocImpl(registry, rootRule, opts, { abs: r.value }, errors, unconsumedFrom, input);
   }
-  return new ParseDocImpl(registry, rootRule, opts, { abs: null }, [{ ok: false, expected: r.expected, span: r.span }], input);
+  const fail = { _tag: "parseError", span: r.span, expected: r.expected };
+  return new ParseDocImpl(registry, rootRule, opts, { abs: null }, [fail], null, input);
 }
 
 // src/functional/run.ts
@@ -6860,7 +7191,8 @@ function run(entry, input, options = {}) {
     build: options.build,
     state: options.state,
     ...grammarTrivia !== void 0 ? { trivia: grammarTrivia, ...grammarTrivia._meta.triviaKindLabels ? { triviaKindLabels: grammarTrivia._meta.triviaKindLabels } : {} } : {},
-    ...options.triviaCaptureMask !== void 0 ? { _triviaCaptureMask: options.triviaCaptureMask } : {}
+    ...options.triviaCaptureMask !== void 0 ? { _triviaCaptureMask: options.triviaCaptureMask } : {},
+    ...options.tolerant ? { _tolerant: true, _rec: REC } : {}
   };
   const r = invoke(entry, input, 0, ctx);
   let unconsumedFrom = null;
@@ -7246,7 +7578,6 @@ export {
   literal,
   makeWord,
   many,
-  manyRecover,
   noTrivia,
   node,
   not,
@@ -7256,7 +7587,6 @@ export {
   parse,
   parseDoc,
   parser,
-  recover,
   ref,
   regex,
   relativize,
@@ -7265,7 +7595,6 @@ export {
   run,
   scanTo,
   sepBy,
-  sepByRecover,
   sequence,
   shiftAbsolute,
   skip,