@rohal12/spindle-lsp 0.15.15 → 0.15.17

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.15";
+    VERSION = false ? pkg.version : "0.15.17";
   }
 });
 
@@ -10488,10 +10488,30 @@ var init_config_loader = __esm({
   }
 });
 
+// src/core/workspace/source-order.ts
+import { pathToFileURL } from "node:url";
+function compareSourceUris(left, right) {
+  const a = left.split("/").map(decodeURIComponent);
+  const b = right.split("/").map(decodeURIComponent);
+  for (let i2 = 0; i2 < Math.min(a.length, b.length); i2++) {
+    const order = Buffer.compare(Buffer.from(a[i2], "utf8"), Buffer.from(b[i2], "utf8"));
+    if (order !== 0) return order;
+  }
+  return a.length - b.length;
+}
+function compareSourcePaths(left, right) {
+  return compareSourceUris(pathToFileURL(left).href, pathToFileURL(right).href);
+}
+var init_source_order = __esm({
+  "src/core/workspace/source-order.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/workspace/macro-sources.ts
 import { existsSync as existsSync2, lstatSync, readdir, readFileSync as readFileSync2 } from "node:fs";
 import { dirname, isAbsolute, join as join2, relative, resolve as resolve2, sep } from "node:path";
-import { pathToFileURL } from "node:url";
+import { pathToFileURL as pathToFileURL2 } from "node:url";
 function isExcludedSegment(segment) {
   return EXCLUDED_DIRS.includes(segment) || segment.startsWith(".") && segment !== "." && segment !== "..";
 }
@@ -10535,7 +10555,7 @@ async function findProjectFiles(root, pattern) {
       }
     }
   });
