@rohal12/spindle-lsp 0.15.0 → 0.15.2

package/dist/bin.js

@@ -50,6 +50,15 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
+// src/version.ts
+var VERSION;
+var init_version = __esm({
+  "src/version.ts"() {
+    "use strict";
+    VERSION = false ? pkg.version : "0.15.2";
+  }
+});
+
 // node_modules/glob/dist/esm/index.min.js
 import { fileURLToPath as Wi } from "node:url";
 import { posix as mi, win32 as re } from "node:path";
@@ -3041,7 +3050,7 @@ globstar while`, t, d, e, f, m), this.matchOne(t.slice(d), e.slice(f), s)) retur
 
 // src/core/workspace/file-inputs.ts
 import { readFileSync, statSync } from "node:fs";
-import { resolve } from "node:path";
+import { isAbsolute, relative, resolve, sep } from "node:path";
 async function resolveFiles(pattern, cwd) {
   let input = pattern;
   let directory = cwd;
@@ -3066,6 +3075,10 @@ async function resolveInputs(patterns, cwd) {
   const files = await Promise.all(patterns.map((pattern) => resolveFiles(pattern, cwd)));
   return [...new Set(files.flat())];
 }
+function relativeTo(cwd, filePath) {
+  const rel = relative(cwd, filePath);
+  return rel === ".." || rel.startsWith(`..${sep}`) || isAbsolute(rel) ? filePath : rel;
+}
 var init_file_inputs = __esm({
   "src/core/workspace/file-inputs.ts"() {
     "use strict";
@@ -23372,10 +23385,11 @@ function parsePassageHeader(rawLine, lineNumber) {
   const delimiter = /[\[\]{}]/g;
   delimiter.lastIndex = nameStart;
   const first = delimiter.exec(escaped);
-  const nameEnd = first?.index ?? line.length;
-  const name = line.slice(nameStart, nameEnd).trim();
+  const boundary = first?.index ?? line.length;
+  const nameEnd = escaped.slice(0, boundary).trimEnd().length;
+  const name = line.slice(nameStart, nameEnd).replace(/\\(.)/g, "$1").trim();
   if (!name) return null;
-  let rest = nameEnd;
+  let rest = boundary;
   let tags = [];
   if (escaped[rest] === "[") {
     const end = escaped.indexOf("]", rest + 1);
@@ -23400,14 +23414,13 @@ function parsePassageHeader(rawLine, lineNumber) {
     end: { line: lineNumber, character: line.length }
   };
   const nameCharStart = nameStart;
-  const nameCharEnd = nameCharStart + name.length;
+  const nameCharEnd = nameEnd;
   const nameRange = {
     start: { line: lineNumber, character: nameCharStart },
     end: { line: lineNumber, character: nameCharEnd }
   };
   return {
-    name: name.replace(/\\(.)/g, "$1"),
-    // unescape
+    name,
     tags,
     meta: meta3,
     headerRange,
@@ -27577,10 +27590,10 @@ var require_resolve_block_map = __commonJS({
       let offset2 = bm.offset;
       let commentEnd = null;
       for (const collItem of bm.items) {
-        const { start, key, sep, value } = collItem;
+        const { start, key, sep: sep2, value } = collItem;
         const keyProps = resolveProps.resolveProps(start, {
           indicator: "explicit-key-ind",
-          next: key ?? sep?.[0],
+          next: key ?? sep2?.[0],
           offset: offset2,
           onError,
           parentIndent: bm.indent,
@@ -27594,7 +27607,7 @@ var require_resolve_block_map = __commonJS({
             else if ("indent" in key && key.indent !== bm.indent)
               onError(offset2, "BAD_INDENT", startColMsg);
           }
-          if (!keyProps.anchor && !keyProps.tag && !sep) {
+          if (!keyProps.anchor && !keyProps.tag && !sep2) {
             commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map2.comment)
@@ -27618,7 +27631,7 @@ var require_resolve_block_map = __commonJS({
         ctx.atKey = false;
         if (utilMapIncludes.mapIncludes(ctx, map2.items, keyNode))
           onError(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep ?? [], {
+        const valueProps = resolveProps.resolveProps(sep2 ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -27634,7 +27647,7 @@ var require_resolve_block_map = __commonJS({
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset2, sep, null, valueProps, onError);
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset2, sep2, null, valueProps, onError);
           if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bm.indent, value, onError);
           offset2 = valueNode.range[2];
@@ -27725,7 +27738,7 @@ var require_resolve_end = __commonJS({
       let comment = "";
       if (end) {
         let hasSpace = false;
-        let sep = "";
+        let sep2 = "";
         for (const token of end) {
           const { source, type } = token;
           switch (type) {
@@ -27739,13 +27752,13 @@ var require_resolve_end = __commonJS({
               if (!comment)
                 comment = cb;
               else
-                comment += sep + cb;
-              sep = "";
+                comment += sep2 + cb;
+              sep2 = "";
               break;
             }
             case "newline":
               if (comment)
-                sep += source;
+                sep2 += source;
               hasSpace = true;
               break;
             default:
@@ -27788,18 +27801,18 @@ var require_resolve_flow_collection = __commonJS({
       let offset2 = fc.offset + fc.start.source.length;
       for (let i2 = 0; i2 < fc.items.length; ++i2) {
         const collItem = fc.items[i2];
-        const { start, key, sep, value } = collItem;
+        const { start, key, sep: sep2, value } = collItem;
         const props = resolveProps.resolveProps(start, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key ?? sep?.[0],
+          next: key ?? sep2?.[0],
           offset: offset2,
           onError,
           parentIndent: fc.indent,
           startOnNewline: false
         });
         if (!props.found) {
-          if (!props.anchor && !props.tag && !sep && !value) {
+          if (!props.anchor && !props.tag && !sep2 && !value) {
             if (i2 === 0 && props.comma)
               onError(props.comma, "UNEXPECTED_TOKEN", `Unexpected , in ${fcName}`);
             else if (i2 < fc.items.length - 1)
@@ -27853,8 +27866,8 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap2 && !sep && !props.found) {
-          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep, null, props, onError);
+        if (!isMap2 && !sep2 && !props.found) {
+          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep2, null, props, onError);
           coll.items.push(valueNode);
           offset2 = valueNode.range[2];
           if (isBlock(value))
@@ -27866,7 +27879,7 @@ var require_resolve_flow_collection = __commonJS({
           if (isBlock(key))
             onError(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
           ctx.atKey = false;
-          const valueProps = resolveProps.resolveProps(sep ?? [], {
+          const valueProps = resolveProps.resolveProps(sep2 ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -27877,8 +27890,8 @@ var require_resolve_flow_collection = __commonJS({
           });
           if (valueProps.found) {
             if (!isMap2 && !props.found && ctx.options.strict) {
-              if (sep)
-                for (const st2 of sep) {
+              if (sep2)
+                for (const st2 of sep2) {
                   if (st2 === valueProps.found)
                     break;
                   if (st2.type === "newline") {
@@ -27895,7 +27908,7 @@ var require_resolve_flow_collection = __commonJS({
             else
               onError(valueProps.start, "MISSING_CHAR", `Missing , or : between ${fcName} items`);
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep, null, valueProps, onError) : null;
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep2, null, valueProps, onError) : null;
           if (valueNode) {
             if (isBlock(value))
               onError(valueNode.range, "BLOCK_IN_FLOW", blockMsg);
@@ -28075,7 +28088,7 @@ var require_resolve_block_scalar = __commonJS({
           chompStart = i2 + 1;
       }
       let value = "";
-      let sep = "";
+      let sep2 = "";
       let prevMoreIndented = false;
       for (let i2 = 0; i2 < contentStart; ++i2)
         value += lines[i2][0].slice(trimIndent) + "\n";
@@ -28092,24 +28105,24 @@ var require_resolve_block_scalar = __commonJS({
           indent = "";
         }
         if (type === Scalar.Scalar.BLOCK_LITERAL) {
-          value += sep + indent.slice(trimIndent) + content2;
-          sep = "\n";
+          value += sep2 + indent.slice(trimIndent) + content2;
+          sep2 = "\n";
         } else if (indent.length > trimIndent || content2[0] === "	") {
-          if (sep === " ")
-            sep = "\n";
-          else if (!prevMoreIndented && sep === "\n")
-            sep = "\n\n";
-          value += sep + indent.slice(trimIndent) + content2;
-          sep = "\n";
+          if (sep2 === " ")
+            sep2 = "\n";
+          else if (!prevMoreIndented && sep2 === "\n")
+            sep2 = "\n\n";
+          value += sep2 + indent.slice(trimIndent) + content2;
+          sep2 = "\n";
           prevMoreIndented = true;
         } else if (content2 === "") {
-          if (sep === "\n")
+          if (sep2 === "\n")
             value += "\n";
           else
-            sep = "\n";
+            sep2 = "\n";
         } else {
-          value += sep + content2;
-          sep = " ";
+          value += sep2 + content2;
+          sep2 = " ";
           prevMoreIndented = false;
         }
       }
@@ -28292,25 +28305,25 @@ var require_resolve_flow_scalar = __commonJS({
         trimBoth = /^[ \t]+|[ \t]+$/g;
       }
       let res = match[1].replace(trimEnd, "");
-      let sep = " ";
+      let sep2 = " ";
       let pos = line.lastIndex;
       while (match = line.exec(source)) {
         const lm = match[1].replace(trimBoth, "");
         if (lm === "") {
-          if (sep === "\n")
-            res += sep;
+          if (sep2 === "\n")
+            res += sep2;
           else
-            sep = "\n";
+            sep2 = "\n";
         } else {
-          res += sep + lm;
-          sep = " ";
+          res += sep2 + lm;
+          sep2 = " ";
         }
         pos = line.lastIndex;
       }
       const last2 = /[ \t]*(.*)/sy;
       last2.lastIndex = pos;
       match = last2.exec(source);
-      return res + sep + (match?.[1] ?? "");
+      return res + sep2 + (match?.[1] ?? "");
     }
     function doubleQuotedValue(source, onError) {
       let res = "";
@@ -29120,14 +29133,14 @@ var require_cst_stringify = __commonJS({
         }
       }
     }
-    function stringifyItem({ start, key, sep, value }) {
+    function stringifyItem({ start, key, sep: sep2, value }) {
       let res = "";
       for (const st2 of start)
         res += st2.source;
       if (key)
         res += stringifyToken(key);
-      if (sep)
-        for (const st2 of sep)
+      if (sep2)
+        for (const st2 of sep2)
           res += st2.source;
       if (value)
         res += stringifyToken(value);
@@ -30294,18 +30307,18 @@ var require_parser = __commonJS({
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start = getFirstKeyStartProps(prev);
-          let sep;
+          let sep2;
           if (scalar.end) {
-            sep = scalar.end;
-            sep.push(this.sourceToken);
+            sep2 = scalar.end;
+            sep2.push(this.sourceToken);
             delete scalar.end;
           } else
-            sep = [this.sourceToken];
+            sep2 = [this.sourceToken];
           const map2 = {
             type: "block-map",
             offset: scalar.offset,
             indent: scalar.indent,
-            items: [{ start, key: scalar, sep }]
+            items: [{ start, key: scalar, sep: sep2 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map2;
@@ -30458,15 +30471,15 @@ var require_parser = __commonJS({
                 } else if (isFlowToken(it2.key) && !includesToken(it2.sep, "newline")) {
                   const start2 = getFirstKeyStartProps(it2.start);
                   const key = it2.key;
-                  const sep = it2.sep;
-                  sep.push(this.sourceToken);
+                  const sep2 = it2.sep;
+                  sep2.push(this.sourceToken);
                   delete it2.key;
                   delete it2.sep;
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start2, key, sep }]
+                    items: [{ start: start2, key, sep: sep2 }]
                   });
                 } else if (start.length > 0) {
                   it2.sep = it2.sep.concat(start, this.sourceToken);
@@ -30660,13 +30673,13 @@ var require_parser = __commonJS({
             const prev = getPrevProps(parent);
             const start = getFirstKeyStartProps(prev);
             fixFlowSeqItems(fc);
-            const sep = fc.end.splice(1, fc.end.length);
-            sep.push(this.sourceToken);
+            const sep2 = fc.end.splice(1, fc.end.length);
+            sep2.push(this.sourceToken);
             const map2 = {
               type: "block-map",
               offset: fc.offset,
               indent: fc.indent,
-              items: [{ start, key: fc, sep }]
+              items: [{ start, key: fc, sep: sep2 }]
             };
             this.onKeyLine = true;
             this.stack[this.stack.length - 1] = map2;
@@ -31515,6 +31528,8 @@ var init_variable_tracker = __esm({
       sigil;
       present = false;
       declared = /* @__PURE__ */ new Map();
+      /** Every declaration, including earlier defaults for the same binding. */
+      occurrences = [];
       /** Lines Spindle rejects. */
       problems = [];
       /** The names declared, with the range of sigil and name of the first. */
@@ -31522,6 +31537,7 @@ var init_variable_tracker = __esm({
       clear() {
         this.present = false;
         this.declared.clear();
+        this.occurrences.length = 0;
         this.problems = [];
         this.names.clear();
       }
@@ -31548,6 +31564,7 @@ var init_variable_tracker = __esm({
             if (schema.fields && schema.fields.size > 0) declared.fields = [...schema.fields.keys()];
           }
           this.declared.set(name, declared);
+          this.occurrences.push(declared);
           if (!this.names.has(name)) this.names.set(name, declarationRange);
         }
       }
@@ -31619,17 +31636,22 @@ var init_variable_tracker = __esm({
       getUsages(name) {
         return usagesOf(this.usagesByUri, name);
       }
+      /** Every declaration location of a story or transient binding, in source order. */
+      getDeclarations(name, sigil) {
+        const declarations = sigil === "$" ? this.variables : this.transients;
+        return declarations.occurrences.flatMap((d) => d.name === name && d.declarationUri !== void 0 && d.declarationRange ? [{ uri: d.declarationUri, range: d.declarationRange }] : []);
+      }
       /** The executable usage or declaration containing the cursor, in source coordinates. */
       referenceAt(uri, position) {
         const contains = (range) => (position.line > range.start.line || position.line === range.start.line && position.character >= range.start.character) && (position.line < range.end.line || position.line === range.end.line && position.character <= range.end.character);
         let atEnd = null;
         for (const [sigil, usages, declarations] of [
-          ["$", this.usagesByUri.get(uri), this.variables.declared],
-          ["%", this.transientUsagesByUri.get(uri), this.transients.declared]
+          ["$", this.usagesByUri.get(uri), this.variables.occurrences],
+          ["%", this.transientUsagesByUri.get(uri), this.transients.occurrences]
         ]) {
           const candidates = (usages ?? []).map((u) => ({ name: u.baseName, range: u.range }));
-          for (const [name, declaration] of declarations) {
-            if (declaration.declarationUri === uri && declaration.declarationRange) candidates.push({ name, range: declaration.declarationRange });
+          for (const declaration of declarations) {
+            if (declaration.declarationUri === uri && declaration.declarationRange) candidates.push({ name: declaration.name, range: declaration.declarationRange });
           }
           for (const candidate of candidates) {
             if (!contains(candidate.range)) continue;
@@ -31765,6 +31787,13 @@ var init_widget_registry = __esm({
       getAllWidgets() {
         return Array.from(this.widgets.values());
       }
+      /** The effective widget whose declared name contains the cursor. */
+      definitionAt(uri, position) {
+        return this.getAllWidgets().find((widget) => {
+          const { start, end } = widget.nameRange;
+          return widget.uri === uri && position.line === start.line && position.character >= start.character && position.character <= end.character;
+        });
+      }
       /**
        * Record the macros opened in a document (its tags and those in the labels
        * and attribute values that hold markup), replacing any previous record for
@@ -31835,7 +31864,7 @@ var init_markup_index = __esm({
 
 // src/core/workspace/macro-sources.ts
 import { existsSync as existsSync2, readFileSync as readFileSync4 } from "node:fs";
-import { dirname, isAbsolute, join as join2, relative } from "node:path";
+import { dirname, isAbsolute as isAbsolute2, join as join2, relative as relative2 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 function isExcludedSegment(segment) {
   return EXCLUDED_DIRS.includes(segment) || segment.startsWith(".") && segment !== "." && segment !== "..";
@@ -31843,14 +31872,14 @@ function isExcludedSegment(segment) {
 function isMacroSource(uriOrPath) {
   return MACRO_SOURCE_PATTERN.test(uriOrPath);
 }
-function isExcludedMacroSource(path, root) {
-  return (root ? relative(root, path) : path).split(/[\\/]/).some(isExcludedSegment);
+function isExcludedProjectFile(path, root) {
+  return (root ? relative2(root, path) : path).split(/[\\/]/).some(isExcludedSegment);
 }
 function findMacroSourceFiles(root) {
   return findProjectFiles(root, MACRO_SOURCE_GLOB);
 }
 function findProjectFiles(root, pattern) {
-  const excluded = (p) => isExcludedMacroSource(p.fullpath(), root);
+  const excluded = (p) => isExcludedProjectFile(p.fullpath(), root);
   return Ze(pattern, {
     cwd: root,
     absolute: true,
@@ -31861,8 +31890,8 @@ function findProjectFiles(root, pattern) {
   });
 }
 function isWithin(path, dir) {
-  const rel = relative(dir, path);
-  return rel === "" || !rel.startsWith("..") && !isAbsolute(rel);
+  const rel = relative2(dir, path);
+  return rel === "" || !rel.startsWith("..") && !isAbsolute2(rel);
 }
 function commonDirectory(files) {
   return files.map((f) => dirname(f)).reduce((a, b) => {
@@ -34007,6 +34036,10 @@ function structureDiagnostics(passage, workspace) {
     }
   };
   visit(passage.pairing.nodes, []);
+  for (const piece of passage.pieces) {
+    if (piece.kind !== "text") continue;
+    visit(pairMarkup(piece.tokens, { isBlock: (name) => workspace.isContainer(name) }).nodes, []);
+  }
   return diagnostics;
 }
 function parentDiagnostics(passage, token, ancestors, workspace) {
@@ -34539,7 +34572,7 @@ function formatSarif(results) {
         tool: {
           driver: {
             name: "spindle-lsp",
-            version: "0.1.0",
+            version: VERSION,
             rules: Array.from(ruleIds).map((id) => ({
               id,
               shortDescription: { text: `Spindle diagnostic ${id}` }
@@ -34556,6 +34589,7 @@ var sarifLevelMap;
 var init_sarif = __esm({
   "src/cli/reporters/sarif.ts"() {
     "use strict";
+    init_version();
     sarifLevelMap = {
       error: "error",
       warning: "warning",
@@ -34813,7 +34847,7 @@ async function loadPrettier(filePath) {
   if (!p) return void 0;
   try {
     const path = filePath?.startsWith("file:") ? fileURLToPath3(filePath) : filePath;
-    const resolved = await p.resolveConfig(path ?? resolve5(process.cwd(), "story.tw"));
+    const resolved = await p.resolveConfig(path ?? resolve5(process.cwd(), "story.tw"), { useCache: false });
     return { prettier: p, options: { tabWidth: 2, ...resolved ?? {} } };
   } catch {
     return { prettier: p, options: { tabWidth: 2 } };
@@ -34867,8 +34901,7 @@ async function formatLf2(text3, options) {
       }
     }
     if (passage.header) {
-      const header = PASSAGE_HEADER_REGEX.test(passage.header) ? normalizePassageHeader(passage.header) : passage.header;
-      resultLines.push(header.replace(/\s+$/, ""));
+      resultLines.push(normalizePassageHeader(passage.header));
     }
     if (passage.body === "") continue;
     const role = parsePassageHeader(passage.header, passage.startLine);
@@ -34889,26 +34922,14 @@ async function formatRange(text3, _range, options) {
   return formatDocument(text3, options);
 }
 function normalizePassageHeader(line) {
-  const headerMatch = line.match(/^::\s*(.*)/);
-  if (!headerMatch) return line;
-  const rest = headerMatch[1];
-  const unescaped = rest.replace(/\\./g, "ec");
-  const bracketIdx = unescaped.indexOf("[");
-  const braceIdx = unescaped.indexOf("{");
-  let name;
-  let suffix = "";
-  if (bracketIdx !== -1 && (braceIdx === -1 || bracketIdx < braceIdx)) {
-    name = rest.substring(0, bracketIdx).trim();
-    suffix = " " + rest.substring(bracketIdx).trim();
-  } else if (braceIdx !== -1) {
-    name = rest.substring(0, braceIdx).trim();
-    suffix = " " + rest.substring(braceIdx).trim();
-  } else {
-    name = rest.trim();
-  }
-  return `:: ${name}${suffix}`;
-}
-var PASSAGE_HEADER_REGEX, DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
+  const header = parsePassageHeader(line, 0);
+  if (!header) return line;
+  const { start, end } = header.nameRange;
+  const name = line.slice(start.character, end.character);
+  const suffix = line.slice(end.character).trim();
+  return `:: ${name}${suffix ? ` ${suffix}` : ""}`;
+}
+var DEFAULT_DEDENTING2, BUILTIN_CONTAINERS, formatPlugin;
 var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
@@ -34916,7 +34937,6 @@ var init_format = __esm({
     init_passage_parser();
     init_segment();
     init_prettier_bridge();
-    PASSAGE_HEADER_REGEX = /^(::)\s*/;
     DEFAULT_DEDENTING2 = /* @__PURE__ */ new Set(["else", "elseif", "next", "case", "default"]);
     BUILTIN_CONTAINERS = new Set(builtinMacros.filter((m) => m.block).map((m) => m.name.toLowerCase()));
     formatPlugin = {
@@ -35040,8 +35060,7 @@ async function runFormat(args2) {
       const formatted = await formatDocument(text3, { ...formatOpts, filePath });
       if (formatted !== text3) {
         if (options.check) {
-          const relative2 = filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
-          unformatted.push(relative2);
+          unformatted.push(relativeTo(cwd, filePath));
         } else {
           writeFileSync(filePath, formatted, "utf-8");
         }
@@ -61326,49 +61345,49 @@ var require_fast_uri = __commonJS({
       schemelessOptions.skipEscape = true;
       return serialize(resolved, schemelessOptions);
     }
-    function resolveComponent(base, relative2, options, skipNormalization) {
+    function resolveComponent(base, relative3, options, skipNormalization) {
       const target = {};
       if (!skipNormalization) {
         base = parse6(serialize(base, options), options);
-        relative2 = parse6(serialize(relative2, options), options);
+        relative3 = parse6(serialize(relative3, options), options);
       }
       options = options || {};
-      if (!options.tolerant && relative2.scheme) {
-        target.scheme = relative2.scheme;
-        target.userinfo = relative2.userinfo;
-        target.host = relative2.host;
-        target.port = relative2.port;
-        target.path = removeDotSegments(relative2.path || "");
-        target.query = relative2.query;
+      if (!options.tolerant && relative3.scheme) {
+        target.scheme = relative3.scheme;
+        target.userinfo = relative3.userinfo;
+        target.host = relative3.host;
+        target.port = relative3.port;
+        target.path = removeDotSegments(relative3.path || "");
+        target.query = relative3.query;
       } else {
-        if (relative2.userinfo !== void 0 || relative2.host !== void 0 || relative2.port !== void 0) {
-          target.userinfo = relative2.userinfo;
-          target.host = relative2.host;
-          target.port = relative2.port;
-          target.path = removeDotSegments(relative2.path || "");
-          target.query = relative2.query;
+        if (relative3.userinfo !== void 0 || relative3.host !== void 0 || relative3.port !== void 0) {
+          target.userinfo = relative3.userinfo;
+          target.host = relative3.host;
+          target.port = relative3.port;
+          target.path = removeDotSegments(relative3.path || "");
+          target.query = relative3.query;
         } else {
-          if (!relative2.path) {
+          if (!relative3.path) {
             target.path = base.path;
-            if (relative2.query !== void 0) {
-              target.query = relative2.query;
+            if (relative3.query !== void 0) {
+              target.query = relative3.query;
             } else {
               target.query = base.query;
             }
           } else {
-            if (relative2.path[0] === "/") {
-              target.path = removeDotSegments(relative2.path);
+            if (relative3.path[0] === "/") {
+              target.path = removeDotSegments(relative3.path);
             } else {
               if ((base.userinfo !== void 0 || base.host !== void 0 || base.port !== void 0) && !base.path) {
-                target.path = "/" + relative2.path;
+                target.path = "/" + relative3.path;
               } else if (!base.path) {
-                target.path = relative2.path;
+                target.path = relative3.path;
               } else {
-                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative2.path;
+                target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative3.path;
               }
               target.path = removeDotSegments(target.path);
             }
-            target.query = relative2.query;
+            target.query = relative3.query;
           }
           target.userinfo = base.userinfo;
           target.host = base.host;
@@ -61376,7 +61395,7 @@ var require_fast_uri = __commonJS({
         }
         target.scheme = base.scheme;
       }
-      target.fragment = relative2.fragment;
+      target.fragment = relative3.fragment;
       return target;
     }
     function equal(uriA, uriB, options) {
@@ -66389,6 +66408,7 @@ var init_sessions = __esm({
     PlaySessions = class {
       entries = /* @__PURE__ */ new Map();
       load;
+      trustedHostCode;
       max;
       idleMs;
       /** Sessions being opened; they count toward the cap before they are registered. */
@@ -66397,6 +66417,7 @@ var init_sessions = __esm({
       closing = false;
       constructor(options = {}) {
         this.load = options.load ?? loadPlay;
+        this.trustedHostCode = options.trustedHostCode === true;
         this.max = options.max ?? 8;
         this.idleMs = options.idleMs ?? 18e5;
       }
@@ -66405,6 +66426,11 @@ var init_sessions = __esm({
         return this.entries.size;
       }
       async start(storyPath, passage) {
+        if (!this.trustedHostCode) {
+          throw new Error(
+            "spindle_play requires host-code trust: stories can read/write host files, access environment variables and run commands with your account privileges. Only for trusted stories, set SPINDLE_LSP_TRUSTED_PLAY=1 in the MCP server environment and restart it."
+          );
+        }
         if (this.closing) throw shuttingDown();
         this.prune();
         if (this.entries.size + this.starting >= this.max) {
@@ -66605,7 +66631,7 @@ async function guarded(handler) {
 function registerPlayTools(server, sessions) {
   server.tool(
     "spindle_play_start",
-    "Start playing a Spindle story headlessly. Returns a session id and what the reader sees.",
+    "Execute a trusted Spindle story headlessly with host file, environment and command access. Requires SPINDLE_LSP_TRUSTED_PLAY=1 in the server environment. Returns a session id and what the reader sees.",
     {
       story: external_exports3.string().describe("Path to compiled .html, a .twee/.tw file, a glob or a project directory"),
       passage: external_exports3.string().optional().describe("Passage to go to after boot")
@@ -66742,7 +66768,7 @@ async function checkProject(pattern, severity, cwd = process.cwd()) {
       if (severity) {
         diags = filterBySeverity2(diags, severity);
       }
-      const relativePath = filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
+      const relativePath = relativeTo(cwd, filePath);
       for (const d of diags) {
         results.push({
           file: relativePath,
@@ -66759,9 +66785,6 @@ async function checkProject(pattern, severity, cwd = process.cwd()) {
     workspace.dispose();
   }
 }
-function relativeTo(cwd, filePath) {
-  return filePath.startsWith(cwd) ? filePath.slice(cwd.length + 1) : filePath;
-}
 async function formatFiles(pattern, cwd = process.cwd()) {
   const files = await resolveFiles(pattern, cwd);
   const contents = readFiles(files);
@@ -66857,7 +66880,7 @@ async function startMcpServer(version2) {
       };
     }
   );
-  const playSessions = new PlaySessions();
+  const playSessions = new PlaySessions({ trustedHostCode: process.env.SPINDLE_LSP_TRUSTED_PLAY === "1" });
   registerPlayTools(server, playSessions);
   const transport = new StdioServerTransport();
   closePlaySessionsOnShutdown(playSessions, transport);
@@ -77681,6 +77704,30 @@ function getSignatureHelp(uri, position, workspace) {
       return { signatures, activeSignature, activeParameter };
     }
   }
+  if (macroInfo) {
+    const definitions = macroInfo.parameters === void 0 ? macroInfo.parameterDefs : void 0;
+    if (!definitions?.length) return null;
+    const parameters = definitions.map((parameter) => ({
+      label: parameter.required ? parameter.name : `[${parameter.name}]`,
+      documentation: [parameter.description, `Type: ${parameter.type}`].filter(Boolean).join("\n\n")
+    }));
+    const positional = definitions.every((p) => p.type === "string" || p.type === "number") && argument < parameters.length;
+    const documentation = [
+      macroInfo.description,
+      ...!positional ? parameters.map((p) => `${p.label}
+
+${p.documentation}`) : []
+    ].filter(Boolean).join("\n\n") || void 0;
+    return {
+      signatures: [{
+        label: `{${[macroName, ...parameters.map((p) => p.label)].join(" ")}}`,
+        documentation,
+        parameters: positional ? parameters : []
+      }],
+      activeSignature: 0,
+      activeParameter: positional ? argument : 0
+    };
+  }
   const widget = workspace.widgets.getWidget(macroName);
   if (widget && widget.params.length > 0) {
     const paramLabels = widget.params;
@@ -77885,6 +77932,8 @@ function findReferences(uri, position, workspace, includeDeclaration) {
   if (variable) {
     return variable.sigil === "%" ? findTransientReferences(variable.name, workspace, includeDeclaration) : findVariableReferences(variable.name, workspace, includeDeclaration);
   }
+  const declaration = workspace.widgets.definitionAt(uri, position);
+  if (declaration) return findWidgetReferences(declaration.name, workspace, includeDeclaration);
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
   if (head) {
@@ -77929,13 +77978,7 @@ function findPassageRefs(passageName, workspace) {
 function findVariableReferences(varName, workspace, includeDeclaration) {
   const locations = [];
   if (includeDeclaration) {
-    const decl = workspace.variables.getDeclared().get(varName);
-    if (decl?.declarationRange && decl.declarationUri) {
-      locations.push({
-        uri: decl.declarationUri,
-        range: decl.declarationRange
-      });
-    }
+    locations.push(...workspace.variables.getDeclarations(varName, "$"));
   }
   const usages = workspace.variables.getUsages(varName);
   for (const u of usages) {
@@ -77946,10 +77989,7 @@ function findVariableReferences(varName, workspace, includeDeclaration) {
 function findTransientReferences(varName, workspace, includeDeclaration) {
   const results = [];
   if (includeDeclaration) {
-    const decl = workspace.variables.getDeclaredTransient().get(varName);
-    if (decl?.declarationUri && decl.declarationRange) {
-      results.push({ uri: decl.declarationUri, range: decl.declarationRange });
-    }
+    results.push(...workspace.variables.getDeclarations(varName, "%"));
   }
   const usages = workspace.variables.getTransientUsages(varName);
   for (const u of usages) {
@@ -77963,6 +78003,7 @@ function findWidgetReferences(widgetName2, workspace, includeDeclaration) {
   if (includeDeclaration && widget) {
     locations.push({ uri: widget.uri, range: widget.range });
   }
+  if (workspace.macros.getMacro(widgetName2)) return locations;
   const lowerName2 = widgetName2.toLowerCase();
   const isBlock = widget?.block ?? false;
   for (const docUri of workspace.documents.getUris()) {
@@ -78241,12 +78282,8 @@ function resolveSymbolAtCursor(uri, position, workspace) {
   if (variable) {
     return { kind: "variable", name: variable.name, sigil: variable.sigil, range: variable.range };
   }
-  for (const widget of workspace.widgets.getAllWidgets()) {
-    const { start, end } = widget.nameRange;
-    if (widget.uri === uri && position.line === start.line && position.character >= start.character && position.character <= end.character) {
-      return { kind: "widget", name: widget.name, range: widget.nameRange };
-    }
-  }
+  const declaration = workspace.widgets.definitionAt(uri, position);
+  if (declaration) return { kind: "widget", name: declaration.name, range: declaration.nameRange };
   const doc = workspace.markup.get(uri);
   const head = doc && macroHeadAt(doc, position);
   if (head) {
@@ -78457,6 +78494,7 @@ function addWidgetParamHints(passages, inRange, workspace, hints) {
     for (const token of macroTokens(passage)) {
       if (token.isClose || token.rawArgs === "") continue;
       if (!inRange(passage.position(token.start).line)) continue;
+      if (workspace.macros.getMacro(token.name)) continue;
       const widget = workspace.widgets.getWidget(token.name);
       if (!widget || widget.params.length === 0) continue;
       const args2 = splitArgs(token.rawArgs);
@@ -79505,8 +79543,12 @@ function startServer(args2) {
     if (workspace) {
       try {
         const fsPath = uriToFsPath(textDocument.uri);
-        const text3 = readFileSync8(fsPath, "utf-8");
-        workspace.documents.update(textDocument.uri, text3);
+        if (isExcludedProjectFile(fsPath, workspaceRoot)) {
+          workspace.documents.close(textDocument.uri);
+        } else {
+          const text3 = readFileSync8(fsPath, "utf-8");
+          workspace.documents.update(textDocument.uri, text3);
+        }
       } catch {
         workspace.documents.close(textDocument.uri);
       }
@@ -79532,7 +79574,7 @@ function startServer(args2) {
         configChanged = true;
         continue;
       }
-      if (isMacroSource(change.uri) && isExcludedMacroSource(uriToFsPath(change.uri), workspaceRoot)) {
+      if (isExcludedProjectFile(uriToFsPath(change.uri), workspaceRoot)) {
         continue;
       }
       if (documents.has(change.uri)) continue;
@@ -79568,11 +79610,7 @@ async function scanWorkspaceFiles(root) {
   if (!root) return contents;
   try {
     const files = [
-      ...await Ze("**/*.{tw,twee}", {
-        cwd: root,
-        absolute: true,
-        nodir: true
-      }),
+      ...await findProjectFiles(root, "**/*.{tw,twee}"),
       ...await findMacroSourceFiles(root)
     ];
     for (const filePath of files) {
@@ -79593,7 +79631,6 @@ var init_server4 = __esm({
     "use strict";
     import_node = __toESM(require_main3(), 1);
     init_main2();
-    init_index_min();
     init_workspace_model();
     init_plugin_loader();
     init_capabilities();
@@ -79606,8 +79643,8 @@ var init_server4 = __esm({
 });
 
 // src/bin.ts
+init_version();
 var args = process.argv.slice(2);
-var VERSION = "0.15.0";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format
 
@@ -79621,6 +79658,9 @@ Options:
   --help, -h                 Show this help message
   --version, -v              Show version number
 
+MCP environment:
+  SPINDLE_LSP_TRUSTED_PLAY=1   Allow trusted stories to access host files, environment and commands
+
 Check options:
   --format <pretty|json|sarif>   Output format (default: pretty)
   --severity <level>             Minimum severity: error, warning, info, hint