@rohal12/spindle-lsp 0.15.27 → 0.15.29

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.27";
+    VERSION = false ? pkg.version : "0.15.29";
   }
 });
 
@@ -10640,6 +10640,11 @@ var init_file_inputs = __esm({
 });
 
 // node_modules/@rohal12/spindle/dist/pkg/story-variables.js
+function effectiveNamedDefinitions(definitions) {
+  const latest = new NameMap();
+  for (const definition2 of definitions) latest.set(definition2.name, definition2);
+  return [...latest.values()];
+}
 function isSigil(c) {
   return c !== void 0 && SIGIL_CHARS.has(c);
 }
@@ -14051,11 +14056,66 @@ function peg$parse(input2, options) {
   if (peg$success) return peg$result;
   else peg$throw();
 }
+function consumesOptionClauses(macro) {
+  const name = macro.name.toLowerCase();
+  return macro.source === "builtin" && !macro.widget && (name === "listbox" || name === "cycle");
+}
+function checkParameterTypes(macro, parameters) {
+  const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
+  for (const param of parameters) {
+    const type = param.type;
+    if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
+    const holds = param.holds;
+    if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
+    if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
+    if (param.parameters) checkParameterTypes(macro, param.parameters);
+  }
+}
+function parameterError(macro, param, problem, fix) {
+  return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
+}
+function indexCompanionParents(index, macro) {
+  const name = macro.name.toLowerCase();
+  for (const sub of macro.subMacros) {
+    const parents = index.get(sub) ?? /* @__PURE__ */ new Set();
+    parents.add(name);
+    index.set(sub, parents);
+  }
+}
+function branchParents(name, macros) {
+  if (!macros) return [...companionParents.get(name) ?? []].filter((parent) => !consumesOptionClauses(metadataRegistry.get(parent)));
+  return [...branchParentLookup(macros)(name)];
+}
+function branchParentLookup(macros) {
+  const parents = new NameMap();
+  for (const macro of effectiveNamedDefinitions(macros)) {
+    if (consumesOptionClauses(macro)) continue;
+    indexCompanionParents(parents, macro);
+  }
+  const index = new NameMap();
+  for (const [sub, names] of parents) index.set(sub, [...names]);
+  return (name) => index.get(name) ?? [];
+}
+function getMacroParameters(name) {
+  return metadataRegistry.get(name)?.parameters;
+}
+function getMacroRegistry() {
+  return Array.from(metadataRegistry.values());
+}
 function isRawMacro(name, widget = WIDGETS.has(name)) {
   return RAW_BODY_MACROS.has(name.toLowerCase()) && !widget;
 }
 function isBlockMacro(name) {
-  return BLOCK_MACROS.has(name) || DEFINED_BLOCK_MACROS.has(name) || BLOCK_WIDGETS.has(name);
+  if (REGISTERED_BLOCK_MACROS.has(name)) return true;
+  if (WIDGETS.has(name)) return BLOCK_WIDGETS.has(name);
+  if (DEFINED_MACROS.has(name)) return DEFINED_BLOCK_MACROS.has(name);
+  return isBuiltinBlockMacro(name);
+}
+function isBuiltinBlockMacro(name) {
+  return BLOCK_MACROS.has(name);
+}
+function isRegisteredBlockMacro(name) {
+  return REGISTERED_BLOCK_MACROS.has(name);
 }
 function buildAst(nodes) {
   return nodes.map(astNode);
@@ -14106,7 +14166,7 @@ function astNode({ token, body }) {
       };
       if (!body) return withSelectors$1(node2, token);
       const children = buildAst(body.children);
-      const branching = BRANCHING.has(name) && !WIDGETS.has(name);
+      const branching = BRANCHING.has(name) && !WIDGETS.has(name) && getMacroParameters.source(name) !== "user";
       if (!branching && body.branches.length === 0) {
         node2.children = children;
         return withSelectors$1(node2, token);
@@ -14121,29 +14181,15 @@ function astNode({ token, body }) {
     }
   }
 }
