refactor: reactive queue now sorts by control flow owner

2025-12-08 19:26:05 +00:00 · 2025-01-15 12:44:06 -05:00 · 2025-01-15 12:44:06 -05:00 · f1b51ba936
commit f1b51ba936
parent f99d363cd0
435 changed files with 2589 additions and 822 deletions
--- a/.sizes.json
+++ b/.sizes.json
@ -7,23 +7,23 @@
    {
      "name": "*",
      "total": {
-        "min": 18159,
-        "brotli": 6558
+        "min": 18438,
+        "brotli": 6702
      }
    },
    {
      "name": "counter",
      "user": {
        "min": 189,
-        "brotli": 144
+        "brotli": 143
      },
      "runtime": {
-        "min": 3802,
-        "brotli": 1590
+        "min": 4081,
+        "brotli": 1737
      },
      "total": {
-        "min": 3991,
-        "brotli": 1734
+        "min": 4270,
+        "brotli": 1880
      }
    },
    {
@ -33,12 +33,12 @@
        "brotli": 100
      },
      "runtime": {
-        "min": 3140,
-        "brotli": 1422
+        "min": 3419,
+        "brotli": 1556
      },
      "total": {
-        "min": 3251,
-        "brotli": 1522
+        "min": 3530,
+        "brotli": 1656
      }
    },
    {
@ -48,12 +48,12 @@
        "brotli": 550
      },
      "runtime": {
-        "min": 7806,
-        "brotli": 3163
+        "min": 8085,
+        "brotli": 3304
      },
      "total": {
-        "min": 8959,
-        "brotli": 3713
+        "min": 9238,
+        "brotli": 3854
      }
    },
    {
@ -63,12 +63,12 @@
        "brotli": 482
      },
      "runtime": {
-        "min": 8818,
-        "brotli": 3568
+        "min": 9097,
+        "brotli": 3718
      },
      "total": {
-        "min": 9772,
-        "brotli": 4050
+        "min": 10051,
+        "brotli": 4200
      }
    }
  ]