-  return files.filter((file2) => canDiscoverProjectPath(file2, root));
+  return files.filter((file2) => canDiscoverProjectPath(file2, root)).sort(compareSourcePaths);
 }
 function isWithin(path2, dir) {
   const rel = relative(dir, path2);
@@ -10557,7 +10577,7 @@ function findProjectRoot(dir) {
 }
 async function addProjectMacroSources(contents, dir) {
   for (const filePath of await findMacroSourceFiles(findProjectRoot(dir))) {
-    const uri = pathToFileURL(filePath).toString();
+    const uri = pathToFileURL2(filePath).toString();
     if (contents.has(uri)) continue;
     try {
       contents.set(uri, readFileSync2(filePath, "utf-8"));
@@ -10571,6 +10591,7 @@ var init_macro_sources = __esm({
     "use strict";
     init_index_min();
     init_config_loader();
+    init_source_order();
     MACRO_SOURCE_PATTERN = /\.[cm]?[jt]s$/i;
     MACRO_SOURCE_GLOB = "**/*.{js,cjs,mjs,ts,cts,mts}";
     EXCLUDED_DIRS = ["node_modules", "dist", "build"];
@@ -10600,7 +10621,7 @@ async function resolveFiles(pattern, cwd) {
   return [...new Set(await findProjectFiles(directory, input))];
 }
 function readFileContents(files) {
-  return new Map(files.map((file2) => [file2, readFileSync3(file2, "utf8")]));
+  return new Map([...files].sort(compareSourcePaths).map((file2) => [file2, readFileSync3(file2, "utf8")]));
 }
 async function resolveInputs(patterns, cwd) {
   const files = await Promise.all(patterns.map((pattern) => resolveFiles(pattern, cwd)));
@@ -10614,6 +10635,7 @@ var init_file_inputs = __esm({
   "src/core/workspace/file-inputs.ts"() {
     "use strict";
     init_macro_sources();
+    init_source_order();
   }
 });
 
@@ -14645,6 +14667,31 @@ function parseWithAst(src, goal) {
     }
   }
 }
+function parseReferencePath(src) {
+  const { ast } = parseWithAst(src, "expression");
+  let node = ast.type === "ChainExpression" ? ast.expression : ast;
+  let nested = false;
+  while (node.type === "MemberExpression") {
+    node = node.object;
+    nested = true;
+  }
+  if (node.type !== "Identifier") return null;
+  const sigil = sigilOf(node, src);
+  if (!sigil || node.start !== 0) return null;
+  return {
+    sigil: sigil[0],
+    name: sigil[1],
+    nested
+  };
+}
+function parseMemberIdentifier(src) {
+  const { ast } = parseWithAst(`x.${src}`, "expression");
+  if (ast.type !== "MemberExpression" || ast.computed) return null;
+  const object3 = ast.object;
+  const property = ast.property;
+  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 parseAst(src, goal, percentAt, transientsRead) {
   try {
     const p = tokenizerAt(src, 0, goal);
@@ -15194,9 +15241,13 @@ function indexCodeEnds(input) {
       if (open !== void 0) possible.add(open);
     } else if (/['"`/\\]/.test(c)) uncertain();
   }
-  return (start) => {
-    if (start > lastBrace) return -1;
-    return possible.has(start - 1) ? defaultCodeEnd.closeBrace(input, start, start) : parsedCodeEnd(input, start, "expression");
+  return (start, codeStart = start, limit = input.length) => {
+    if (start > lastBrace || codeStart >= limit) return -1;
+    const source = limit === input.length ? input : input.slice(0, limit);
+    if (input[start - 1] !== "{" || possible.has(start - 1) || input.slice(start, codeStart).includes("{")) return defaultCodeEnd.closeBrace(source, codeStart, start);
+    const base = Math.max(0, codeStart - 1);
+    const end = parsedCodeEnd(source.slice(base), codeStart - base, "expression");
+    return end < 0 ? -1 : base + end;
   };
 }
 function isCodeAttribute(name) {
@@ -15232,10 +15283,14 @@ function splitSigilTemplate(template, incomplete = false) {
   return parts;
 }
 function run$1(source, startRule, options, completion = false) {
-  const hooks = options.hooks ? {
+  const hooks = {
     ...defaultHooks,
     ...options.hooks
-  } : defaultHooks;
+  };
+  if (!options.hooks?.closeBrace) {
+    const codeEnd = indexCodeEnds(source);
+    hooks.closeBrace = (_input, codeStart, lenientStart) => codeEnd(lenientStart, codeStart);
+  }
   try {
     return peg$parse(source, {
       startRule,
@@ -15290,7 +15345,7 @@ function pairingError(position, error48) {
   const { line, column } = position(error48.start);
   return new MarkupError(error48.message, error48.start, line, column, error48.code, error48.end, error48.data);
 }
-function tokenizeMarkup(source, options = {}) {
+function tokenizeMarkup$1(source, options = {}) {
   return run$1(source, "Tokens", options);
 }
 function parseSelectors(source, at3 = 0) {
@@ -15300,7 +15355,7 @@ function parseSelectors(source, at3 = 0) {
     end: at3 + found.end
   };
 }
-function tokenizeMarkupTolerant(source, options = {}) {
+function tokenizeMarkupTolerant$1(source, options = {}) {
   const { tokens: tokens2, errors } = scanMarkupTolerant(source, options);
   return {
     tokens: tokens2,
@@ -15312,15 +15367,18 @@ function scanMarkupTolerant(source, options = {}, completion = false) {
   const errors = [];
   const damage = [];
   let position;
+  const codeEnd = indexCodeEnds(source);
+  const customCloseBrace = options.hooks?.closeBrace;
   const lastBrace = source.lastIndexOf("}");
-  const { closeBrace } = {
-    ...defaultHooks,
-    ...options.hooks
-  };
   const attempt = (text3, base2) => {
     const hooks = {
       ...options.hooks,
-      closeBrace: (input, codeStart, lenientStart) => base2 + Math.min(codeStart, lenientStart) > lastBrace ? -1 : closeBrace(input, codeStart, lenientStart)
+      closeBrace: (input, codeStart, lenientStart) => {
+        if (base2 + Math.min(codeStart, lenientStart) > lastBrace) return -1;
+        if (customCloseBrace) return customCloseBrace(input, codeStart, lenientStart);
+        const end = codeEnd(base2 + lenientStart, base2 + codeStart, base2 + text3.length);
+        return end < 0 ? -1 : end - base2;
+      }
     };
     try {
       return run$1(text3, "Tokens", {
@@ -15401,6 +15459,20 @@ function createListeners() {
     }
   };
 }
+function variableNameError(name, label2 = name) {
+  return name === "__proto__" ? `"${label2}" cannot be used as a variable name (${RESERVED_NAME} is reserved)` : void 0;
+}
+function ownEntries(sources, keep = () => true) {
+  const record2 = /* @__PURE__ */ Object.create(null);
+  for (const source of sources) {
+    if (!source) continue;
+    for (const key of Object.keys(source)) {
+      const value = source[key];
+      if (keep(value)) record2[key] = value;
+    }
+  }
+  return record2;
+}
 function isWhitespace(ch) {
   return /\s/.test(ch);
 }
@@ -15721,6 +15793,51 @@ function passageTarget(arg) {
     name
   };
 }
+function readBoundVariable(rawArgs) {
+  const src = rawArgs.trim();
+  const first = terms(src)[0];
+  return first ? slice(src, first) : "";
+}
+function parseBoundVariable(rawArgs) {
+  const term = readBoundVariable(rawArgs);
+  if (!term) return null;
+  const lead = rawArgs.length - rawArgs.trimStart().length;
+  const offsets = [];
+  for (let i2 = 0; i2 < term.length; i2++) if (term[i2] !== '"' && term[i2] !== "'") offsets.push(lead + i2);
+  const firstToken = term.replace(/["']/g, "");
+  const kind = {
+    "%": "transient variables",
+    _: "temporary variables",
+    "@": "locals"
+  }[firstToken.charAt(0)];
+  if (kind) throw new Error(`${kind} (${firstToken}) cannot be bound to input macros`);
+  const explicitSigil = firstToken.startsWith("$");
+  if (!explicitSigil && firstToken.split(".")[0].includes("\\")) throw new Error("Escaped binding identifiers require a literal $ story-variable sigil");
+  const segments = firstToken.replace(/^\$/, "").split(".").map((segment, index) => {
+    if (!segment.includes("\\")) return segment;
+    if (index > 0) {
+      const name = parseMemberIdentifier(segment);
+      if (name === null) throw new Error("Invalid bound identifier");
+      return name;
+    }
+    const reference = parseReferencePath(`$${segment}`);
+    if (!reference || reference.nested) throw new Error("Invalid bound identifier");
+    return reference.name;
+  });
+  if (segments.includes("__proto__")) throw new Error(`"$${segments.join(".")}" cannot be bound: ${RESERVED_NAME} is reserved`);
+  const rootStart = explicitSigil ? 1 : 0;
+  const rootEnd = firstToken.indexOf(".", rootStart);
+  const nameEnd = rootEnd < 0 ? firstToken.length : rootEnd;
+  return {
+    name: segments[0],
+    path: segments.slice(1),
+    explicitSigil,
+    start: offsets[0] ?? lead,
+    end: offsets.length ? offsets[offsets.length - 1] + 1 : lead,
+    nameStart: offsets[rootStart] ?? lead + rootStart,
+    nameEnd: offsets[nameEnd - 1] === void 0 ? lead : offsets[nameEnd - 1] + 1
+  };
+}
 function macroArgumentSpans(rawArgs, parameters) {
   const spans = /* @__PURE__ */ new Map();
   parseMacroArgs(rawArgs, parameters, void 0, spans);
@@ -15745,20 +15862,6 @@ function macroArgumentSpans(rawArgs, parameters) {
 function subMacroParameters(name) {
   return SUB_MACRO_PARAMETERS.get(name.toLowerCase());
 }
-function variableNameError(name, label2 = name) {
-  return name === "__proto__" ? `"${label2}" cannot be used as a variable name (${RESERVED_NAME} is reserved)` : void 0;
-}
-function ownEntries(sources, keep = () => true) {
-  const record2 = /* @__PURE__ */ Object.create(null);
-  for (const source of sources) {
-    if (!source) continue;
-    for (const key of Object.keys(source)) {
-      const value = source[key];
-      if (keep(value)) record2[key] = value;
-    }
-  }
-  return record2;
-}
 function withParseCache(fn) {
   const outer = parses;
   parses = /* @__PURE__ */ new Map();
@@ -15794,8 +15897,11 @@ function widgetParameters(params, holds = {}) {
     ...hasOwn(holds, name) ? { holds: holds[name] } : {}
   }));
 }
+function usesBuiltinSemantics(name, parametersOf2) {
+  return parametersOf2.widget?.(name) === void 0 && parametersOf2.source?.(name) !== "user";
+}
 function executesRawBody(name, parametersOf2) {
-  return isRawMacro(name, parametersOf2.widget?.(name) !== void 0) && parametersOf2.source?.(name) !== "user";
+  return isRawMacro(name, false) && usesBuiltinSemantics(name, parametersOf2);
 }
 function withHolds(params, holds) {
   return params.map((param) => {
@@ -15816,12 +15922,13 @@ function parameterLookup(macros) {
   for (const { name, parameters: params, interpolate, widget, source } of macros) {
     sources.set(name, source ?? "user");
     if (params) parameters.set(name, withHolds(params, holdsByDefault(interpolate)));
+    else parameters.delete(name);
     if (widget) widgets.set(name, widgetParameters(widget.params, widget.holds) ?? []);
   }
   const lookup = (name) => {
     if (widgets.has(name)) return void 0;
     let params = parameters.get(name);
-    if (!params) {
+    if (!params && sources.get(name) !== "user") {
       const sub = subMacroParameters(name);
       if (sub) parameters.set(name, params = withHolds(sub, "text"));
     }
@@ -15897,7 +16004,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
         continue;
       }
       const args2 = token.rawArgs;
-      if (PASSAGE_BODIES.has(name) && !widget) {
+      if (PASSAGE_BODIES.has(name) && usesBuiltinSemantics(name, parametersOf2)) {
         const close = closeOfTextBody(t, name);
         if (close > t + 1) {
           const text3 = src.slice(token.end, tokens2[close].start);
@@ -15915,7 +16022,7 @@ function* codeAndText(src, tokens2, parametersOf2) {
       if (!args2) continue;
       const label2 = `{${token.name} ${args2}}`;
       const argsAt = token.argsStart;
-      if (CONDITION_MACROS.has(name) && !widget) {
+      if (CONDITION_MACROS.has(name) && usesBuiltinSemantics(name, parametersOf2)) {
         yield {
           kind: "code",
           code: args2,
@@ -16179,7 +16286,7 @@ function locate(text3, part, from) {
 function completionContext(source, cursor, macros = []) {
   if (!Number.isInteger(cursor) || cursor < 0 || cursor > source.length) throw new RangeError("cursor must be a UTF-16 offset within source");
   const parametersOf2 = parameterLookup(macros);
-  const codeContext = (code, goal, map2) => {
+  const codeContext = (code, goal, map2, containers) => {
     const probe = code.length + 1;
     let executable = false;
     lexJs(code + " __spindle_cursor__", {
@@ -16199,15 +16306,16 @@ function completionContext(source, cursor, macros = []) {
       goal,
       offset: offset2,
       cursor: code.length,
+      ...containers.length ? { containers } : {},
       ...offsets.some((at3, i2) => at3 !== offset2 + i2) ? { sourceOffsets: offsets } : {}
     };
   };
-  const read = (src, map2, text3 = false, depth = 0, sigilsOnly = false) => {
+  const read = (src, map2, text3 = false, depth = 0, sigilsOnly = false, containers = []) => {
     if (depth >= 64) return LITERAL;
     if (sigilsOnly) {
       let at3 = 0;
       for (const part of splitSigilTemplate(src, true)) if ("expr" in part) {
-        if (at3 + 1 + part.expr.length === src.length) return codeContext(part.expr, "expression", (i2) => map2(at3 + 1 + i2));
+        if (at3 + 1 + part.expr.length === src.length) return codeContext(part.expr, "expression", (i2) => map2(at3 + 1 + i2), containers);
         at3 += part.expr.length + 2;
       } else at3 += ("text" in part ? part.text : part.verbatim).length;
       return LITERAL;
@@ -16218,13 +16326,21 @@ function completionContext(source, cursor, macros = []) {
     });
     const token = tokens2[tokens2.length - 1];
     if (!token || token.end !== src.length) return LITERAL;
-    const codeAt = (code, at3, goal = "expression") => codeContext(code, goal, (i2) => map2(at3 + i2));
-    const nested = (value, at3, offsets, onlySigils = false) => read(value, (i2) => map2(offsets?.[i2] ?? at3 + i2), true, depth + 1, onlySigils);
+    const codeAt = (code, at3, goal = "expression") => codeContext(code, goal, (i2) => map2(at3 + i2), containers);
+    const nested = (value, at3, offsets, onlySigils = false, container) => read(value, (i2) => map2(offsets?.[i2] ?? at3 + i2), true, depth + 1, onlySigils, container ? [...containers, container] : containers);
     if (token.type === "variable" && token.nameEnd === src.length) return codeAt(src.slice(token.nameStart - 1), token.nameStart - 1);
     if (token.type === "expression" && token.expressionEnd === src.length) return codeAt(token.expression, token.expressionStart);
     if (token.type === "html") {
-      for (const { name, value, at: at3 } of attributeValues(src, token)) if (at3 + value.length === src.length) return nested(value, at3, void 0, isCodeAttribute(name));
-    } else if (token.type === "link" && token.displayEnd === src.length) return nested(token.display, token.displayStart);
+      for (const { name, value, at: at3 } of attributeValues(src, token)) if (at3 + value.length === src.length) {
+        const span = token.attributeSpans.find((span2) => span2.valueStart === at3);
+        return nested(value, at3, void 0, isCodeAttribute(name), {
+          kind: "attribute",
+          name,
+          quote: span?.quote ?? null,
+          code: isCodeAttribute(name)
+        });
+      }
+    } else if (token.type === "link" && token.displayEnd === src.length) return nested(token.display, token.displayStart, void 0, false, { kind: "link-label" });
     else if (token.type === "text" && !token.comment) {
       const opener = tokens2[tokens2.length - 2];
       if (opener?.type === "macro" && !opener.isClose && executesRawBody(opener.name, parametersOf2)) return codeAt(token.value, token.start, "statements");
@@ -16232,7 +16348,7 @@ function completionContext(source, cursor, macros = []) {
       const name = token.name.toLowerCase();
       const args2 = token.rawArgs;
       const widget = parametersOf2.widget?.(name);
-      if (!widget && [
+      if (usesBuiltinSemantics(name, parametersOf2) && [
         "if",
         "elseif",
         "case"
@@ -16246,9 +16362,14 @@ function completionContext(source, cursor, macros = []) {
         if (scanStringLiteral(raw2, 0).closed) return LITERAL;
         const value = escapes === "javascript" ? stringLiteralValue(raw2 + raw2[0]) : quoted.value;
         if (value == null) return LITERAL;
+        const container = {
+          kind: "string",
+          quote: raw2[0],
+          escapes
+        };
         const offsets = escapeOffsets(raw2.slice(1), at4 + 1, value, escapes);
-        if (holds === "expression" || holds === "statements") return codeContext(value, holds, (i2) => map2(offsets?.[i2] ?? at4 + 1 + i2));
-        return holds === "markup" ? nested(value, at4 + 1, offsets) : LITERAL;
+        if (holds === "expression" || holds === "statements") return codeContext(value, holds, (i2) => map2(offsets?.[i2] ?? at4 + 1 + i2), [...containers, container]);
+        return holds === "markup" ? nested(value, at4 + 1, offsets, false, container) : LITERAL;
       };
       if (widget) {
         const spans2 = splitArgSpans(args2);
@@ -16368,7 +16489,7 @@ function widgetDefinitions$1(passages, parametersOf2 = registeredParameters) {
       if (passage.name !== "StoryInit" && !passage.tags?.includes("widget")) continue;
       const open = [];
       const done = [];
-      for (const token of tokenizeMarkupTolerant(passage.content, { hooks }).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
+      for (const token of tokenizeMarkupTolerant$1(passage.content, { hooks }).tokens) if (token.type === "macro" && token.name.toLowerCase() === "widget") {
         if (!token.isClose) open.push({
           token,
           isBlock: false
@@ -16507,7 +16628,7 @@ function validateMarkup(passages, options) {
       continue;
     }
     try {
-      const tokens2 = tokenizeMarkup(passage.content, { hooks });
+      const tokens2 = tokenizeMarkup$1(passage.content, { hooks });
       addWidgets(tokens2);
       if (!reported) continue;
       parseMarkup(passage.content, { hooks });
@@ -16614,9 +16735,9 @@ function tokensOf(text3, textMode, { tolerant, parametersOf: parametersOf2 } = {
     text: textMode,
     hooks: parametersOf2 && { isRaw: (name) => isRawMacro(name, parametersOf2.widget?.(name) !== void 0) }
   };
-  if (tolerant) return tokenizeMarkupTolerant(text3, options).tokens;
+  if (tolerant) return tokenizeMarkupTolerant$1(text3, options).tokens;
   try {
-    return tokenizeMarkup(text3, options);
+    return tokenizeMarkup$1(text3, options);
   } catch (err) {
     if (err instanceof MarkupError) return [];
     throw err;
@@ -16846,6 +16967,29 @@ function scanSelectors(content2, token, at3, emit, options) {
     storeVarMacros: NO_STORE_VAR_MACROS
   });
 }
+function boundReference(token, at3, all) {
+  try {
+    const binding = parseBoundVariable(token.rawArgs);
+    if (!binding || !all && !binding.explicitSigil) return void 0;
+    const mapped = {
+      ...binding,
+      start: at3(token.argsStart + binding.start),
+      end: at3(token.argsStart + binding.end),
+      nameStart: at3(token.argsStart + binding.nameStart),
+      nameEnd: at3(token.argsStart + binding.nameEnd)
+    };
+    return {
+      sigil: "$",
+      name: binding.name,
+      path: binding.path,
+      start: mapped.start,
+      end: mapped.end,
+      binding: mapped
+    };
+  } catch {
+    return;
+  }
+}
 function collectTokenRefs(content2, tokens2, at3, emit, options) {
   const { storeVarMacros, parametersOf: parametersOf2 } = options;
   for (let t = 0; t < tokens2.length; t++) {
@@ -16873,24 +17017,12 @@ function collectTokenRefs(content2, tokens2, at3, emit, options) {
       else scanInterpolations(value, valueIn, emit, options);
     }
     else if (token.type === "macro" && !token.isClose) {
-      scanArgs(token, parametersOf2, at3, emit, options);
+      const binding = storeVarMacros.has(token.name.toLowerCase()) && !parametersOf2.widget?.(token.name) ? boundReference(token, at3, options.all) : void 0;
+      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 (storeVarMacros.has(token.name.toLowerCase()) && !parametersOf2.widget?.(token.name)) {
-        const lead = token.rawArgs.length - token.rawArgs.trimStart().length;
-        const first = token.rawArgs.trim().split(/\s+/)[0] ?? "";
-        const quoted = QUOTED_VAR_ARG_RE.exec(first);
-        if (quoted) {
-          const [name, ...path2] = quoted[1].split(".");
-          const start = token.argsStart + lead + 1;
-          emit({
-            sigil: "$",
-            name,
-            path: path2,
-            start: at3(start),
-            end: at3(start + 1 + quoted[1].length)
-          });
-        } else if (!/^["'`]/.test(first)) scanCode(first, (i2) => at3(token.argsStart + lead + i2), emit);
-      }
+      if (binding) emit(binding);
       if (executesRawBody(token.name, parametersOf2)) {
         let close = t + 1;
         while (close < tokens2.length) {
@@ -20983,7 +21115,7 @@ function scanSpindleMarkup(text3) {
     if (inAttribute) match2.inAttribute = true;
     tokens2.push(match2);
   };
-  for (const t of tokenizeMarkupTolerant(text3).tokens) if (t.type === "html") {
+  for (const t of tokenizeMarkupTolerant$1(text3).tokens) if (t.type === "html") {
     tags.push({
       start: t.start,
       end: t.end
@@ -20992,7 +21124,7 @@ function scanSpindleMarkup(text3) {
       if (attribute.valueStart === void 0 || attribute.valueEnd === void 0) continue;
       const value = text3.slice(attribute.valueStart, attribute.valueEnd);
       if (!value.includes("{")) continue;
-      for (const inner of tokenizeMarkupTolerant(value, { text: true }).tokens) if (inner.type === "macro" || inner.type === "variable" || inner.type === "expression") push2({
+      for (const inner of tokenizeMarkupTolerant$1(value, { text: true }).tokens) if (inner.type === "macro" || inner.type === "variable" || inner.type === "expression") push2({
         start: attribute.valueStart + inner.start,
         end: attribute.valueStart + inner.end
       }, true);
@@ -21145,7 +21277,7 @@ function replaceSpindleTokens(html) {
 }
 function closedMacroNames(text3) {
   const found = /* @__PURE__ */ new Set();
-  for (const t of tokenizeMarkupTolerant(text3).tokens) if (t.type === "macro" && t.isClose) found.add(t.name.toLowerCase());
+  for (const t of tokenizeMarkupTolerant$1(text3).tokens) if (t.type === "macro" && t.isClose) found.add(t.name.toLowerCase());
   return found;
 }
 function defaultIsBlock(text3, extra = []) {
@@ -21398,7 +21530,7 @@ function macroTokensByLine(lines) {
     offset2 += line2.length + 1;
   }
   let line = 0;
-  for (const token of tokenizeMarkupTolerant(lines.join("\n")).tokens) {
+  for (const token of tokenizeMarkupTolerant$1(lines.join("\n")).tokens) {
     if (token.type !== "macro") continue;
     while (line + 1 < lines.length && starts[line + 1] <= token.start) line++;
     const lineStart = starts[line];
@@ -21462,7 +21594,7 @@ function verbatimLines(lines) {
 function wordWrap(text3, maxLen, indent) {
   const lines = [];
   const inToken = new Array(text3.length).fill(false);
-  for (const token of tokenizeMarkupTolerant(text3).tokens) {
+  for (const token of tokenizeMarkupTolerant$1(text3).tokens) {
     if (token.type === "text") continue;
     inToken.fill(true, token.start, token.end);
   }
@@ -21491,6 +21623,23 @@ function wordWrap(text3, maxLen, indent) {
   }
   return lines;
 }
+function tokenizationOptions(options) {
+  if (!options.macros) return options;
+  const macros = [...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),
+      ...options.hooks
+    }
+  };
+}
+function tokenizeMarkupTolerant(source, options = {}) {
+  return tokenizeMarkupTolerant$1(source, tokenizationOptions(options));
+}
 function validateStoryMarkup(passages, macros, options = {}) {
   const list3 = [...passages];
   const all = [...macros];
@@ -21538,10 +21687,12 @@ function widgetDefinitions(passages, macros = []) {
 }
 function referenceOptions(macros, all = false, passages = []) {
   const list3 = [...macros];
+  const effective = new NameMap();
+  for (const macro of list3) effective.set(macro.name, macro);
   const widgets = effectiveWidgetDefinitions(widgetDefinitions$1(passages, parameterLookup(list3)));
   return {
     all,
-    storeVarMacros: new Set(list3.filter((m) => m.storeVar).map((m) => m.name.toLowerCase())),
+    storeVarMacros: new Set([...effective.values()].filter((m) => m.storeVar).map((m) => m.name.toLowerCase())),
     parametersOf: parameterLookup([...list3, ...definedWidgetMacros(widgets)]),
     tolerant: true
   };
@@ -21553,7 +21704,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, 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, NameMap, NameSet, 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, TRAILING_OPERATOR_RE, slice, MacroArgumentError, WORD_RE$1, NUMBER_RE$1, WORD_OR_PUNCT_RE, LEADING_OPERATOR_RE, takesRest, SUB_MACRO_PARAMETERS, RESERVED_NAME, isArrayIndex, hasOwn, createNamespace, 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, QUOTED_VAR_ARG_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, 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 init_story_variables = __esm({
   "node_modules/@rohal12/spindle/dist/pkg/story-variables.js"() {
     __defProp2 = Object.defineProperty;
@@ -21566,6 +21717,38 @@ var init_story_variables = __esm({
       if (!no_symbols) __defProp2(target, Symbol.toStringTag, { value: "Module" });
       return target;
     };
+    NameMap = class extends Map {
+      get(name) {
+        return super.get(name.toLowerCase());
+      }
+      set(name, value) {
+        return super.set(name.toLowerCase(), value);
+      }
+      has(name) {
+        return super.has(name.toLowerCase());
+      }
+      delete(name) {
+        return super.delete(name.toLowerCase());
+      }
+    };
+    NameSet = class {
+      constructor(names = []) {
+        this.names = new NameMap();
+        for (const name of names) this.add(name);
+      }
+      add(name) {
+        this.names.set(name, true);
+      }
+      has(name) {
+        return this.names.has(name);
+      }
+      delete(name) {
+        this.names.delete(name);
+      }
+      clear() {
+        this.names.clear();
+      }
+    };
     SIGIL_SCOPES = {
       $: "variable",
       _: "temporary",
@@ -21700,38 +21883,6 @@ var init_story_variables = __esm({
         return "Expected " + describeExpected(expected) + " but " + describeFound(found) + " found.";
       }
     };
-    NameMap = class extends Map {
-      get(name) {
-        return super.get(name.toLowerCase());
-      }
-      set(name, value) {
-        return super.set(name.toLowerCase(), value);
-      }
-      has(name) {
-        return super.has(name.toLowerCase());
-      }
-      delete(name) {
-        return super.delete(name.toLowerCase());
-      }
-    };
-    NameSet = class {
-      constructor(names = []) {
-        this.names = new NameMap();
-        for (const name of names) this.add(name);
-      }
-      add(name) {
-        this.names.set(name, true);
-      }
-      has(name) {
-        return this.names.has(name);
-      }
-      delete(name) {
-        this.names.delete(name);
-      }
-      clear() {
-        this.names.clear();
-      }
-    };
     BLOCK_MACROS = new NameSet([
       "if",
       "for",
@@ -26999,6 +27150,11 @@ var init_story_variables = __esm({
     OFFSET_FIELD = /^(start|end|[A-Za-z]*(Start|End))$/;
     listeners = createListeners();
     listeners.subscribe;
+    RESERVED_NAME = "__proto__";
+    isArrayIndex = (key) => /^(?:0|[1-9]\d*)$/.test(key);
+    hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
+    createNamespace = (...sources) => ownEntries(sources);
+    Object.freeze(createNamespace());
     TRAILING_OPERATOR_RE = /(?:[-+*/%&|^!~=<>?:,.]|(?:^|[^\w$@.])(?:typeof|void|new|delete|in|instanceof|await|yield))$/;
     slice = (src, [start, end]) => src.slice(start, end);
     MacroArgumentError = class extends Error {
@@ -27018,11 +27174,6 @@ var init_story_variables = __esm({
       holds: "text",
       required: true
     }]]]);
-    RESERVED_NAME = "__proto__";
-    isArrayIndex = (key) => /^(?:0|[1-9]\d*)$/.test(key);
-    hasOwn = (obj, key) => Object.prototype.hasOwnProperty.call(obj, key);
-    createNamespace = (...sources) => ownEntries(sources);
-    Object.freeze(createNamespace());
     parses = null;
     CONDITION_MACROS = /* @__PURE__ */ new Set([
       "if",
@@ -27435,7 +27586,6 @@ var init_story_variables = __esm({
       }
     };
     VAR_PATH_RE = /([$%])(\w+(?:\.\w+)*)/y;
-    QUOTED_VAR_ARG_RE = /^["']\$(\w+(?:\.\w+)*)["']?$/;
     VALID_VAR_TYPES = /* @__PURE__ */ new Set([
       "number",
       "string",
@@ -31487,7 +31637,7 @@ var init_tooling = __esm({
 // src/core/workspace/document-store.ts
 import { EventEmitter } from "node:events";
 import { readFileSync as readFileSync4 } from "node:fs";
-import { pathToFileURL as pathToFileURL2 } from "node:url";
+import { pathToFileURL as pathToFileURL3 } from "node:url";
 function stripBom(text3) {
   return text3.charCodeAt(0) === 65279 ? text3.slice(1) : text3;
 }
@@ -31535,7 +31685,7 @@ var init_document_store = __esm({
         for (const filePath of paths) {
           try {
             const text3 = readFileSync4(filePath, "utf-8");
-            const uri = pathToFileURL2(filePath).href;
+            const uri = pathToFileURL3(filePath).href;
             this.open(uri, text3);
           } catch {
           }
@@ -31549,7 +31699,10 @@ var init_document_store = __esm({
 function buildLineStarts(text3) {
   const starts = [0];
   for (let i2 = 0; i2 < text3.length; i2++) {
-    if (text3[i2] === "\n") starts.push(i2 + 1);
+    if (text3[i2] === "\r") {
+      if (text3[i2 + 1] === "\n") i2++;
+      starts.push(i2 + 1);
+    } else if (text3[i2] === "\n") starts.push(i2 + 1);
   }
   return starts;
 }
@@ -31574,7 +31727,7 @@ function withoutCr(line) {
   return line.endsWith("\r") ? line.slice(0, -1) : line;
 }
 function splitLines(text3) {
-  return text3.split("\n").map(withoutCr);
+  return text3.split(/\r\n|[\r\n]/);
 }
 var init_text = __esm({
   "src/core/text.ts"() {
@@ -31584,33 +31737,40 @@ var init_text = __esm({
 
 // src/core/parsing/passage-parser.ts
 import { createRequire as createCompilerRequire } from "node:module";
+function encodePassageName(name) {
+  if (!name || /[\r\n]/.test(name)) return void 0;
+  const encoded = name.replace(/[[\]{}\\]/g, "\\$&");
+  const { parseTwee } = createCompilerRequire(import.meta.url)("@rohal12/twee-ts");
+  const parsed = parseTwee(`:: ${encoded}`);
+  return parsed.passages.length === 1 && parsed.passages[0].name === name && !parsed.diagnostics.some((d) => d.level === "error") ? encoded : void 0;
+}
 function parsePassageHeader(rawLine, lineNumber) {
   const line = withoutCr(rawLine);
-  const bomLength = lineNumber === 0 && line.charCodeAt(0) === 65279 ? 1 : 0;
+  const bomLength = /^\uFEFF*/.exec(line)[0].length;
   const escaped = line.replace(/\\./g, "ec");
-  const prefix = /^::\s*/.exec(escaped.slice(bomLength));
+  const prefix = new RegExp("^::\\p{White_Space}*", "u").exec(escaped.slice(bomLength));
   if (!prefix) return null;
   const nameStart = bomLength + prefix[0].length;
   const delimiter = /[\[\]{}]/g;
   delimiter.lastIndex = nameStart;
   const first = delimiter.exec(escaped);
   const boundary = first?.index ?? line.length;
-  const nameEnd = escaped.slice(0, boundary).trimEnd().length;
-  const name = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").trim();
+  const nameEnd = escaped.slice(0, boundary).replace(new RegExp("\\p{White_Space}+$", "u"), "").length;
+  const name = line.slice(nameStart, nameEnd).replace(/\\(.|$)/g, "$1").replace(new RegExp("^\\p{White_Space}+|\\p{White_Space}+$", "gu"), "");
   if (!name) return null;
   let rest = boundary;
   let tags = [];
   if (escaped[rest] === "[") {
     const end = escaped.indexOf("]", rest + 1);
     if (end === -1 || /[\[{}]/.test(escaped.slice(rest + 1, end))) return null;
-    const decoded = line.slice(rest + 1, end).replace(/\\(.)/g, "$1").trim();
-    tags = decoded ? decoded.split(/\s+/) : [];
+    const decoded = line.slice(rest + 1, end).replace(/\\(.)/g, "$1");
+    tags = decoded.match(/[^\p{White_Space}]+/gu) ?? [];
     rest = end + 1;
-    while (rest < line.length && /\s/.test(escaped[rest])) rest++;
+    while (rest < line.length && new RegExp("\\p{White_Space}", "u").test(escaped[rest])) rest++;
   }
   let meta3;
   if (rest < line.length) {
-    const raw = line.slice(rest).trim();
+    const raw = line.slice(rest).replace(new RegExp("\\p{White_Space}+$", "u"), "");
     if (escaped[rest] !== "{" || !raw.endsWith("}")) return null;
     try {
       meta3 = JSON.parse(raw);
@@ -31694,21 +31854,13 @@ var init_passage_parser = __esm({
 
 // src/core/workspace/passage-index.ts
 import { createRequire as createSettingsRequire } from "node:module";
-function compareSourceUris(left, right) {
-  const a = left.split("/").map(decodeURIComponent);
-  const b = right.split("/").map(decodeURIComponent);
-  for (let i2 = 0; i2 < Math.min(a.length, b.length); i2++) {
-    const order = Buffer.compare(Buffer.from(a[i2], "utf8"), Buffer.from(b[i2], "utf8"));
-    if (order !== 0) return order;
-  }
-  return a.length - b.length;
-}
 var PassageIndex;
 var init_passage_index = __esm({
   "src/core/workspace/passage-index.ts"() {
     "use strict";
     init_passage_parser();
     init_text();
+    init_source_order();
     PassageIndex = class {
       /** Per-URI list of passages. */
       byUri = /* @__PURE__ */ new Map();
@@ -32334,20 +32486,18 @@ var init_parameter_validator = __esm({
         // and reads the rest as a dot path into the story variables.
         name: ["receiver"],
         validate(arg) {
-          let name;
-          if (arg.type === 0 /* String */) {
-            name = arg.text.slice(1, -1);
-          } else if (arg.type === 8 /* Bareword */) {
-            name = arg.text;
-          }
-          if (name === void 0) {
+          if (arg.type !== 0 /* String */ && arg.type !== 8 /* Bareword */) {
             return new TypeError2("Argument is not a variable receiver");
           }
-          if (/^[_@%]/.test(name)) {
-            return new TypeError2(`Variable receiver must be a story variable ($name), got '${name}'`);
-          }
-          if (!/^(?:\$\w|[A-Za-z_])[\w$]*(?:\.[\w$]+)*$/.test(name)) {
-            return new TypeError2(`Argument is not a valid variable receiver: '${name}'`);
+          try {
+            const binding = parseBoundVariable(arg.text);
+            if (!binding) return new TypeError2("Argument is not a variable receiver");
+            const root = `${binding.explicitSigil ? "$" : ""}${binding.name}`;
+            if (!/^(?:\$\w|[A-Za-z_])[\w$]*$/.test(root)) {
+              return new TypeError2(`Argument is not a valid variable receiver: '${root}'`);
+            }
+          } catch (error48) {
+            return new TypeError2(`Invalid story variable receiver: ${error48 instanceof Error ? error48.message : String(error48)}`);
           }
           return null;
         }
@@ -32779,7 +32929,8 @@ function collectVariableReferences2(markup) {
     name: ref2.name,
     path: [ref2.name, ...ref2.path].join("."),
     start: ref2.start,
-    end: ref2.end
+    end: ref2.end,
+    binding: ref2.binding
   }));
 }
 var init_executable_refs = __esm({
@@ -32805,13 +32956,13 @@ var init_passage_markup = __esm({
         this.bodyEnd = bodyEnd;
         const raw = doc.text.slice(bodyStart, bodyEnd);
         this.isMarkup = isMarkupPassage(passage);
-        if (raw.includes("\r\n")) {
+        if (raw.includes("\r")) {
           const map2 = [];
           let content2 = "";
           for (let i2 = 0; i2 < raw.length; i2++) {
             if (raw[i2] === "\r" && raw[i2 + 1] === "\n") continue;
             map2.push(bodyStart + i2);
-            content2 += raw[i2];
+            content2 += raw[i2] === "\r" ? "\n" : raw[i2];
           }
           map2.push(bodyEnd);
           this.content = content2;
@@ -32829,7 +32980,7 @@ var init_passage_markup = __esm({
       content;
       /** Whether Spindle reads the body as story markup (see isMarkupPassage). */
       isMarkup;
-      /** For each `content` offset, its offset in the document; null when the body has no CRLF. */
+      /** For each `content` offset, its offset in the document; null when the body has no CR. */
       toDoc;
       cachedTokens;
       cachedPairing;
@@ -32870,7 +33021,7 @@ var init_passage_markup = __esm({
       }
       /** The flat tokens and the malformed tags; none for a passage that is not markup. */
       get tokenization() {
-        return this.cachedTokens ??= this.isMarkup ? tokenizeMarkupTolerant(this.content) : { tokens: [], errors: [] };
+        return this.cachedTokens ??= this.isMarkup ? tokenizeMarkupTolerant(this.content, { macros: this.doc.context.macros }) : { tokens: [], errors: [] };
       }
       get tokens() {
         return this.tokenization.tokens;
@@ -33533,20 +33684,22 @@ function resolveStoryFormat(declared) {
   return foreign === void 0 ? UNDECLARED_STORY_FORMAT : { name: foreign, isSpindle: false };
 }
 function passageContent(passage, text3) {
-  return text3.split("\n").slice(passage.headerEnd.end.line + 1, passage.range.end.line + 1).join("\n");
+  return splitLines(text3).slice(passage.headerEnd.end.line + 1, passage.range.end.line + 1).join("\n");
+}
+function effectiveStoryData(passages) {
+  const passage = [...passages].filter((p) => p.name === "StoryData").at(-1);
+  return passage ? [passage] : [];
 }
 function storyDataFormats(passages, getText) {
   const formats = [];
-  for (const passage of passages) {
-    if (passage.name !== "StoryData") continue;
+  for (const passage of effectiveStoryData(passages)) {
     const text3 = getText(passage.uri);
     formats.push(text3 === void 0 ? void 0 : readStoryDataFormat(passageContent(passage, text3)));
   }
   return formats;
 }
 function storyDataFormatVersion(passages, getText) {
-  for (const passage of passages) {
-    if (passage.name !== "StoryData") continue;
+  for (const passage of effectiveStoryData(passages)) {
     const text3 = getText(passage.uri);
     if (text3 === void 0) continue;
     const version2 = readStoryDataFormatVersion(passageContent(passage, text3));
@@ -33554,15 +33707,18 @@ function storyDataFormatVersion(passages, getText) {
   }
   return void 0;
 }
-function storyFormatOfTexts(texts) {
+function indexStoryDataTexts(texts) {
   const index = new PassageIndex();
   const byUri = /* @__PURE__ */ new Map();
   for (const text3 of texts) {
-    if (!text3.includes("StoryData")) continue;
-    const uri = `story-format:${byUri.size}`;
+    const uri = `story-format:${String(byUri.size).padStart(16, "0")}`;
     byUri.set(uri, text3);
     index.rebuild(uri, text3);
   }
+  return { index, byUri };
+}
+function storyFormatOfTexts(texts) {
+  const { index, byUri } = indexStoryDataTexts(texts);
   const formats = storyDataFormats(index.getAllPassages(), (uri) => byUri.get(uri));
   return { ...resolveStoryFormat(formats), hasStoryData: formats.length > 0 };
 }
@@ -33580,14 +33736,7 @@ async function findStoryFormat(texts, dir) {
   return { name, isSpindle };
 }
 function storyFormatVersionOfTexts(texts) {
-  const index = new PassageIndex();
-  const byUri = /* @__PURE__ */ new Map();
-  for (const text3 of texts) {
-    if (!text3.includes("StoryData")) continue;
-    const uri = `story-format:${byUri.size}`;
-    byUri.set(uri, text3);
-    index.rebuild(uri, text3);
-  }
+  const { index, byUri } = indexStoryDataTexts(texts);
   return storyDataFormatVersion(index.getAllPassages(), (uri) => byUri.get(uri));
 }
 async function findSpindleTarget(texts, dir) {
@@ -33614,6 +33763,7 @@ var UNDECLARED_STORY_FORMAT;
 var init_story_format = __esm({
   "src/core/workspace/story-format.ts"() {
     "use strict";
+    init_text();
     init_document_store();
     init_passage_index();
     init_story_data();
@@ -34358,6 +34508,8 @@ var init_diagnostic_codes = __esm({
     DiagnosticCode = {
       /** The Spindle the project targets is older than the oldest one supported. */
       UnsupportedSpindleVersion: "SP001",
+      /** A fatal Twee source error reported by the public compiler parser. */
+      TweeSyntaxError: "SP002",
       /** `unknown-macro`: a macro that is none of the built-in, configured or defined ones. */
       UndefinedMacro: "SP100",
       /** `unclosed-block`, `mismatched-closer`, `stray-closer` of a macro. */
@@ -34406,38 +34558,39 @@ var init_diagnostic_codes = __esm({
       LineTooLong: "SP500"
     };
     severityMap = {
-      SP001: "warning",
-      SP100: "warning",
-      SP101: "error",
-      SP102: "error",
-      SP104: "error",
-      SP105: "error",
-      SP106: "error",
-      SP107: "error",
-      SP108: "error",
-      SP109: "error",
-      SP110: "warning",
-      SP111: "error",
-      SP113: "error",
-      SP114: "error",
-      SP115: "error",
-      SP200: "error",
-      SP201: "error",
-      SP202: "info",
-      SP203: "warning",
-      SP205: "warning",
-      SP206: "warning",
-      SP207: "error",
-      SP208: "error",
-      SP300: "warning",
-      SP301: "warning",
-      SP302: "warning",
-      SP303: "hint",
-      SP304: "warning",
-      SP305: "warning",
-      SP400: "hint",
-      SP401: "hint",
-      SP500: "warning"
+      [DiagnosticCode.UnsupportedSpindleVersion]: "warning",
+      [DiagnosticCode.TweeSyntaxError]: "error",
+      [DiagnosticCode.UndefinedMacro]: "warning",
+      [DiagnosticCode.MalformedContainer]: "error",
+      [DiagnosticCode.MalformedElement]: "error",
+      [DiagnosticCode.IllegalClosingTag]: "error",
+      [DiagnosticCode.UnclosedMarkup]: "error",
+      [DiagnosticCode.CodeSyntaxError]: "error",
+      [DiagnosticCode.InvalidChildren]: "error",
+      [DiagnosticCode.ExpectedNoArguments]: "error",
+      [DiagnosticCode.ParameterTypeError]: "error",
+      [DiagnosticCode.ParameterWarning]: "warning",
+      [DiagnosticCode.TooManyArguments]: "error",
+      [DiagnosticCode.UnquotedPassageName]: "error",
+      [DiagnosticCode.ChildMaxExceeded]: "error",
+      [DiagnosticCode.ChildMinNotMet]: "error",
+      [DiagnosticCode.UndeclaredVariable]: "error",
+      [DiagnosticCode.PrimitiveFieldAccess]: "error",
+      [DiagnosticCode.NoStoryVariables]: "info",
+      [DiagnosticCode.UndeclaredTransient]: "warning",
+      [DiagnosticCode.TemporaryAssignedInLoop]: "warning",
+      [DiagnosticCode.ArrayMemberAccess]: "warning",
+      [DiagnosticCode.InvalidDeclaration]: "error",
+      [DiagnosticCode.ReservedVariableName]: "error",
+      [DiagnosticCode.BrokenPassageLink]: "warning",
+      [DiagnosticCode.WidgetArgCountMismatch]: "warning",
+      [DiagnosticCode.IncludeWidgetPassage]: "warning",
+      [DiagnosticCode.UnusedWidget]: "hint",
+      [DiagnosticCode.LinkRuntimeMismatch]: "warning",
+      [DiagnosticCode.LiteralLinkInterpolation]: "warning",
+      [DiagnosticCode.DeadEndPassage]: "hint",
+      [DiagnosticCode.UnreachablePassage]: "hint",
+      [DiagnosticCode.LineTooLong]: "warning"
     };
   }
 });
@@ -34689,12 +34842,14 @@ var init_story_variables_owner = __esm({
 });
 
 // src/plugins/diagnostics.ts
+import { createRequire as createCompilerRequire3 } from "node:module";
 function computeDiagnostics(uri, workspace, options) {
   if (!workspace.initialized) return [];
   if (!workspace.isSpindleProject()) return [];
   const doc = workspace.markup.get(uri);
-  if (!doc || doc.passages.length === 0) return [];
-  const diagnostics = [];
+  if (!doc || isMacroSource(uri)) return [];
+  const diagnostics = [...tweeDiagnostics(doc)];
+  if (doc.passages.length === 0) return diagnostics;
   const attempt = (check2) => {
     try {
       check2();
@@ -34725,6 +34880,27 @@ function computeDiagnostics(uri, workspace, options) {
   }
   return diagnostics.sort((a, b) => a.range.start.line - b.range.start.line || a.range.start.character - b.range.start.character);
 }
+function tweeDiagnostics(doc) {
+  const kept3 = tweeReports.get(doc);
+  if (kept3) return kept3;
+  const lines = splitLines(doc.text);
+  const indexed = new Set(doc.passages.map((p) => p.passage.headerEnd.start.line));
+  if (!lines.some((line, i2) => /^\uFEFF*::/.test(line) && (!indexed.has(i2) || /[[\]{}]/.test(line)))) {
+    tweeReports.set(doc, []);
+    return [];
+  }
+  const { parseTwee } = createCompilerRequire3(import.meta.url)("@rohal12/twee-ts");
+  const diagnostics = parseTwee(doc.text).diagnostics.filter((d) => d.level === "error").map((d) => {
+    const line = Math.min(Math.max((d.line ?? 1) - 1, 0), lines.length - 1);
+    return makeDiag(
+      { start: { line, character: 0 }, end: { line, character: lines[line].length } },
+      DiagnosticCode.TweeSyntaxError,
+      d.message
+    );
+  });
+  tweeReports.set(doc, diagnostics);
+  return diagnostics;
+}
 function storyReport(workspace) {
   const documents = [];
   for (const uri of workspace.passages.getDocumentUris()) {
@@ -35261,7 +35437,7 @@ function toLspDiagnostic(d) {
     data: d.data
   };
 }
-var reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, SPINDLE_MACROS, diagnosticsPlugin;
+var tweeReports, reports, COMPILER_PASSAGES, MARKUP_CODES, text2, list2, VARIABLE_CODES, WILL_NOT_START, BRANCH_MACROS2, DIRECT_CHILD_MACROS, DEFERRED_CONTAINERS, SPINDLE_MACROS, diagnosticsPlugin;
 var init_diagnostics = __esm({
   "src/plugins/diagnostics.ts"() {
     "use strict";
@@ -35278,6 +35454,7 @@ var init_diagnostics = __esm({
     init_story_variables_owner();
     init_macro_sources();
     init_spindle_version();
+    tweeReports = /* @__PURE__ */ new WeakMap();
     reports = /* @__PURE__ */ new WeakMap();
     COMPILER_PASSAGES = /* @__PURE__ */ new Set(["StoryTitle", "StoryData"]);
     MARKUP_CODES = {
@@ -35513,7 +35690,7 @@ __export(check_exports, {
   runCheck: () => runCheck
 });
 import { resolve as resolve5 } from "node:path";
-import { pathToFileURL as pathToFileURL3 } from "node:url";
+import { pathToFileURL as pathToFileURL4 } from "node:url";
 function parseArgs(args2) {
   const options = {
     format: "pretty",
@@ -35626,7 +35803,7 @@ async function runCheck(args2) {
       return 1;
     }
   }
-  const fileContents = new Map([...contents].map(([path2, text3]) => [pathToFileURL3(path2).toString(), text3]));
+  const fileContents = new Map([...contents].map(([path2, text3]) => [pathToFileURL4(path2).toString(), text3]));
   const storyFormat = await findStoryFormat(fileContents.values(), commonDir);
   if (!storyFormat.isSpindle) {
     console.error(skippedFormatNote(storyFormat));
@@ -35694,7 +35871,7 @@ var init_check = __esm({
 
 // src/plugins/format/segment.ts
 function splitPassages(text3) {
-  const lines = text3.split("\n");
+  const lines = splitLines(text3);
   if (lines.length > 0 && lines[lines.length - 1] === "") {
     lines.pop();
   }
@@ -35742,6 +35919,7 @@ function headerTags(header) {
 var init_segment = __esm({
   "src/plugins/format/segment.ts"() {
     "use strict";
+    init_text();
     init_passage_parser();
   }
 });
@@ -37733,14 +37911,15 @@ function buildDefaultIsBlock(text3) {
 async function formatDocument(text3, options) {
   if (text3.charCodeAt(0) === 65279) return "\uFEFF" + await formatDocument(text3.slice(1), options);
   const eol = dominantEol2(text3);
-  const output = await formatLf2(text3.replace(/\r\n/g, "\n"), options);
-  return eol === "\r\n" ? output.replace(/\n/g, "\r\n") : output;
+  const output = await formatLf2(splitLines(text3).join("\n"), options);
+  return output.replace(/\n/g, eol);
 }
 function dominantEol2(text3) {
-  const crlf = (text3.match(/\r\n/g) ?? []).length;
-  const lf = (text3.match(/\n/g) ?? []).length - crlf;
-  if (crlf !== lf) return crlf > lf ? "\r\n" : "\n";
-  return text3.indexOf("\r\n") !== -1 && text3.indexOf("\r\n") < text3.indexOf("\n") ? "\r\n" : "\n";
+  const counts = /* @__PURE__ */ new Map();
+  for (const [ending] of text3.matchAll(/\r\n|[\r\n]/g)) {
+    counts.set(ending, (counts.get(ending) ?? 0) + 1);
+  }
+  return [...counts].sort((a, b) => b[1] - a[1])[0]?.[0] ?? "\n";
 }
 async function formatLf2(text3, options) {
   const isBlock = options?.isBlock ?? buildDefaultIsBlock(text3);
@@ -37791,6 +37970,7 @@ var DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
 var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
+    init_text();
     init_tooling();
     init_passage_parser();
     init_segment();
@@ -37814,7 +37994,7 @@ var init_format = __esm({
           if (text3 === void 0) return [];
           const formatted = await formatDocument(text3, { ...formatOpts, filePath: params.textDocument.uri });
           if (formatted === text3) return [];
-          const lines = text3.split("\n");
+          const lines = splitLines(text3);
           return [{
             range: {
               start: { line: 0, character: 0 },
@@ -37832,7 +38012,7 @@ var init_format = __esm({
           };
           const formatted = await formatRange(text3, range2, { ...formatOpts, filePath: params.textDocument.uri });
           if (formatted === text3) return [];
-          const lines = text3.split("\n");
+          const lines = splitLines(text3);
           return [{
             range: {
               start: { line: 0, character: 0 },
@@ -69577,7 +69757,7 @@ __export(server_exports, {
   startMcpServer: () => startMcpServer
 });
 import { writeFileSync as writeFileSync2 } from "node:fs";
-import { pathToFileURL as pathToFileURL4 } from "node:url";
+import { pathToFileURL as pathToFileURL5 } from "node:url";
 function filterBySeverity2(diagnostics, minSeverity) {
   const minIdx = SEVERITY_ORDER2.indexOf(minSeverity);
   return diagnostics.filter((d) => {
@@ -69586,7 +69766,7 @@ function filterBySeverity2(diagnostics, minSeverity) {
   });
 }
 function readFiles(files) {
-  return new Map([...readFileContents(files)].map(([path2, text3]) => [pathToFileURL4(path2).toString(), text3]));
+  return new Map([...readFileContents(files)].map(([path2, text3]) => [pathToFileURL5(path2).toString(), text3]));
 }
 async function skippedReason(fileContents, files) {
   const format = await findStoryFormat(fileContents.values(), commonDirectory(files));
@@ -69622,7 +69802,7 @@ async function checkProject(pattern, severity, cwd = process.cwd()) {
   try {
     const results = [];
     for (const filePath of files) {
-      const uri = pathToFileURL4(filePath).toString();
+      const uri = pathToFileURL5(filePath).toString();
       let diags = computeDiagnostics(uri, workspace);
       if (severity) {
         diags = filterBySeverity2(diags, severity);
@@ -69654,7 +69834,7 @@ async function formatFiles(pattern, cwd = process.cwd()) {
   let unchanged = 0;
   const changedFiles = [];
   for (const filePath of files) {
-    const text3 = contents.get(pathToFileURL4(filePath).toString());
+    const text3 = contents.get(pathToFileURL5(filePath).toString());
     if (text3 === void 0) continue;
     try {
       const result2 = await formatDocument(text3, { filePath });
@@ -69680,7 +69860,7 @@ async function checkFormatting(pattern, cwd = process.cwd()) {
   const needsFormatting = [];
   const alreadyFormatted = [];
   for (const filePath of files) {
-    const text3 = contents.get(pathToFileURL4(filePath).toString());
+    const text3 = contents.get(pathToFileURL5(filePath).toString());
     if (text3 === void 0) continue;
     try {
       const result2 = await formatDocument(text3, { filePath });
@@ -79947,7 +80127,11 @@ function gateRegistrations(target, methods, enabled, nested = {}) {
       }
       if (methods.includes(prop) && typeof value === "function") {
         return (handler, ...rest) => Reflect.apply(value, obj, [
-          (...args2) => enabled() ? handler(...args2) : null,
+          (...args2) => {
+            const allowed = enabled();
+            const answer = (yes) => yes ? handler(...args2) : null;
+            return typeof allowed === "boolean" ? answer(allowed) : allowed.then(answer);
+          },
           ...rest
         ]);
       }
@@ -79992,6 +80176,26 @@ var init_story_format_gate = __esm({
   }
 });
 
+// src/core/parsing/js-string-literal.ts
+function encodeStringLiteralBody(value, quote) {
+  let out = "";
+  for (let i2 = 0; i2 < value.length; i2++) {
+    const ch = value[i2];
+    if (ch === "\\" || ch === quote) out += "\\" + ch;
+    else if (ch === "\n") out += "\\n";
+    else if (ch === "\r") out += "\\r";
+    else if (ch === "\u2028") out += "\\u2028";
+    else if (ch === "\u2029") out += "\\u2029";
+    else out += ch;
+  }
+  return out;
+}
+var init_js_string_literal = __esm({
+  "src/core/parsing/js-string-literal.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/markup/tree.ts
 function* walkNodes(nodes) {
   for (const node of nodes) {
@@ -80245,7 +80449,7 @@ function getCompletions(uri, position, triggerChar, workspace) {
         ...item,
         textEdit: {
           range: passage.range(start, end),
-          newText: identifier ? item.label : encodeEnclosingMarkup(passage, start, end, `[${JSON.stringify(item.label)}]`)
+          newText: identifier ? item.label : encodeCompletion(`[${JSON.stringify(item.label)}]`, context.containers)
         }
       };
     });
@@ -80268,6 +80472,12 @@ function getCompletions(uri, position, triggerChar, workspace) {
   }
   return [];
 }
+function encodeCompletion(spelling, containers = []) {
+  for (const container of [...containers].reverse()) {
+    if (container.kind === "string") spelling = encodeStringLiteralBody(spelling, container.quote);
+  }
+  return spelling;
+}
 function getClosingMacroCompletions(cursor, brace) {
   const names = [...new Set(cursor.openBlocks(brace).map((macro) => macro.name))];
   return names.map((name, idx) => ({
@@ -80360,7 +80570,7 @@ var init_completions = __esm({
     "use strict";
     init_tooling();
     init_widgets();
-    init_passage_refs();
+    init_js_string_literal();
     init_link_runtime();
     init_passage_parser();
     init_markup_cursor();
@@ -80717,7 +80927,7 @@ var init_macro_heads = __esm({
 function getDefinition(uri, position, workspace) {
   const text3 = workspace.documents.getText(uri);
   if (text3 === void 0 || !workspace.hasPassages(uri)) return null;
-  const lines = text3.split("\n");
+  const lines = splitLines(text3);
   if (position.line >= lines.length) return null;
   const passageResult = getPassageRefDefinition(uri, position, workspace);
   if (passageResult) return passageResult;
@@ -80729,7 +80939,7 @@ function getPassageRefDefinition(uri, position, workspace) {
   const doc = workspace.markup.get(uri);
   const ref2 = doc && passageRefAt(doc, position);
   if (!ref2) return null;
-  const passage = workspace.passages.getPassage(ref2.name);
+  const passage = workspace.passages.getEffectivePassage(ref2.name);
   if (!passage) return null;
   return {
     uri: passage.uri,
@@ -80754,6 +80964,7 @@ var definitionPlugin;
 var init_definition = __esm({
   "src/plugins/definition.ts"() {
     "use strict";
+    init_text();
     init_macro_heads();
     init_passage_refs();
     definitionPlugin = {
@@ -80783,7 +80994,7 @@ var init_definition = __esm({
 function findReferences(uri, position, workspace, includeDeclaration) {
   const text3 = workspace.documents.getText(uri);
   if (text3 === void 0 || !workspace.hasPassages(uri)) return [];
-  const lines = text3.split("\n");
+  const lines = splitLines(text3);
   if (position.line >= lines.length) return [];
   const line = lines[position.line];
   const header = parsePassageHeader(line, position.line);
@@ -80893,6 +81104,7 @@ var referencesPlugin;
 var init_references = __esm({
   "src/plugins/references.ts"() {
     "use strict";
+    init_text();
     init_macro_heads();
     init_passage_refs();
     init_passage_parser();
@@ -80919,26 +81131,6 @@ var init_references = __esm({
   }
 });
 
-// src/core/parsing/js-string-literal.ts
-function encodeStringLiteralBody(value, quote) {
-  let out = "";
-  for (let i2 = 0; i2 < value.length; i2++) {
-    const ch = value[i2];
-    if (ch === "\\" || ch === quote) out += "\\" + ch;
-    else if (ch === "\n") out += "\\n";
-    else if (ch === "\r") out += "\\r";
-    else if (ch === "\u2028") out += "\\u2028";
-    else if (ch === "\u2029") out += "\\u2029";
-    else out += ch;
-  }
-  return out;
-}
-var init_js_string_literal = __esm({
-  "src/core/parsing/js-string-literal.ts"() {
-    "use strict";
-  }
-});
-
 // src/plugins/rename.ts
 function prepareRename(uri, position, workspace) {
   const symbol2 = resolveSymbolAtCursor(uri, position, workspace);
@@ -80988,10 +81180,13 @@ function computeRename(uri, position, newName, workspace) {
       if (isReservedPassageName(newName)) {
         throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: it is a reserved passage name with a fixed meaning.`).at(uri, symbol2.range);
       }
+      const encoded = encodePassageName(newName);
       for (const declaration of workspace.passages.getPassages(symbol2.name)) {
-        const problem = passageHeaderProblem(newName);
-        if (problem) throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: ${problem}.`).at(declaration.uri, declaration.nameRange);
-        addEdit(declaration.uri, declaration.nameRange, escapePassageName(newName));
+        if (encoded === void 0) {
+          const reason = /[\r\n]/.test(newName) ? "a passage header is a single line" : "a passage header cannot represent that name exactly";
+          throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: ${reason}.`).at(declaration.uri, declaration.nameRange);
+        }
+        addEdit(declaration.uri, declaration.nameRange, encoded);
       }
       for (const { uri: refUri, ref: ref2, text: text3 } of refEdits) addEdit(refUri, ref2.range, text3);
       preserveEntryPassage(symbol2.name, newName, workspace, addEdit);
@@ -81018,11 +81213,30 @@ function computeRename(uri, position, newName, workspace) {
         throw new RenameError(`Cannot rename to ${JSON.stringify(newName)}: a variable with that name already exists.`).at(uri, symbol2.range);
       }
       const refs = symbol2.sigil === "%" ? findTransientReferences(symbol2.name, workspace, true) : findVariableReferences(symbol2.name, workspace, true);
+      const bindings = /* @__PURE__ */ new Map();
       for (const ref2 of refs) {
         const doc = workspace.markup.get(ref2.uri);
         const passage = doc.passageAt(ref2.range.start);
         const start = passage.contentOffset(positionToOffset(ref2.range.start, doc.lineStarts));
         const end = passage.contentOffset(positionToOffset(ref2.range.end, doc.lineStarts));
+        let byStart = bindings.get(passage);
+        if (!byStart) {
+          byStart = new Map(collectVariableReferences2(passage).flatMap((ref3) => ref3.binding ? [[ref3.start, ref3.binding]] : []));
+          bindings.set(passage, byStart);
+        }
+        const binding = byStart.get(start);
+        if (binding && binding.end === end) {
+          let spelling = bareName;
+          if (!binding.explicitSigil) {
+            try {
+              parseBoundVariable(spelling);
+            } catch {
+              spelling = `$${spelling}`;
+            }
+          }
+          addEdit(ref2.uri, passage.range(binding.nameStart, binding.nameEnd), spelling);
+          continue;
+        }
         const view = sourceView(passage, start, end);
         const index = viewIndex(view, start);
         let base;
@@ -81114,19 +81328,13 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
     const declaration = workspace.passages.getPassage(oldName);
     const doc = workspace.markup.get(declaration.uri);
     const end = doc.passages.at(-1).position(doc.passages.at(-1).content.length);
-    const eol = doc.text.includes("\r\n") ? "\r\n" : "\n";
+    const eol = /\r\n|[\r\n]/.exec(doc.text)?.[0] ?? "\n";
     addEdit(declaration.uri, { start: end, end }, `${eol}${eol}:: StoryData${eol}${JSON.stringify({ start: newName })}${eol}`);
   }
 }
 function isEntryField(key) {
   return readStoryData(JSON.stringify({ [key]: "Start" })).start === "Start";
 }
-function passageHeaderProblem(name) {
-  if (name.trim() === "") return "a passage name cannot be empty";
-  if (/[\r\n]/.test(name)) return "a passage header is a single line, so the name cannot contain a line break";
-  if (name !== name.trim()) return "a passage name cannot start or end with whitespace";
-  return null;
-}
 function unrepresentable(newName, where2) {
   return new RenameError(`Cannot rename to ${JSON.stringify(newName)}: it cannot be written inside ${where2}.`);
 }
@@ -81190,13 +81398,10 @@ function misreadRewrite(passage, edits, oldName, newName) {
   const owner = edits.filter((edit) => edit.ref.piece <= index).at(-1) ?? edits[0];
   return owner.ref;
 }
-function escapePassageName(name) {
-  return name.replace(/[[\]{}\\]/g, "\\$&");
-}
 function resolveSymbolAtCursor(uri, position, workspace) {
   const text3 = workspace.documents.getText(uri);
   if (text3 === void 0 || !workspace.hasPassages(uri)) return null;
-  const lines = text3.split("\n");
+  const lines = splitLines(text3);
   if (position.line >= lines.length) return null;
   const line = lines[position.line];
   const header = parsePassageHeader(line, position.line);
@@ -81240,6 +81445,7 @@ var init_rename = __esm({
     import_vscode_languageserver2 = __toESM(require_api3(), 1);
     init_story_data();
     init_tooling();
+    init_executable_refs();
     init_source_view();
     init_text();
     init_link_runtime();
@@ -81609,7 +81815,7 @@ var init_semantic_tokens = __esm({
 // src/plugins/code-actions.ts
 import { readFileSync as readFileSync7 } from "node:fs";
 import { basename as basename2, dirname as dirname5, join as join4 } from "node:path";
-import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL5 } from "node:url";
+import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL6 } from "node:url";
 function computeCodeActions(uri, diagnostics, workspace, options = {}) {
   const actions = [];
   for (const diag of diagnostics) {
@@ -81660,7 +81866,7 @@ function addMacroToConfig(uri, macroName, workspace, options) {
   if (!root) return null;
   const existingPath = findConfigFile(root);
   const configPath = existingPath ?? join4(root, DEFAULT_CONFIG_FILENAME);
-  const configUri = pathToFileURL5(configPath).toString();
+  const configUri = pathToFileURL6(configPath).toString();
   const action = {
     title: `Add '${macroName}' to ${basename2(configPath)}`,
     kind: "quickfix",
@@ -81734,7 +81940,7 @@ function addMacroToYamlConfig(text3, macroName) {
         const nl = text3.indexOf("\n", offset2);
         offset2 = nl === -1 ? text3.length : nl + 1;
       }
-      const lead = offset2 === text3.length && text3.length > 0 && !text3.endsWith("\n") ? "\n" : "";
+      const lead = offset2 === text3.length && text3.length > 0 && !/[\r\n]$/.test(text3) ? "\n" : "";
       const pos = offsetToPosition2(text3, offset2);
       return { range: { start: pos, end: pos }, newText: lead + entry };
     }
@@ -81764,16 +81970,14 @@ function addMacroToJsonConfig(text3, macroName) {
     container.macros = { [macroName]: NEW_MACRO_ENTRY };
   }
   const indent = text3.match(/^[ \t]+(?=")/m)?.[0] ?? "  ";
-  const newline = text3.endsWith("\n") || !text3.trim() ? "\n" : "";
+  const newline = /[\r\n]$/.test(text3) || !text3.trim() ? "\n" : "";
   return minimalEdit(text3, JSON.stringify(raw, null, indent) + newline);
 }
 function columnOf2(text3, offset2) {
-  return offset2 - (text3.lastIndexOf("\n", offset2 - 1) + 1);
+  return offsetToPosition2(text3, offset2).character;
 }
 function offsetToPosition2(text3, offset2) {
-  const before = text3.slice(0, offset2);
-  const lineStart = before.lastIndexOf("\n") + 1;
-  return { line: before.split("\n").length - 1, character: offset2 - lineStart };
+  return offsetToPosition(offset2, buildLineStarts(text3));
 }
 function minimalEdit(oldText, newText) {
   const max = Math.min(oldText.length, newText.length);
@@ -81790,19 +81994,19 @@ function minimalEdit(oldText, newText) {
   };
 }
 function insertLinesAt(text3, line, body, eol) {
-  const lines = text3.split("\n");
+  const lines = splitLines(text3);
   const normalized = body.replace(/\r?\n/g, eol);
   if (line < lines.length) {
     const pos = { line, character: 0 };
     return { range: { start: pos, end: pos }, newText: normalized };
   }
   const end = offsetToPosition2(text3, text3.length);
-  const atBoundary = text3.length === 0 || text3.endsWith("\n");
+  const atBoundary = text3.length === 0 || /[\r\n]$/.test(text3);
   return { range: { start: end, end }, newText: (atBoundary ? "" : eol) + normalized };
 }
 function lineEndingFor(workspace, uri) {
   const own2 = workspace.documents.getText(uri) ?? "";
-  const detect = (text3) => text3.includes("\r\n") ? "\r\n" : text3.includes("\n") ? "\n" : void 0;
+  const detect = (text3) => text3.includes("\r\n") ? "\r\n" : text3.includes("\n") ? "\n" : text3.includes("\r") ? "\r" : void 0;
   const fromOwn = detect(own2);
   if (fromOwn) return fromOwn;
   for (const other of [...workspace.documents.getUris()].sort()) {
@@ -81821,7 +82025,7 @@ function declareVariable(diag, workspace, sigil) {
   if (text3 === void 0) return [];
   const markup = workspace.markup.get(passage.uri)?.passages.find((p) => p.passage === passage);
   if (!markup) return [];
-  const boundary = markup.bodyEnd === text3.length ? text3.split("\n").length : markup.position(markup.content.length).line;
+  const boundary = markup.bodyEnd === text3.length ? splitLines(text3).length : markup.position(markup.content.length).line;
   const edit = insertLinesAt(text3, boundary, `${sigil}${name} = 0
 `, lineEndingFor(workspace, passage.uri));
   return [{
@@ -81837,7 +82041,7 @@ function fixNoStoryVariables(workspace) {
   if (targetUri === void 0) return null;
   const text3 = workspace.documents.getText(targetUri);
   if (text3 === void 0) return null;
-  const edit = insertLinesAt(text3, text3.split("\n").length, "\n:: StoryVariables\n", lineEndingFor(workspace, targetUri));
+  const edit = insertLinesAt(text3, splitLines(text3).length, "\n:: StoryVariables\n", lineEndingFor(workspace, targetUri));
   return {
     title: "Create StoryVariables passage",
     kind: "quickfix",
@@ -81882,10 +82086,10 @@ function fixBrokenLink(uri, diag, workspace) {
       edits: [{ uri, ...edit }]
     });
   }
-  const header = `:: ${name.replace(/[\\[\]{}]/g, "\\$&")}`;
-  if (!workspace.passages.getPassage(name) && name.trim() === name && name !== "" && !/[\r\n]/.test(name)) {
-    const edit = insertLinesAt(text3, text3.split("\n").length, `
-${header}
+  const encoded = encodePassageName(name);
+  if (!workspace.passages.getPassage(name) && encoded !== void 0) {
+    const edit = insertLinesAt(text3, splitLines(text3).length, `
+:: ${encoded}
 `, lineEndingFor(workspace, uri));
     actions.push({
       title: `Create passage '${name}'`,
@@ -82233,7 +82437,7 @@ function computeDocumentLinks(uri, workspace) {
   const links = [];
   for (const ref2 of documentPassageRefs(doc)) {
     if (ref2.form !== "bracket") continue;
-    const targetPassage = workspace.passages.getPassage(ref2.name);
+    const targetPassage = workspace.passages.getEffectivePassage(ref2.name);
     links.push({
       range: ref2.range,
       target: targetPassage ? `${targetPassage.uri}#L${targetPassage.range.start.line + 1}` : void 0
@@ -82319,7 +82523,7 @@ var server_exports2 = {};
 __export(server_exports2, {
   startServer: () => startServer
 });
-import { fileURLToPath as fileURLToPath5, pathToFileURL as pathToFileURL6 } from "node:url";
+import { fileURLToPath as fileURLToPath5, pathToFileURL as pathToFileURL7 } from "node:url";
 import { readFileSync as readFileSync8 } from "node:fs";
 import { basename as basename3, dirname as dirname6 } from "node:path";
 function uriToFsPath(uri) {
@@ -82330,7 +82534,7 @@ function uriToFsPath(uri) {
   }
 }
 function fsPathToUri(fsPath) {
-  return pathToFileURL6(fsPath).toString();
+  return pathToFileURL7(fsPath).toString();
 }
 function isConfigFileUri(uri) {
   const name = basename3(uriToFsPath(uri));
@@ -82344,6 +82548,10 @@ function startServer(args2) {
   let activePlugins = [];
   let workspaceRoot;
   let startupWarning;
+  let completeInitialScan;
+  const initialScan = new Promise((resolve8) => {
+    completeInitialScan = resolve8;
+  });
   connection.onInitialize((params) => {
     console.error("[spindle-lsp] onInitialize called");
     const initOptions = params.initializationOptions ?? {};
@@ -82371,7 +82579,10 @@ function startServer(args2) {
     activePlugins = loadPlugins(allPlugins, config2);
     console.error("[spindle-lsp] plugins loaded:", activePlugins.map((p) => p.id).join(", "));
     const model = workspace;
-    const pluginConnection = gateConnection(connection, () => model.isSpindleProject());
+    const pluginConnection = gateConnection(connection, async () => {
+      await initialScan;
+      return model.initialized && model.isSpindleProject();
+    });
     for (const plugin of activePlugins) {
       plugin.initialize({ connection: pluginConnection, workspace, config: config2 });
     }
@@ -82423,6 +82634,8 @@ function startServer(args2) {
           console.error("[spindle-lsp] workspace initialized, macros:", workspace.macros.getAllMacros().length);
         } catch (err) {
           console.error("[spindle-lsp] workspace scan failed:", err);
+        } finally {
+          completeInitialScan();
         }
       });
     }