@rohal12/spindle-lsp 0.14.2 → 0.14.3

package/dist/bin.js

@@ -3039,6 +3039,40 @@ 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";
+async function resolveFiles(pattern, cwd) {
+  let input = pattern;
+  let directory = cwd;
+  const literal3 = resolve(cwd, pattern);
+  try {
+    const stat = statSync(literal3);
+    if (stat.isFile()) return [literal3];
+    if (stat.isDirectory()) {
+      directory = literal3;
+      input = "**/*.{tw,twee}";
+    }
+  } catch (error48) {
+    const code = error48.code;
+    if (code !== "ENOENT" && code !== "ENOTDIR") throw error48;
+  }
+  return [...new Set(await Ze(input, { cwd: directory, absolute: true, nodir: true }))];
+}
+function readFileContents(files) {
+  return new Map(files.map((file2) => [file2, readFileSync(file2, "utf8")]));
+}
+async function resolveInputs(patterns, cwd) {
+  const files = await Promise.all(patterns.map((pattern) => resolveFiles(pattern, cwd)));
+  return [...new Set(files.flat())];
+}
+var init_file_inputs = __esm({
+  "src/core/workspace/file-inputs.ts"() {
+    "use strict";
+    init_index_min();
+  }
+});
+
 // node_modules/@rohal12/spindle/dist/pkg/story-variables.js
 function isSigil(c) {
   return c !== void 0 && SIGIL_CHARS.has(c);
@@ -16619,7 +16653,7 @@ var init_tooling = __esm({
 
 // src/core/workspace/document-store.ts
 import { EventEmitter } from "node:events";
-import { readFileSync } from "node:fs";
+import { readFileSync as readFileSync2 } from "node:fs";
 import { pathToFileURL } from "node:url";
 function stripBom(text2) {
   return text2.charCodeAt(0) === 65279 ? text2.slice(1) : text2;
@@ -16667,7 +16701,7 @@ var init_document_store = __esm({
       loadFromDisk(paths) {
         for (const filePath of paths) {
           try {
-            const text2 = readFileSync(filePath, "utf-8");
+            const text2 = readFileSync2(filePath, "utf-8");
             const uri = pathToFileURL(filePath).href;
             this.open(uri, text2);
           } catch {
@@ -16681,32 +16715,32 @@ var init_document_store = __esm({
 // src/core/parsing/passage-parser.ts
 function parsePassageHeader(line, lineNumber) {
   const bomLength = lineNumber === 0 && line.charCodeAt(0) === 65279 ? 1 : 0;
-  const escaped = line.slice(bomLength).replace(/\\./g, "ec");
-  const match = passageHeaderRegex.exec(escaped);
-  if (!match) return null;
-  const prefix = line.slice(0, bomLength) + (match[1] ?? "");
-  const rawName = match[2] ?? "";
-  const rawTags = match[3] ?? "";
-  const rawMeta = match[4] ?? "";
-  const nameStart = prefix.length;
-  const nameEnd = nameStart + rawName.length;
-  const name = line.substring(nameStart, nameEnd).trim();
+  const escaped = line.replace(/\\./g, "ec");
+  const prefix = /^::\s*/.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 nameEnd = first?.index ?? line.length;
+  const name = line.slice(nameStart, nameEnd).trim();
   if (!name) return null;
-  const escapedName = name.replace(/\\./g, "ec");
-  if (/[\[\]\{\}]/.test(escapedName)) return null;
-  const tagsStr = line.slice(nameEnd, nameEnd + rawTags.length).trim();
+  let rest = nameEnd;
   let tags = [];
-  if (tagsStr) {
-    const inner = tagsStr.substring(1, tagsStr.length - 1);
-    if (/[\[\]\{\}]/.test(inner.replace(/\\./g, "ec"))) return null;
-    const decoded = inner.replace(/\\(.)/g, "$1").trim();
+  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+/) : [];
+    rest = end + 1;
+    while (rest < line.length && /\s/.test(escaped[rest])) rest++;
   }
   let meta3;
-  const metaStr = rawMeta.trim();
-  if (metaStr) {
+  if (rest < line.length) {
+    const raw = line.slice(rest).trim();
+    if (escaped[rest] !== "{" || !raw.endsWith("}")) return null;
     try {
-      meta3 = JSON.parse(line.substring(nameStart + rawName.length + rawTags.length, nameStart + rawName.length + rawTags.length + rawMeta.length).trim());
+      meta3 = JSON.parse(raw);
     } catch {
       return null;
     }
@@ -16739,11 +16773,10 @@ function isScriptOrStylesheetPassage(passage) {
 function isMarkupPassage(passage) {
   return !(passage.name !== void 0 && NON_MARKUP_PASSAGES.has(passage.name)) && !isScriptOrStylesheetPassage(passage);
 }
-var passageHeaderRegex, SPECIAL_PASSAGES, CODE_PASSAGE_TAGS, RESERVED_PASSAGE_NAMES, NON_MARKUP_PASSAGES;
+var SPECIAL_PASSAGES, CODE_PASSAGE_TAGS, RESERVED_PASSAGE_NAMES, NON_MARKUP_PASSAGES;
 var init_passage_parser = __esm({
   "src/core/parsing/passage-parser.ts"() {
     "use strict";
-    passageHeaderRegex = /^(::\s*)(.*?)(\[.*?\]\s*)?(\{.*?\}\s*)?\r?$/;
     SPECIAL_PASSAGES = /* @__PURE__ */ new Set([
       "StoryVariables",
       "StoryInit",
@@ -24256,8 +24289,8 @@ var require_dist = __commonJS({
 });
 
 // src/core/workspace/config-loader.ts
-import { readFileSync as readFileSync2, existsSync } from "node:fs";
-import { join, resolve } from "node:path";
+import { readFileSync as readFileSync3, existsSync } from "node:fs";
+import { join, resolve as resolve2 } from "node:path";
 function parseConfig(content, format) {
   if (!content.trim()) {
     return { macros: {} };
@@ -24317,7 +24350,7 @@ function findConfigRoot(directory) {
   let search = directory;
   for (let i2 = 0; i2 < 10; i2++) {
     if (findConfigFile(search)) return search;
-    const parent = resolve(search, "..");
+    const parent = resolve2(search, "..");
     if (parent === search) break;
     search = parent;
   }
@@ -24326,7 +24359,7 @@ function findConfigRoot(directory) {
 function loadConfigFile(configPath) {
   let content;
   try {
-    content = readFileSync2(configPath, "utf-8");
+    content = readFileSync3(configPath, "utf-8");
   } catch (err) {
     const reason = err?.code === "ENOENT" ? "file not found" : err instanceof Error ? err.message : String(err);
     throw new Error(`Cannot read config file '${configPath}': ${reason}`);
@@ -24344,7 +24377,7 @@ function loadConfigFromDisk(workspaceRoot) {
   if (!configPath) {
     return { ...EMPTY_CONFIG };
   }
-  const content = readFileSync2(configPath, "utf-8");
+  const content = readFileSync3(configPath, "utf-8");
   const format = configPath.endsWith(".json") ? "json" : "yaml";
   return parseConfig(content, format);
 }
@@ -25088,6 +25121,7 @@ var init_widget_registry = __esm({
           const { name, tags } = markup.passage;
           for (const definition of widgetDefinitions([{ name, tags, content: markup.content }], known)) {
             this.widgets.set(definition.name.toLowerCase(), {
+              tooling: definition,
               name: definition.name,
               params: definition.params,
               uri: markup.passage.uri,
@@ -25175,7 +25209,7 @@ var init_markup_index = __esm({
 });
 
 // src/core/workspace/macro-sources.ts
-import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
+import { existsSync as existsSync2, readFileSync as readFileSync4 } from "node:fs";
 import { dirname, isAbsolute, join as join2, relative } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 function isExcludedSegment(segment) {
@@ -25224,7 +25258,7 @@ async function addProjectMacroSources(contents, dir) {
     const uri = pathToFileURL2(filePath).toString();
     if (contents.has(uri)) continue;
     try {
-      contents.set(uri, readFileSync3(filePath, "utf-8"));
+      contents.set(uri, readFileSync4(filePath, "utf-8"));
     } catch {
     }
   }
@@ -25243,8 +25277,8 @@ var init_macro_sources = __esm({
 });
 
 // src/core/workspace/spindle-version.ts
-import { existsSync as existsSync3, readFileSync as readFileSync4 } from "node:fs";
-import { dirname as dirname2, join as join3, resolve as resolve2 } from "node:path";
+import { existsSync as existsSync3, readFileSync as readFileSync5 } from "node:fs";
+import { dirname as dirname2, join as join3, resolve as resolve3 } from "node:path";
 function parseSpindleVersion(text2) {
   const m = /^\s*v?(\d+)\.(\d+)\.(\d+)(?:[-+].*)?\s*$/.exec(text2);
   return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : void 0;
@@ -25258,12 +25292,12 @@ function atLeast(version2, minimum) {
 }
 function readInstalledSpindleVersion(startDir) {
   const target = join3("node_modules", "@rohal12", "spindle", "package.json");
-  let dir = resolve2(startDir);
+  let dir = resolve3(startDir);
   for (; ; ) {
     const candidate = join3(dir, target);
     if (existsSync3(candidate)) {
       try {
-        const version2 = JSON.parse(readFileSync4(candidate, "utf-8")).version;
+        const version2 = JSON.parse(readFileSync5(candidate, "utf-8")).version;
         return typeof version2 === "string" && parseSpindleVersion(version2) ? version2 : void 0;
       } catch {
         return void 0;
@@ -25294,7 +25328,7 @@ var init_spindle_version = __esm({
 });
 
 // src/core/workspace/story-format.ts
-import { readFileSync as readFileSync5 } from "node:fs";
+import { readFileSync as readFileSync6 } from "node:fs";
 function isSpindleFormatName(name) {
   return name.trim().toLowerCase() === "spindle";
 }
@@ -25374,7 +25408,7 @@ async function findStoryFormat(texts, dir) {
   const projectTexts = [];
   for (const file2 of await findProjectFiles(findProjectRoot(dir), "**/*.{tw,twee}")) {
     try {
-      projectTexts.push(stripBom(readFileSync5(file2, "utf-8")));
+      projectTexts.push(stripBom(readFileSync6(file2, "utf-8")));
     } catch {
     }
   }
@@ -25401,7 +25435,7 @@ async function findSpindleTarget(texts, dir) {
     const projectTexts = [];
     for (const file2 of await findProjectFiles(findProjectRoot(dir), "**/*.{tw,twee}")) {
       try {
-        projectTexts.push(readFileSync5(file2, "utf-8"));
+        projectTexts.push(readFileSync6(file2, "utf-8"));
       } catch {
       }
     }
@@ -25877,7 +25911,7 @@ var init_workspace_model = __esm({
           text: (uri) => this.documents.getText(uri),
           passages: (uri) => this.passages.getPassagesInDocument(uri),
           context: () => ({
-            macros: this.macros.toolingMacros(),
+            macros: this.toolingMacros(),
             isBlock: (name) => this.isContainer(name)
           })
         });
@@ -26054,60 +26088,38 @@ var init_workspace_model = __esm({
         this.markup.invalidate();
         this.declaredVersion = storyDataFormatVersion(this.passages.getAllPassages(), (uri) => this.documents.getText(uri));
         this.target = resolveSpindleTarget(this.installedVersion, this.declaredVersion);
-        const storyVars = this.passages.getStoryVariables();
-        if (storyVars) {
-          const text2 = this.documents.getText(storyVars.uri);
-          if (text2) {
-            const lines = text2.split("\n");
-            const contentStart = storyVars.headerEnd.end.line + 1;
-            let contentEnd = lines.length;
-            for (let i2 = contentStart; i2 < lines.length; i2++) {
-              if (/^\uFEFF?::\s+/.test(lines[i2])) {
-                contentEnd = i2;
-                break;
-              }
-            }
-            const content = lines.slice(contentStart, contentEnd).join("\n");
-            this.variables.parseStoryVariables(content, contentStart, storyVars.uri);
-          }
-        } else {
-          this.variables.clearStoryVariables();
-        }
-        const storyTransients = this.passages.getStoryTransients();
-        if (storyTransients) {
-          const text2 = this.documents.getText(storyTransients.uri);
-          if (text2) {
-            const lines = text2.split("\n");
-            const contentStart = storyTransients.headerEnd.end.line + 1;
-            let contentEnd = lines.length;
-            for (let i2 = contentStart; i2 < lines.length; i2++) {
-              if (/^\uFEFF?::\s+/.test(lines[i2])) {
-                contentEnd = i2;
-                break;
-              }
-            }
-            const content = lines.slice(contentStart, contentEnd).join("\n");
-            this.variables.parseStoryTransients(content, contentStart, storyTransients.uri);
-          }
-        } else {
-          this.variables.clearStoryTransients();
-        }
-        const documents = this.documents.getUris().flatMap((uri) => {
+        const declarations = (name) => {
+          const passage = this.passages.getPassage(name);
+          return passage ? this.markup.get(passage.uri)?.passages.find((p) => p.passage === passage) : void 0;
+        };
+        const variables = declarations("StoryVariables");
+        if (variables) this.variables.parseStoryVariables(variables.content, variables.passage.headerEnd.end.line + 1, variables.doc.uri);
+        else this.variables.clearStoryVariables();
+        const transients = declarations("StoryTransients");
+        if (transients) this.variables.parseStoryTransients(transients.content, transients.passage.headerEnd.end.line + 1, transients.doc.uri);
+        else this.variables.clearStoryTransients();
+        const readDocuments = () => this.documents.getUris().flatMap((uri) => {
           const markup = isMacroSource(uri) ? void 0 : this.markup.get(uri);
           return markup ? [markup] : [];
         });
         const markups = /* @__PURE__ */ new Map();
-        for (const doc of documents) for (const passage of doc.passages) markups.set(passage.passage, passage);
+        for (const doc of readDocuments()) for (const passage of doc.passages) markups.set(passage.passage, passage);
         this.widgets.scan(
           this.passages.getAllPassages().flatMap((passage) => markups.get(passage) ?? []),
           this.macros.toolingMacros()
         );
+        this.markup.invalidate();
         this.widgets.clearInvocations();
-        for (const doc of documents) {
+        for (const doc of readDocuments()) {
           this.variables.scanDocument(doc.uri, doc.text, doc);
           this.widgets.recordInvocations(doc.uri, doc.passages);
         }
       }
+      /** All runtime metadata, with real macros taking precedence over widgets. */
+      toolingMacros() {
+        const macros = this.macros.toolingMacros();
+        return [...macros, ...this.widgets.getAllWidgets().filter((widget) => !this.macros.getMacro(widget.name)).map((widget) => ({ name: widget.name, block: widget.block, subMacros: [], widget: widget.tooling }))];
+      }
       /** Debounce modelReady emission. */
       scheduleModelReady() {
         if (this.debounceTimer) {
@@ -27881,8 +27893,7 @@ var check_exports = {};
 __export(check_exports, {
   runCheck: () => runCheck
 });
-import { readFileSync as readFileSync6 } from "node:fs";
-import { resolve as resolve3 } from "node:path";
+import { resolve as resolve4 } from "node:path";
 import { pathToFileURL as pathToFileURL3 } from "node:url";
 function parseArgs(args2) {
   const options = {
@@ -27958,22 +27969,21 @@ async function runCheck(args2) {
   let explicitConfig = null;
   if (options.configPath) {
     try {
-      explicitConfig = loadConfigFile(resolve3(cwd, options.configPath));
+      explicitConfig = loadConfigFile(resolve4(cwd, options.configPath));
     } catch (err) {
       console.error(`spindle-lsp check: ${err instanceof Error ? err.message : String(err)}`);
       return 2;
     }
   }
-  const files = [];
-  for (const pattern of options.patterns) {
-    const matches = await Ze(pattern, {
-      cwd,
-      absolute: true,
-      nodir: true
-    });
-    files.push(...matches);
+  let uniqueFiles;
+  let contents;
+  try {
+    uniqueFiles = await resolveInputs(options.patterns, cwd);
+    contents = readFileContents(uniqueFiles);
+  } catch (error48) {
+    console.error(`spindle-lsp check: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return 2;
   }
-  const uniqueFiles = [...new Set(files)];
   if (uniqueFiles.length === 0) {
     if (options.format === "pretty") {
       console.log("No files found");
@@ -27997,15 +28007,7 @@ async function runCheck(args2) {
       return 1;
     }
   }
-  const fileContents = /* @__PURE__ */ new Map();
-  for (const filePath of uniqueFiles) {
-    try {
-      const text2 = readFileSync6(filePath, "utf-8");
-      const uri = pathToFileURL3(filePath).toString();
-      fileContents.set(uri, text2);
-    } catch {
-    }
-  }
+  const fileContents = new Map([...contents].map(([path, text2]) => [pathToFileURL3(path).toString(), text2]));
   const storyFormat = await findStoryFormat(fileContents.values(), commonDir);
   if (!storyFormat.isSpindle) {
     console.error(skippedFormatNote(storyFormat));
@@ -28058,7 +28060,7 @@ var SEVERITY_ORDER;
 var init_check = __esm({
   "src/cli/check.ts"() {
     "use strict";
-    init_index_min();
+    init_file_inputs();
     init_workspace_model();
     init_diagnostics();
     init_config_loader();
@@ -28126,7 +28128,7 @@ var init_segment = __esm({
 });
 
 // src/plugins/format/prettier-bridge.ts
-import { resolve as resolve4 } from "node:path";
+import { resolve as resolve5 } from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 async function loadPrettier(filePath) {
   prettier ??= import("prettier").catch(() => null);
@@ -28134,7 +28136,7 @@ async function loadPrettier(filePath) {
   if (!p) return void 0;
   try {
     const path = filePath?.startsWith("file:") ? fileURLToPath2(filePath) : filePath;
-    const resolved = await p.resolveConfig(path ?? resolve4(process.cwd(), "story.tw"));
+    const resolved = await p.resolveConfig(path ?? resolve5(process.cwd(), "story.tw"));
     return { prettier: p, options: { tabWidth: 2, ...resolved ?? {} } };
   } catch {
     return { prettier: p, options: { tabWidth: 2 } };
@@ -28192,8 +28194,10 @@ async function formatLf2(text2, options) {
       resultLines.push(header.replace(/\s+$/, ""));
     }
     if (passage.body === "") continue;
-    const body = await formatPassage(passage.body, {
-      kind: classifyPassage(passage.header),
+    const role = parsePassageHeader(passage.header, passage.startLine);
+    const kind = classifyPassage(passage.header);
+    const body = kind === "normal" && role && !isMarkupPassage(role) ? passage.body : await formatPassage(passage.body, {
+      kind,
       prettier: prettier2?.prettier,
       prettierOptions: prettier2?.options,
       isBlock,
@@ -28232,6 +28236,7 @@ var init_format = __esm({
   "src/plugins/format.ts"() {
     "use strict";
     init_tooling();
+    init_passage_parser();
     init_segment();
     init_prettier_bridge();
     PASSAGE_HEADER_REGEX = /^(::)\s*/;
@@ -28291,7 +28296,7 @@ var format_exports = {};
 __export(format_exports, {
   runFormat: () => runFormat
 });
-import { readFileSync as readFileSync7, writeFileSync } from "node:fs";
+import { writeFileSync } from "node:fs";
 function parseArgs2(args2) {
   const options = {
     check: false,
@@ -28327,27 +28332,19 @@ function parseArgs2(args2) {
 async function runFormat(args2) {
   const options = parseArgs2(args2);
   const cwd = process.cwd();
-  const files = [];
-  for (const pattern of options.patterns) {
-    const matches = await Ze(pattern, {
-      cwd,
-      absolute: true,
-      nodir: true
-    });
-    files.push(...matches);
+  let uniqueFiles;
+  let texts;
+  try {
+    uniqueFiles = await resolveInputs(options.patterns, cwd);
+    texts = readFileContents(uniqueFiles);
+  } catch (error48) {
+    console.error(`spindle-lsp format: ${error48 instanceof Error ? error48.message : String(error48)}`);
+    return 2;
   }
-  const uniqueFiles = [...new Set(files)];
   if (uniqueFiles.length === 0) {
     console.log("No files found");
     return 0;
   }
-  const texts = /* @__PURE__ */ new Map();
-  for (const filePath of uniqueFiles) {
-    try {
-      texts.set(filePath, readFileSync7(filePath, "utf-8"));
-    } catch {
-    }
-  }
   const storyFormat = await findStoryFormat(texts.values(), commonDirectory(uniqueFiles));
   if (!storyFormat.isSpindle) {
     console.error(skippedFormatNote(storyFormat));
@@ -28360,6 +28357,7 @@ async function runFormat(args2) {
     formatOpts.maxLineLength = options.maxLineLength;
   }
   const unformatted = [];
+  let failed = false;
   for (const [filePath, text2] of texts) {
     try {
       const formatted = await formatDocument(text2, { ...formatOpts, filePath });
@@ -28371,9 +28369,12 @@ async function runFormat(args2) {
           writeFileSync(filePath, formatted, "utf-8");
         }
       }
-    } catch {
+    } catch (error48) {
+      failed = true;
+      console.error(`spindle-lsp format: ${filePath}: ${error48 instanceof Error ? error48.message : String(error48)}`);
     }
   }
+  if (failed) return 2;
   if (options.check) {
     if (unformatted.length > 0) {
       for (const file2 of unformatted) {
@@ -28390,7 +28391,7 @@ ${unformatted.length} file${unformatted.length !== 1 ? "s" : ""} would be reform
 var init_format2 = __esm({
   "src/cli/format.ts"() {
     "use strict";
-    init_index_min();
+    init_file_inputs();
     init_format();
     init_macro_sources();
     init_story_format();
@@ -59658,8 +59659,7 @@ __export(server_exports, {
   formatFiles: () => formatFiles,
   startMcpServer: () => startMcpServer
 });
-import { readFileSync as readFileSync8, writeFileSync as writeFileSync2, statSync } from "node:fs";
-import { resolve as resolve5 } from "node:path";
+import { writeFileSync as writeFileSync2 } from "node:fs";
 import { pathToFileURL as pathToFileURL4 } from "node:url";
 function filterBySeverity2(diagnostics, minSeverity) {
   const minIdx = SEVERITY_ORDER2.indexOf(minSeverity);
@@ -59668,37 +59668,8 @@ function filterBySeverity2(diagnostics, minSeverity) {
     return idx >= minIdx;
   });
 }
-async function resolveFiles(pattern, cwd) {
-  let input = pattern;
-  let directory = cwd;
-  try {
-    const literal3 = resolve5(cwd, pattern);
-    const stat = statSync(literal3);
-    if (stat.isFile()) return [literal3];
-    if (stat.isDirectory()) {
-      directory = literal3;
-      input = "**/*.{tw,twee}";
-    }
-  } catch {
-  }
-  const matches = await Ze(input, {
-    cwd: directory,
-    absolute: true,
-    nodir: true
-  });
-  return [...new Set(matches)];
-}
 function readFiles(files) {
-  const fileContents = /* @__PURE__ */ new Map();
-  for (const filePath of files) {
-    try {
-      const text2 = readFileSync8(filePath, "utf-8");
-      const uri = pathToFileURL4(filePath).toString();
-      fileContents.set(uri, text2);
-    } catch {
-    }
-  }
-  return fileContents;
+  return new Map([...readFileContents(files)].map(([path, text2]) => [pathToFileURL4(path).toString(), text2]));
 }
 async function skippedReason(fileContents, files) {
   const format = await findStoryFormat(fileContents.values(), commonDirectory(files));
@@ -59735,7 +59706,6 @@ async function checkProject(pattern, severity, cwd = process.cwd()) {
     const results = [];
     for (const filePath of files) {
       const uri = pathToFileURL4(filePath).toString();
-      if (!workspace.documents.has(uri)) continue;
       let diags = computeDiagnostics(uri, workspace);
       if (severity) {
         diags = filterBySeverity2(diags, severity);
@@ -59781,7 +59751,8 @@ async function formatFiles(pattern, cwd = process.cwd()) {
       } else {
         unchanged++;
       }
-    } catch {
+    } catch (error48) {
+      throw new Error(`${filePath}: ${error48 instanceof Error ? error48.message : String(error48)}`, { cause: error48 });
     }
   }
   return { formatted, unchanged, files: changedFiles, ...warning && { warning } };
@@ -59800,7 +59771,8 @@ async function checkFormatting(pattern, cwd = process.cwd()) {
     try {
       const result = await formatDocument(text2, { filePath });
       (result !== text2 ? needsFormatting : alreadyFormatted).push(relativeTo(cwd, filePath));
-    } catch {
+    } catch (error48) {
+      throw new Error(`${filePath}: ${error48 instanceof Error ? error48.message : String(error48)}`, { cause: error48 });
     }
   }
   return { needsFormatting, alreadyFormatted, ...warning && { warning } };
@@ -59860,7 +59832,7 @@ var SEVERITY_ORDER2;
 var init_server3 = __esm({
   "src/mcp/server.ts"() {
     "use strict";
-    init_index_min();
+    init_file_inputs();
     init_mcp();
     init_stdio2();
     init_zod();
@@ -71635,7 +71607,7 @@ var init_semantic_tokens = __esm({
 });
 
 // src/plugins/code-actions.ts
-import { readFileSync as readFileSync9 } from "node:fs";
+import { readFileSync as readFileSync7 } from "node:fs";
 import { basename, dirname as dirname3, join as join4 } from "node:path";
 import { fileURLToPath as fileURLToPath3, pathToFileURL as pathToFileURL5 } from "node:url";
 function computeCodeActions(uri, diagnostics, workspace, options = {}) {
@@ -71709,7 +71681,7 @@ function addMacroToConfig(uri, macroName, workspace, options) {
   let text2 = workspace.documents.getText(configUri);
   if (text2 === void 0) {
     try {
-      text2 = readFileSync9(existingPath, "utf-8");
+      text2 = readFileSync7(existingPath, "utf-8");
     } catch {
       return null;
     }
@@ -71840,18 +71812,6 @@ function lineEndingFor(workspace, uri) {
   }
   return "\n";
 }
-function declarationInsertEdit(text2, headerLine, declaration, eol) {
-  const lines = text2.split("\n");
-  let contentEnd = lines.length;
-  for (let i2 = headerLine + 1; i2 < lines.length; i2++) {
-    if (/^\uFEFF?::\s+/.test(lines[i2])) {
-      contentEnd = i2;
-      break;
-    }
-  }
-  if (contentEnd === lines.length && text2.endsWith("\n")) contentEnd = lines.length;
-  return insertLinesAt(text2, contentEnd, declaration, eol);
-}
 function declareVariable(diag, workspace, sigil) {
   if (diag.data?.kind !== "undeclared-variable" || diag.data.sigil !== sigil) return [];
   const { name } = diag.data;
@@ -71859,7 +71819,10 @@ function declareVariable(diag, workspace, sigil) {
   if (!passage) return [];
   const text2 = workspace.documents.getText(passage.uri);
   if (text2 === void 0) return [];
-  const edit = declarationInsertEdit(text2, passage.headerEnd.end.line, `${sigil}${name} = 0
+  const markup = workspace.markup.get(passage.uri)?.passages.find((p) => p.passage === passage);
+  if (!markup) return [];
+  const boundary = markup.bodyEnd === text2.length ? text2.split("\n").length : markup.position(markup.content.length).line;
+  const edit = insertLinesAt(text2, boundary, `${sigil}${name} = 0
 `, lineEndingFor(workspace, passage.uri));
   return [{
     title: `Declare '${sigil}${name}' in ${sigil === "$" ? "StoryVariables" : "StoryTransients"}`,
@@ -72354,7 +72317,7 @@ __export(server_exports2, {
   startServer: () => startServer
 });
 import { fileURLToPath as fileURLToPath4, pathToFileURL as pathToFileURL6 } from "node:url";
-import { readFileSync as readFileSync10 } from "node:fs";
+import { readFileSync as readFileSync8 } from "node:fs";
 import { basename as basename2 } from "node:path";
 function uriToFsPath(uri) {
   try {
@@ -72492,7 +72455,7 @@ function startServer(args2) {
     if (workspace) {
       try {
         const fsPath = uriToFsPath(textDocument.uri);
-        const text2 = readFileSync10(fsPath, "utf-8");
+        const text2 = readFileSync8(fsPath, "utf-8");
         workspace.documents.update(textDocument.uri, text2);
       } catch {
         workspace.documents.close(textDocument.uri);
@@ -72528,7 +72491,7 @@ function startServer(args2) {
       } else {
         try {
           const fsPath = uriToFsPath(change.uri);
-          const text2 = readFileSync10(fsPath, "utf-8");
+          const text2 = readFileSync8(fsPath, "utf-8");
           if (workspace.documents.has(change.uri)) {
             workspace.documents.update(change.uri, text2);
           } else {
@@ -72564,7 +72527,7 @@ async function scanWorkspaceFiles(root) {
     ];
     for (const filePath of files) {
       try {
-        const text2 = readFileSync10(filePath, "utf-8");
+        const text2 = readFileSync8(filePath, "utf-8");
         const uri = fsPathToUri(filePath);
         contents.set(uri, text2);
       } catch {
@@ -72594,7 +72557,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.14.2";
+var VERSION = "0.14.3";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format