--- a/.sizes/counter.csr/entry.js
+++ b/.sizes/counter.csr/entry.js
@ -1,4 +1,4 @@
-// size: 189 (min) 144 (brotli)
+// size: 189 (min) 143 (brotli)
 const _clickCount_effect = effect("a0", (_scope, { 2: clickCount }) =>
    on(_scope[0], "click", function () {
      _clickCount(_scope, clickCount + 1);
--- a/.sizes/dom.js
+++ b/.sizes/dom.js
@ -1,4 +1,4 @@
-// size: 18159 (min) 6558 (brotli)
+// size: 18438 (min) 6702 (brotli)
 var empty = [],
  rest = Symbol();
 function attrTag(attrs2) {
@ -49,28 +49,28 @@ function triggerMacroTask() {
  port2.postMessage(0);
 }
 function createScope($global) {
-  return { u: 1, $global: $global };
+  return { y: 1, $global: $global };
 }
 var emptyScope = createScope({});
 function getEmptyScope(marker) {
  return (emptyScope.a = emptyScope.b = marker), emptyScope;
 }
 function destroyScope(scope) {
-  _destroyScope(scope), scope.d?.h?.delete(scope);
-  let closureSignals = scope.x?.c;
-  if (closureSignals) for (let signal of closureSignals) signal.j?.(scope);
+  _destroyScope(scope), scope.e?.k?.delete(scope);
+  let closureSignals = scope.z?.c;
+  if (closureSignals) for (let signal of closureSignals) signal.l?.(scope);
  return scope;
 }
 function _destroyScope(scope) {
-  scope.h?.forEach(_destroyScope);
-  let controllers = scope.l;
+  scope.k?.forEach(_destroyScope);
+  let controllers = scope.n;
  if (controllers) for (let ctrl of controllers.values()) ctrl.abort();
 }
 function onDestroy(scope) {
-  let parentScope = scope.d;
-  for (; parentScope && !parentScope.h?.has(scope); )
-    (parentScope.h ||= new Set()).add(scope),
-      (parentScope = (scope = parentScope).d);
+  let parentScope = scope.e;
+  for (; parentScope && !parentScope.k?.has(scope); )
+    (parentScope.k ||= new Set()).add(scope),
+      (parentScope = (scope = parentScope).e);
 }
 function removeAndDestroyScope(scope) {
  destroyScope(scope);
@ -91,30 +91,30 @@ function insertBefore(scope, parent, nextSibling) {
 }
 var registeredValues = {},
  Render = class {
-    m = [];
-    n = {};
-    y = { _: registeredValues };
+    o = [];
+    p = {};
+    A = { _: registeredValues };
    constructor(renders, runtimeId, renderId) {
-      (this.z = renders),
-        (this.A = runtimeId),
-        (this.o = renderId),
-        (this.p = renders[renderId]),
-        this.q();
+      (this.B = renders),
+        (this.C = runtimeId),
+        (this.q = renderId),
+        (this.s = renders[renderId]),
+        this.t();
    }
    w() {
-      this.p.w(), this.q();
+      this.s.w(), this.t();
    }
-    q() {
-      let data2 = this.p,
-        serializeContext = this.y,
-        scopeLookup = this.n,
+    t() {
+      let data2 = this.s,
+        serializeContext = this.A,
+        scopeLookup = this.p,
        visits = data2.v,
        cleanupOwners = new Map();
      if (visits.length) {
        let commentPrefixLen = data2.i.length,
          cleanupMarkers = new Map();
        data2.v = [];
-        let sectionEnd = (visit, scopeId = this.f, curNode = visit) => {
+        let sectionEnd = (visit, scopeId = this.h, curNode = visit) => {
          let scope = (scopeLookup[scopeId] ||= {}),
            endNode = curNode;
          for (; 8 === (endNode = endNode.previousSibling).nodeType; );
@ -141,17 +141,17 @@ var registeredValues = {},
          if ("*" === token) scope[data3] = visit.previousSibling;
          else if ("$" === token) cleanupMarkers.set(scopeId, visit);
          else if ("[" === token)
-            this.f && (data3 && sectionEnd(visit), this.m.push(this.f)),
-              (this.f = scopeId),
+            this.h && (data3 && sectionEnd(visit), this.o.push(this.h)),
+              (this.h = scopeId),
              (scope.a = visit);
          else if ("]" === token) {
-            if (((scope[data3] = visit), scopeId < this.f)) {
+            if (((scope[data3] = visit), scopeId < this.h)) {
              let currParent = visit.parentNode,
                startNode = sectionEnd(visit).a;
              currParent &&
                currParent !== startNode.parentNode &&
                currParent.prepend(startNode),
-                (this.f = this.m.pop());
+                (this.h = this.o.pop());
            }
          } else if ("|" === token) {
            scope[parseInt(data3)] = visit;
@ -177,8 +177,8 @@ var registeredValues = {},
                { $global: $global } = scopeLookup;
              $global ||
                ((scopeLookup.$global = $global = scopes.$ || {}),
-                ($global.runtimeId = this.A),
-                ($global.renderId = this.o));
+                ($global.runtimeId = this.C),
+                ($global.renderId = this.q));
              for (let scopeId in scopes)
                if ("$" !== scopeId) {
                  let scope = scopes[scopeId],
@ -188,11 +188,11 @@ var registeredValues = {},
                      (scopeLookup[scopeId] = Object.assign(scope, prevScope));
                  let cleanupOwnerId = cleanupOwners.get(scopeId);
                  cleanupOwnerId &&
-                    ((scope.d = scopes[cleanupOwnerId]), onDestroy(scope));
+                    ((scope.e = scopes[cleanupOwnerId]), onDestroy(scope));
                }
            } else
              i === len || "string" != typeof resumes[i]
-                ? delete this.z[this.o]
+                ? delete this.B[this.q]
                : registeredValues[resumes[i++]](
                    scopeLookup[resumeData],
                    scopeLookup[resumeData],
@ -235,7 +235,7 @@ function init(runtimeId = "M") {
      });
 }
 function registerSubscriber(id, signal) {
-  return register(id, signal.g), signal;
+  return register(id, signal.j), signal;
 }
 function nodeRef(id, key) {
  return register(id, (scope) => () => scope[key]);
@ -266,8 +266,24 @@ function state(valueAccessor, fn, getIntersection) {
              ((isScheduled = !0), queueMicrotask(flushAndWaitFrame)),
              (rendering = !0),
              signal(scope, MARK),
-              (rendering = !1),
-              pendingSignals.push(scope, signal, value2);
+              (rendering = !1);
+            let nextSignal = { f: scope, D: signal, E: value2, d: void 0 };
+            if (pendingSignal)
+              if (sortScopeByDOMPosition(pendingSignal.f, nextSignal.f) < 0)
+                (nextSignal.d = pendingSignal), (pendingSignal = nextSignal);
+              else {
+                let currentSignal = pendingSignal;
+                for (
+                  ;
+                  currentSignal.d &&
+                  sortScopeByDOMPosition(currentSignal.d.f, nextSignal.f) <= 0;
+
+                )
+                  currentSignal = currentSignal.d;
+                (nextSignal.d = currentSignal.d),
+                  (currentSignal.d = nextSignal);
+              }
+            else pendingSignal = nextSignal;
          })(scope, valueSignal, valueOrOp),
    valueOrOp
  );
@ -341,7 +357,7 @@ function closure(
        (ownerScope = getOwnerScope(scope)),
          (ownerValueAccessor2 = getOwnerValueAccessor(scope));
        let ownerMark = ownerScope[ownerValueAccessor2 + "#"],
-          ownerHasRun = void 0 === ownerMark ? !ownerScope.u : 0 === ownerMark;
+          ownerHasRun = void 0 === ownerMark ? !ownerScope.y : 0 === ownerMark;
        (scope[markAccessor] = ownerHasRun ? 1 : 2), (op = DIRTY);
      }
      0 == --scope[markAccessor]
@ -374,7 +390,7 @@ function dynamicClosure(
    ),
    subscribeFns = new WeakMap();
  return (
-    (signalFn.g = (scope) => {
+    (signalFn.j = (scope) => {
      let subscribeFn = (value2) => signalFn(scope, value2),
        ownerScope = getOwnerScope(scope),
        providerSubscriptionsAccessor = getOwnerValueAccessor(scope) + "*";
@ -383,7 +399,7 @@ function dynamicClosure(
          subscribeFn,
        );
    }),
-    (signalFn.j = (scope) => {
+    (signalFn.l = (scope) => {
      let ownerScope = getOwnerScope(scope),
        providerSubscriptionsAccessor = getOwnerValueAccessor(scope) + "*";
      ownerScope[providerSubscriptionsAccessor]?.delete(
@ -400,14 +416,14 @@ function childClosures(closureSignals, childAccessor) {
    for (let closureSignal of closureSignals) closureSignal(childScope, op);
  };
  return (
-    (signal.g = (scope) => {
-      let childScope = scope[childAccessor];
-      for (let closureSignal of closureSignals) closureSignal.g?.(childScope);
-    }),
    (signal.j = (scope) => {
      let childScope = scope[childAccessor];
      for (let closureSignal of closureSignals) closureSignal.j?.(childScope);
    }),
+    (signal.l = (scope) => {
+      let childScope = scope[childAccessor];
+      for (let closureSignal of closureSignals) closureSignal.l?.(childScope);
+    }),
    signal
  );
 }
@ -456,35 +472,30 @@ function effect(id, fn) {
    }
  );
 }
-var pendingSignals = [],
+var pendingSignal,
  pendingEffects = [],
  rendering = !1;
 function queueEffect(scope, fn) {
  pendingEffects.push(scope, fn);
 }
 function run() {
-  let signals = pendingSignals,
-    effects = pendingEffects;
+  let effects = pendingEffects;
  try {
-    (rendering = !0), (pendingSignals = []), runSignals(signals);
+    (rendering = !0), runSignals();
  } finally {
-    rendering = !1;
+    (pendingSignal = void 0), (rendering = !1);
  }
  (pendingEffects = []), runEffects(effects);
 }
 function prepareEffects(fn) {
-  let prevSignals = pendingSignals,
+  let prevSignals = pendingSignal,
    prevEffects = pendingEffects,
-    preparedEffects = (pendingEffects = []),
-    preparedSignals = (pendingSignals = []);
+    preparedEffects = (pendingEffects = []);
  try {
-    (rendering = !0),
-      fn(),
-      (pendingSignals = prevSignals),
-      runSignals(preparedSignals);
+    (rendering = !0), (pendingSignal = void 0), fn(), runSignals();
  } finally {
    (rendering = !1),
-      (pendingSignals = prevSignals),
+      (pendingSignal = prevSignals),
      (pendingEffects = prevEffects);
  }
  return preparedEffects;
@ -495,21 +506,41 @@ function runEffects(effects = pendingEffects) {
    (0, effects[i + 1])(scope, scope);
  }
 }
-function runSignals(signals) {
-  for (let i = 0; i < signals.length; i += 3) {
-    let scope = signals[i + 0];
-    (0, signals[i + 1])(scope, signals[i + 2]);
-  }
+function runSignals() {
+  for (; pendingSignal; )
+    scopeIsConnected(pendingSignal.f) &&
+      pendingSignal.D(pendingSignal.f, pendingSignal.E),
+      (pendingSignal = pendingSignal.d);
+}
+function scopeIsConnected(scope) {
+  let start = ownerStartNode(scope);
+  return !start || start.isConnected;
+}
+function sortScopeByDOMPosition(a, b) {
+  let aStart = ownerStartNode(a),
+    bStart = ownerStartNode(b);
+  return aStart === bStart
+    ? 0
+    : aStart
+      ? bStart
+        ? 2 & aStart.compareDocumentPosition(bStart)
+          ? -1
+          : 1
+        : -1
+      : 1;
+}
+function ownerStartNode(scope) {
+  return (scope.e || scope).a;
 }
 function resetAbortSignal(scope, id) {
-  let controllers = scope.l;
+  let controllers = scope.n;
  if (controllers) {
    let ctrl = controllers.get(id);
    ctrl && (queueEffect(null, () => ctrl.abort()), controllers.delete(id));
  }
 }
 function getAbortSignal(scope, id) {
-  let controllers = (scope.l ||= new Map()),
+  let controllers = (scope.n ||= new Map()),
    controller = controllers.get(id);
  return (
    controller ||
@ -1071,7 +1102,7 @@ function walkInternal(walkCodes, scope, cleanupOwnerScope, currentWalkIndex) {
    currentMultiplier = 0,
    currentScopeIndex = 0;
  for (
-    cleanupOwnerScope !== scope && (scope.d = cleanupOwnerScope);
+    cleanupOwnerScope !== scope && (scope.e = cleanupOwnerScope);
    (value2 = walkCodes.charCodeAt(currentWalkIndex++));

  )
@ -1114,12 +1145,12 @@ function walkInternal(walkCodes, scope, cleanupOwnerScope, currentWalkIndex) {
 function createScopeWithRenderer(renderer, $global, ownerScope) {
  let newScope = createScope($global);
  if (
-    ((newScope._ = newScope.d = renderer.B || ownerScope),
-    (newScope.x = renderer),
+    ((newScope._ = newScope.e = renderer.F || ownerScope),
+    (newScope.z = renderer),
    initRenderer(renderer, newScope),
    renderer.c)
  )
-    for (let signal of renderer.c) signal.g?.(newScope);
+    for (let signal of renderer.c) signal.j?.(newScope);
  return newScope;
 }
 function createScopeWithTagNameOrRenderer(
@ -1131,7 +1162,7 @@ function createScopeWithTagNameOrRenderer(
    return createScopeWithRenderer(tagNameOrRenderer, $global, ownerScope);
  let newScope = createScope($global);
  return (
-    (newScope._ = newScope.d = ownerScope),
+    (newScope._ = newScope.e = ownerScope),
    (newScope[0] =
      newScope.a =
      newScope.b =
@ -1140,12 +1171,12 @@ function createScopeWithTagNameOrRenderer(
  );
 }
 function initRenderer(renderer, scope) {
-  let dom = renderer.k();
+  let dom = renderer.m();
  return (
-    walk(11 === dom.nodeType ? dom.firstChild : dom, renderer.C, scope),
+    walk(11 === dom.nodeType ? dom.firstChild : dom, renderer.G, scope),
    (scope.a = 11 === dom.nodeType ? dom.firstChild : dom),
    (scope.b = 11 === dom.nodeType ? dom.lastChild : dom),
-    renderer.s && renderer.s(scope),
+    renderer.u && renderer.u(scope),
    dom
  );
 }
@ -1155,14 +1186,14 @@ function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
    if (!renderer || attrsOrOp === DIRTY) return;
    let childScope = scope[nodeAccessor + "!"];
    if (attrsOrOp === MARK || attrsOrOp === CLEAN)
-      return renderer.e?.(childScope, attrsOrOp);
+      return renderer.g?.(childScope, attrsOrOp);
    let content = getContent?.(scope);
    if ("string" == typeof renderer)
      setConditionalRendererOnlyChild(childScope, 0, content),
        attrs(childScope, 0, attrsOrOp());
-    else if (renderer.e) {
+    else if (renderer.g) {
      let attributes = attrsOrOp();
-      renderer.e(
+      renderer.g(
        childScope,
        inputIsArgs
          ? attributes
@ -1183,14 +1214,14 @@ function createRendererWithOwner(
    id = {},
    walks = rawWalks ? trimWalkString(rawWalks) : " ";
  return (owner) => ({
-    t: id,
-    D: template,
-    C: walks,
-    s: setup,
-    k: _clone,
-    B: owner,
-    E: void 0,
-    get e() {
+    x: id,
+    H: template,
+    G: walks,
+    u: setup,
+    m: _clone,
+    F: owner,
+    I: void 0,
+    get g() {
      return (args ||= getArgs?.());
    },
    get c() {
@ -1208,7 +1239,7 @@ function createRenderer(template, walks, setup, getClosureSignals, getArgs) {
  )();
 }
 function _clone() {
-  return (this.E ||= (function (html2) {
+  return (this.I ||= (function (html2) {
    let content = parseHTML(html2);
    return content.firstChild
      ? content.firstChild === content.lastChild &&
@ -1216,7 +1247,7 @@ function _clone() {
        ? content.firstChild
        : content
      : fallback;
-  })(this.D)).cloneNode(!0);
+  })(this.H)).cloneNode(!0);
 }
 var conditional = function (nodeAccessor, fn, getIntersection) {
  let rendererAccessor = nodeAccessor + "(",
@ -1338,7 +1369,7 @@ function loopTo(nodeAccessor, renderer) {
 function loop(nodeAccessor, renderer, forEach) {
  let loopScopeAccessor = nodeAccessor + "!",
    closureSignals = renderer.c,
-    params = renderer.e;
+    params = renderer.g;
  return (scope, valueOrOp) => {
    if (valueOrOp === DIRTY) return;
    if (valueOrOp === MARK || valueOrOp === CLEAN) {
@ -1540,7 +1571,7 @@ function byFirstArg(name) {
  return name;
 }
 function isDifferentRenderer(a, b) {
-  return a !== b && (a?.t || 0) !== b?.t;
+  return a !== b && (a?.x || 0) !== b?.x;
 }
 var classIdToScope = new Map(),
  compat = {
@ -1558,7 +1589,7 @@ var classIdToScope = new Map(),
      register("$C_r", fn);
    },
    isOp: (value2) => value2 === MARK || value2 === CLEAN || value2 === DIRTY,
-    isRenderer: (renderer) => void 0 !== renderer.k,
+    isRenderer: (renderer) => void 0 !== renderer.m,
    getStartNode: (scope) => scope.a,
    setScopeNodes(scope, startNode, endNode) {
      (scope.a = startNode), (scope.b = endNode);
@ -1579,7 +1610,7 @@ var classIdToScope = new Map(),
            2 === value2.length &&
              window[runtimeId]?.[
                "s" === componentIdPrefix ? "_" : componentIdPrefix
-              ]?.n[value2[1]],
+              ]?.p[value2[1]],
          )
        : value2,
    createRenderer(setup, clone, args) {
@ -1590,7 +1621,7 @@ var classIdToScope = new Map(),
        void 0,
        args && (() => args),
      );
-      return (renderer.k = clone), renderer;
+      return (renderer.m = clone), renderer;
    },
    render(out, component, renderer, args) {
      let scope = component.scope;
@ -1598,7 +1629,7 @@ var classIdToScope = new Map(),
        ((scope = classIdToScope.get(component.id)),
        scope &&
          ((component.scope = scope), classIdToScope.delete(component.id)));
-      let applyArgs = renderer.e || noop,
+      let applyArgs = renderer.g || noop,
        existing = !1;
      if ("object" == typeof args[0] && "renderBody" in args[0]) {
        let input = args[0],
@ -1642,7 +1673,7 @@ function mount(input = {}, reference, position) {
    ? (({ $global: $global, ...input } = input),
      ($global = { runtimeId: "M", renderId: "_", ...$global }))
    : ($global = { runtimeId: "M", renderId: "_" });
-  let args = this.e,
+  let args = this.g,
    effects = prepareEffects(() => {
      (scope = createScope($global)),
        (dom = initRenderer(this, scope)),
--- a/.sizes/name-cache.json
+++ b/.sizes/name-cache.json
@ -1 +1 @@
-{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"i","$forIn":"l","$forOf":"o","$forTo":"f","$isScheduled":"u","$port2":"a","$flushAndWaitFrame":"c","$triggerMacroTask":"s","$createScope":"d","$emptyScope":"h","$getEmptyScope":"g","$destroyScope":"p","$_destroyScope":"v","$onDestroy":"b","$removeAndDestroyScope":"m","$insertBefore":"y","$registeredValues":"k","$Render":"w","$isResuming":"C","$register":"A","$registerBoundSignal":"S","$init":"N","$registerSubscriber":"x","$nodeRef":"$","$MARK":"M","$CLEAN":"E","$DIRTY":"I","$state":"T","$value":"_","$accessorId":"O","$intersection":"B","$defaultGetOwnerScope":"V","$closure":"j","$dynamicClosure":"R","$childClosures":"q","$dynamicSubscribers":"D","$setTagVar":"P","$tagVarSignal":"W","$setTagVarChange":"L","$tagVarSignalChange":"z","$renderBodyClosures":"F","$tagIdsByGlobal":"U","$nextTagId":"G","$inChild":"J","$intersections":"X","$effect":"Z","$pendingSignals":"H","$pendingEffects":"K","$rendering":"Q","$queueEffect":"Y","$run":"ee","$prepareEffects":"te","$runEffects":"ne","$runSignals":"re","$resetAbortSignal":"ie","$getAbortSignal":"le","$stringifyClassObject":"oe","$NON_DIMENSIONAL":"fe","$stringifyStyleObject":"ue","$toDelimitedString":"ae","$isEventHandler":"ce","$getEventHandlerName":"se","$normalizeDynamicRenderer":"de","$elementHandlersByEvent":"he","$defaultDelegator":"ge","$on":"pe","$createDelegator":"ve","$handleDelegated":"be","$stripSpacesAndPunctuation":"me","$controllable_input_checked":"ye","$controllable_input_checked_effect":"ke","$controllable_input_checkedValue":"we","$controllable_input_checkedValue_effect":"Ce","$controllable_input_value":"Ae","$controllable_input_value_effect":"Se","$controllable_select_value":"Ne","$controllable_select_value_effect":"xe","$setSelectOptions":"$e","$controllable_detailsOrDialog_open":"Me","$controllable_detailsOrDialog_open_effect":"Ee","$inputType":"Ie","$setValueAndUpdateSelection":"Te","$setCheckboxValue":"_e","$delegateFormControl":"Oe","$formChangeHandlers":"Be","$syncControllable":"Ve","$onFormChange":"je","$onFormReset":"Re","$hasValueChanged":"qe","$hasCheckboxChanged":"De","$hasSelectChanged":"Pe","$hasFormElementChanged":"We","$normalizeStrProp":"Le","$normalizeBoolProp":"ze","$toValueProp":"Fe","$fallback":"Ue","$parser":"Ge","$parseHTML":"Je","$attr":"Xe","$setAttribute":"Ze","$classAttr":"He","$styleAttr":"Ke","$data":"Qe","$attrs":"Ye","$hasAttrAlias":"et","$partialAttrs":"tt","$attrsInternal":"nt","$attrsEvents":"rt","$html":"it","$props":"lt","$normalizeAttrValue":"ot","$lifecycle":"ft","$walker":"ut","$trimWalkString":"at","$walk":"ct","$walkInternal":"st","$createScopeWithRenderer":"dt","$createScopeWithTagNameOrRenderer":"ht","$initRenderer":"gt","$dynamicTagAttrs":"pt","$createRendererWithOwner":"vt","$createRenderer":"bt","$_clone":"mt","$conditional":"yt","$inConditionalScope":"kt","$conditionalOnlyChild":"wt","$setConditionalRendererOnlyChild":"Ct","$emptyMarkerMap":"At","$emptyMarkerArray":"St","$emptyMap":"Nt","$emptyArray":"xt","$loopOf":"$t","$loopIn":"Mt","$loopTo":"Et","$loop":"It","$inLoopScope":"Tt","$bySecondArg":"_t","$byFirstArg":"Ot","$isDifferentRenderer":"Bt","$classIdToScope":"Vt","$compat":"jt","$noop":"Rt","$createTemplate":"qt","$mount":"Dt","$parseHTMLOrSingleNode":"Wt","$marker":"Ft","$_clickCount_effect":"Qt","$_clickCount":"Yt","$_setup_":"zt","$_expr_comment_comments_id$ifBody":"ss","$_id$ifBody":"as","$_comment_comments$ifBody":"ts","$_ifBody":"ns","$_expr_input_path_i$forBody":"os","$_if$forBody":"cs","$_open$forBody_effect":"is","$_open$forBody":"ms","$_id$forBody":"ls","$_i$forBody":"us","$_comment_comments$forBody":"es","$_comment_text$forBody":"ds","$_comment$forBody":"rs","$_params_2$forBody":"bs","$_input_path$forBody":"ps","$_for":"hs","$_input_path_":"vs","$_input_comments_":"fs","$_input_$1":"js","$_input_":"ks","$_params__":"Ss","$noop2":"Pt","$textContent":"Lt","$normalizeString":"Ut","$contentClosures":"Gt","$_expr_comment_comments_id$if_content":"Zs","$_id$if_content":"$s","$_comment_comments$if_content":"_s","$_if_content":"gs","$_expr_input_path_i$for_content":"ws","$_if$for_content":"xs","$_open$for_content_effect":"Bs","$_open$for_content":"Ds","$_id$for_content":"Es","$_i$for_content":"Hs","$_comment_comments$for_content":"Xs","$_comment_text$for_content":"qs","$_comment$for_content":"ys","$_params_2$for_content":"zs","$_input_path$for_content":"As"}}}
+{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"i","$forIn":"l","$forOf":"o","$forTo":"f","$isScheduled":"u","$port2":"a","$flushAndWaitFrame":"c","$triggerMacroTask":"s","$createScope":"d","$emptyScope":"h","$getEmptyScope":"g","$destroyScope":"p","$_destroyScope":"v","$onDestroy":"b","$removeAndDestroyScope":"m","$insertBefore":"y","$registeredValues":"k","$Render":"w","$isResuming":"C","$register":"A","$registerBoundSignal":"S","$init":"N","$registerSubscriber":"x","$nodeRef":"$","$MARK":"M","$CLEAN":"E","$DIRTY":"I","$state":"T","$value":"_","$accessorId":"O","$intersection":"B","$defaultGetOwnerScope":"V","$closure":"j","$dynamicClosure":"R","$childClosures":"q","$dynamicSubscribers":"D","$setTagVar":"P","$tagVarSignal":"W","$setTagVarChange":"L","$tagVarSignalChange":"z","$renderBodyClosures":"F","$tagIdsByGlobal":"U","$nextTagId":"G","$inChild":"J","$intersections":"X","$effect":"Z","$pendingSignals":"H","$pendingEffects":"K","$rendering":"Q","$queueEffect":"Y","$run":"ee","$prepareEffects":"te","$runEffects":"ne","$runSignals":"re","$resetAbortSignal":"ie","$getAbortSignal":"le","$stringifyClassObject":"oe","$NON_DIMENSIONAL":"fe","$stringifyStyleObject":"ue","$toDelimitedString":"ae","$isEventHandler":"ce","$getEventHandlerName":"se","$normalizeDynamicRenderer":"de","$elementHandlersByEvent":"he","$defaultDelegator":"ge","$on":"pe","$createDelegator":"ve","$handleDelegated":"be","$stripSpacesAndPunctuation":"me","$controllable_input_checked":"ye","$controllable_input_checked_effect":"ke","$controllable_input_checkedValue":"we","$controllable_input_checkedValue_effect":"Ce","$controllable_input_value":"Ae","$controllable_input_value_effect":"Se","$controllable_select_value":"Ne","$controllable_select_value_effect":"xe","$setSelectOptions":"$e","$controllable_detailsOrDialog_open":"Me","$controllable_detailsOrDialog_open_effect":"Ee","$inputType":"Ie","$setValueAndUpdateSelection":"Te","$setCheckboxValue":"_e","$delegateFormControl":"Oe","$formChangeHandlers":"Be","$syncControllable":"Ve","$onFormChange":"je","$onFormReset":"Re","$hasValueChanged":"qe","$hasCheckboxChanged":"De","$hasSelectChanged":"Pe","$hasFormElementChanged":"We","$normalizeStrProp":"Le","$normalizeBoolProp":"ze","$toValueProp":"Fe","$fallback":"Ue","$parser":"Ge","$parseHTML":"Je","$attr":"Xe","$setAttribute":"Ze","$classAttr":"He","$styleAttr":"Ke","$data":"Qe","$attrs":"Ye","$hasAttrAlias":"et","$partialAttrs":"tt","$attrsInternal":"nt","$attrsEvents":"rt","$html":"it","$props":"lt","$normalizeAttrValue":"ot","$lifecycle":"ft","$walker":"ut","$trimWalkString":"at","$walk":"ct","$walkInternal":"st","$createScopeWithRenderer":"dt","$createScopeWithTagNameOrRenderer":"ht","$initRenderer":"gt","$dynamicTagAttrs":"pt","$createRendererWithOwner":"vt","$createRenderer":"bt","$_clone":"mt","$conditional":"yt","$inConditionalScope":"kt","$conditionalOnlyChild":"wt","$setConditionalRendererOnlyChild":"Ct","$emptyMarkerMap":"At","$emptyMarkerArray":"St","$emptyMap":"Nt","$emptyArray":"xt","$loopOf":"$t","$loopIn":"Mt","$loopTo":"Et","$loop":"It","$inLoopScope":"Tt","$bySecondArg":"_t","$byFirstArg":"Ot","$isDifferentRenderer":"Bt","$classIdToScope":"Vt","$compat":"jt","$noop":"Rt","$createTemplate":"qt","$mount":"Dt","$parseHTMLOrSingleNode":"Wt","$marker":"Ft","$_clickCount_effect":"Qt","$_clickCount":"Yt","$_setup_":"zt","$_expr_comment_comments_id$ifBody":"ss","$_id$ifBody":"as","$_comment_comments$ifBody":"ts","$_ifBody":"ns","$_expr_input_path_i$forBody":"os","$_if$forBody":"cs","$_open$forBody_effect":"is","$_open$forBody":"ms","$_id$forBody":"ls","$_i$forBody":"us","$_comment_comments$forBody":"es","$_comment_text$forBody":"ds","$_comment$forBody":"rs","$_params_2$forBody":"bs","$_input_path$forBody":"ps","$_for":"hs","$_input_path_":"vs","$_input_comments_":"fs","$_input_$1":"js","$_input_":"ks","$_params__":"Ss","$noop2":"Pt","$textContent":"Lt","$normalizeString":"Ut","$contentClosures":"Gt","$_expr_comment_comments_id$if_content":"Zs","$_id$if_content":"$s","$_comment_comments$if_content":"_s","$_if_content":"gs","$_expr_input_path_i$for_content":"ws","$_if$for_content":"xs","$_open$for_content_effect":"Bs","$_open$for_content":"Ds","$_id$for_content":"Es","$_i$for_content":"Hs","$_comment_comments$for_content":"Xs","$_comment_text$for_content":"qs","$_comment$for_content":"ys","$_params_2$for_content":"zs","$_input_path$for_content":"As","$pendingSignal":"Ht","$scopeIsConnected":"Jt","$sortScopeByDOMPosition":"Xt","$ownerStartNode":"Zt"}}}
--- a/packages/runtime-tags/src/tests/fixtures/abort-signal-render-phase-error/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/abort-signal-render-phase-error/snapshots/html.expected/template.js
@ -1,8 +1,9 @@
 import * as _$ from "@marko/runtime-tags/debug/html";
 const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  const _scope0_id = _$.nextScopeId();
-  _$.write(`<div>${_$.markResumeCleanup(_scope0_id)}${_$.escapeXML((() => {
+  _$.write(`<div>${_$.escapeXML((() => {
    throw new Error("Cannot use $signal in a server render.");
  })().onabort = () => {})}</div>`);
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/html.expected/template.js
@ -8,5 +8,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  _$.writeScope(_scope0_id, {
    "clickCount": clickCount
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/resume.expected.md
@ -15,6 +15,7 @@
      ‍
      <!--M_*0 #text/2-->
    </span>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -47,6 +48,7 @@ container.querySelector("button").click()
      0
      <!--M_*0 #text/2-->
    </span>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -80,6 +82,7 @@ container.querySelector("button").click()
      1
      <!--M_*0 #text/2-->
    </span>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -113,6 +116,7 @@ container.querySelector("button").click()
      2
      <!--M_*0 #text/2-->
    </span>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/assignment-before-tag-var/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>+</button><!--M_*0 #button/0--><span>0<!--M_*0 #text/1--> was <!>&zwj;<!--M_*0 #text/2--></span><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()</script>
+  <button>+</button><!--M_*0 #button/0--><span>0<!--M_*0 #text/1--> was <!>&zwj;<!--M_*0 #text/2--></span><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()</script>


 # Render "End"
@ -19,6 +19,7 @@
      ‍
      <!--M_*0 #text/2-->
    </span>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -41,6 +42,7 @@ inserted #document/html0/body1/span2/#text2
 inserted #document/html0/body1/span2/#comment3
 inserted #document/html0/body1/span2/#text4
 inserted #document/html0/body1/span2/#comment5
-inserted #document/html0/body1/script3
-inserted #document/html0/body1/script3/#text0
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/script4
+inserted #document/html0/body1/script4/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/html.expected/template.js
@ -7,5 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  _$.writeScope(_scope0_id, {
    "disabled": disabled
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/resume.expected.md
@ -12,6 +12,7 @@
      <!--M_*0 #text/2-->
    </button>
    <!--M_*0 #button/1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()
    </script>
@ -39,6 +40,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/2-->
    </button>
    <!--M_*0 #button/1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()
    </script>
@ -69,6 +71,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/2-->
    </button>
    <!--M_*0 #button/1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()
    </script>
@ -97,6 +100,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/2-->
    </button>
    <!--M_*0 #button/1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/attr-boolean-dynamic/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <input disabled><!--M_*0 #input/0--><button>enable<!--M_*0 #text/2--></button><!--M_*0 #button/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()</script>
+  <input disabled><!--M_*0 #input/0--><button>enable<!--M_*0 #text/2--></button><!--M_*0 #button/1--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()</script>


 # Render "End"
@ -16,6 +16,7 @@
      <!--M_*0 #text/2-->
    </button>
    <!--M_*0 #button/1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{disabled:!0}}),0,"__tests__/template.marko_0_disabled",0];M._.w()
    </script>
@ -34,6 +35,7 @@ inserted #document/html0/body1/button2
 inserted #document/html0/body1/button2/#text0
 inserted #document/html0/body1/button2/#comment1
 inserted #document/html0/body1/#comment3
-inserted #document/html0/body1/script4
-inserted #document/html0/body1/script4/#text0
+inserted #document/html0/body1/#comment4
+inserted #document/html0/body1/script5
+inserted #document/html0/body1/script5/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/await-tag/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/await-tag/snapshots/html.expected/template.js
@ -10,6 +10,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
  });
  _$.fork(resolveAfter("b", 2), value => {
    const _scope2_id = _$.nextScopeId();
@ -17,6 +18,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope2_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope2_id);
  });
  _$.fork(resolveAfter("c", 1), value => {
    const _scope3_id = _$.nextScopeId();
@ -24,11 +26,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope3_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope3_id);
  });
  _$.write(`<button>Inc</button>${_$.markResumeNode(_scope0_id, "#button/0")}</div>`);
  _$.writeEffect(_scope0_id, "__tests__/template.marko_0_count");
  _$.writeScope(_scope0_id, {
    "count": count
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/await-tag/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/await-tag/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div>Got: a <!>0<!--M_*1 #text/1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:_.a={count:0},1:{_:_.a}})]</script>
+  <div>Got: a <!>0<!--M_*1 #text/1--><!--M_$1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:_.a={count:0},1:{_:_.a}})]</script>


 # Write
@ -7,7 +7,7 @@


 # Write
-  Got: b <!>0<!--M_*3 #text/1-->Got: c <!>0<!--M_*2 #text/1--><button>Inc</button><!--M_*0 #button/0--></div><script>M._.r.push(_=>(_.d={3:{_:_.a}}),0,"__tests__/template.marko_0_count",0);M._.w()</script>
+  Got: b <!>0<!--M_*3 #text/1--><!--M_$3-->Got: c <!>0<!--M_*2 #text/1--><!--M_$2--><button>Inc</button><!--M_*0 #button/0--></div><!--M_$0--><script>M._.r.push(_=>(_.d={3:{_:_.a}}),0,"__tests__/template.marko_0_count",0);M._.w()</script>


 # Render "End"
@ -20,6 +20,7 @@
      <!---->
      0
      <!--M_*1 #text/1-->
+      <!--M_$1-->
      <script>
        WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={count:0},1:{_:_.a}})]
      </script>
@ -30,15 +31,18 @@
      <!---->
      0
      <!--M_*3 #text/1-->
+      <!--M_$3-->
      Got: c 
      <!---->
      0
      <!--M_*2 #text/1-->
+      <!--M_$2-->
      <button>
        Inc
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      M._.r.push(_=&gt;(_.d={3:{_:_.a}}),0,"__tests__/template.marko_0_count",0);M._.w()
    </script>
@ -56,21 +60,25 @@ inserted #document/html0/body1/div0/#text0
 inserted #document/html0/body1/div0/#comment1
 inserted #document/html0/body1/div0/#text2
 inserted #document/html0/body1/div0/#comment3
-inserted #document/html0/body1/div0/script4
-inserted #document/html0/body1/div0/script4/#text0
+inserted #document/html0/body1/div0/#comment4
 inserted #document/html0/body1/div0/script5
 inserted #document/html0/body1/div0/script5/#text0
-inserted #document/html0/body1/div0/#text6
-inserted #document/html0/body1/div0/#comment7
-inserted #document/html0/body1/div0/#text8
-inserted #document/html0/body1/div0/#comment9
-inserted #document/html0/body1/div0/#text10
+inserted #document/html0/body1/div0/script6
+inserted #document/html0/body1/div0/script6/#text0
+inserted #document/html0/body1/div0/#text7
+inserted #document/html0/body1/div0/#comment8
+inserted #document/html0/body1/div0/#text9
+inserted #document/html0/body1/div0/#comment10
 inserted #document/html0/body1/div0/#comment11
 inserted #document/html0/body1/div0/#text12
 inserted #document/html0/body1/div0/#comment13
-inserted #document/html0/body1/div0/button14
-inserted #document/html0/body1/div0/button14/#text0
+inserted #document/html0/body1/div0/#text14
 inserted #document/html0/body1/div0/#comment15
-inserted #document/html0/body1/script1
-inserted #document/html0/body1/script1/#text0
+inserted #document/html0/body1/div0/#comment16
+inserted #document/html0/body1/div0/button17
+inserted #document/html0/body1/div0/button17/#text0
+inserted #document/html0/body1/div0/#comment18
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/script2
+inserted #document/html0/body1/script2/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/html.expected/template.js
@ -5,5 +5,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  const y = x * 2;
  const z = y * 3;
  _$.write(`<div>${_$.escapeXML(z)}${_$.markResumeNode(_scope0_id, "#text/0")}</div>`);
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/resume.expected.md
@ -7,6 +7,7 @@
      6
      <!--M_*0 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_")
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-chain/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div>6<!--M_*0 #text/0--></div><script>WALKER_RUNTIME("M")("_")</script>
+  <div>6<!--M_*0 #text/0--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_")</script>


 # Render "End"
@ -11,6 +11,7 @@
      6
      <!--M_*0 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_")
    </script>
@ -26,6 +27,7 @@ inserted #document/html0/body1
 inserted #document/html0/body1/div0
 inserted #document/html0/body1/div0/#text0
 inserted #document/html0/body1/div0/#comment1
-inserted #document/html0/body1/script1
-inserted #document/html0/body1/script1/#text0
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/script2
+inserted #document/html0/body1/script2/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/html.expected/template.js
@ -14,5 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "clickCount": clickCount,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-attrs/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/html.expected/template.js
@ -14,5 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "clickCount": clickCount,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -58,6 +60,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-alias/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/html.expected/template.js
@ -26,5 +26,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#childScope/0": _$.writeExistingScope(_childScope),
    "#childScope/1": _$.writeExistingScope(_childScope2)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/resume.expected.md
@ -21,6 +21,7 @@
      <!--M_*2 #text/2-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -59,6 +60,7 @@ container.querySelector("button").click()
      <!--M_*2 #text/2-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -100,6 +102,7 @@ container.querySelector("button").click()
      <!--M_*2 #text/2-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias-within-pattern/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><button>0<!--M_*2 #text/1--> <!>0<!--M_*2 #text/2--></button><!--M_*2 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -25,6 +25,7 @@
      <!--M_*2 #text/2-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={},"#childScope/1":_.c={}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c.onClick=_._["__tests__/template.marko_0/onClick_0"](_.a),_.d),1,"__tests__/tags/my-button.marko_0_onClick",2,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -53,6 +54,7 @@ inserted #document/html0/body1/button2/#comment3
 inserted #document/html0/body1/button2/#text4
 inserted #document/html0/body1/button2/#comment5
 inserted #document/html0/body1/#comment3
-inserted #document/html0/body1/script4
-inserted #document/html0/body1/script4/#text0
+inserted #document/html0/body1/#comment4
+inserted #document/html0/body1/script5
+inserted #document/html0/body1/script5/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/html.expected/template.js
@ -14,5 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "clickCount": clickCount,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/resume.expected.md
@ -12,6 +12,7 @@
      <!--M_*1 #text/2-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -41,6 +42,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/2-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -71,6 +73,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/2-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input-same-source-alias/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button>0<!--M_*1 #text/1--> <!>0<!--M_*1 #text/2--></button><!--M_*1 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -16,6 +16,7 @@
      <!--M_*1 #text/2-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -36,6 +37,7 @@ inserted #document/html0/body1/button0/#comment3
 inserted #document/html0/body1/button0/#text4
 inserted #document/html0/body1/button0/#comment5
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/html.expected/template.js
@ -14,5 +14,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "clickCount": clickCount,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -58,6 +60,7 @@ container.querySelector("button").click()
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-input/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#childScope/0":_.b={}},1:_.b},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c),1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/html.expected/template.js
@ -15,11 +15,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      _$.writeScope(_scope1_id, {
        "_": _$.ensureScopeWithId(_scope0_id)
      });
+      _$.markResumeCleanup(_scope1_id);
    }), "__tests__/template.marko_1_renderer", _scope0_id)
  });
  _$.writeScope(_scope0_id, {
    "clickCount": clickCount,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/resume.expected.md
@ -7,9 +7,11 @@
      <!--M_[2-->
      0
      <!--M_*2 #text/0-->
+      <!--M_$2-->
      <!--M_]1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -34,9 +36,11 @@ container.querySelector("button").click()
      <!--M_[2-->
      1
      <!--M_*2 #text/0-->
+      <!--M_$2-->
      <!--M_]1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -61,9 +65,11 @@ container.querySelector("button").click()
      <!--M_[2-->
      2
      <!--M_*2 #text/0-->
+      <!--M_$2-->
      <!--M_]1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -88,9 +94,11 @@ container.querySelector("button").click()
      <!--M_[2-->
      3
      <!--M_*2 #text/0-->
+      <!--M_$2-->
      <!--M_]1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component-renderBody/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button><!--M_[2-->0<!--M_*2 #text/0--><!--M_]1 #text/1--></button><!--M_*1 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>
+  <button><!--M_[2-->0<!--M_*2 #text/0--><!--M_$2--><!--M_]1 #text/1--></button><!--M_*1 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()</script>


 # Render "End"
@ -11,9 +11,11 @@
      <!--M_[2-->
      0
      <!--M_*2 #text/0-->
+      <!--M_$2-->
      <!--M_]1 #text/1-->
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={clickCount:0,"#childScope/0":_.b={"#text/1!":_.c={}}},1:_.b,2:_.c},_.b.onClick=_._["__tests__/template.marko_0/onClick"](_.a),_.c._=_.a,_.b["#text/1("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_clickCount/subscriber",1,"__tests__/tags/my-button.marko_0_onClick",0];M._.w()
    </script>
@ -31,7 +33,9 @@ inserted #document/html0/body1/button0/#comment0
 inserted #document/html0/body1/button0/#text1
 inserted #document/html0/body1/button0/#comment2
 inserted #document/html0/body1/button0/#comment3
+inserted #document/html0/body1/button0/#comment4
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/html.expected/tags/counter.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/html.expected/tags/counter.js
@ -7,5 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  _$.writeScope(_scope0_id, {
    "clickCount": clickCount
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/tags/counter.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/resume.expected.md
@ -9,6 +9,7 @@
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
    </div>
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),1,"__tests__/tags/counter.marko_0_clickCount",0];M._.w()
@ -36,6 +37,7 @@ container.querySelector("button").click()
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
    </div>
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),1,"__tests__/tags/counter.marko_0_clickCount",0];M._.w()
--- a/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-component/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),1,"__tests__/tags/counter.marko_0_clickCount",0];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_$1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),1,"__tests__/tags/counter.marko_0_clickCount",0];M._.w()</script>


 # Render "End"
@ -13,6 +13,7 @@
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
    </div>
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:{"#childScope/0":_.a={clickCount:0}},1:_.a}),1,"__tests__/tags/counter.marko_0_clickCount",0];M._.w()
@ -31,6 +32,7 @@ inserted #document/html0/body1/div0/button0
 inserted #document/html0/body1/div0/button0/#text0
 inserted #document/html0/body1/div0/button0/#comment1
 inserted #document/html0/body1/div0/#comment1
+inserted #document/html0/body1/div0/#comment2
 inserted #document/html0/body1/script1
 inserted #document/html0/body1/script1/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/html.expected/template.js
@ -11,6 +11,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
    _ifScopeId = _scope1_id;
  }
@ -23,5 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#text/2(": _ifRenderer,
    "#text/2!": _$.getScopeById(_ifScopeId)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/resume.expected.md
@ -16,7 +16,9 @@
    <!---->
    0
    <!--M_*1 #text/0-->
+    <!--M_$1-->
    <!--M_]0 #text/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -50,7 +52,9 @@ container.querySelector("button.inc").click()
    <!---->
    1
    <!--M_*1 #text/0-->
+    <!--M_$1-->
    <!--M_]0 #text/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -81,6 +85,8 @@ container.querySelector("button.toggle").click()
    <!--M_*0 #button/1-->
    <!--M_]0 #text/2-->
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -90,7 +96,7 @@ container.querySelector("button.toggle").click()

 # Mutations
 ```
-removed #document/html0/body1/#comment4 after #document/html0/body1/#comment5
+removed #document/html0/body1/#comment4 after #document/html0/body1/#comment6
 inserted #document/html0/body1/#comment4
 removed #comment after #document/html0/body1/#comment4
 removed #text after #document/html0/body1/#comment4
@ -116,6 +122,8 @@ container.querySelector("button.inc").click()
    <!--M_*0 #button/1-->
    <!--M_]0 #text/2-->
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -146,6 +154,8 @@ container.querySelector("button.toggle").click()
    <!--M_*0 #button/1-->
    The count is 2
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -179,6 +189,8 @@ container.querySelector("button.inc").click()
    <!--M_*0 #button/1-->
    The count is 3
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter-multiple-nodes/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button class=inc></button><!--M_*0 #button/0--><button class=toggle></button><!--M_*0 #button/1--><!--M_[1-->The count is <!>0<!--M_*1 #text/0--><!--M_]0 #text/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()</script>
+  <button class=inc></button><!--M_*0 #button/0--><button class=toggle></button><!--M_*0 #button/1--><!--M_[1-->The count is <!>0<!--M_*1 #text/0--><!--M_$1--><!--M_]0 #text/2--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()</script>


 # Render "End"
@ -20,7 +20,9 @@
    <!---->
    0
    <!--M_*1 #text/0-->
+    <!--M_$1-->
    <!--M_]0 #text/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -43,6 +45,8 @@ inserted #document/html0/body1/#comment6
 inserted #document/html0/body1/#text7
 inserted #document/html0/body1/#comment8
 inserted #document/html0/body1/#comment9
-inserted #document/html0/body1/script10
-inserted #document/html0/body1/script10/#text0
+inserted #document/html0/body1/#comment10
+inserted #document/html0/body1/#comment11
+inserted #document/html0/body1/script12
+inserted #document/html0/body1/script12/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/html.expected/template.js
@ -11,6 +11,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
    _ifScopeId = _scope1_id;
  }
@ -23,5 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#text/2(": _ifRenderer,
    "#text/2!": _$.getScopeById(_ifScopeId)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/resume.expected.md
@ -15,7 +15,9 @@
      0
      <!--M_*1 #text/0-->
    </span>
+    <!--M_$1-->
    <!--M_|0 #text/2 1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -48,7 +50,9 @@ container.querySelector("button.inc").click()
      1
      <!--M_*1 #text/0-->
    </span>
+    <!--M_$1-->
    <!--M_|0 #text/2 1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -78,6 +82,8 @@ container.querySelector("button.toggle").click()
    />
    <!--M_*0 #button/1-->
    <!--M_|0 #text/2 1-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -87,7 +93,7 @@ container.querySelector("button.toggle").click()

 # Mutations
 ```
-removed #document/html0/body1/#comment4 after span
+removed #document/html0/body1/#comment4 after #document/html0/body1/#comment5
 inserted #document/html0/body1/#comment4
 removed span after #document/html0/body1/#comment4
 ```
@ -109,6 +115,8 @@ container.querySelector("button.inc").click()
    />
    <!--M_*0 #button/1-->
    <!--M_|0 #text/2 1-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -140,6 +148,8 @@ container.querySelector("button.toggle").click()
    <span>
      2
    </span>
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -173,6 +183,8 @@ container.querySelector("button.inc").click()
    <span>
      3
    </span>
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-conditional-counter/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button class=inc></button><!--M_*0 #button/0--><button class=toggle></button><!--M_*0 #button/1--><span>0<!--M_*1 #text/0--></span><!--M_|0 #text/2 1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()</script>
+  <button class=inc></button><!--M_*0 #button/0--><button class=toggle></button><!--M_*0 #button/1--><span>0<!--M_*1 #text/0--></span><!--M_$1--><!--M_|0 #text/2 1--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()</script>


 # Render "End"
@ -19,7 +19,9 @@
      0
      <!--M_*1 #text/0-->
    </span>
+    <!--M_$1-->
    <!--M_|0 #text/2 1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={show:!0,count:0,"#text/2(":_._["__tests__/template.marko_1_renderer"],"#text/2!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0_show",0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -40,6 +42,8 @@ inserted #document/html0/body1/span4
 inserted #document/html0/body1/span4/#text0
 inserted #document/html0/body1/span4/#comment1
 inserted #document/html0/body1/#comment5
-inserted #document/html0/body1/script6
-inserted #document/html0/body1/script6/#text0
+inserted #document/html0/body1/#comment6
+inserted #document/html0/body1/#comment7
+inserted #document/html0/body1/script8
+inserted #document/html0/body1/script8/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/html.expected/template.js
@ -10,6 +10,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _ifScopeId = _scope1_id;
  }
  _$.writeScope(_scope0_id, {
@ -17,5 +18,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "b": b,
    "#text/0!": _$.getScopeById(_ifScopeId)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/resume.expected.md
@ -5,6 +5,8 @@
  <body>
    0
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),0]
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-converge-in-if/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  0<!--M_*1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),0]</script>
+  0<!--M_*1 #text/0--><!--M_$1--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),0]</script>


 # Render "End"
@ -9,6 +9,8 @@
  <body>
    0
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={a:0,b:0,"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),0]
    </script>
@ -23,6 +25,8 @@ inserted #document/html0/head0
 inserted #document/html0/body1
 inserted #document/html0/body1/#text0
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/script4
+inserted #document/html0/body1/script4/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/html.expected/template.js
@ -11,5 +11,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "clickCount": clickCount,
    "increment": increment
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()
    </script>
@ -58,6 +60,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()
    </script>
@ -83,6 +86,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-const-event-handler/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()</script>
+  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.b={0:_.a={clickCount:0}},_.a.increment=_._["__tests__/template.marko_0/increment"](_.a),_.b),0,"__tests__/template.marko_0_increment",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/html.expected/template.js
@ -11,5 +11,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "count": count,
    "multiplier": multiplier
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/resume.expected.md
@ -23,6 +23,7 @@
      0
      <!--M_*0 #text/3-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()
    </script>
@ -63,6 +64,7 @@ container.querySelector("button#count").click()
      1
      <!--M_*0 #text/3-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()
    </script>
@ -103,6 +105,7 @@ container.querySelector("button#count").click()
      2
      <!--M_*0 #text/3-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()
    </script>
@ -143,6 +146,7 @@ container.querySelector("button#multiplier").click()
      4
      <!--M_*0 #text/3-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter-multiplier/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button id=multiplier>increase multiplier (<!>1<!--M_*0 #text/1-->)</button><!--M_*0 #button/0--><button id=count>increase count</button><!--M_*0 #button/2--><div>0<!--M_*0 #text/3--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()</script>
+  <button id=multiplier>increase multiplier (<!>1<!--M_*0 #text/1-->)</button><!--M_*0 #button/0--><button id=count>increase count</button><!--M_*0 #button/2--><div>0<!--M_*0 #text/3--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()</script>


 # Render "End"
@ -27,6 +27,7 @@
      0
      <!--M_*0 #text/3-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0,multiplier:1}}),0,"__tests__/template.marko_0_count",0,"__tests__/template.marko_0_multiplier",0];M._.w()
    </script>
@ -52,6 +53,7 @@ inserted #document/html0/body1/#comment3
 inserted #document/html0/body1/div4
 inserted #document/html0/body1/div4/#text0
 inserted #document/html0/body1/div4/#comment1
-inserted #document/html0/body1/script5
-inserted #document/html0/body1/script5/#text0
+inserted #document/html0/body1/#comment5
+inserted #document/html0/body1/script6
+inserted #document/html0/body1/script6/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/html.expected/template.js
@ -7,5 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  _$.writeScope(_scope0_id, {
    "clickCount": clickCount
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/resume.expected.md
@ -10,6 +10,7 @@
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -37,6 +38,7 @@ container.querySelector("button").click()
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -64,6 +66,7 @@ container.querySelector("button").click()
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -91,6 +94,7 @@ container.querySelector("button").click()
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-counter/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()</script>
+  <div><button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()</script>


 # Render "End"
@ -14,6 +14,7 @@
      </button>
      <!--M_*0 #button/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{clickCount:0}}),0,"__tests__/template.marko_0_clickCount",0];M._.w()
    </script>
@ -31,6 +32,7 @@ inserted #document/html0/body1/div0/button0
 inserted #document/html0/body1/div0/button0/#text0
 inserted #document/html0/body1/div0/button0/#comment1
 inserted #document/html0/body1/div0/#comment1
-inserted #document/html0/body1/script1
-inserted #document/html0/body1/script1/#text0
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/script2
+inserted #document/html0/body1/script2/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/html.expected/template.js
@ -13,6 +13,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
    _ifScopeId = _scope1_id;
  }
@ -23,5 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#text/1(": _ifRenderer,
    "#text/1!": _$.getScopeById(_ifScopeId)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/resume.expected.md
@ -9,7 +9,9 @@
    <!--M_*0 #button/0-->
    hi
    <!--M_*1 #text/0-->
+    <!--M_$1-->
    <!--M_|0 #text/1 1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={message_text:"hi","#text/1(":_._["__tests__/template.marko_1_renderer"],"#text/1!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -36,6 +38,8 @@ container.querySelector("button").click()
    <!--M_*0 #button/0-->
    <!--M_|0 #text/1 1-->
    <!--M_*1 #text/0-->
+    <!--M_$1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={message_text:"hi","#text/1(":_._["__tests__/template.marko_1_renderer"],"#text/1!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -45,7 +49,7 @@ container.querySelector("button").click()

 # Mutations
 ```
-removed #document/html0/body1/#comment2 after #document/html0/body1/#comment3
+removed #document/html0/body1/#comment2 after #document/html0/body1/#comment4
 inserted #document/html0/body1/#comment2
 removed #text after #document/html0/body1/#comment2
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-execution-order/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>hide</button><!--M_*0 #button/0-->hi<!--M_*1 #text/0--><!--M_|0 #text/1 1--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={message_text:"hi","#text/1(":_._["__tests__/template.marko_1_renderer"],"#text/1!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0",0];M._.w()</script>
+  <button>hide</button><!--M_*0 #button/0-->hi<!--M_*1 #text/0--><!--M_$1--><!--M_|0 #text/1 1--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={message_text:"hi","#text/1(":_._["__tests__/template.marko_1_renderer"],"#text/1!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0",0];M._.w()</script>


 # Render "End"
@ -13,7 +13,9 @@
    <!--M_*0 #button/0-->
    hi
    <!--M_*1 #text/0-->
+    <!--M_$1-->
    <!--M_|0 #text/1 1-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={message_text:"hi","#text/1(":_._["__tests__/template.marko_1_renderer"],"#text/1!":_.b={}},1:_.b},_.b._=_.a,_.c),0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -32,6 +34,8 @@ inserted #document/html0/body1/#comment1
 inserted #document/html0/body1/#text2
 inserted #document/html0/body1/#comment3
 inserted #document/html0/body1/#comment4
-inserted #document/html0/body1/script5
-inserted #document/html0/body1/script5/#text0
+inserted #document/html0/body1/#comment5
+inserted #document/html0/body1/#comment6
+inserted #document/html0/body1/script7
+inserted #document/html0/body1/script7/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/html.expected/template.js
@ -7,5 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  _$.writeScope(_scope0_id, {
    "count": count
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -58,6 +60,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -83,6 +86,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-fn-with-block/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()</script>
+  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{count:0}}),0,"__tests__/template.marko_0_count",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/html.expected/template.js
@ -9,5 +9,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "a": a,
    "b": b
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{a:[0],b:1}}),0,"__tests__/template.marko_0_a_b",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{a:[0],b:1}}),0,"__tests__/template.marko_0_a_b",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-multi-ref-nested/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{a:[0],b:1}}),0,"__tests__/template.marko_0_a_b",0];M._.w()</script>
+  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{a:[0],b:1}}),0,"__tests__/template.marko_0_a_b",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{a:[0],b:1}}),0,"__tests__/template.marko_0_a_b",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/html.expected/template.js
@ -4,5 +4,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  const data = 0;
  _$.write(`<button>${_$.escapeXML(data)}${_$.markResumeNode(_scope0_id, "#text/1")}</button>${_$.markResumeNode(_scope0_id, "#button/0")}`);
  _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/resume.expected.md
@ -8,6 +8,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -33,6 +34,7 @@ container.querySelector("button").click()
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-handler-refless/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()</script>
+  <button>0<!--M_*0 #text/1--></button><!--M_*0 #button/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()</script>


 # Render "End"
@ -12,6 +12,7 @@
      <!--M_*0 #text/1-->
    </button>
    <!--M_*0 #button/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -28,6 +29,7 @@ inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/button0/#comment1
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/script2
-inserted #document/html0/body1/script2/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/script3
+inserted #document/html0/body1/script3/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/html.expected/tags/comments.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/html.expected/tags/comments.js
@ -21,6 +21,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
        "#childScope/0": _$.writeExistingScope(_childScope),
        "_": _$.ensureScopeWithId(_scope1_id)
      });
+      _$.markResumeCleanup(_scope2_id);
      _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/tags/comments.marko_2_renderer");
      _ifScopeId = _scope2_id;
    }
@ -36,6 +37,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      "#text/4!": _$.getScopeById(_ifScopeId),
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _scope1_.set(i, _$.getScopeById(_scope1_id));
  });
  _$.write(`${_$.markResumeControlSingleNodeEnd(_scope0_id, "#ul/0", _forScopeIds)}</ul>${_$.markResumeNode(_scope0_id, "#ul/0")}`);
--- a/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/resume.expected.md
@ -32,12 +32,15 @@
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        id="c-1"
      >
@ -53,6 +56,7 @@
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -106,12 +110,15 @@ container.querySelector(`#c-${id} > button`).click()
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        id="c-1"
      >
@ -127,6 +134,7 @@ container.querySelector(`#c-${id} > button`).click()
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -180,12 +188,15 @@ container.querySelector(`#c-${id} > button`).click()
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        id="c-1"
      >
@ -201,6 +212,7 @@ container.querySelector(`#c-${id} > button`).click()
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -255,12 +267,15 @@ container.querySelector(`#c-${id} > button`).click()
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        id="c-1"
      >
@ -276,6 +291,7 @@ container.querySelector(`#c-${id} > button`).click()
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -330,12 +346,15 @@ container.querySelector(`#c-${id} > button`).click()
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        hidden=""
        id="c-1"
@ -352,6 +371,7 @@ container.querySelector(`#c-${id} > button`).click()
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -364,6 +384,6 @@ container.querySelector(`#c-${id} > button`).click()

 # Mutations
 ```
-#document/html0/body1/ul0/li2: attr(hidden) null => ""
-#document/html0/body1/ul0/li2/button1/#text0: "[-]" => "[+]"
+#document/html0/body1/ul0/li3: attr(hidden) null => ""
+#document/html0/body1/ul0/li3/button1/#text0: "[-]" => "[+]"
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-inert-collapsible-tree/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <ul><li id=c-0><span>Hello World<!--M_*2 #text/1--></span><button>[-]<!--M_*2 #text/3--></button><!--M_*2 #button/2--><ul><li id=c-0-0><span>testing 123<!--M_*5 #text/1--></span><button>[-]<!--M_*5 #text/3--></button><!--M_*5 #button/2--><!--M_|5 #text/4 --></li><!--M_*5 #li/0--><!--M_|4 #ul/0 5--></ul><!--M_*4 #ul/0--><!--M_|2 #text/4 3--></li><!--M_*2 #li/0--><li id=c-1><span>Goodbye World<!--M_*6 #text/1--></span><button>[-]<!--M_*6 #text/3--></button><!--M_*6 #button/2--><!--M_|6 #text/4 --></li><!--M_*6 #li/0--><!--M_|1 #ul/0 2,6--></ul><!--M_*1 #ul/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.i={0:{"#childScope/0":_.g={"#ul/0(":new Map(_.a=[[0,_.e={comment_comments:[{text:"testing 123"}],i:0,id:"c-0",open:!0,"#text/4(":_._["__tests__/tags/comments.marko_2_renderer"],"#text/4!":_.f={"#childScope/0":_.c={input_path:"c-0","#ul/0(":new Map(_.b=[[0,_.d={i:0,id:"c-0-0",open:!0}]])}}}],[1,_.h={i:1,id:"c-1",open:!0}]])}},1:_.g,2:_.e,3:_.f,4:_.c,5:_.d,6:_.h},_.d._=_.c,_.f._=_.e,_.e._=_.h._=_.g,_.i),5,"__tests__/tags/comments.marko_1_open",2,"__tests__/tags/comments.marko_1_open",6,"__tests__/tags/comments.marko_1_open",0];M._.w()</script>
+  <ul><li id=c-0><span>Hello World<!--M_*2 #text/1--></span><button>[-]<!--M_*2 #text/3--></button><!--M_*2 #button/2--><ul><li id=c-0-0><span>testing 123<!--M_*5 #text/1--></span><button>[-]<!--M_*5 #text/3--></button><!--M_*5 #button/2--><!--M_|5 #text/4 --></li><!--M_*5 #li/0--><!--M_$5--><!--M_|4 #ul/0 5--></ul><!--M_*4 #ul/0--><!--M_$3--><!--M_|2 #text/4 3--></li><!--M_*2 #li/0--><!--M_$2--><li id=c-1><span>Goodbye World<!--M_*6 #text/1--></span><button>[-]<!--M_*6 #text/3--></button><!--M_*6 #button/2--><!--M_|6 #text/4 --></li><!--M_*6 #li/0--><!--M_$6--><!--M_|1 #ul/0 2,6--></ul><!--M_*1 #ul/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.i={0:{"#childScope/0":_.g={"#ul/0(":new Map(_.a=[[0,_.e={comment_comments:[{text:"testing 123"}],i:0,id:"c-0",open:!0,"#text/4(":_._["__tests__/tags/comments.marko_2_renderer"],"#text/4!":_.f={"#childScope/0":_.c={input_path:"c-0","#ul/0(":new Map(_.b=[[0,_.d={i:0,id:"c-0-0",open:!0}]])}}}],[1,_.h={i:1,id:"c-1",open:!0}]])}},1:_.g,2:_.e,3:_.f,4:_.c,5:_.d,6:_.h},_.d._=_.c,_.f._=_.e,_.e._=_.h._=_.g,_.i),5,"__tests__/tags/comments.marko_1_open",2,"__tests__/tags/comments.marko_1_open",6,"__tests__/tags/comments.marko_1_open",0];M._.w()</script>


 # Render "End"
@ -36,12 +36,15 @@
            <!--M_|5 #text/4 -->
          </li>
          <!--M_*5 #li/0-->
+          <!--M_$5-->
          <!--M_|4 #ul/0 5-->
        </ul>
        <!--M_*4 #ul/0-->
+        <!--M_$3-->
        <!--M_|2 #text/4 3-->
      </li>
      <!--M_*2 #li/0-->
+      <!--M_$2-->
      <li
        id="c-1"
      >
@ -57,6 +60,7 @@
        <!--M_|6 #text/4 -->
      </li>
      <!--M_*6 #li/0-->
+      <!--M_$6-->
      <!--M_|1 #ul/0 2,6-->
    </ul>
    <!--M_*1 #ul/0-->
@ -93,20 +97,24 @@ inserted #document/html0/body1/ul0/li0/ul3/li0/#comment2
 inserted #document/html0/body1/ul0/li0/ul3/li0/#comment3
 inserted #document/html0/body1/ul0/li0/ul3/#comment1
 inserted #document/html0/body1/ul0/li0/ul3/#comment2
+inserted #document/html0/body1/ul0/li0/ul3/#comment3
 inserted #document/html0/body1/ul0/li0/#comment4
 inserted #document/html0/body1/ul0/li0/#comment5
+inserted #document/html0/body1/ul0/li0/#comment6
 inserted #document/html0/body1/ul0/#comment1
-inserted #document/html0/body1/ul0/li2
-inserted #document/html0/body1/ul0/li2/span0
-inserted #document/html0/body1/ul0/li2/span0/#text0
-inserted #document/html0/body1/ul0/li2/span0/#comment1
-inserted #document/html0/body1/ul0/li2/button1
-inserted #document/html0/body1/ul0/li2/button1/#text0
-inserted #document/html0/body1/ul0/li2/button1/#comment1
-inserted #document/html0/body1/ul0/li2/#comment2
-inserted #document/html0/body1/ul0/li2/#comment3
-inserted #document/html0/body1/ul0/#comment3
+inserted #document/html0/body1/ul0/#comment2
+inserted #document/html0/body1/ul0/li3
+inserted #document/html0/body1/ul0/li3/span0
+inserted #document/html0/body1/ul0/li3/span0/#text0
+inserted #document/html0/body1/ul0/li3/span0/#comment1
+inserted #document/html0/body1/ul0/li3/button1
+inserted #document/html0/body1/ul0/li3/button1/#text0
+inserted #document/html0/body1/ul0/li3/button1/#comment1
+inserted #document/html0/body1/ul0/li3/#comment2
+inserted #document/html0/body1/ul0/li3/#comment3
 inserted #document/html0/body1/ul0/#comment4
+inserted #document/html0/body1/ul0/#comment5
+inserted #document/html0/body1/ul0/#comment6
 inserted #document/html0/body1/#comment1
 inserted #document/html0/body1/script2
 inserted #document/html0/body1/script2/#text0
--- a/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/html.expected/template.js
@ -14,6 +14,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      _$.writeScope(_scope1_id, {
        "_": _$.ensureScopeWithId(_scope0_id)
      });
+      _$.markResumeCleanup(_scope1_id);
    }), "__tests__/template.marko_1_renderer", _scope0_id)
  });
  _$.writeScope(_scope0_id, {
--- a/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/resume.expected.md
@ -10,6 +10,7 @@
      World
      <!--M_*2 #text/0-->
    </h1>
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_name/subscriber",0];M._.w()
--- a/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-layout/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <body><!--M_[2--><h1>Hello <!>World<!--M_*2 #text/0--></h1><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_name/subscriber",0];M._.w()</script></body>
+  <body><!--M_[2--><h1>Hello <!>World<!--M_*2 #text/0--></h1><!--M_$2--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_name/subscriber",0];M._.w()</script></body>


 # Render "End"
@ -14,6 +14,7 @@
      World
      <!--M_*2 #text/0-->
    </h1>
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={name:"World","#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_name/subscriber",0];M._.w()
@ -34,6 +35,7 @@ inserted #document/html0/body1/h11/#comment1
 inserted #document/html0/body1/h11/#text2
 inserted #document/html0/body1/h11/#comment3
 inserted #document/html0/body1/#comment2
-inserted #document/html0/body1/script3
-inserted #document/html0/body1/script3/#text0
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/script4
+inserted #document/html0/body1/script4/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/html.expected/template.js
@ -7,5 +7,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
  } = foo;
  _$.write(`<div${_$.classAttr((foo, foo.class))}></div>${_$.markResumeNode(_scope0_id, "#div/0")}<div${_$.classAttr((foo, foo.class))}></div>${_$.markResumeNode(_scope0_id, "#div/1")}<button>Click</button>${_$.markResumeNode(_scope0_id, "#button/2")}`);
  _$.writeEffect(_scope0_id, "__tests__/template.marko_0");
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/resume.expected.md
@ -11,6 +11,7 @@
      Click
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -43,6 +44,7 @@ container.querySelector("button").click()
      Click
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-merge-member-expression/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div></div><!--M_*0 #div/0--><div></div><!--M_*0 #div/1--><button>Click</button><!--M_*0 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()</script>
+  <div></div><!--M_*0 #div/0--><div></div><!--M_*0 #div/1--><button>Click</button><!--M_*0 #button/2--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()</script>


 # Render "End"
@ -15,6 +15,7 @@
      Click
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[0,"__tests__/template.marko_0",0];M._.w()
    </script>
@ -34,6 +35,7 @@ inserted #document/html0/body1/#comment3
 inserted #document/html0/body1/button4
 inserted #document/html0/body1/button4/#text0
 inserted #document/html0/body1/#comment5
-inserted #document/html0/body1/script6
-inserted #document/html0/body1/script6/#text0
+inserted #document/html0/body1/#comment6
+inserted #document/html0/body1/script7
+inserted #document/html0/body1/script7/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/html.expected/template.js
@ -21,6 +21,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
        "#childScope/0": _$.writeExistingScope(_childScope),
        "_": _$.ensureScopeWithId(_scope1_id)
      });
+      _$.markResumeCleanup(_scope2_id);
      _scope2_.set(_index, _$.getScopeById(_scope2_id));
    });
    _forScopeIds2.push(_scope1_id);
@ -30,6 +31,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      "#text/0(": _scope2_.size ? _scope2_ : undefined,
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _scope1_.set(_index2, _$.getScopeById(_scope1_id));
  });
  _$.write(_$.markResumeControlSingleNodeEnd(_scope0_id, "#text/1", _forScopeIds2));
@ -38,5 +40,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "items": items,
    "#text/1(": _scope1_.size ? _scope1_ : undefined
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/resume.expected.md
@ -11,21 +11,28 @@
      0.0
      <!--M_*3 #text/0-->
    </div>
+    <!--M_$2-->
    <div>
      0.1
      <!--M_*5 #text/0-->
    </div>
+    <!--M_$4-->
    <!--M_|1 #text/0 2,4-->
+    <!--M_$1-->
    <div>
      1.0
      <!--M_*8 #text/0-->
    </div>
+    <!--M_$7-->
    <div>
      1.1
      <!--M_*10 #text/0-->
    </div>
+    <!--M_$9-->
    <!--M_|6 #text/0 7,9-->
+    <!--M_$6-->
    <!--M_|0 #text/1 1,6-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.f={items:[0,1],"#text/1(":new Map(_.a=[[0,_.c={outer:0,"#text/0(":new Map(_.b=[[0,_.d={"#childScope/0":_.k={}}],[1,_.e={"#childScope/0":_.l={}}]])}],[1,_.h={outer:1,"#text/0(":new Map(_.g=[[0,_.i={"#childScope/0":_.m={}}],[1,_.j={"#childScope/0":_.n={}}]])}]])},1:_.c,2:_.d,3:_.k,4:_.e,5:_.l,6:_.h,7:_.i,8:_.m,9:_.j,10:_.n},_.d._=_.e._=_.c,_.c._=_.h._=_.f,_.i._=_.j._=_.h,_.o),0,"__tests__/template.marko_0_items",0];M._.w()
    </script>
@ -54,6 +61,7 @@ container.querySelector("button").click()
      0.0
      <!--M_*3 #text/0-->
    </div>
+    <!--M_$2-->
    <div>
      0.1
      <!--M_*5 #text/0-->
@ -61,11 +69,14 @@ container.querySelector("button").click()
    <div>
      0.2
    </div>
+    <!--M_$4-->
    <!--M_|1 #text/0 2,4-->
+    <!--M_$1-->
    <div>
      1.0
      <!--M_*8 #text/0-->
    </div>
+    <!--M_$7-->
    <div>
      1.1
      <!--M_*10 #text/0-->
@ -84,8 +95,11 @@ container.querySelector("button").click()
      2.2
    </div>
    <!---->
+    <!--M_$9-->
    <!--M_|6 #text/0 7,9-->
+    <!--M_$6-->
    <!--M_|0 #text/1 1,6-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.f={items:[0,1],"#text/1(":new Map(_.a=[[0,_.c={outer:0,"#text/0(":new Map(_.b=[[0,_.d={"#childScope/0":_.k={}}],[1,_.e={"#childScope/0":_.l={}}]])}],[1,_.h={outer:1,"#text/0(":new Map(_.g=[[0,_.i={"#childScope/0":_.m={}}],[1,_.j={"#childScope/0":_.n={}}]])}]])},1:_.c,2:_.d,3:_.k,4:_.e,5:_.l,6:_.h,7:_.i,8:_.m,9:_.j,10:_.n},_.d._=_.e._=_.c,_.c._=_.h._=_.f,_.i._=_.j._=_.h,_.o),0,"__tests__/template.marko_0_items",0];M._.w()
    </script>
@ -95,13 +109,13 @@ container.querySelector("button").click()

 # Mutations
 ```
-inserted #document/html0/body1/#comment9
-inserted #text
 inserted #document/html0/body1/#comment13
-inserted #document/html0/body1/div4
-inserted #document/html0/body1/div8
-inserted #document/html0/body1/div10
-inserted #document/html0/body1/div11
+inserted #text
+inserted #document/html0/body1/#comment17
+inserted #document/html0/body1/div5
 inserted #document/html0/body1/div12
-removed #text after #document/html0/body1/#comment9
+inserted #document/html0/body1/div14
+inserted #document/html0/body1/div15
+inserted #document/html0/body1/div16
+removed #text after #document/html0/body1/#comment13
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-for/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>Push</button><!--M_*0 #button/0--><div>0.0<!--M_*3 #text/0--></div><div>0.1<!--M_*5 #text/0--></div><!--M_|1 #text/0 2,4--><div>1.0<!--M_*8 #text/0--></div><div>1.1<!--M_*10 #text/0--></div><!--M_|6 #text/0 7,9--><!--M_|0 #text/1 1,6--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.o={0:_.f={items:[0,1],"#text/1(":new Map(_.a=[[0,_.c={outer:0,"#text/0(":new Map(_.b=[[0,_.d={"#childScope/0":_.k={}}],[1,_.e={"#childScope/0":_.l={}}]])}],[1,_.h={outer:1,"#text/0(":new Map(_.g=[[0,_.i={"#childScope/0":_.m={}}],[1,_.j={"#childScope/0":_.n={}}]])}]])},1:_.c,2:_.d,3:_.k,4:_.e,5:_.l,6:_.h,7:_.i,8:_.m,9:_.j,10:_.n},_.d._=_.e._=_.c,_.c._=_.h._=_.f,_.i._=_.j._=_.h,_.o),0,"__tests__/template.marko_0_items",0];M._.w()</script>
+  <button>Push</button><!--M_*0 #button/0--><div>0.0<!--M_*3 #text/0--></div><!--M_$2--><div>0.1<!--M_*5 #text/0--></div><!--M_$4--><!--M_|1 #text/0 2,4--><!--M_$1--><div>1.0<!--M_*8 #text/0--></div><!--M_$7--><div>1.1<!--M_*10 #text/0--></div><!--M_$9--><!--M_|6 #text/0 7,9--><!--M_$6--><!--M_|0 #text/1 1,6--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.o={0:_.f={items:[0,1],"#text/1(":new Map(_.a=[[0,_.c={outer:0,"#text/0(":new Map(_.b=[[0,_.d={"#childScope/0":_.k={}}],[1,_.e={"#childScope/0":_.l={}}]])}],[1,_.h={outer:1,"#text/0(":new Map(_.g=[[0,_.i={"#childScope/0":_.m={}}],[1,_.j={"#childScope/0":_.n={}}]])}]])},1:_.c,2:_.d,3:_.k,4:_.e,5:_.l,6:_.h,7:_.i,8:_.m,9:_.j,10:_.n},_.d._=_.e._=_.c,_.c._=_.h._=_.f,_.i._=_.j._=_.h,_.o),0,"__tests__/template.marko_0_items",0];M._.w()</script>


 # Render "End"
@ -15,21 +15,28 @@
      0.0
      <!--M_*3 #text/0-->
    </div>
+    <!--M_$2-->
    <div>
      0.1
      <!--M_*5 #text/0-->
    </div>
+    <!--M_$4-->
    <!--M_|1 #text/0 2,4-->
+    <!--M_$1-->
    <div>
      1.0
      <!--M_*8 #text/0-->
    </div>
+    <!--M_$7-->
    <div>
      1.1
      <!--M_*10 #text/0-->
    </div>
+    <!--M_$9-->
    <!--M_|6 #text/0 7,9-->
+    <!--M_$6-->
    <!--M_|0 #text/1 1,6-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.f={items:[0,1],"#text/1(":new Map(_.a=[[0,_.c={outer:0,"#text/0(":new Map(_.b=[[0,_.d={"#childScope/0":_.k={}}],[1,_.e={"#childScope/0":_.l={}}]])}],[1,_.h={outer:1,"#text/0(":new Map(_.g=[[0,_.i={"#childScope/0":_.m={}}],[1,_.j={"#childScope/0":_.n={}}]])}]])},1:_.c,2:_.d,3:_.k,4:_.e,5:_.l,6:_.h,7:_.i,8:_.m,9:_.j,10:_.n},_.d._=_.e._=_.c,_.c._=_.h._=_.f,_.i._=_.j._=_.h,_.o),0,"__tests__/template.marko_0_items",0];M._.w()
    </script>
@ -48,18 +55,25 @@ inserted #document/html0/body1/#comment1
 inserted #document/html0/body1/div2
 inserted #document/html0/body1/div2/#text0
 inserted #document/html0/body1/div2/#comment1
-inserted #document/html0/body1/div3
-inserted #document/html0/body1/div3/#text0
-inserted #document/html0/body1/div3/#comment1
-inserted #document/html0/body1/#comment4
-inserted #document/html0/body1/div5
-inserted #document/html0/body1/div5/#text0
-inserted #document/html0/body1/div5/#comment1
-inserted #document/html0/body1/div6
-inserted #document/html0/body1/div6/#text0
-inserted #document/html0/body1/div6/#comment1
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/div4
+inserted #document/html0/body1/div4/#text0
+inserted #document/html0/body1/div4/#comment1
+inserted #document/html0/body1/#comment5
+inserted #document/html0/body1/#comment6
 inserted #document/html0/body1/#comment7
-inserted #document/html0/body1/#comment8
-inserted #document/html0/body1/script9
-inserted #document/html0/body1/script9/#text0
+inserted #document/html0/body1/div8
+inserted #document/html0/body1/div8/#text0
+inserted #document/html0/body1/div8/#comment1
+inserted #document/html0/body1/#comment9
+inserted #document/html0/body1/div10
+inserted #document/html0/body1/div10/#text0
+inserted #document/html0/body1/div10/#comment1
+inserted #document/html0/body1/#comment11
+inserted #document/html0/body1/#comment12
+inserted #document/html0/body1/#comment13
+inserted #document/html0/body1/#comment14
+inserted #document/html0/body1/#comment15
+inserted #document/html0/body1/script16
+inserted #document/html0/body1/script16/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/html.expected/template.js
@ -20,6 +20,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
          _$.writeScope(_scope2_id, {
            "_": _$.ensureScopeWithId(_scope1_id)
          });
+          _$.markResumeCleanup(_scope2_id);
        }), "__tests__/template.marko_2_renderer", _scope1_id)
      });
      _$.writeEffect(_scope1_id, "__tests__/template.marko_1_y/subscriber");
@ -28,6 +29,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
        "#childScope/0": _$.writeExistingScope(_childScope),
        "_": _$.ensureScopeWithId(_scope0_id)
      });
+      _$.markResumeCleanup(_scope1_id);
    }), "__tests__/template.marko_1_renderer", _scope0_id)
  });
  _$.writeEffect(_scope0_id, "__tests__/template.marko_0_x");
@ -36,5 +38,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "y": y,
    "#childScope/1": _$.writeExistingScope(_childScope2)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/resume.expected.md
@ -19,10 +19,13 @@
          2
          <!--M_*4 #text/1-->
        </div>
+        <!--M_$4-->
        <!--M_]3 #text/0-->
      </div>
+      <!--M_$2-->
      <!--M_]1 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()
    </script>
@ -59,10 +62,13 @@ container.querySelector("button").click()
          2
          <!--M_*4 #text/1-->
        </div>
+        <!--M_$4-->
        <!--M_]3 #text/0-->
      </div>
+      <!--M_$2-->
      <!--M_]1 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()
    </script>
@ -99,10 +105,13 @@ container.querySelector("button").click()
          2
          <!--M_*4 #text/1-->
        </div>
+        <!--M_$4-->
        <!--M_]3 #text/0-->
      </div>
+      <!--M_$2-->
      <!--M_]1 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()
    </script>
@ -139,10 +148,13 @@ container.querySelector("button").click()
          2
          <!--M_*4 #text/1-->
        </div>
+        <!--M_$4-->
        <!--M_]3 #text/0-->
      </div>
+      <!--M_$2-->
      <!--M_]1 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-params/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>Inc</button><!--M_*0 #button/0--><div><!--M_[2--><div><!--M_[4--><div>1<!--M_*4 #text/0-->.<!>2<!--M_*4 #text/1--></div><!--M_]3 #text/0--></div><!--M_]1 #text/0--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()</script>
+  <button>Inc</button><!--M_*0 #button/0--><div><!--M_[2--><div><!--M_[4--><div>1<!--M_*4 #text/0-->.<!>2<!--M_*4 #text/1--></div><!--M_$4--><!--M_]3 #text/0--></div><!--M_$2--><!--M_]1 #text/0--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()</script>


 # Render "End"
@ -23,10 +23,13 @@
          2
          <!--M_*4 #text/1-->
        </div>
+        <!--M_$4-->
        <!--M_]3 #text/0-->
      </div>
+      <!--M_$2-->
      <!--M_]1 #text/0-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.f={0:_.d={x:1,y:2,"#childScope/1":_.e={value:1,"#text/0!":_.a={outer:1,"#childScope/0":_.c={value:2,"#text/0!":_.b={}}}}},1:_.e,2:_.a,3:_.c,4:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_2_renderer"](_.a),_.a._=_.d,_.e["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.d),_.f),4,"__tests__/template.marko_2_outer/subscriber",2,"__tests__/template.marko_1_y/subscriber",0,"__tests__/template.marko_0_x",0];M._.w()
    </script>
@ -54,7 +57,10 @@ inserted #document/html0/body1/div2/div1/div1/#comment3
 inserted #document/html0/body1/div2/div1/div1/#text4
 inserted #document/html0/body1/div2/div1/div1/#comment5
 inserted #document/html0/body1/div2/div1/#comment2
+inserted #document/html0/body1/div2/div1/#comment3
 inserted #document/html0/body1/div2/#comment2
-inserted #document/html0/body1/script3
-inserted #document/html0/body1/script3/#text0
+inserted #document/html0/body1/div2/#comment3
+inserted #document/html0/body1/#comment3
+inserted #document/html0/body1/script4
+inserted #document/html0/body1/script4/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/html.expected/template.js
@ -13,11 +13,13 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      _$.writeScope(_scope1_id, {
        "_": _$.ensureScopeWithId(_scope0_id)
      });
+      _$.markResumeCleanup(_scope1_id);
    }), "__tests__/template.marko_1_renderer", _scope0_id)
  });
  _$.writeScope(_scope0_id, {
    "count": count,
    "#childScope/0": _$.writeExistingScope(_childScope)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/resume.expected.md
@ -9,7 +9,9 @@
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -37,7 +39,9 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -64,7 +68,9 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -91,7 +97,9 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-custom-tag/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <!--M_[2--><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()</script>
+  <!--M_[2--><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_$2--><!--M_]1 #text/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()</script>


 # Render "End"
@ -13,7 +13,9 @@
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#childScope/0":_.c={"#text/0!":_.b={}}},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -32,6 +34,8 @@ inserted #document/html1/body1/button0/#text0
 inserted #document/html1/body1/button0/#comment1
 inserted #document/html1/body1/#comment1
 inserted #document/html1/body1/#comment2
-inserted #document/html1/body1/script3
-inserted #document/html1/body1/script3/#text0
+inserted #document/html1/body1/#comment3
+inserted #document/html1/body1/#comment4
+inserted #document/html1/body1/script5
+inserted #document/html1/body1/script5/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/html.expected/template.js
@ -12,6 +12,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
  }), "__tests__/template.marko_1_renderer", _scope0_id));
  _$.write(_$.markResumeControlEnd(_scope0_id, "#text/0"));
  _$.writeScope(_scope0_id, {
@ -19,5 +20,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#text/0!": _$.writeExistingScope(_dynamicScope),
    "#text/0(": _$.normalizeDynamicRenderer(false || Child)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/resume.expected.md
@ -10,8 +10,10 @@
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <!--M_]0 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -42,8 +44,10 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <!--M_]0 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -71,8 +75,10 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <!--M_]0 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -100,8 +106,10 @@ container.querySelector("button").click()
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <!--M_]0 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-dynamic-tag/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <!--M_[1--><!--M_[2--><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_]1 #text/0--><!--M_]0 #text/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()</script>
+  <!--M_[1--><!--M_[2--><button>0<!--M_*2 #text/1--></button><!--M_*2 #button/0--><!--M_$2--><!--M_]1 #text/0--><!--M_]0 #text/0--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()</script>


 # Render "End"
@ -14,8 +14,10 @@
      <!--M_*2 #text/1-->
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <!--M_]1 #text/0-->
    <!--M_]0 #text/0-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.d={0:_.a={count:0,"#text/0!":_.c={"#text/0!":_.b={}},"#text/0(":_._["__tests__/tags/child.marko"]},1:_.c,2:_.b},_.b._=_.a,_.c["#text/0("]=_._["__tests__/template.marko_1_renderer"](_.a),_.d),2,"__tests__/template.marko_1_count/subscriber",2,"__tests__/template.marko_1_count",0];M._.w()
    </script>
@ -36,6 +38,8 @@ inserted #document/html2/body1/button0/#comment1
 inserted #document/html2/body1/#comment1
 inserted #document/html2/body1/#comment2
 inserted #document/html2/body1/#comment3
-inserted #document/html2/body1/script4
-inserted #document/html2/body1/script4/#text0
+inserted #document/html2/body1/#comment4
+inserted #document/html2/body1/#comment5
+inserted #document/html2/body1/script6
+inserted #document/html2/body1/script6/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/html.expected/template.js
@ -11,10 +11,12 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
      "num": num,
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _scope1_.set(_index, _$.getScopeById(_scope1_id));
  });
  _$.writeScope(_scope0_id, {
    "#text/0(": _scope1_.size ? _scope1_ : undefined
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/resume.expected.md
@ -7,50 +7,63 @@
      1
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$1-->
    <button>
      2
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <button>
      3
    </button>
    <!--M_*3 #button/0-->
+    <!--M_$3-->
    <button>
      4
    </button>
    <!--M_*4 #button/0-->
+    <!--M_$4-->
    <button>
      5
    </button>
    <!--M_*5 #button/0-->
+    <!--M_$5-->
    <button>
      6
    </button>
    <!--M_*6 #button/0-->
+    <!--M_$6-->
    <button>
      7
    </button>
    <!--M_*7 #button/0-->
+    <!--M_$7-->
    <button>
      8
    </button>
    <!--M_*8 #button/0-->
+    <!--M_$8-->
    <button>
      9
    </button>
    <!--M_*9 #button/0-->
+    <!--M_$9-->
    <button>
      10
    </button>
    <!--M_*10 #button/0-->
+    <!--M_$10-->
    <button>
      11
    </button>
    <!--M_*11 #button/0-->
+    <!--M_$11-->
    <button>
      12
    </button>
    <!--M_*12 #button/0-->
+    <!--M_$12-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()
    </script>
@ -75,6 +88,7 @@ c => click(c, 2)
      1
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$1-->
    <button
      data-multiple=""
      data-selected=""
@ -82,56 +96,68 @@ c => click(c, 2)
      2
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <button>
      3
    </button>
    <!--M_*3 #button/0-->
+    <!--M_$3-->
    <button
      data-multiple=""
    >
      4
    </button>
    <!--M_*4 #button/0-->
+    <!--M_$4-->
    <button>
      5
    </button>
    <!--M_*5 #button/0-->
+    <!--M_$5-->
    <button
      data-multiple=""
    >
      6
    </button>
    <!--M_*6 #button/0-->
+    <!--M_$6-->
    <button>
      7
    </button>
    <!--M_*7 #button/0-->
+    <!--M_$7-->
    <button
      data-multiple=""
    >
      8
    </button>
    <!--M_*8 #button/0-->
+    <!--M_$8-->
    <button>
      9
    </button>
    <!--M_*9 #button/0-->
+    <!--M_$9-->
    <button
      data-multiple=""
    >
      10
    </button>
    <!--M_*10 #button/0-->
+    <!--M_$10-->
    <button>
      11
    </button>
    <!--M_*11 #button/0-->
+    <!--M_$11-->
    <button
      data-multiple=""
    >
      12
    </button>
    <!--M_*12 #button/0-->
+    <!--M_$12-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()
    </script>
@ -141,13 +167,13 @@ c => click(c, 2)

 # Mutations
 ```
-#document/html0/body1/button2: attr(data-selected) null => ""
-#document/html0/body1/button2: attr(data-multiple) null => ""
-#document/html0/body1/button6: attr(data-multiple) null => ""
-#document/html0/body1/button10: attr(data-multiple) null => ""
-#document/html0/body1/button14: attr(data-multiple) null => ""
-#document/html0/body1/button18: attr(data-multiple) null => ""
-#document/html0/body1/button22: attr(data-multiple) null => ""
+#document/html0/body1/button3: attr(data-selected) null => ""
+#document/html0/body1/button3: attr(data-multiple) null => ""
+#document/html0/body1/button9: attr(data-multiple) null => ""
+#document/html0/body1/button15: attr(data-multiple) null => ""
+#document/html0/body1/button21: attr(data-multiple) null => ""
+#document/html0/body1/button27: attr(data-multiple) null => ""
+#document/html0/body1/button33: attr(data-multiple) null => ""
 ```


@ -162,10 +188,12 @@ c => click(c, 3)
      1
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$1-->
    <button>
      2
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <button
      data-multiple=""
      data-selected=""
@ -173,48 +201,59 @@ c => click(c, 3)
      3
    </button>
    <!--M_*3 #button/0-->
+    <!--M_$3-->
    <button>
      4
    </button>
    <!--M_*4 #button/0-->
+    <!--M_$4-->
    <button>
      5
    </button>
    <!--M_*5 #button/0-->
+    <!--M_$5-->
    <button
      data-multiple=""
    >
      6
    </button>
    <!--M_*6 #button/0-->
+    <!--M_$6-->
    <button>
      7
    </button>
    <!--M_*7 #button/0-->
+    <!--M_$7-->
    <button>
      8
    </button>
    <!--M_*8 #button/0-->
+    <!--M_$8-->
    <button
      data-multiple=""
    >
      9
    </button>
    <!--M_*9 #button/0-->
+    <!--M_$9-->
    <button>
      10
    </button>
    <!--M_*10 #button/0-->
+    <!--M_$10-->
    <button>
      11
    </button>
    <!--M_*11 #button/0-->
+    <!--M_$11-->
    <button
      data-multiple=""
    >
      12
    </button>
    <!--M_*12 #button/0-->
+    <!--M_$12-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()
    </script>
@ -224,14 +263,14 @@ c => click(c, 3)

 # Mutations
 ```
-#document/html0/body1/button2: attr(data-selected) "" => null
-#document/html0/body1/button2: attr(data-multiple) "" => null
-#document/html0/body1/button4: attr(data-selected) null => ""
-#document/html0/body1/button4: attr(data-multiple) null => ""
-#document/html0/body1/button6: attr(data-multiple) "" => null
-#document/html0/body1/button14: attr(data-multiple) "" => null
-#document/html0/body1/button16: attr(data-multiple) null => ""
-#document/html0/body1/button18: attr(data-multiple) "" => null
+#document/html0/body1/button3: attr(data-selected) "" => null
+#document/html0/body1/button3: attr(data-multiple) "" => null
+#document/html0/body1/button6: attr(data-selected) null => ""
+#document/html0/body1/button6: attr(data-multiple) null => ""
+#document/html0/body1/button9: attr(data-multiple) "" => null
+#document/html0/body1/button21: attr(data-multiple) "" => null
+#document/html0/body1/button24: attr(data-multiple) null => ""
+#document/html0/body1/button27: attr(data-multiple) "" => null
 ```


@ -246,18 +285,22 @@ c => click(c, 5)
      1
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$1-->
    <button>
      2
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <button>
      3
    </button>
    <!--M_*3 #button/0-->
+    <!--M_$3-->
    <button>
      4
    </button>
    <!--M_*4 #button/0-->
+    <!--M_$4-->
    <button
      data-multiple=""
      data-selected=""
@ -265,36 +308,45 @@ c => click(c, 5)
      5
    </button>
    <!--M_*5 #button/0-->
+    <!--M_$5-->
    <button>
      6
    </button>
    <!--M_*6 #button/0-->
+    <!--M_$6-->
    <button>
      7
    </button>
    <!--M_*7 #button/0-->
+    <!--M_$7-->
    <button>
      8
    </button>
    <!--M_*8 #button/0-->
+    <!--M_$8-->
    <button>
      9
    </button>
    <!--M_*9 #button/0-->
+    <!--M_$9-->
    <button
      data-multiple=""
    >
      10
    </button>
    <!--M_*10 #button/0-->
+    <!--M_$10-->
    <button>
      11
    </button>
    <!--M_*11 #button/0-->
+    <!--M_$11-->
    <button>
      12
    </button>
    <!--M_*12 #button/0-->
+    <!--M_$12-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()
    </script>
@ -304,12 +356,12 @@ c => click(c, 5)

 # Mutations
 ```
-#document/html0/body1/button4: attr(data-selected) "" => null
-#document/html0/body1/button4: attr(data-multiple) "" => null
-#document/html0/body1/button8: attr(data-selected) null => ""
-#document/html0/body1/button8: attr(data-multiple) null => ""
-#document/html0/body1/button10: attr(data-multiple) "" => null
-#document/html0/body1/button16: attr(data-multiple) "" => null
-#document/html0/body1/button18: attr(data-multiple) null => ""
-#document/html0/body1/button22: attr(data-multiple) "" => null
+#document/html0/body1/button6: attr(data-selected) "" => null
+#document/html0/body1/button6: attr(data-multiple) "" => null
+#document/html0/body1/button12: attr(data-selected) null => ""
+#document/html0/body1/button12: attr(data-multiple) null => ""
+#document/html0/body1/button15: attr(data-multiple) "" => null
+#document/html0/body1/button24: attr(data-multiple) "" => null
+#document/html0/body1/button27: attr(data-multiple) null => ""
+#document/html0/body1/button33: attr(data-multiple) "" => null
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-for/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <button>1</button><!--M_*1 #button/0--><button>2</button><!--M_*2 #button/0--><button>3</button><!--M_*3 #button/0--><button>4</button><!--M_*4 #button/0--><button>5</button><!--M_*5 #button/0--><button>6</button><!--M_*6 #button/0--><button>7</button><!--M_*7 #button/0--><button>8</button><!--M_*8 #button/0--><button>9</button><!--M_*9 #button/0--><button>10</button><!--M_*10 #button/0--><button>11</button><!--M_*11 #button/0--><button>12</button><!--M_*12 #button/0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()</script>
+  <button>1</button><!--M_*1 #button/0--><!--M_$1--><button>2</button><!--M_*2 #button/0--><!--M_$2--><button>3</button><!--M_*3 #button/0--><!--M_$3--><button>4</button><!--M_*4 #button/0--><!--M_$4--><button>5</button><!--M_*5 #button/0--><!--M_$5--><button>6</button><!--M_*6 #button/0--><!--M_$6--><button>7</button><!--M_*7 #button/0--><!--M_$7--><button>8</button><!--M_*8 #button/0--><!--M_$8--><button>9</button><!--M_*9 #button/0--><!--M_$9--><button>10</button><!--M_*10 #button/0--><!--M_$10--><button>11</button><!--M_*11 #button/0--><!--M_$11--><button>12</button><!--M_*12 #button/0--><!--M_$12--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()</script>


 # Render "End"
@ -11,50 +11,63 @@
      1
    </button>
    <!--M_*1 #button/0-->
+    <!--M_$1-->
    <button>
      2
    </button>
    <!--M_*2 #button/0-->
+    <!--M_$2-->
    <button>
      3
    </button>
    <!--M_*3 #button/0-->
+    <!--M_$3-->
    <button>
      4
    </button>
    <!--M_*4 #button/0-->
+    <!--M_$4-->
    <button>
      5
    </button>
    <!--M_*5 #button/0-->
+    <!--M_$5-->
    <button>
      6
    </button>
    <!--M_*6 #button/0-->
+    <!--M_$6-->
    <button>
      7
    </button>
    <!--M_*7 #button/0-->
+    <!--M_$7-->
    <button>
      8
    </button>
    <!--M_*8 #button/0-->
+    <!--M_$8-->
    <button>
      9
    </button>
    <!--M_*9 #button/0-->
+    <!--M_$9-->
    <button>
      10
    </button>
    <!--M_*10 #button/0-->
+    <!--M_$10-->
    <button>
      11
    </button>
    <!--M_*11 #button/0-->
+    <!--M_$11-->
    <button>
      12
    </button>
    <!--M_*12 #button/0-->
+    <!--M_$12-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.o={0:_.b={"#text/0(":new Map(_.a=[[0,_.c={num:1}],[1,_.d={num:2}],[2,_.e={num:3}],[3,_.f={num:4}],[4,_.g={num:5}],[5,_.h={num:6}],[6,_.i={num:7}],[7,_.j={num:8}],[8,_.k={num:9}],[9,_.l={num:10}],[10,_.m={num:11}],[11,_.n={num:12}]])},1:_.c,2:_.d,3:_.e,4:_.f,5:_.g,6:_.h,7:_.i,8:_.j,9:_.k,10:_.l,11:_.m,12:_.n},_.c._=_.d._=_.e._=_.f._=_.g._=_.h._=_.i._=_.j._=_.k._=_.l._=_.m._=_.n._=_.b,_.o),1,"__tests__/template.marko_1_num",2,"__tests__/template.marko_1_num",3,"__tests__/template.marko_1_num",4,"__tests__/template.marko_1_num",5,"__tests__/template.marko_1_num",6,"__tests__/template.marko_1_num",7,"__tests__/template.marko_1_num",8,"__tests__/template.marko_1_num",9,"__tests__/template.marko_1_num",10,"__tests__/template.marko_1_num",11,"__tests__/template.marko_1_num",12,"__tests__/template.marko_1_num",0];M._.w()
    </script>
@ -70,39 +83,52 @@ inserted #document/html0/body1
 inserted #document/html0/body1/button0
 inserted #document/html0/body1/button0/#text0
 inserted #document/html0/body1/#comment1
-inserted #document/html0/body1/button2
-inserted #document/html0/body1/button2/#text0
-inserted #document/html0/body1/#comment3
-inserted #document/html0/body1/button4
-inserted #document/html0/body1/button4/#text0
+inserted #document/html0/body1/#comment2
+inserted #document/html0/body1/button3
+inserted #document/html0/body1/button3/#text0
+inserted #document/html0/body1/#comment4
 inserted #document/html0/body1/#comment5
 inserted #document/html0/body1/button6
 inserted #document/html0/body1/button6/#text0
 inserted #document/html0/body1/#comment7
-inserted #document/html0/body1/button8
-inserted #document/html0/body1/button8/#text0
-inserted #document/html0/body1/#comment9
-inserted #document/html0/body1/button10
-inserted #document/html0/body1/button10/#text0
+inserted #document/html0/body1/#comment8
+inserted #document/html0/body1/button9
+inserted #document/html0/body1/button9/#text0
+inserted #document/html0/body1/#comment10
 inserted #document/html0/body1/#comment11
 inserted #document/html0/body1/button12
 inserted #document/html0/body1/button12/#text0
 inserted #document/html0/body1/#comment13
-inserted #document/html0/body1/button14
-inserted #document/html0/body1/button14/#text0
-inserted #document/html0/body1/#comment15
-inserted #document/html0/body1/button16
-inserted #document/html0/body1/button16/#text0
+inserted #document/html0/body1/#comment14
+inserted #document/html0/body1/button15
+inserted #document/html0/body1/button15/#text0
+inserted #document/html0/body1/#comment16
 inserted #document/html0/body1/#comment17
 inserted #document/html0/body1/button18
 inserted #document/html0/body1/button18/#text0
 inserted #document/html0/body1/#comment19
-inserted #document/html0/body1/button20
-inserted #document/html0/body1/button20/#text0
-inserted #document/html0/body1/#comment21
-inserted #document/html0/body1/button22
-inserted #document/html0/body1/button22/#text0
+inserted #document/html0/body1/#comment20
+inserted #document/html0/body1/button21
+inserted #document/html0/body1/button21/#text0
+inserted #document/html0/body1/#comment22
 inserted #document/html0/body1/#comment23
-inserted #document/html0/body1/script24
-inserted #document/html0/body1/script24/#text0
+inserted #document/html0/body1/button24
+inserted #document/html0/body1/button24/#text0
+inserted #document/html0/body1/#comment25
+inserted #document/html0/body1/#comment26
+inserted #document/html0/body1/button27
+inserted #document/html0/body1/button27/#text0
+inserted #document/html0/body1/#comment28
+inserted #document/html0/body1/#comment29
+inserted #document/html0/body1/button30
+inserted #document/html0/body1/button30/#text0
+inserted #document/html0/body1/#comment31
+inserted #document/html0/body1/#comment32
+inserted #document/html0/body1/button33
+inserted #document/html0/body1/button33/#text0
+inserted #document/html0/body1/#comment34
+inserted #document/html0/body1/#comment35
+inserted #document/html0/body1/#comment36
+inserted #document/html0/body1/script37
+inserted #document/html0/body1/script37/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/html.expected/template.js
@ -11,6 +11,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope1_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope1_id);
    _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_1_renderer");
    _ifScopeId = _scope1_id;
  } else {
@ -19,6 +20,7 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    _$.writeScope(_scope2_id, {
      "_": _$.ensureScopeWithId(_scope0_id)
    });
+    _$.markResumeCleanup(_scope2_id);
    _$.register(_ifRenderer = /* @__PURE__ */_$.createRenderer(() => {}), "__tests__/template.marko_2_renderer");
    _ifScopeId = _scope2_id;
  }
@ -28,5 +30,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "#text/0(": _ifRenderer,
    "#text/0!": _$.getScopeById(_ifScopeId)
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/resume.expected.md
@ -9,8 +9,10 @@
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
      <!--M_|0 #text/0 1-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()
    </script>
@ -37,8 +39,10 @@ container.querySelector("button").click()
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
      <!--M_|0 #text/0 1-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()
    </script>
@ -65,8 +69,10 @@ container.querySelector("button").click()
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
      <!--M_|0 #text/0 1-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()
    </script>
@ -92,8 +98,10 @@ container.querySelector("button").click()
        The button was clicked 3 times.
      </span>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
      <!--M_|0 #text/0 1-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-nested-scope-if/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_|0 #text/0 1--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()</script>
+  <div><button>0<!--M_*1 #text/1--></button><!--M_*1 #button/0--><!--M_$1--><!--M_|0 #text/0 1--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()</script>


 # Render "End"
@ -13,8 +13,10 @@
        <!--M_*1 #text/1-->
      </button>
      <!--M_*1 #button/0-->
+      <!--M_$1-->
      <!--M_|0 #text/0 1-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.c={0:_.a={clickCount:0,"#text/0(":_._["__tests__/template.marko_1_renderer"],"#text/0!":_.b={}},1:_.b},_.b._=_.a,_.c),1,"__tests__/template.marko_1_clickCount",0];M._.w()
    </script>
@ -33,6 +35,8 @@ inserted #document/html0/body1/div0/button0/#text0
 inserted #document/html0/body1/div0/button0/#comment1
 inserted #document/html0/body1/div0/#comment1
 inserted #document/html0/body1/div0/#comment2
-inserted #document/html0/body1/script1
-inserted #document/html0/body1/script1/#text0
+inserted #document/html0/body1/div0/#comment3
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/script2
+inserted #document/html0/body1/script2/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/html.expected/template.js
@ -21,5 +21,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "items": items,
    "#text/0(": _scope1_.size ? _scope1_ : undefined
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/resume.expected.md
@ -18,6 +18,7 @@
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
@ -53,6 +54,7 @@ container.querySelector("#add").click()
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
@ -89,6 +91,7 @@ container.querySelector("#add").click()
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
@ -124,6 +127,7 @@ container.querySelector("#remove").click()
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
@ -159,6 +163,7 @@ container.querySelector("#add").click()
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-push-pop-list/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <div><!--M_|0 #text/0 --><button id=add>Add</button><!--M_*0 #button/1--><button id=remove>Remove</button><!--M_*0 #button/2--></div><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()</script>
+  <div><!--M_|0 #text/0 --><button id=add>Add</button><!--M_*0 #button/1--><button id=remove>Remove</button><!--M_*0 #button/2--></div><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()</script>


 # Render "End"
@ -22,6 +22,7 @@
      </button>
      <!--M_*0 #button/2-->
    </div>
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.a={0:{id:0,items:[]}}),0,"__tests__/template.marko_0_items",0,"__tests__/template.marko_0_id_items",0];M._.w()
    </script>
@ -42,6 +43,7 @@ inserted #document/html0/body1/div0/#comment2
 inserted #document/html0/body1/div0/button3
 inserted #document/html0/body1/div0/button3/#text0
 inserted #document/html0/body1/div0/#comment4
-inserted #document/html0/body1/script1
-inserted #document/html0/body1/script1/#text0
+inserted #document/html0/body1/#comment1
+inserted #document/html0/body1/script2
+inserted #document/html0/body1/script2/#text0
 ```
--- a/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/html.expected/template.js
+++ b/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/html.expected/template.js
@ -24,5 +24,6 @@ const _renderer = /* @__PURE__ */_$.createRenderer((input, _tagVar) => {
    "list": list,
    "#ul/0(": _scope1_.size ? _scope1_ : undefined
  });
+  _$.markResumeCleanup(_scope0_id);
 });
 export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
--- a/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/resume.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/resume.expected.md
@ -31,6 +31,7 @@
      Reverse
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()
    </script>
@ -81,6 +82,7 @@ container.querySelector("#toggle").click()
      Reverse
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()
    </script>
@ -129,6 +131,7 @@ container.querySelector("#toggle").click()
      Reverse
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()
    </script>
@ -177,6 +180,7 @@ container.querySelector("#reverse").click()
      Reverse
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()
    </script>
--- a/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/ssr.expected.md
+++ b/packages/runtime-tags/src/tests/fixtures/basic-shared-node-ref/snapshots/ssr.expected.md
@ -1,5 +1,5 @@
 # Write
-  <ul><li>1<!--M_*1 #text/0--></li><li>2<!--M_*2 #text/0--></li><li>3<!--M_*3 #text/0--></li><!--M_|0 #ul/0 1,2,3--></ul><!--M_*0 #ul/0--><button id=toggle>Toggle</button><!--M_*0 #button/1--><button id=reverse>Reverse</button><!--M_*0 #button/2--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()</script>
+  <ul><li>1<!--M_*1 #text/0--></li><li>2<!--M_*2 #text/0--></li><li>3<!--M_*3 #text/0--></li><!--M_|0 #ul/0 1,2,3--></ul><!--M_*0 #ul/0--><button id=toggle>Toggle</button><!--M_*0 #button/1--><button id=reverse>Reverse</button><!--M_*0 #button/2--><!--M_$0--><script>WALKER_RUNTIME("M")("_");M._.r=[_=>(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()</script>


 # Render "End"
@ -35,6 +35,7 @@
      Reverse
    </button>
    <!--M_*0 #button/2-->
+    <!--M_$0-->
    <script>
      WALKER_RUNTIME("M")("_");M._.r=[_=&gt;(_.e={0:{open:!0,list:[1,2,3],"#ul/0(":new Map(_.a=[[1,_.b={}],[2,_.c={}],[3,_.d={}]])},1:_.b,2:_.c,3:_.d}),0,"__tests__/template.marko_0_list",0,"__tests__/template.marko_0_open",0];M._.w()
    </script>
@ -65,6 +66,7 @@ inserted #document/html0/body1/#comment3
 inserted #document/html0/body1/button4
 inserted #document/html0/body1/button4/#text0
 inserted #document/html0/body1/#comment5
-inserted #document/html0/body1/script6
-inserted #document/html0/body1/script6/#text0
+inserted #document/html0/body1/#comment6
+inserted #document/html0/body1/script7
+inserted #document/html0/body1/script7/#text0
 ```
--- a/Show More
+++ b/Show More