@rohal12/spindle-lsp 0.9.1 → 0.9.2

package/dist/bin.js

@@ -3185,10 +3185,10 @@ var init_esm4 = __esm({
        * Return a void Promise that resolves once the stream ends.
        */
       async promise() {
-        return new Promise((resolve3, reject) => {
+        return new Promise((resolve4, reject) => {
           this.on(DESTROYED, () => reject(new Error("stream destroyed")));
           this.on("error", (er) => reject(er));
-          this.on("end", () => resolve3());
+          this.on("end", () => resolve4());
         });
       }
       /**
@@ -3212,7 +3212,7 @@ var init_esm4 = __esm({
             return Promise.resolve({ done: false, value: res });
           if (this[EOF])
             return stop();
-          let resolve3;
+          let resolve4;
           let reject;
           const onerr = (er) => {
             this.off("data", ondata);
@@ -3226,19 +3226,19 @@ var init_esm4 = __esm({
             this.off("end", onend);
             this.off(DESTROYED, ondestroy);
             this.pause();
-            resolve3({ value, done: !!this[EOF] });
+            resolve4({ value, done: !!this[EOF] });
           };
           const onend = () => {
             this.off("error", onerr);
             this.off("data", ondata);
             this.off(DESTROYED, ondestroy);
             stop();
-            resolve3({ done: true, value: void 0 });
+            resolve4({ done: true, value: void 0 });
           };
           const ondestroy = () => onerr(new Error("stream destroyed"));
           return new Promise((res2, rej) => {
             reject = rej;
-            resolve3 = res2;
+            resolve4 = res2;
             this.once(DESTROYED, ondestroy);
             this.once("error", onerr);
             this.once("end", onend);
@@ -4226,9 +4226,9 @@ var init_esm5 = __esm({
         if (this.#asyncReaddirInFlight) {
           await this.#asyncReaddirInFlight;
         } else {
-          let resolve3 = () => {
+          let resolve4 = () => {
           };
-          this.#asyncReaddirInFlight = new Promise((res) => resolve3 = res);
+          this.#asyncReaddirInFlight = new Promise((res) => resolve4 = res);
           try {
             for (const e of await this.#fs.promises.readdir(fullpath, {
               withFileTypes: true
@@ -4241,7 +4241,7 @@ var init_esm5 = __esm({
             children.provisional = 0;
           }
           this.#asyncReaddirInFlight = void 0;
-          resolve3();
+          resolve4();
         }
         return children.slice(0, children.provisional);
       }
@@ -6439,9 +6439,19 @@ var init_passage_index = __esm({
 
 // src/core/workspace/macro-registry.ts
 import { existsSync, readFileSync as readFileSync2 } from "node:fs";
-import { createRequire } from "node:module";
-import { dirname, join, parse as parsePath } from "node:path";
+import { dirname, join, resolve } from "node:path";
 import { fileURLToPath as fileURLToPath3 } from "node:url";
+function findRegistryPath(startDir) {
+  const target = join("node_modules", "@rohal12", "spindle", "dist", "pkg", "macro-registry.json");
+  let dir = resolve(startDir);
+  for (; ; ) {
+    const candidate = join(dir, target);
+    if (existsSync(candidate)) return candidate;
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
 var MacroRegistry;
 var init_macro_registry = __esm({
   "src/core/workspace/macro-registry.ts"() {
@@ -6454,18 +6464,30 @@ var init_macro_registry = __esm({
       discovered = /* @__PURE__ */ new Map();
       /** Tier 4: user config entries, kept so they can be re-applied over discovered macros. */
       configEntries = /* @__PURE__ */ new Map();
+      /** Warnings collected during loadBuiltins for logging. */
+      warnings = [];
+      /** Path of the macro-registry.json the builtins were loaded from, if any. */
+      builtinsPath = null;
       /**
        * Load built-in macro metadata from @rohal12/spindle's macro-registry.json.
        * This is the base layer that provides name, block, subMacros, flags, source.
+       *
+       * The project's own Spindle is authoritative: the registry is resolved from
+       * `workspaceRoot` first, and from this package's install location (a
+       * development copy, or one installed for the peer dependency) only when the
+       * workspace has none.
        */
-      /** Warnings collected during loadBuiltins for logging. */
-      warnings = [];
-      loadBuiltins() {
+      loadBuiltins(workspaceRoot) {
         let builtinMacros = [];
         try {
           const thisDir = dirname(fileURLToPath3(import.meta.url));
-          const registryPath = this.resolveRegistryPathViaRequire(thisDir) ?? this.resolveRegistryPath(thisDir);
-          if (registryPath) {
+          const registryPath = (workspaceRoot ? findRegistryPath(workspaceRoot) : null) ?? findRegistryPath(thisDir);
+          if (!registryPath) {
+            this.warnings.push(
+              "macro-registry.json not found: install @rohal12/spindle in the project. Continuing with supplements only."
+            );
+          } else {
+            this.builtinsPath = registryPath;
             const raw = readFileSync2(registryPath, "utf-8");
             const parsed = JSON.parse(raw);
             if (!Array.isArray(parsed)) {
@@ -6641,37 +6663,6 @@ var init_macro_registry = __esm({
         }
         return info;
       }
-      /**
-       * Walk up directory tree from `startDir` to find the
-       * @rohal12/spindle/dist/pkg/macro-registry.json file.
-       */
-      /**
-       * Resolve macro-registry.json using Node's require resolution.
-       * Works in bundled contexts where import.meta.url may not be near node_modules.
-       */
-      resolveRegistryPathViaRequire(startDir) {
-        try {
-          const require2 = createRequire(join(startDir, "_"));
-          const toolingPath = require2.resolve("@rohal12/spindle/tooling");
-          const candidate = join(dirname(toolingPath), "macro-registry.json");
-          if (existsSync(candidate)) return candidate;
-        } catch {
-        }
-        return null;
-      }
-      resolveRegistryPath(startDir) {
-        const target = join("node_modules", "@rohal12", "spindle", "dist", "pkg", "macro-registry.json");
-        let dir = startDir;
-        const { root } = parsePath(dir);
-        while (dir !== root) {
-          const candidate = join(dir, target);
-          if (existsSync(candidate)) {
-            return candidate;
-          }
-          dir = dirname(dir);
-        }
-        return null;
-      }
       /** Merge a set of supplement/config entries into the registry. */
       mergeEntries(entries) {
         for (const [rawKey, entry] of Object.entries(entries)) {
@@ -7746,7 +7737,7 @@ var init_workspace_model = __esm({
         this.macros = new MacroRegistry();
         this.variables = new VariableTracker();
         this.widgets = new WidgetRegistry();
-        this.macros.loadBuiltins();
+        this.macros.loadBuiltins(config2?.workspaceRoot);
         this.macros.loadSupplements(macro_supplements_default);
         this.onDocumentChanged = (uri) => this.handleDocumentChange(uri);
         this.onDocumentOpened = (uri) => this.handleDocumentChange(uri);
@@ -8951,11 +8942,11 @@ function parseMacroPassageRefs(text, lineOffset = 0) {
   const refs = [];
   for (const macro of parseMacros(text)) {
     if (!macro.open || !macro.rawArgs) continue;
-    const resolve3 = macroTargetResolvers[macro.name.toLowerCase()];
-    if (!resolve3) continue;
+    const resolve4 = macroTargetResolvers[macro.name.toLowerCase()];
+    if (!resolve4) continue;
     const argsEnd = lineStarts[macro.range.end.line] + macro.range.end.character - 1;
     const argsStart = argsEnd - macro.rawArgs.length;
-    const target = resolve3(text.slice(argsStart, argsEnd));
+    const target = resolve4(text.slice(argsStart, argsEnd));
     if (!target || target.name === "") continue;
     const startPos = offsetToPosition(argsStart + target.start, lineStarts);
     const endPos = offsetToPosition(argsStart + target.end, lineStarts);
@@ -17203,7 +17194,7 @@ __export(check_exports, {
   runCheck: () => runCheck
 });
 import { readFileSync as readFileSync4 } from "node:fs";
-import { resolve } from "node:path";
+import { resolve as resolve2 } from "node:path";
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 function parseArgs(args2) {
   const options = {
@@ -17279,7 +17270,7 @@ async function runCheck(args2) {
   let explicitConfig = null;
   if (options.configPath) {
     try {
-      explicitConfig = loadConfigFile(resolve(cwd, options.configPath));
+      explicitConfig = loadConfigFile(resolve2(cwd, options.configPath));
     } catch (err) {
       console.error(`spindle-lsp check: ${err instanceof Error ? err.message : String(err)}`);
       return 2;
@@ -17305,28 +17296,28 @@ async function runCheck(args2) {
     }
     return 0;
   }
+  const commonDir = uniqueFiles.map((f) => resolve2(f, "..")).reduce((a, b) => {
+    while (!b.startsWith(a)) a = resolve2(a, "..");
+    return a;
+  });
   let projectConfig;
   if (explicitConfig) {
     projectConfig = explicitConfig;
   } else {
-    const dirs = uniqueFiles.map((f) => resolve(f, ".."));
-    let configRoot = dirs.reduce((a, b) => {
-      while (!b.startsWith(a)) a = resolve(a, "..");
-      return a;
-    });
+    let configRoot = commonDir;
     let search = configRoot;
     for (let i = 0; i < 10; i++) {
       if (findConfigFile(search)) {
         configRoot = search;
         break;
       }
-      const parent = resolve(search, "..");
+      const parent = resolve2(search, "..");
       if (parent === search) break;
       search = parent;
     }
     projectConfig = loadConfigFromDisk(configRoot);
   }
-  const workspace = new WorkspaceModel();
+  const workspace = new WorkspaceModel({ workspaceRoot: commonDir });
   const fileContents = /* @__PURE__ */ new Map();
   for (const filePath of uniqueFiles) {
     try {
@@ -40352,7 +40343,7 @@ var init_protocol = __esm({
               return;
             }
             const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3;
-            await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
+            await new Promise((resolve4) => setTimeout(resolve4, pollInterval));
             options?.signal?.throwIfAborted();
           }
         } catch (error48) {
@@ -40369,7 +40360,7 @@ var init_protocol = __esm({
        */
       request(request, resultSchema, options) {
         const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {};
-        return new Promise((resolve3, reject) => {
+        return new Promise((resolve4, reject) => {
           const earlyReject = (error48) => {
             reject(error48);
           };
@@ -40447,7 +40438,7 @@ var init_protocol = __esm({
               if (!parseResult.success) {
                 reject(parseResult.error);
               } else {
-                resolve3(parseResult.data);
+                resolve4(parseResult.data);
               }
             } catch (error48) {
               reject(error48);
@@ -40708,12 +40699,12 @@ var init_protocol = __esm({
           }
         } catch {
         }
-        return new Promise((resolve3, reject) => {
+        return new Promise((resolve4, reject) => {
           if (signal.aborted) {
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
             return;
           }
-          const timeoutId = setTimeout(resolve3, interval);
+          const timeoutId = setTimeout(resolve4, interval);
           signal.addEventListener("abort", () => {
             clearTimeout(timeoutId);
             reject(new McpError(ErrorCode.InvalidRequest, "Request cancelled"));
@@ -43740,7 +43731,7 @@ var require_compile = __commonJS({
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
         return schOrFunc;
-      let _sch = resolve3.call(this, root, ref);
+      let _sch = resolve4.call(this, root, ref);
       if (_sch === void 0) {
         const schema = (_a3 = root.localRefs) === null || _a3 === void 0 ? void 0 : _a3[ref];
         const { schemaId } = this.opts;
@@ -43767,7 +43758,7 @@ var require_compile = __commonJS({
     function sameSchemaEnv(s1, s2) {
       return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId;
     }
-    function resolve3(root, ref) {
+    function resolve4(root, ref) {
       let sch;
       while (typeof (sch = this.refs[ref]) == "string")
         ref = sch;
@@ -44342,7 +44333,7 @@ var require_fast_uri = __commonJS({
       }
       return uri;
     }
-    function resolve3(baseURI, relativeURI, options) {
+    function resolve4(baseURI, relativeURI, options) {
       const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" };
       const resolved = resolveComponent(parse3(baseURI, schemelessOptions), parse3(relativeURI, schemelessOptions), schemelessOptions, true);
       schemelessOptions.skipEscape = true;
@@ -44569,7 +44560,7 @@ var require_fast_uri = __commonJS({
     var fastUri = {
       SCHEMES,
       normalize: normalize2,
-      resolve: resolve3,
+      resolve: resolve4,
       resolveComponent,
       equal,
       serialize,
@@ -48693,7 +48684,7 @@ var init_mcp = __esm({
         let task = createTaskResult.task;
         const pollInterval = task.pollInterval ?? 5e3;
         while (task.status !== "completed" && task.status !== "failed" && task.status !== "cancelled") {
-          await new Promise((resolve3) => setTimeout(resolve3, pollInterval));
+          await new Promise((resolve4) => setTimeout(resolve4, pollInterval));
           const updatedTask = await extra.taskStore.getTask(taskId);
           if (!updatedTask) {
             throw new McpError(ErrorCode.InternalError, `Task ${taskId} not found during polling`);
@@ -49284,12 +49275,12 @@ var init_stdio2 = __esm({
         this.onclose?.();
       }
       send(message) {
-        return new Promise((resolve3) => {
+        return new Promise((resolve4) => {
           const json2 = serializeMessage(message);
           if (this._stdout.write(json2)) {
-            resolve3();
+            resolve4();
           } else {
-            this._stdout.once("drain", resolve3);
+            this._stdout.once("drain", resolve4);
           }
         });
       }
@@ -49303,7 +49294,7 @@ __export(server_exports, {
   startMcpServer: () => startMcpServer
 });
 import { readFileSync as readFileSync6, writeFileSync as writeFileSync2 } from "node:fs";
-import { resolve as resolve2 } from "node:path";
+import { resolve as resolve3 } from "node:path";
 import { pathToFileURL as pathToFileURL3, fileURLToPath as fileURLToPath5 } from "node:url";
 function filterBySeverity2(diagnostics, minSeverity) {
   const minIdx = SEVERITY_ORDER2.indexOf(minSeverity);
@@ -49321,9 +49312,9 @@ async function resolveFiles(pattern, cwd) {
   return [...new Set(matches)];
 }
 function findConfigRoot(files) {
-  const dirs = files.map((f) => resolve2(f, ".."));
+  const dirs = files.map((f) => resolve3(f, ".."));
   let configRoot = dirs.reduce((a, b) => {
-    while (!b.startsWith(a)) a = resolve2(a, "..");
+    while (!b.startsWith(a)) a = resolve3(a, "..");
     return a;
   });
   let search = configRoot;
@@ -49332,7 +49323,7 @@ function findConfigRoot(files) {
       configRoot = search;
       break;
     }
-    const parent = resolve2(search, "..");
+    const parent = resolve3(search, "..");
     if (parent === search) break;
     search = parent;
   }
@@ -49341,7 +49332,7 @@ function findConfigRoot(files) {
 function createWorkspace(files) {
   const configRoot = findConfigRoot(files);
   const projectConfig = loadConfigFromDisk(configRoot);
-  const workspace = new WorkspaceModel();
+  const workspace = new WorkspaceModel({ workspaceRoot: configRoot });
   const fileContents = /* @__PURE__ */ new Map();
   for (const filePath of files) {
     try {
@@ -50534,8 +50525,8 @@ var require_semaphore = __commonJS({
         this._waiting = [];
       }
       lock(thunk) {
-        return new Promise((resolve3, reject) => {
-          this._waiting.push({ thunk, resolve: resolve3, reject });
+        return new Promise((resolve4, reject) => {
+          this._waiting.push({ thunk, resolve: resolve4, reject });
           this.runNext();
         });
       }
@@ -52025,9 +52016,9 @@ ${JSON.stringify(message, null, 4)}`);
           if (typeof cancellationStrategy.sender.enableCancellation === "function") {
             cancellationStrategy.sender.enableCancellation(requestMessage);
           }
-          return new Promise(async (resolve3, reject) => {
+          return new Promise(async (resolve4, reject) => {
             const resolveWithCleanup = (r) => {
-              resolve3(r);
+              resolve4(r);
               cancellationStrategy.sender.cleanup(id);
               disposable?.dispose();
             };
@@ -52438,10 +52429,10 @@ var require_ril = __commonJS({
         return api_1.Disposable.create(() => this.stream.off("end", listener));
       }
       write(data, encoding) {
-        return new Promise((resolve3, reject) => {
+        return new Promise((resolve4, reject) => {
           const callback = (error48) => {
             if (error48 === void 0 || error48 === null) {
-              resolve3();
+              resolve4();
             } else {
               reject(error48);
             }
@@ -52693,10 +52684,10 @@ var require_main = __commonJS({
     exports.generateRandomPipeName = generateRandomPipeName;
     function createClientPipeTransport(pipeName, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve3, _reject) => {
-        connectResolve = resolve3;
+      const connected = new Promise((resolve4, _reject) => {
+        connectResolve = resolve4;
       });
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         let server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -52707,7 +52698,7 @@ var require_main = __commonJS({
         server.on("error", reject);
         server.listen(pipeName, () => {
           server.removeListener("error", reject);
-          resolve3({
+          resolve4({
             onConnected: () => {
               return connected;
             }
@@ -52726,10 +52717,10 @@ var require_main = __commonJS({
     exports.createServerPipeTransport = createServerPipeTransport;
     function createClientSocketTransport(port, encoding = "utf-8") {
       let connectResolve;
-      const connected = new Promise((resolve3, _reject) => {
-        connectResolve = resolve3;
+      const connected = new Promise((resolve4, _reject) => {
+        connectResolve = resolve4;
       });
-      return new Promise((resolve3, reject) => {
+      return new Promise((resolve4, reject) => {
         const server = (0, net_1.createServer)((socket) => {
           server.close();
           connectResolve([
@@ -52740,7 +52731,7 @@ var require_main = __commonJS({
         server.on("error", reject);
         server.listen(port, "127.0.0.1", () => {
           server.removeListener("error", reject);
-          resolve3({
+          resolve4({
             onConnected: () => {
               return connected;
             }
@@ -57526,8 +57517,8 @@ var require_server = __commonJS({
         if (value instanceof Promise) {
           return value;
         } else if (Is.thenable(value)) {
-          return new Promise((resolve3, reject) => {
-            value.then((resolved) => resolve3(resolved), (error48) => reject(error48));
+          return new Promise((resolve4, reject) => {
+            value.then((resolved) => resolve4(resolved), (error48) => reject(error48));
           });
         } else {
           return Promise.resolve(value);
@@ -57797,7 +57788,7 @@ var require_files = __commonJS({
     function isWindows() {
       return process.platform === "win32";
     }
-    function resolve3(moduleName, nodePath, cwd, tracer) {
+    function resolve4(moduleName, nodePath, cwd, tracer) {
       const nodePathKey = "NODE_PATH";
       const app = [
         "var p = process;",
@@ -57816,7 +57807,7 @@ var require_files = __commonJS({
         "}",
         "});"
       ].join("");
-      return new Promise((resolve4, reject) => {
+      return new Promise((resolve5, reject) => {
         let env = process.env;
         let newEnv = /* @__PURE__ */ Object.create(null);
         Object.keys(env).forEach((key) => newEnv[key] = env[key]);
@@ -57848,7 +57839,7 @@ var require_files = __commonJS({
             if (message2.c === "r") {
               cp.send({ c: "e" });
               if (message2.s) {
-                resolve4(message2.r);
+                resolve5(message2.r);
               } else {
                 reject(new Error(`Failed to resolve module: ${moduleName}`));
               }
@@ -57864,7 +57855,7 @@ var require_files = __commonJS({
         }
       });
     }
-    exports.resolve = resolve3;
+    exports.resolve = resolve4;
     function resolveGlobalNodePath(tracer) {
       let npmCommand = "npm";
       const env = /* @__PURE__ */ Object.create(null);
@@ -57979,17 +57970,17 @@ var require_files = __commonJS({
         if (!path2.isAbsolute(nodePath)) {
           nodePath = path2.join(workspaceRoot, nodePath);
         }
-        return resolve3(moduleName, nodePath, nodePath, tracer).then((value) => {
+        return resolve4(moduleName, nodePath, nodePath, tracer).then((value) => {
           if (FileSystem.isParent(nodePath, value)) {
             return value;
           } else {
             return Promise.reject(new Error(`Failed to load ${moduleName} from node path location.`));
           }
         }).then(void 0, (_error) => {
-          return resolve3(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+          return resolve4(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
         });
       } else {
-        return resolve3(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
+        return resolve4(moduleName, resolveGlobalNodePath(tracer), workspaceRoot, tracer);
       }
     }
     exports.resolveModulePath = resolveModulePath;
@@ -60716,8 +60707,10 @@ function startServer(_args) {
       diagnostics: initOptions.diagnostics,
       workspaceRoot
     };
-    workspace = new WorkspaceModel();
+    workspace = new WorkspaceModel(workspaceRoot ? { workspaceRoot } : void 0);
     console.error("[spindle-lsp] workspaceRoot:", workspaceRoot ?? "undefined");
+    console.error("[spindle-lsp] builtin macros:", workspace.macros.builtinsPath ?? "not found");
+    for (const warning of workspace.macros.warnings) console.error("[spindle-lsp]", warning);
     activePlugins = loadPlugins(allPlugins, config2);
     console.error("[spindle-lsp] plugins loaded:", activePlugins.map((p) => p.id).join(", "));
     for (const plugin of activePlugins) {
@@ -60883,7 +60876,7 @@ var init_server4 = __esm({
 
 // src/bin.ts
 var args = process.argv.slice(2);
-var VERSION = "0.9.1";
+var VERSION = "0.9.2";
 var HELP = `spindle-lsp v${VERSION}
 Language Server Protocol server for Spindle story format