-function checkParameterTypes(macro, parameters) {
-  const holdsFix = `Give a \`string\` or \`text\` parameter one of ${STRING_HOLDS.join(", ")} to hold (see docs/custom-macros.md#what-a-string-holds).`;
-  for (const param of parameters) {
-    const type = param.type;
-    if (!PARAMETER_TYPES.includes(type)) throw parameterError(macro, param, type === void 0 ? "has no type" : `has the unknown type ${JSON.stringify(type)}`, `Give it one of the types ${PARAMETER_TYPES.join(", ")} (see docs/custom-macros.md#parameter-types), or declare no parameters and read props.rawArgs.`);
-    const holds = param.holds;
-    if (holds !== void 0 && type !== "string" && type !== "text") throw parameterError(macro, param, `is of the type ${type}, which holds what it is`, holdsFix);
-    if (holds !== void 0 && !STRING_HOLDS.includes(holds)) throw parameterError(macro, param, `holds the unknown ${JSON.stringify(holds)}`, holdsFix);
-    if (param.parameters) checkParameterTypes(macro, param.parameters);
+function upperBound(sorted, value) {
+  let low = 0;
+  let high = sorted.length;
+  while (low < high) {
+    const mid = low + high >>> 1;
+    if (sorted[mid] <= value) low = mid + 1;
+    else high = mid;
   }
-}
-function parameterError(macro, param, problem, fix) {
-  return /* @__PURE__ */ new Error(`spindle: The parameter "${param.name}" of the macro {${macro}} ${problem}. ${fix}`);
-}
-function branchParents(name, macros) {
-  if (!macros) return [...companionParents.get(name) ?? []].filter((parent) => parent !== "listbox");
-  return macros.filter((macro) => macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name.toLowerCase())).map((macro) => macro.name.toLowerCase());
-}
-function getMacroParameters(name) {
-  return metadataRegistry.get(name)?.parameters;
-}
-function getMacroRegistry() {
-  return Array.from(metadataRegistry.values());
+  return low;
 }
 function lineColumn(text3, offset2) {
   let line = 1;
@@ -14162,14 +14208,7 @@ function sourcePositions(text3) {
   const starts = [0];
   for (let i2 = 0; i2 < text3.length; i2++) if (text3[i2] === "\n") starts.push(i2 + 1);
   return (offset2) => {
-    let low = 0;
-    let high = starts.length;
-    while (low < high) {
-      const mid = low + high >>> 1;
-      if (starts[mid] <= offset2) low = mid + 1;
-      else high = mid;
-    }
-    const line = Math.max(1, low);
+    const line = Math.max(1, upperBound(starts, offset2));
     return {
       line,
       column: offset2 - starts[line - 1] + 1
@@ -14183,9 +14222,11 @@ function pairMarkup(tokens2, options = {}) {
   const isBlock = options.isBlock ?? isBlockMacro;
   const isRaw = options.isRaw ?? isRawMacro;
   const parentsOf = (name) => {
+    if (options.branchParents) return options.branchParents(name);
+    const registered = branchParents(name);
     const lower = name.toLowerCase();
     const builtin = Object.prototype.hasOwnProperty.call(BRANCH_PARENT, lower) ? BRANCH_PARENT[lower] : void 0;
-    return builtin ? [builtin] : options.branchParents?.(name) ?? branchParents(name);
+    return builtin && getMacroParameters.source(builtin) === void 0 ? [...registered, builtin] : registered;
   };
   const errors = [];
   const noticedAtEnd = (tokens2[tokens2.length - 1]?.end ?? 0) + 1;
@@ -14284,6 +14325,10 @@ function pairMarkup(tokens2, options = {}) {
       add(node2);
       continue;
     }
+    if (stack.length === MAX_MARKUP_DEPTH) report2("nesting-limit", token, `Markup nesting exceeds the limit of ${MAX_MARKUP_DEPTH} elements`, token.start, {
+      name: nameOf(token),
+      limit: String(MAX_MARKUP_DEPTH)
+    });
     const body = {
       children: [],
       branches: []
@@ -14692,6 +14737,28 @@ function parseMemberIdentifier(src) {
   if (object3.type !== "Identifier" || object3.start !== 0 || object3.end !== 1 || property.type !== "Identifier" || property.start !== 2 || property.end !== src.length + 2) return null;
   return property.name;
 }
+function readMemberPath(src, end) {
+  const path2 = [];
+  const p = tokenizerAt(src, end, "expression", { afterOperand: true });
+  try {
+    for (; ; ) {
+      p.nextToken();
+      if (p.type !== types$1.dot || p.start !== end) break;
+      const dotEnd = p.end;
+      p.nextToken();
+      if (p.start !== dotEnd || p.type !== types$1.name && !p.type.keyword) break;
+      if (!/^\w+$/.test(String(p.value))) break;
+      path2.push(String(p.value));
+      end = p.end;
+    }
+  } catch (error62) {
+    if (!(error62 instanceof SyntaxError)) throw error62;
+  }
+  return {
+    path: path2,
+    end
+  };
+}
 function parseAst(src, goal, percentAt, transientsRead) {
   try {
     const p = tokenizerAt(src, 0, goal);
@@ -14719,121 +14786,147 @@ function propertyName(node2, src) {
   const c = src.charAt(node2.start);
   if (c === "@" || c === "%") throw new CodeSyntaxError(`"${node2.name}" can't be a property name`, src, node2.start);
 }
-function walk(node2, src, out, binding, shorthand, access = "read") {
-  if (Array.isArray(node2)) {
-    for (const n7 of node2) walk(n7, src, out, binding, false, access);
-    return;
+function walk(root, src, out, binding, shorthand, access = "read") {
+  const pending = [[
+    root,
+    binding,
+    shorthand,
+    access
+  ]];
+  while (pending.length) {
+    const [node2, bind, short, role] = pending.pop();
+    const children = [];
+    visit2(node2, bind, short, role, children);
+    for (let i2 = children.length - 1; i2 >= 0; i2--) pending.push(children[i2]);
   }
-  if (!isNode(node2)) return;
-  const sub = (child, bind = false, short = false, role = "read") => walk(child, src, out, bind, short, role);
-  switch (node2.type) {
-    case "Identifier": {
-      const sigil = sigilOf(node2, src);
-      if (!sigil) return;
-      if (binding) throw new CodeSyntaxError(`"${node2.name}" is a ${NAMESPACE_NAME[sigil[0]]} variable and can't be declared`, src, node2.start);
-      out.refs.push({
-        sigil: sigil[0],
-        name: sigil[1],
-        start: node2.start,
-        end: node2.end,
-        shorthand,
-        read: access !== "write",
-        write: access !== "read"
-      });
+  function visit2(node2, binding2, shorthand2, access2, children) {
+    if (Array.isArray(node2)) {
+      for (const n7 of node2) children.push([
+        n7,
+        binding2,
+        false,
+        access2
+      ]);
       return;
     }
-    case "Literal":
-      if (typeof node2.value === "string") out.strings.push(src.slice(node2.start + 1, node2.end - 1));
-      return;
-    case "TemplateElement":
-      out.strings.push(node2.value.raw);
-      return;
-    case "MemberExpression":
-      sub(node2.object);
-      if (node2.computed) sub(node2.property);
-      else propertyName(node2.property, src);
-      return;
-    case "Property":
-      if (node2.computed) sub(node2.key);
-      else if (!node2.shorthand) propertyName(node2.key, src);
-      if (node2.shorthand) {
-        const value = node2.value;
-        if (value.type === "AssignmentPattern") {
-          sub(value.left, binding, true, access);
-          sub(value.right);
-        } else sub(value, binding, true, access);
-      } else sub(node2.value, binding, false, access);
-      return;
-    case "MethodDefinition":
-    case "PropertyDefinition":
-      if (node2.computed) sub(node2.key);
-      else propertyName(node2.key, src);
-      sub(node2.value);
-      return;
-    case "LabeledStatement":
-      sub(node2.body);
-      return;
-    case "BreakStatement":
-    case "ContinueStatement":
-    case "MetaProperty":
-    case "PrivateIdentifier":
-      return;
-    case "VariableDeclarator":
-      sub(node2.id, true);
-      sub(node2.init);
-      return;
-    case "FunctionDeclaration":
-    case "FunctionExpression":
-    case "ArrowFunctionExpression":
-      sub(node2.id, true);
-      for (const p of node2.params) sub(p, true);
-      sub(node2.body);
-      return;
-    case "ClassDeclaration":
-    case "ClassExpression":
-      sub(node2.id, true);
-      sub(node2.superClass);
-      sub(node2.body);
-      return;
-    case "CatchClause":
-      sub(node2.param, true);
-      sub(node2.body);
-      return;
-    case "AssignmentExpression":
-      sub(node2.left, false, false, node2.operator === "=" ? "write" : "readwrite");
-      sub(node2.right);
-      return;
-    case "UnaryExpression":
-      sub(node2.argument, false, false, node2.operator === "delete" ? "write" : "read");
-      return;
-    case "UpdateExpression":
-      sub(node2.argument, false, false, "readwrite");
-      return;
-    case "ForInStatement":
-    case "ForOfStatement":
-      sub(node2.left, false, false, "write");
-      sub(node2.right);
-      sub(node2.body);
-      return;
-    case "AssignmentPattern":
-      sub(node2.left, binding, false, access);
-      sub(node2.right);
-      return;
-    case "ObjectPattern":
-    case "ArrayPattern":
-    case "RestElement":
-      for (const key of [
-        "properties",
-        "elements",
-        "argument"
-      ]) sub(node2[key], binding, false, access);
-      return;
-    default:
-      for (const key in node2) {
-        if (key === "type" || key === "start" || key === "end") continue;
-        const v2 = node2[key];
-        if (typeof v2 === "object" && v2 !== null) sub(v2);
+    if (!isNode(node2)) return;
+    const sub = (child, bind = false, short = false, role = "read") => {
+      children.push([
+        child,
+        bind,
+        short,
+        role
+      ]);
+    };
+    switch (node2.type) {
+      case "Identifier": {
+        const sigil = sigilOf(node2, src);
+        if (!sigil) return;
+        if (binding2) throw new CodeSyntaxError(`"${node2.name}" is a ${NAMESPACE_NAME[sigil[0]]} variable and can't be declared`, src, node2.start);
+        out.refs.push({
+          sigil: sigil[0],
+          name: sigil[1],
+          start: node2.start,
+          end: node2.end,
+          shorthand: shorthand2,
+          read: access2 !== "write",
+          write: access2 !== "read"
+        });
+        return;
       }
+      case "Literal":
+        if (typeof node2.value === "string") out.strings.push(src.slice(node2.start + 1, node2.end - 1));
+        return;
+      case "TemplateElement":
+        out.strings.push(node2.value.raw);
+        return;
+      case "MemberExpression":
+        sub(node2.object);
+        if (node2.computed) sub(node2.property);
+        else propertyName(node2.property, src);
+        return;
+      case "Property":
+        if (node2.computed) sub(node2.key);
+        else if (!node2.shorthand) propertyName(node2.key, src);
+        if (node2.shorthand) {
+          const value = node2.value;
+          if (value.type === "AssignmentPattern") {
+            sub(value.left, binding2, true, access2);
+            sub(value.right);
+          } else sub(value, binding2, true, access2);
+        } else sub(node2.value, binding2, false, access2);
+        return;
+      case "MethodDefinition":
+      case "PropertyDefinition":
+        if (node2.computed) sub(node2.key);
+        else propertyName(node2.key, src);
+        sub(node2.value);
+        return;
+      case "LabeledStatement":
+        sub(node2.body);
+        return;
+      case "BreakStatement":
+      case "ContinueStatement":
+      case "MetaProperty":
+      case "PrivateIdentifier":
+        return;
+      case "VariableDeclarator":
+        sub(node2.id, true);
+        sub(node2.init);
+        return;
+      case "FunctionDeclaration":
+      case "FunctionExpression":
+      case "ArrowFunctionExpression":
+        sub(node2.id, true);
+        for (const p of node2.params) sub(p, true);
+        sub(node2.body);
+        return;
+      case "ClassDeclaration":
+      case "ClassExpression":
+        sub(node2.id, true);
+        sub(node2.superClass);
+        sub(node2.body);
+        return;
+      case "CatchClause":
+        sub(node2.param, true);
+        sub(node2.body);
+        return;
+      case "AssignmentExpression":
+        sub(node2.left, false, false, node2.operator === "=" ? "write" : "readwrite");
+        sub(node2.right);
+        return;
+      case "UnaryExpression":
+        sub(node2.argument, false, false, node2.operator === "delete" ? "write" : "read");
+        return;
+      case "UpdateExpression":
+        sub(node2.argument, false, false, "readwrite");
+        return;
+      case "ForInStatement":
+      case "ForOfStatement":
+        sub(node2.left, false, false, "write");
+        sub(node2.right);
+        sub(node2.body);
+        return;
+      case "AssignmentPattern":
+        sub(node2.left, binding2, false, access2);
+        sub(node2.right);
+        return;
+      case "ObjectPattern":
+      case "ArrayPattern":
+      case "RestElement":
+        for (const key of [
+          "properties",
+          "elements",
+          "argument"
+        ]) sub(node2[key], binding2, false, access2);
+        return;
+      default:
+        for (const key in node2) {
+          if (key === "type" || key === "start" || key === "end") continue;
+          const v2 = node2[key];
+          if (typeof v2 === "object" && v2 !== null) sub(v2);
+        }
+    }
   }
 }
 function findCodeEnd(src, start, { goal = "expression", stop, onRunOut } = {}) {
@@ -15276,7 +15369,11 @@ function splitSigilTemplate(template, incomplete = false) {
     if (text3) parts.push({ text: text3 });
     text3 = "";
     const block = template.slice(i2, end);
-    parts.push(/^.\w/.test(block) || incomplete && block.length === 1 && end === template.length ? { expr: block } : { verbatim: `{${block}}` });
+    let reference = /^.\w/.test(block);
+    if (!reference && block[1] === "\\") lexJs(block, { variable(_sigil, _name, start) {
+      if (start === 0) reference = true;
+    } });
+    parts.push(reference || incomplete && block.length === 1 && end === template.length ? { expr: block } : { verbatim: `{${block}}` });
     i2 = end + 1;
   }
   if (text3) parts.push({ text: text3 });
@@ -15325,7 +15422,12 @@ function analyzeMarkup(source, options = {}) {
     nodes: paired.nodes,
     errors
   };
-  const inDamage = (start) => errors.some((e, i2) => start >= damage[i2] && start <= e.offset);
+  const damageEnds = [];
+  for (const e of errors) damageEnds.push(Math.max(damageEnds[damageEnds.length - 1] ?? -1, e.offset));
+  const inDamage = (start) => {
+    const index = upperBound(damage, start) - 1;
+    return index >= 0 && start <= damageEnds[index];
+  };
   const noticed = errors.map((e, i2) => [damage[i2] + 0.5, e]);
   const position = paired.errors.length ? sourcePositions(source) : void 0;
   for (const error62 of paired.errors) if (!inDamage(error62.start)) noticed.push([error62.noticedAt, pairingError(position, error62)]);
@@ -15395,7 +15497,7 @@ function scanMarkupTolerant(source, options = {}, completion = false) {
     const rest = source.slice(base);
     const result2 = attempt(rest, base);
     if (Array.isArray(result2)) {
-      tokens2.push(...result2);
+      for (const token of result2) tokens2.push(token);
       break;
     }
     const at3 = base + result2.offset;
@@ -15408,7 +15510,7 @@ function scanMarkupTolerant(source, options = {}, completion = false) {
       cut = prefix.offset;
       prefix = attempt(rest.slice(0, cut), base);
     }
-    tokens2.push(...prefix);
+    for (const token of prefix) tokens2.push(token);
     damage.push(base + cut);
     if (cut < rest.length) {
       const start = base + cut;
@@ -15897,6 +15999,29 @@ function widgetParameters(params, holds = {}) {
     ...hasOwn(holds, name) ? { holds: holds[name] } : {}
   }));
 }
+function macroArgumentLookup(tokens2, parametersOf2) {
+  let owners;
+  const parentsOf = parametersOf2.pairing?.branchParents ?? branchParents;
+  return (token) => {
+    const name = token.name.toLowerCase();
+    if (parentsOf(name).length > 0 && !owners) {
+      owners = /* @__PURE__ */ new Map();
+      const pending = [...pairMarkup(tokens2, parametersOf2.pairing).nodes];
+      while (pending.length) {
+        const node2 = pending.pop();
+        if (!node2.body) continue;
+        for (const branch of node2.body.branches) {
+          if (node2.token.type === "macro") owners.set(branch.tag, node2.token.name.toLowerCase());
+          for (const child of branch.children) pending.push(child);
+        }
+        for (const child of node2.body.children) pending.push(child);
+      }
+    }
+    const owner = owners?.get(token);
+    if (owner !== void 0) return CONDITION_MACROS.has(name) && owner === BRANCH_PARENT[name] && usesBuiltinSemantics(owner, parametersOf2) ? "condition" : "branch";
+    return CONDITION_MACROS.has(name) && usesBuiltinSemantics(name, parametersOf2) ? "condition" : "invocation";
+  };
+}
 function usesBuiltinSemantics(name, parametersOf2) {
   return parametersOf2.widget?.(name) === void 0 && parametersOf2.source?.(name) !== "user";
 }
@@ -15916,10 +16041,11 @@ function withHolds(params, holds) {
   });
 }
 function parameterLookup(macros) {
+  const list3 = [...macros];
   const parameters = new NameMap();
   const widgets = new NameMap();
   const sources = new NameMap();
-  for (const { name, parameters: params, interpolate, widget, source } of macros) {
+  for (const { name, parameters: params, interpolate, widget, source } of list3) {
     sources.set(name, source ?? "user");
     if (params) parameters.set(name, withHolds(params, holdsByDefault(interpolate)));
     else parameters.delete(name);
@@ -15936,6 +16062,15 @@ function parameterLookup(macros) {
   };
   if (widgets.size > 0) lookup.widget = (name) => widgets.get(name);
   lookup.source = (name) => sources.get(name);
+  const definitions = new NameMap(effectiveNamedDefinitions([...list3.filter((macro) => !macro.widget), ...list3.filter((macro) => macro.widget)]).map((macro) => [macro.name, macro]));
+  lookup.pairing = {
+    isBlock: (name) => definitions.get(name)?.block ?? isBuiltinBlockMacro(name),
+    isRaw: (name) => isRawMacro(name, widgets.has(name)),
+    branchParents: branchParentLookup([...definitions.values()].map((macro) => ({
+      ...macro,
+      subMacros: [...macro.subMacros ?? []]
+    })))
+  };
   return lookup;
 }
 function codeGoal(param) {
@@ -15947,6 +16082,7 @@ function stringHolds(param) {
   return param.holds ?? "markup";
 }
 function* codeAndText(src, tokens2, parametersOf2) {
+  const argumentRole = macroArgumentLookup(tokens2, parametersOf2);
   const closeOfTextBody = (t, name) => {
     for (let k2 = t + 1; k2 < tokens2.length; k2++) {
       const c = tokens2[k2];
@@ -15964,6 +16100,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
         offset: token.targetStart,
         length: token.targetEnd - token.targetStart,
         macro: "link",
+        ...usesBuiltinSemantics("link", parametersOf2) && { navigation: true },
         label: src.slice(token.start, token.end)
       };
       if (token.display.includes("{")) yield textPiece(token.display, token.displayStart, "In the label of a link: ");
@@ -15989,6 +16126,8 @@ function* codeAndText(src, tokens2, parametersOf2) {
     }
     else if (token.type === "macro" && !token.isClose) {
       const name = token.name.toLowerCase();
+      const role = argumentRole(token);
+      if (role === "branch") continue;
       const widget = parametersOf2.widget?.(name);
       if (executesRawBody(name, parametersOf2)) {
         const close = closeOfTextBody(t, name);
@@ -16022,7 +16161,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
       if (!args2) continue;
       const label2 = `{${token.name} ${args2}}`;
       const argsAt = token.argsStart;
-      if (CONDITION_MACROS.has(name) && usesBuiltinSemantics(name, parametersOf2)) {
+      if (role === "condition") {
         yield {
           kind: "code",
           code: args2,
@@ -16033,7 +16172,10 @@ function* codeAndText(src, tokens2, parametersOf2) {
         continue;
       }
       const params = parametersOf2(name);
-      if (params) yield* argPieces(args2, argsAt, params, token.name, label2);
+      if (params) {
+        const navigation = usesBuiltinSemantics(name, parametersOf2) ? name === "goto" || name === "link" ? ["passage"] : name === "watch" ? ["goto"] : [] : [];
+        yield* argPieces(args2, argsAt, params, token.name, label2, navigation);
+      }
       if (widget) yield* widgetPieces(args2, argsAt, widget, token.name, label2);
     }
   }
@@ -16041,32 +16183,46 @@ function* codeAndText(src, tokens2, parametersOf2) {
 function* passagePiecesOf(src, tokens2, parametersOf2, options = {}) {
   let position;
   const locate2 = (offset2) => (position ?? (position = sourcePositions(src)))(offset2);
-  yield* expand(src, src, tokens2, parametersOf2, options, (i2) => i2, void 0, locate2);
+  yield* expand(src, src, tokens2, parametersOf2, options, (i2) => i2, void 0, locate2, new MarkupExpansionBudget(src.length));
 }
-function* expand(root, src, tokens2, parametersOf2, options, toRoot, where2, locate2) {
+function* expand(root, src, tokens2, parametersOf2, options, toRoot, where2, locate2, budget) {
   for (const flat of codeAndText(src, tokens2, parametersOf2)) {
     const piece = where2 ? nestedPiece(flat, toRoot, where2) : flat;
     if (flat.kind !== "text" || !flat.text.includes("{")) {
       yield piece;
       continue;
     }
-    const toText = (i2) => toRoot(pieceOffset(flat, i2));
-    const inner = analyzeMarkup(flat.text, {
-      text: true,
-      hooks: {
-        ...options.isBlock && { isBlock: options.isBlock },
-        isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0)
-      }
-    });
-    yield {
-      ...piece,
-      tokens: inner.tokens.map((t) => mapOffsets(t, toText)),
-      errors: inner.errors.map((e) => {
-        const { line, column } = locate2(toText(e.offset));
-        return new MarkupError(e.reason, toText(e.offset), line, column, e.code, toText(e.end), e.data);
-      })
-    };
-    yield* expand(root, flat.text, inner.tokens, parametersOf2, options, toText, flat.where, locate2);
+    const toText = (i2) => pieceOffset(piece, i2);
+    if (!budget.enter(flat.text.length)) {
+      const at3 = toText(0);
+      const { line, column } = locate2(at3);
+      yield {
+        ...piece,
+        errors: [new MarkupError("Markup in labels and attributes exceeds the nesting or work limit", at3, line, column, "nesting-limit", toText(flat.text.length), { limit: String(MarkupExpansionBudget.maxDepth) })]
+      };
+      continue;
+    }
+    try {
+      const inner = analyzeMarkup(flat.text, {
+        text: true,
+        hooks: {
+          ...parametersOf2.pairing,
+          ...options.isBlock && { isBlock: options.isBlock },
+          isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0)
+        }
+      });
+      yield {
+        ...piece,
+        tokens: inner.tokens.map((t) => mapOffsets(t, toText)),
+        errors: inner.errors.map((e) => {
+          const { line, column } = locate2(toText(e.offset));
+          return new MarkupError(e.reason, toText(e.offset), line, column, e.code, toText(e.end), e.data);
+        })
+      };
+      yield* expand(root, flat.text, inner.tokens, parametersOf2, options, toText, flat.where, locate2, budget);
+    } finally {
+      budget.leave();
+    }
   }
 }
 function nestedPiece(piece, toRoot, where2) {
@@ -16130,7 +16286,7 @@ function escapeOffsets(raw, at3, value, escapes) {
   offsets.push(at3 + i2);
   return escaped ? offsets : void 0;
 }
-function* argPieces(args2, offset2, params, macro, label2) {
+function* argPieces(args2, offset2, params, macro, label2, navigation = []) {
   let values;
   const spans = /* @__PURE__ */ new Map();
   try {
@@ -16147,7 +16303,7 @@ function* argPieces(args2, offset2, params, macro, label2) {
     };
     return;
   }
-  yield* valuePieces(args2, offset2, params, values, spans, macro, label2, "quotes");
+  yield* valuePieces(args2, offset2, params, values, spans, macro, label2, "quotes", navigation);
 }
 function* widgetPieces(args2, offset2, params, macro, label2) {
   const written2 = splitArgSpans(args2);
@@ -16169,7 +16325,7 @@ function* widgetPieces(args2, offset2, params, macro, label2) {
   });
   yield* valuePieces(args2, offset2, declared, values, spans, macro, label2, "javascript");
 }
-function* valuePieces(args2, offset2, params, values, spans, macro, label2, escapes) {
+function* valuePieces(args2, offset2, params, values, spans, macro, label2, escapes, navigation = []) {
   const name = macro.toLowerCase();
   function* visit2(list3, from) {
     for (const param of list3) {
@@ -16188,7 +16344,8 @@ function* valuePieces(args2, offset2, params, values, spans, macro, label2, esca
         offset: offset2 + start,
         length: end - start,
         macro: name,
-        label: label2
+        label: label2,
+        ...navigation.includes(param.name) && { navigation: true }
       });
       const goal = codeGoal(param);
       if (param.type === "passage") {
@@ -16348,11 +16505,9 @@ function completionContext(source, cursor, macros = []) {
       const name = token.name.toLowerCase();
       const args2 = token.rawArgs;
       const widget = parametersOf2.widget?.(name);
-      if (usesBuiltinSemantics(name, parametersOf2) && [
-        "if",
-        "elseif",
-        "case"
-      ].includes(name)) return codeAt(args2, token.argsStart);
+      const role = macroArgumentLookup(tokens2, parametersOf2)(token);
+      if (role === "branch") return LITERAL;
+      if (role === "condition") return codeAt(args2, token.argsStart);
       const stringContext = (raw2, at4, holds, escapes = "quotes") => {
         const quoted = readQuoted(raw2, 0, true);
         if (!quoted) {
@@ -16400,25 +16555,28 @@ function completionContext(source, cursor, macros = []) {
   };
   return read(source.slice(0, cursor), (i2) => i2);
 }
-function textContainsChildren(text3, parametersOf2, hooks) {
+function textContainsChildren(text3, parametersOf2, hooks, budget = new MarkupExpansionBudget(text3.length)) {
   if (!text3.includes("{")) return false;
-  let nodes;
+  if (!budget.enter(text3.length)) return false;
   try {
-    nodes = parseMarkup(text3, {
+    return astContainsChildren(parseMarkup(text3, {
       text: true,
       hooks
-    });
+    }), parametersOf2, hooks, budget);
   } catch {
     return false;
+  } finally {
+    budget.leave();
   }
-  return astContainsChildren(nodes, parametersOf2, hooks);
 }
-function tokenTextContainsChildren(token, parametersOf2 = registeredParameters, src = "", hooks) {
-  for (const piece of codeAndText(src, [token], parametersOf2)) if (piece.kind === "text" && textContainsChildren(piece.text, parametersOf2, hooks)) return true;
+function tokenTextContainsChildren(token, parametersOf2 = registeredParameters, src = "", hooks, budget) {
+  for (const piece of codeAndText(src, [token], parametersOf2)) if (piece.kind === "text" && textContainsChildren(piece.text, parametersOf2, hooks, budget)) return true;
   return false;
 }
-function astContainsChildren(nodes, parametersOf2 = registeredParameters, hooks) {
-  for (const node2 of nodes) {
+function astContainsChildren(nodes, parametersOf2 = registeredParameters, hooks, budget) {
+  const pending = [...nodes];
+  while (pending.length) {
+    const node2 = pending.pop();
     if (node2.type === "variable" && node2.scope === "local" && node2.name === "children") return true;
     if (node2.type !== "html" && node2.type !== "macro") continue;
     if (node2.type === "macro" && node2.name.toLowerCase() === "widget") continue;
@@ -16441,10 +16599,9 @@ function astContainsChildren(nodes, parametersOf2 = registeredParameters, hooks)
       nameEnd: 0,
       argsStart: 0,
       argsEnd: 0
-    }, parametersOf2, "", hooks) || astContainsChildren(node2.children, parametersOf2, hooks)) return true;
-    if (node2.type === "macro" && node2.branches) {
-      for (const branch of node2.branches) if (astContainsChildren(branch.children, parametersOf2, hooks)) return true;
-    }
+    }, parametersOf2, "", hooks, budget)) return true;
+    for (const child of node2.children) pending.push(child);
+    if (node2.type === "macro" && node2.branches) for (const branch of node2.branches) for (const child of branch.children) pending.push(child);
   }
   return false;
 }
@@ -16487,6 +16644,7 @@ function widgetDefinitions$1(passages, parametersOf2 = registeredParameters) {
     const hooks = { isRaw: (name) => isRawMacro(name, replacesDo || parametersOf2.widget?.(name) !== void 0) };
     for (const passage of list3) {
       if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
+      const budget = new MarkupExpansionBudget(passage.content.length);
       const open2 = [];
       const done = [];
       for (const token of tokenizeMarkupTolerant$1(passage.content, { hooks }).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
@@ -16501,7 +16659,7 @@ function widgetDefinitions$1(passages, parametersOf2 = registeredParameters) {
             closeStart: token.start
           });
         }
-      } else if (open2.length > 0 && (token.type === "variable" && token.scope === "local" && token.name === "children" || tokenTextContainsChildren(token, parametersOf2, passage.content, hooks))) open2[open2.length - 1].isBlock = true;
+      } else if (open2.length > 0 && (token.type === "variable" && token.scope === "local" && token.name === "children" || tokenTextContainsChildren(token, parametersOf2, passage.content, hooks, budget))) open2[open2.length - 1].isBlock = true;
       done.push(...open2);
       const defs = [];
       for (const { token, isBlock, closeStart } of done) try {
@@ -16531,6 +16689,9 @@ function effectiveWidgetDefinitions(definitions) {
   for (const def of [...definitions.filter((def2) => !inInit(def2)), ...definitions.filter(inInit)]) if (def.closeStart !== void 0) effective.set(def.name, def);
   return [...effective.values()];
 }
+function isSpecialPassage(name) {
+  return SPECIAL_PASSAGES.has(name);
+}
 function distance(a, b) {
   let prev = Array.from({ length: b.length + 1 }, (_2, j2) => j2);
   for (let i2 = 1; i2 <= a.length; i2++) {
@@ -16664,6 +16825,13 @@ function validateMarkup(passages, options) {
           report2(passage, at3, at3 + piece.length, "argument-error", `${where2}${piece.message} in ${piece.label}`, { macro: piece.macro });
           break;
         case "passage":
+          if (piece.navigation && isSpecialPassage(piece.name)) {
+            report2(passage, at3, at3 + piece.length, "special-passage", `${where2}Cannot navigate to special passage ${JSON.stringify(piece.name)} in ${piece.label}.`, {
+              name: piece.name,
+              macro: piece.macro
+            });
+            break;
+          }
           if (options.checkPassageNames !== false && !passageNames.has(piece.name)) {
             const best = closestName(piece.name, passageNames);
             report2(passage, at3, at3 + piece.length, "unknown-passage", `${where2}No passage named ${JSON.stringify(piece.name)} in ${piece.label}.${didYouMean(best, JSON.stringify)}`, {
@@ -16868,28 +17036,14 @@ function checkReference(ref2, declared) {
   }
   return null;
 }
-function referenceAt(code, sigil, name, start, end, at3) {
-  FIELD_PATH_RE.lastIndex = end;
-  const fields = FIELD_PATH_RE.exec(code)[0];
+function referenceAt(code, { sigil, name, start, end }, at3) {
+  const fields = readMemberPath(code, end);
   return {
     sigil,
     name,
-    path: fields ? fields.slice(1).split(".") : [],
+    path: fields.path,
     start: at3(start),
-    end: at3(end + fields.length)
-  };
-}
-function termReferenceAt(term, index, at3) {
-  VAR_PATH_RE.lastIndex = index;
-  const match2 = VAR_PATH_RE.exec(term);
-  if (!match2) return void 0;
-  const [name, ...path2] = match2[2].split(".");
-  return {
-    sigil: match2[1],
-    name,
-    path: path2,
-    start: at3(index),
-    end: at3(index + match2[0].length)
+    end: at3(fields.end)
   };
 }
 function scanSigilReferences(value, at3, emit) {
@@ -16897,7 +17051,15 @@ function scanSigilReferences(value, at3, emit) {
 }
 function scanInterpolations(text3, at3, emit, options) {
   if (!text3.includes("{")) return;
-  collectTokenRefs(text3, tokensOf(text3, true, options), at3, emit, options);
+  const budget = options.expansionBudget;
+  if (!budget.enter(text3.length)) return;
+  try {
+    const offset2 = at3(0);
+    const sourceOffsets = at3(text3.length) - offset2 === text3.length ? void 0 : Array.from({ length: text3.length + 1 }, (_2, i2) => at3(i2));
+    collectTokenRefs(text3, tokensOf(text3, true, options), (i2) => sourceOffsets?.[i2] ?? offset2 + i2, emit, options);
+  } finally {
+    budget.leave();
+  }
 }
 function scanCode(code, at3, emit, goal = "expression") {
   const parsed = parseOrError(code, goal);
@@ -16907,14 +17069,19 @@ function scanCode(code, at3, emit, goal = "expression") {
   }
   for (const ref2 of parsed.refs) {
     if (ref2.sigil !== "$" && ref2.sigil !== "%") continue;
-    emit(referenceAt(code, ref2.sigil, ref2.name, ref2.start, ref2.end, at3));
+    emit(referenceAt(code, ref2, at3));
   }
 }
 function scanCodeLeniently(code, at3, emit, goal) {
   lexJs(code, {
     variable(sigil, name, index, _nesting, end) {
       if (sigil !== "$" && sigil !== "%") return;
-      emit(referenceAt(code, sigil, name, index, end, at3));
+      emit(referenceAt(code, {
+        sigil,
+        name,
+        start: index,
+        end
+      }, at3));
     },
     literal() {
     }
@@ -16935,7 +17102,7 @@ function scanArgs(token, parametersOf2, at3, emit, options) {
   const params = parametersOf2(token.name);
   let byParameters = false;
   if (params) {
-    if (options.all && !options.storeVarMacros.has(token.name.toLowerCase())) scanVariableParameters(token, params, at3, emit);
+    if (!options.storeVarMacros.has(token.name.toLowerCase())) scanVariableParameters(token, params, at3, emit, options.all);
     const pieces = [...argPieces(token.rawArgs, token.argsStart, params, token.name, "")];
     byParameters = !pieces.some((piece) => piece.kind === "argument-error");
     if (byParameters) scanPieces(pieces, at3, emit, options);
@@ -16944,7 +17111,7 @@ function scanArgs(token, parametersOf2, at3, emit, options) {
   const widget = parametersOf2.widget?.(token.name);
   if (widget) scanPieces(widgetPieces(token.rawArgs, token.argsStart, widget, token.name, ""), at3, emit, options);
 }
-function scanVariableParameters(token, params, at3, emit) {
+function scanVariableParameters(token, params, at3, emit, all) {
   const spans = /* @__PURE__ */ new Map();
   try {
     parseMacroArgs(token.rawArgs, params, spans);
@@ -16955,8 +17122,10 @@ function scanVariableParameters(token, params, at3, emit) {
   for (const param of params) {
     const span = spans.get(param);
     if (param.type !== "variable" || !span) continue;
-    const ref2 = termReferenceAt(token.rawArgs.slice(span[0], span[1]), 0, (i2) => at3(token.argsStart + span[0] + i2));
-    if (ref2) emit(ref2);
+    const start = token.argsStart + span[0];
+    scanCode(token.rawArgs.slice(span[0], span[1]), (i2) => at3(start + i2), (ref2) => {
+      if (all || ref2.start !== at3(start)) emit(ref2);
+    });
   }
 }
 function scanSelectors(content2, token, at3, emit, options) {
@@ -16992,6 +17161,7 @@ function boundReference(token, at3, all) {
 }
 function collectTokenRefs(content2, tokens2, at3, emit, options) {
   const { storeVarMacros, parametersOf: parametersOf2 } = options;
+  const argumentRole = macroArgumentLookup(tokens2, parametersOf2);
   for (let t = 0; t < tokens2.length; t++) {
     const token = tokens2[t];
     if (options.all && token.type !== "macro" && token.type !== "html" && token.type !== "text") scanSelectors(content2, token, at3, emit, options);
@@ -17017,13 +17187,15 @@ function collectTokenRefs(content2, tokens2, at3, emit, options) {
       else scanInterpolations(value, valueIn, emit, options);
     }
     else if (token.type === "macro" && !token.isClose) {
-      const binding = storeVarMacros.has(token.name.toLowerCase()) && !parametersOf2.widget?.(token.name) ? boundReference(token, at3, options.all) : void 0;
-      scanArgs(token, parametersOf2, at3, (ref2) => {
+      const role = argumentRole(token);
+      const binding = role === "invocation" && storeVarMacros.has(token.name.toLowerCase()) && !parametersOf2.widget?.(token.name) ? boundReference(token, at3, options.all) : void 0;
+      if (role === "condition") scanCode(token.rawArgs, (i2) => at3(token.argsStart + i2), emit);
+      else if (role === "invocation") scanArgs(token, parametersOf2, at3, (ref2) => {
         if (!binding || ref2.start < binding.start || ref2.start >= binding.end) emit(ref2);
       }, options);
       scanSelectors(content2, token, at3, emit, options);
       if (binding) emit(binding);
-      if (executesRawBody(token.name, parametersOf2)) {
+      if (role === "invocation" && executesRawBody(token.name, parametersOf2)) {
         let close = t + 1;
         while (close < tokens2.length) {
           const c = tokens2[close];
@@ -17040,7 +17212,10 @@ function collectTokenRefs(content2, tokens2, at3, emit, options) {
 }
 function collectVariableReferences(content2, options) {
   const found = [];
-  withParseCache(() => collectTokenRefs(content2, tokensOf(content2, false, options), (i2) => i2, (ref2) => found.push(ref2), options));
+  withParseCache(() => collectTokenRefs(content2, tokensOf(content2, false, options), (i2) => i2, (ref2) => found.push(ref2), {
+    ...options,
+    expansionBudget: new MarkupExpansionBudget(content2.length)
+  }));
   return found.sort((a, b) => a.start - b.start);
 }
 function checkVariableReferences(passages, declared, options) {
@@ -21377,7 +21552,7 @@ async function formatLf(text3, options) {
     }
     if (region.type === "html") {
       const htmlText2 = region.lines.join("\n");
-      if (WHITESPACE_AS_WRITTEN.test(htmlText2) || region.lines.some((line) => literalLines.has(line.trim()))) {
+      if (WHITESPACE_AS_WRITTEN.test(htmlText2) || region.lines.some((line) => literalLines.has(line.trim())) || hasMarkdownBoundaries(htmlText2, isBlock)) {
         for (let i2 = 0; i2 < region.lines.length; i2++) preservedLines.add(lines.length + i2);
         lines.push(...region.lines);
         continue;
@@ -21408,6 +21583,16 @@ async function formatLf(text3, options) {
   output2 = output2.replace(/\n*$/, "\n");
   return replaceAll(output2.split("\n").map((line) => literalLines.get(line.trim()) ?? line).join("\n"), sentinel, "\n");
 }
+function hasMarkdownBoundaries(source, isBlock) {
+  const { tokens: tokens2 } = analyzeMarkup(source, { hooks: { isBlock } });
+  let possibleBoundary = false;
+  for (const token of tokens2) {
+    if (token.type !== "text") continue;
+    if (/\n[ \t]*\n/.test(token.value)) return true;
+    if (/[\\#*+\d=>[`~|-]|[ \t]\n/.test(token.value)) possibleBoundary = true;
+  }
+  return possibleBoundary && markdownLines(source, isBlock, HTML_MARKDOWN_BOUNDARIES).size > 0;
+}
 function whitespaceSensitiveLines(source, isBlock) {
   const lines = /* @__PURE__ */ new Set();
   if (!WHITESPACE_AS_WRITTEN.test(source)) return lines;
@@ -21623,16 +21808,20 @@ function wordWrap(text3, maxLen, indent) {
   }
   return lines;
 }
+function effectiveToolingMacros(macros) {
+  const list3 = [...macros];
+  return effectiveNamedDefinitions([...list3.filter((m) => !m.widget), ...list3.filter((m) => m.widget)]);
+}
 function tokenizationOptions(options) {
   if (!options.macros) return options;
-  const macros = [...options.macros];
+  const macros = effectiveToolingMacros(options.macros);
   const parametersOf2 = parameterLookup(macros);
   return {
     ...options,
     hooks: {
       isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0),
       isBlock: blockLookup(macros),
-      branchParents: (name) => branchParents(name, macros),
+      branchParents: branchParentLookup(macros),
       ...options.hooks
     }
   };
@@ -21642,23 +21831,27 @@ function tokenizeMarkupTolerant(source, options = {}) {
 }
 function validateStoryMarkup(passages, macros, options = {}) {
   const list3 = [...passages];
-  const all = [...macros];
+  const all = effectiveToolingMacros(macros);
   const known = /* @__PURE__ */ new Set();
   const widgets = effectiveWidgetDefinitions(widgetDefinitions$1(list3, parameterLookup(all)));
-  const blocks = new Set(widgets.filter((def) => def.block).map((def) => def.name.toLowerCase()));
+  const effective = effectiveToolingMacros([...all, ...widgets.map((widget) => ({
+    name: widget.name,
+    block: widget.block,
+    subMacros: [],
+    widget
+  }))]);
   const parametersOf2 = parameterLookup([...all, ...definedWidgetMacros(widgets)]);
   for (const macro of all) {
     const name = macro.name.toLowerCase();
     known.add(name);
     for (const sub of macro.subMacros) known.add(sub.toLowerCase());
-    if (macro.block) blocks.add(name);
   }
   return validateMarkup(list3, {
-    branchParents: (name) => branchParents(name, all),
+    branchParents: branchParentLookup(effective),
     isKnownMacro: (name) => known.has(name),
     macroNames: known,
     parametersOf: parametersOf2,
-    isBlockMacro: (name) => blocks.has(name.toLowerCase()) || isBlockMacro(name),
+    isBlockMacro: blockLookup(effective),
     checkPassageNames: options.checkPassageNames,
     tolerant: options.tolerant
   });
@@ -21669,17 +21862,18 @@ function definedWidgetMacros(widgets) {
     widget
   }));
 }
-function blockLookup(macros) {
-  const blocks = new Set(macros.filter((m) => m.block).map((m) => m.name.toLowerCase()));
-  return (name) => blocks.has(name.toLowerCase()) || isBlockMacro(name);
+function blockLookup(macros, includeRuntime = true) {
+  const definitions = new NameMap();
+  for (const macro of effectiveToolingMacros(macros)) definitions.set(macro.name, macro.block);
+  return (name) => includeRuntime && isRegisteredBlockMacro(name) || (definitions.get(name) ?? (includeRuntime ? isBlockMacro(name) : isBuiltinBlockMacro(name)));
 }
 function passagePieces(source, macros = []) {
-  const all = [...macros];
+  const all = effectiveToolingMacros(macros);
   const parametersOf2 = parameterLookup(all);
   return passagePiecesOfTokens(source, all, tokenizeMarkupTolerant(source, { hooks: { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) } }).tokens);
 }
 function passagePiecesOfTokens(source, macros, tokens2) {
-  const all = [...macros];
+  const all = effectiveToolingMacros(macros);
   return [...passagePiecesOf(source, tokens2, parameterLookup(all), { isBlock: blockLookup(all) })];
 }
 function widgetDefinitions(passages, macros = []) {
@@ -21704,7 +21898,7 @@ function validateVariableReferences(passages, declarations, macros = []) {
   const list3 = [...passages];
   return checkVariableReferences(list3.filter((p) => !p.tags?.some((t) => NOT_MARKUP_TAGS.includes(t))), declarations, referenceOptions(macros, false, list3));
 }
-var __defProp2, __exportAll, NameMap, NameSet, SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, BLOCK_MACROS, BLOCK_WIDGETS, WIDGETS, DEFINED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, last$1, BRANCH_PARENT, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty$1, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list$2, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, LITERAL, registeredParameters, WIDGET_PARAMETERS, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VAR_PATH_RE, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, FIELD_PATH_RE, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, VOID_ELEMENTS, characterEntities, own, hasOwnProperty, asciiAlpha, asciiAlphanumeric, asciiAtext, asciiDigit, asciiHexDigit, asciiPunctuation, unicodePunctuation, unicodeWhitespace, content$1, EditMap$1, document$1, containerConstruct, attention, autolink, blankLine, blockQuote, characterEscape, characterReference, nonLazyContinuation, codeFenced, codeIndented, furtherStart, codeText, SpliceBuffer, content, continuationConstruct, definition, titleBefore, hardBreakEscape, headingAtx, htmlBlockNames, htmlRawNames, htmlFlow, blankLineBefore, nonLazyContinuationStart, htmlText, labelEnd, resourceConstruct, referenceFullConstruct, referenceCollapsedConstruct, labelStartImage, labelStartLink, lineEnding, thematicBreak, list, listItemPrefixWhitespaceConstruct, indentConstruct, setextUnderline, flow$1, resolver, string$1, text$1, constructs_exports, document, contentInitial, flowInitial, flow, string, text, insideSpan, attentionMarkers, disable, search, alignment, EditMap, DEFAULT_PRETTIER_OPTIONS, SVG_PLACEHOLDERS, SPINDLE_PLACEHOLDERS, PLACEHOLDER_PATTERN, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NO_WRAP, NOT_MARKUP_TAGS;
+var __defProp2, __exportAll, NameMap, NameSet, SIGIL_SCOPES, SIGIL_CHARS, grammar_shared_default, LB, RB, SIGIL_SCOPES$1, withSelectors, VOID_TAGS, BRANCH_PARENT$1, LINK_SEPARATORS, NO_SELECTORS, EMAIL_AUTOLINK, peg$SyntaxError, OPTION_CLAUSE, PARAMETER_TYPES, STRING_HOLDS, metadataRegistry, companionParents, BLOCK_MACROS, BLOCK_WIDGETS, WIDGETS, DEFINED_BLOCK_MACROS, DEFINED_MACROS, REGISTERED_BLOCK_MACROS, RAW_BODY_MACROS, BRANCHING, quoteArg, MAX_MARKUP_DEPTH, last$1, BRANCH_PARENT, lowerName, nameOf, closerOf, closes, astralIdentifierCodes, astralIdentifierStartCodes, nonASCIIidentifierChars, nonASCIIidentifierStartChars, reservedWords, ecma5AndLessKeywords, keywords$1, keywordRelationalOperator, nonASCIIidentifierStart, nonASCIIidentifier, TokenType, beforeExpr, startsExpr, keywords, types$1, lineBreak, lineBreakG, nonASCIIwhitespace, skipWhiteSpace, ref, hasOwnProperty$1, toString, hasOwn$1, isArray, regexpCache, loneSurrogate, Position, SourceLocation, defaultOptions, warnedAboutEcmaVersion, SCOPE_TOP, SCOPE_FUNCTION, SCOPE_ASYNC, SCOPE_GENERATOR, SCOPE_ARROW, SCOPE_SIMPLE_CATCH, SCOPE_SUPER, SCOPE_DIRECT_SUPER, SCOPE_CLASS_STATIC_BLOCK, SCOPE_CLASS_FIELD_INIT, SCOPE_SWITCH, SCOPE_VAR, BIND_NONE, BIND_VAR, BIND_LEXICAL, BIND_FUNCTION, BIND_SIMPLE_CATCH, BIND_OUTSIDE, Parser, prototypeAccessors, pp$9, literal, DestructuringErrors, pp$8, loopLabel, switchLabel, empty$1, FUNC_STATEMENT, FUNC_HANGING_STATEMENT, FUNC_NULLABLE_ID, pp$7, TokContext, types, pp$6, pp$5, empty, pp$4, pp$3, Scope, Node, pp$2, scriptValuesAddedInUnicode, ecma9BinaryProperties, ecma10BinaryProperties, ecma11BinaryProperties, ecma12BinaryProperties, ecma13BinaryProperties, unicodeBinaryProperties, unicodeBinaryPropertiesOfStrings, unicodeGeneralCategoryValues, ecma9ScriptValues, ecma10ScriptValues, ecma11ScriptValues, ecma12ScriptValues, ecma13ScriptValues, unicodeScriptValues, data, ecmaVersion, i, list$2, pp$1, BranchID, RegExpValidationState, CharSetNone, CharSetOk, CharSetString, Token, pp, INVALID_TEMPLATE_ESCAPE_ERROR, OPTIONS, AT_NAME_RE, TRANS_NAME_RE, SIGIL_IDENT_RE, LINE_BREAK_RE, NOT_A_BODY_RE, OPERAND_ENDS, SigilParser, OPENERS, CLOSERS$1, CodeSyntaxError, last, CLOSER, isNode, NAMESPACE_NAME, WORD_RE$2, FLAGS_RE, WORDS_BEFORE_STRING, NON_STRING_QUOTE_PREFIX, memoInput, memo, defaultCodeEnd, defaultHooks, MarkupError, OFFSET_FIELD, listeners, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, _MarkupExpansionBudget, MarkupExpansionBudget, parses, CONDITION_MACROS, PASSAGE_BODIES, holdsByDefault, JS_ESCAPE_RE, textPiece, LITERAL, registeredParameters, WIDGET_PARAMETERS, SPECIAL_PASSAGES, NOT_MARKUP, NOT_MARKUP_TAGS$1, BRANCH_MACROS, didYouMean, PASSAGE_ARGUMENT_HINT, BARE_WORD_RE, NUMBER_RE, IDENT_RE, KEY_RE, ARROW_RE, LINE_END_RE, ARRAY_INDEX_RE, UNSUPPORTED_UNDEFINED, Reader, VALID_VAR_TYPES, PRIMITIVE_SAMPLES, UNSUPPORTED_TYPE, NO_STORE_VAR_MACROS, CLOSERS, BLOCK_WORDS, NOT_PARAMETERS, DECLARATIONS, WRITE_RE, MUTATORS, MUTATING_CALL_RE, BEFORE_BINDING, isWordChar, Bindings, CALL_RE, IDENTIFIER_ARGUMENT_RE, WORD_RE, MODIFIER_RE, KEY_START_RE, CONFIG_KEYS, ConfigReader, stringOf, booleanOf, textOf, stringsOf, VOID_ELEMENTS, characterEntities, own, hasOwnProperty, asciiAlpha, asciiAlphanumeric, asciiAtext, asciiDigit, asciiHexDigit, asciiPunctuation, unicodePunctuation, unicodeWhitespace, content$1, EditMap$1, document$1, containerConstruct, attention, autolink, blankLine, blockQuote, characterEscape, characterReference, nonLazyContinuation, codeFenced, codeIndented, furtherStart, codeText, SpliceBuffer, content, continuationConstruct, definition, titleBefore, hardBreakEscape, headingAtx, htmlBlockNames, htmlRawNames, htmlFlow, blankLineBefore, nonLazyContinuationStart, htmlText, labelEnd, resourceConstruct, referenceFullConstruct, referenceCollapsedConstruct, labelStartImage, labelStartLink, lineEnding, thematicBreak, list, listItemPrefixWhitespaceConstruct, indentConstruct, setextUnderline, flow$1, resolver, string$1, text$1, constructs_exports, document, contentInitial, flowInitial, flow, string, text, insideSpan, attentionMarkers, disable, search, alignment, EditMap, DEFAULT_PRETTIER_OPTIONS, SVG_PLACEHOLDERS, SPINDLE_PLACEHOLDERS, PLACEHOLDER_PATTERN, DEFAULT_DEDENTING, WHITESPACE_AS_WRITTEN, HTML_MARKDOWN_BOUNDARIES, LIST_ITEM_REGEX, CODE_FENCE_REGEX, NO_WRAP, NOT_MARKUP_TAGS;
 var init_story_variables = __esm({
   "node_modules/@rohal12/spindle/dist/pkg/story-variables.js"() {
     __defProp2 = Object.defineProperty;
@@ -21883,32 +22077,7 @@ var init_story_variables = __esm({
         return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
       }
     };
-    BLOCK_MACROS = new NameSet([
-      "if",
-      "for",
-      "do",
-      "button",
-      "link",
-      "listbox",
-      "cycle",
-      "switch",
-      "timed",
-      "repeat",
-      "type",
-      "widget",
-      "span",
-      "nobr"
-    ]);
-    BLOCK_WIDGETS = new NameSet();
-    WIDGETS = new NameSet();
-    DEFINED_BLOCK_MACROS = new NameSet();
-    RAW_BODY_MACROS = /* @__PURE__ */ new Set(["do"]);
-    BRANCHING = /* @__PURE__ */ new Set([
-      "if",
-      "switch",
-      "timed"
-    ]);
-    quoteArg = (value) => `"${value.replace(/[\\"]/g, "\\$&")}"`;
+    OPTION_CLAUSE = "option";
     new NameMap();
     new NameMap();
     new NameSet();
@@ -21936,6 +22105,35 @@ var init_story_variables = __esm({
     metadataRegistry = new NameMap();
     companionParents = new NameMap();
     getMacroParameters.source = (name) => metadataRegistry.get(name)?.source;
+    BLOCK_MACROS = new NameSet([
+      "if",
+      "for",
+      "do",
+      "button",
+      "link",
+      "listbox",
+      "cycle",
+      "switch",
+      "timed",
+      "repeat",
+      "type",
+      "widget",
+      "span",
+      "nobr"
+    ]);
+    BLOCK_WIDGETS = new NameSet();
+    WIDGETS = new NameSet();
+    DEFINED_BLOCK_MACROS = new NameSet();
+    DEFINED_MACROS = new NameSet();
+    REGISTERED_BLOCK_MACROS = new NameSet();
+    RAW_BODY_MACROS = /* @__PURE__ */ new Set(["do"]);
+    BRANCHING = /* @__PURE__ */ new Set([
+      "if",
+      "switch",
+      "timed"
+    ]);
+    quoteArg = (value) => `"${value.replace(/[\\"]/g, "\\$&")}"`;
+    MAX_MARKUP_DEPTH = 256;
     last$1 = (items) => items[items.length - 1];
     BRANCH_PARENT = {
       elseif: "if",
@@ -27168,12 +27366,29 @@ var init_story_variables = __esm({
     WORD_OR_PUNCT_RE = /\S+/y;
     LEADING_OPERATOR_RE = /^(?:[-+*/&|^=<>?:,]|\.(?!\d)|%(?![A-Za-z_]))/;
     takesRest = (param) => param.type === "expression" || param.type === "statements" || param.type === "passage" || param.type === "text";
-    SUB_MACRO_PARAMETERS = /* @__PURE__ */ new Map([["option", [{
+    SUB_MACRO_PARAMETERS = /* @__PURE__ */ new Map([[OPTION_CLAUSE, [{
       name: "value",
       type: "string",
       holds: "text",
       required: true
     }]]]);
+    MarkupExpansionBudget = class MarkupExpansionBudget2 {
+      constructor(sourceLength) {
+        this.depth = 0;
+        this.remaining = Math.max(65536, sourceLength * 8);
+      }
+      enter(length) {
+        if (this.depth >= MarkupExpansionBudget2.maxDepth || length > this.remaining) return false;
+        this.remaining -= length;
+        this.depth++;
+        return true;
+      }
+      leave() {
+        this.depth--;
+      }
+    };
+    _MarkupExpansionBudget = MarkupExpansionBudget;
+    _MarkupExpansionBudget.maxDepth = 64;
     parses = null;
     CONDITION_MACROS = /* @__PURE__ */ new Set([
       "if",
@@ -27204,6 +27419,19 @@ var init_story_variables = __esm({
       type: "text",
       holds: "text"
     }];
+    SPECIAL_PASSAGES = /* @__PURE__ */ new Set([
+      "StoryInit",
+      "StoryInterface",
+      "StoryVariables",
+      "StoryTransients",
+      "StoryLoading",
+      "SaveTitle",
+      "PassageReady",
+      "PassageHeader",
+      "PassageFooter",
+      "PassageDone",
+      "StoryContext"
+    ]);
     NOT_MARKUP = /* @__PURE__ */ new Set([
       "StoryVariables",
       "StoryTransients",
@@ -27585,7 +27813,6 @@ var init_story_variables = __esm({
         return this.skipNested("`");
       }
     };
-    VAR_PATH_RE = /([$%])(\w+(?:\.\w+)*)/y;
     VALID_VAR_TYPES = /* @__PURE__ */ new Set([
       "number",
       "string",
@@ -27598,7 +27825,6 @@ var init_story_variables = __esm({
     };
     UNSUPPORTED_TYPE = "Expected number, string, boolean, array, or object.";
     NO_STORE_VAR_MACROS = /* @__PURE__ */ new Set();
-    FIELD_PATH_RE = /(?:\.\w+)*/y;
     CLOSERS = {
       "}": "{",
       ")": "(",
@@ -30998,6 +31224,19 @@ var init_story_variables = __esm({
       "default"
     ]);
     WHITESPACE_AS_WRITTEN = /<(?:pre|textarea|svg)[\s>]|white-space\s*:/i;
+    HTML_MARKDOWN_BOUNDARIES = /* @__PURE__ */ new Set([
+      "hardBreakTrailing",
+      "hardBreakEscape",
+      "atxHeading",
+      "setextHeading",
+      "listOrdered",
+      "listUnordered",
+      "blockQuote",
+      "thematicBreak",
+      "definition",
+      "table",
+      "codeFenced"
+    ]);
     LIST_ITEM_REGEX = /^(?:[-+*]|\d{1,9}[.)])(?:[ \t]|$)/;
     CODE_FENCE_REGEX = /^(?:`{3,}|~{3,})/;
     NO_WRAP = /* @__PURE__ */ new Set([
@@ -31103,7 +31342,10 @@ var init_macro_registry = __esm({
       {
         "name": "if",
         "block": true,
-        "subMacros": [],
+        "subMacros": [
+          "elseif",
+          "else"
+        ],
         "interpolate": true,
         "merged": true,
         "source": "builtin"
@@ -31528,7 +31770,9 @@ var init_macro_registry = __esm({
       {
         "name": "cycle",
         "block": true,
-        "subMacros": [],
+        "subMacros": [
+          "option"
+        ],
         "storeVar": true,
         "interpolate": true,
         "parameters": [
@@ -31798,7 +32042,7 @@ function parsePassageHeader(rawLine, lineNumber) {
   };
 }
 function isReservedPassageName(name) {
-  return RESERVED_PASSAGE_NAMES.has(name);
+  return isSpecialPassage(name) || TWEE_PASSAGE_NAMES.has(name);
 }
 function isScriptOrStylesheetPassage(passage) {
   return passage.tags?.some((t) => CODE_PASSAGE_TAGS.has(t)) ?? false;
@@ -31809,38 +32053,24 @@ function isRuntimePassage(passage) {
 function isMarkupPassage(passage) {
   return isRuntimePassage(passage) && !(passage.name !== void 0 && NON_MARKUP_PASSAGES.has(passage.name));
 }
-var SPECIAL_PASSAGES, CODE_PASSAGE_TAGS, RESERVED_PASSAGE_NAMES, NON_MARKUP_PASSAGES;
+var CODE_PASSAGE_TAGS, TWEE_PASSAGE_NAMES, NON_MARKUP_PASSAGES;
 var init_passage_parser = __esm({
   "src/core/parsing/passage-parser.ts"() {
     "use strict";
+    init_tooling();
     init_text();
-    SPECIAL_PASSAGES = /* @__PURE__ */ new Set([
-      "StoryVariables",
-      "StoryInit",
+    CODE_PASSAGE_TAGS = /* @__PURE__ */ new Set(["script", "stylesheet"]);
+    TWEE_PASSAGE_NAMES = /* @__PURE__ */ new Set([
       "StoryData",
       "StoryTitle",
+      "StoryScript",
       "StoryBanner",
       "StoryCaption",
-      "StoryContext",
       "StoryMenu",
-      "StoryInterface",
-      "StoryAuthor"
-    ]);
-    CODE_PASSAGE_TAGS = /* @__PURE__ */ new Set(["script", "stylesheet"]);
-    RESERVED_PASSAGE_NAMES = /* @__PURE__ */ new Set([
-      ...SPECIAL_PASSAGES,
+      "StoryAuthor",
       // twee-ts also reads these legacy compiler metadata passages by name.
       "StorySettings",
-      "StoryIncludes",
-      "StoryTitle",
-      "StoryLoading",
-      "StoryTransients",
-      "StoryScript",
-      "SaveTitle",
-      "PassageReady",
-      "PassageDone",
-      "PassageHeader",
-      "PassageFooter"
+      "StoryIncludes"
     ]);
     NON_MARKUP_PASSAGES = /* @__PURE__ */ new Set([
       "StoryTitle",
@@ -34301,6 +34531,8 @@ var init_workspace_model = __esm({
        * A same-name block macro retains its syntax when a widget owns the call.
        */
       isContainer(name) {
+        const widget = this.widgets.getEffectiveWidget(name);
+        if (widget) return widget.block;
         return this.macros.isBlock(name) || (this.widgets.getWidget(name)?.block ?? false);
       }
       /** Runtime macro metadata, after effective widgets have claimed their names. */
@@ -34496,7 +34728,7 @@ var init_workspace_model = __esm({
       /** All runtime metadata, with effective widgets taking precedence over macros. */
       toolingMacros() {
         const macros = this.macros.toolingMacros().filter((macro) => !this.widgets.getEffectiveWidget(macro.name));
-        return [...macros, ...this.widgets.getAllWidgets().map((widget) => ({ name: widget.name, block: widget.block || this.macros.isBlock(widget.name), subMacros: [], widget: widget.tooling }))];
+        return [...macros, ...this.widgets.getAllWidgets().map((widget) => ({ name: widget.name, block: widget.block, subMacros: [], widget: widget.tooling }))];
       }
       /** Coalesce analysis and diagnostics across a burst of document changes. */
       scheduleModelReady() {
@@ -34552,6 +34784,8 @@ var init_diagnostic_codes = __esm({
       UnquotedPassageName: "SP113",
       ChildMaxExceeded: "SP114",
       ChildMinNotMet: "SP115",
+      /** `nesting-limit`: markup nested deeper than Spindle builds and renders. */
+      NestingLimitExceeded: "SP116",
       /** `undeclared-variable`. */
       UndeclaredVariable: "SP200",
       /** `primitive-field`: a field of a number, string or boolean. */
@@ -34571,6 +34805,8 @@ var init_diagnostic_codes = __esm({
       UnusedWidget: "SP303",
       LinkRuntimeMismatch: "SP304",
       LiteralLinkInterpolation: "SP305",
+      /** `special-passage`: a link or macro that navigates to a special passage (`StoryInit`), which throws. */
+      SpecialPassageNavigation: "SP306",
       DeadEndPassage: "SP400",
       UnreachablePassage: "SP401",
       LineTooLong: "SP500"
@@ -34593,6 +34829,7 @@ var init_diagnostic_codes = __esm({
       [DiagnosticCode.UnquotedPassageName]: "error",
       [DiagnosticCode.ChildMaxExceeded]: "error",
       [DiagnosticCode.ChildMinNotMet]: "error",
+      [DiagnosticCode.NestingLimitExceeded]: "error",
       [DiagnosticCode.UndeclaredVariable]: "error",
       [DiagnosticCode.PrimitiveFieldAccess]: "error",
       [DiagnosticCode.NoStoryVariables]: "info",
@@ -34607,6 +34844,7 @@ var init_diagnostic_codes = __esm({
       [DiagnosticCode.UnusedWidget]: "hint",
       [DiagnosticCode.LinkRuntimeMismatch]: "warning",
       [DiagnosticCode.LiteralLinkInterpolation]: "warning",
+      [DiagnosticCode.SpecialPassageNavigation]: "error",
       [DiagnosticCode.DeadEndPassage]: "hint",
       [DiagnosticCode.UnreachablePassage]: "hint",
       [DiagnosticCode.LineTooLong]: "warning"
@@ -35168,7 +35406,7 @@ function parentDiagnostics(passage, token, ancestors, workspace) {
   const name = token.name.toLowerCase();
   const parents = workspace.getEffectiveMacro(name)?.parents;
   if (!parents || parents.length === 0 || BRANCH_MACROS2.has(name)) return [];
-  if (workspace.macros.getAllMacros().some((macro) => macro.source === "user" && macro.name.toLowerCase() !== "listbox" && macro.subMacros.some((sub) => sub.toLowerCase() === name))) return [];
+  if (workspace.macros.getAllMacros().some((macro) => macro.source === "user" && macro.subMacros.some((sub) => sub.toLowerCase() === name))) return [];
   const allowed = new Set(parents.map((parent) => parent.toLowerCase()));
   const parentList = parents.join(", ");
   const range2 = passage.range(token.start, token.end);
@@ -35505,6 +35743,7 @@ var init_diagnostics = __esm({
       "mismatched-closer": DiagnosticCode.MalformedContainer,
       "stray-closer": DiagnosticCode.MalformedContainer,
       "misplaced-branch": DiagnosticCode.InvalidChildren,
+      "nesting-limit": DiagnosticCode.NestingLimitExceeded,
       "invalid-closer": DiagnosticCode.IllegalClosingTag,
       "closer-with-selectors": DiagnosticCode.IllegalClosingTag,
       "closer-with-arguments": DiagnosticCode.IllegalClosingTag,
@@ -35518,6 +35757,7 @@ var init_diagnostics = __esm({
       "argument-error": DiagnosticCode.ParameterTypeError,
       "code-syntax": DiagnosticCode.CodeSyntaxError,
       "unknown-passage": DiagnosticCode.BrokenPassageLink,
+      "special-passage": DiagnosticCode.SpecialPassageNavigation,
       "unquoted-passage-name": DiagnosticCode.UnquotedPassageName
     };
     text2 = (value) => typeof value === "string" ? value : "";
@@ -87893,10 +88133,6 @@ function computeRename(uri, position, newName, workspace) {
           `Cannot rename to ${JSON.stringify(newName)}: a widget name must start with a letter and contain only letters, digits, _ and - to be called as {name}.`
         ).at(uri, symbol2.range);
       }
-      const widget = workspace.widgets.getWidget(symbol2.name);
-      if (widget && !widget.block && workspace.macros.isBlock(symbol2.name)) {
-        throw new RenameError("Cannot rename this inline widget: its current name inherits a macro container body that the new name would lose.").at(uri, symbol2.range);
-      }
       if (workspace.macros.getMacro(newName)) {
         throw new RenameError(
           `Cannot rename to ${JSON.stringify(newName)}: a macro of that name already exists.`
@@ -87910,6 +88146,7 @@ function computeRename(uri, position, newName, workspace) {
       for (const ref2 of invocationRefs) {
         addEdit(ref2.uri, ref2.range, newName);
       }
+      const widget = workspace.widgets.getWidget(symbol2.name);
       if (widget) {
         addEdit(widget.uri, widget.nameRange, newName);
       }