pi-lens 3.1.2 → 3.2.0

package/clients/lsp/server.js

@@ -6,6 +6,7 @@
  * - Auto-installation strategies
  * - Platform-specific handling
  */
+import { stat } from "node:fs/promises";
 import path from "node:path";
 import { ensureTool, getToolEnvironment } from "../installer/index.js";
 import { promptForInstall, supportsInteractiveInstall, } from "./interactive-install.js";
@@ -24,7 +25,7 @@ const __dirname = dirname(__filename);
  */
 async function spawnWithInteractiveInstall(language, _command, _args, options, spawnFn) {
     try {
-        return spawnFn();
+        return await spawnFn();
     }
     catch (error) {
         // Check if this is a "command not found" error
@@ -37,7 +38,7 @@ async function spawnWithInteractiveInstall(language, _command, _args, options, s
             const shouldInstall = await promptForInstall(language, options.cwd);
             if (shouldInstall) {
                 // Try again after install
-                return spawnFn();
+                return await spawnFn();
             }
             // User declined, return undefined to skip this LSP
             return undefined;
@@ -47,34 +48,51 @@ async function spawnWithInteractiveInstall(language, _command, _args, options, s
     }
 }
 /**
- * Walk up the tree looking for project root markers
+ * Walk up the directory tree looking for project root markers.
+ *
+ * NearestRoot(includePatterns, excludePatterns?) → RootFunction
+ *
+ * - includePatterns: file/dir names that signal the project root (e.g. ["package.json"])
+ * - excludePatterns: if any of these exist in a directory, skip it (e.g. ["node_modules"])
+ * - stopDir: walk stops here (defaults to filesystem root; set to project cwd for safety)
+ *
+ * Equivalent to createRootDetector; exported under both names for clarity.
  */
-export function createRootDetector(includePatterns, excludePatterns) {
+export function NearestRoot(includePatterns, excludePatterns, stopDir) {
     return async (file) => {
         let currentDir = path.dirname(file);
-        const root = path.parse(currentDir).root;
-        while (currentDir !== root) {
-            // Check exclude patterns first
+        const fsRoot = path.parse(currentDir).root;
+        const stop = stopDir ?? fsRoot;
+        while (currentDir !== fsRoot) {
+            // Bail out if we've reached the stop boundary
+            if (currentDir === stop ||
+                (currentDir.startsWith(stop + path.sep) === false &&
+                    currentDir === stop)) {
+                break;
+            }
+            // Check exclude patterns — skip this dir (but keep walking up)
             if (excludePatterns) {
+                let excluded = false;
                 for (const pattern of excludePatterns) {
-                    const checkPath = path.join(currentDir, pattern);
                     try {
-                        const stat = await import("node:fs/promises").then((fs) => fs.stat(checkPath));
-                        if (stat)
-                            return undefined; // Excluded
+                        await stat(path.join(currentDir, pattern));
+                        excluded = true;
+                        break;
                     }
                     catch {
                         /* not found */
                     }
                 }
+                if (excluded) {
+                    currentDir = path.dirname(currentDir);
+                    continue;
+                }
             }
             // Check include patterns
             for (const pattern of includePatterns) {
-                const checkPath = path.join(currentDir, pattern);
                 try {
-                    const stat = await import("node:fs/promises").then((fs) => fs.stat(checkPath));
-                    if (stat)
-                        return currentDir;
+                    await stat(path.join(currentDir, pattern));
+                    return currentDir;
                 }
                 catch {
                     /* not found */
@@ -85,6 +103,8 @@ export function createRootDetector(includePatterns, excludePatterns) {
         return undefined;
     };
 }
+/** Alias kept for backward compatibility */
+export const createRootDetector = NearestRoot;
 // --- Server Definitions ---
 export const TypeScriptServer = {
     id: "typescript",
@@ -97,7 +117,7 @@ export const TypeScriptServer = {
         "pnpm-lock.yaml",
         "yarn.lock",
         "package.json",
-    ], [".pi-lens"]),
+    ]),
     async spawn(root) {
         const path = await import("node:path");
         const fs = await import("node:fs/promises");
@@ -147,7 +167,7 @@ export const TypeScriptServer = {
         }
         // Use absolute path and proper environment
         const env = await getToolEnvironment();
-        const proc = launchLSP(lspPath, ["--stdio"], {
+        const proc = await launchLSP(lspPath, ["--stdio"], {
             cwd: root,
             env: {
                 ...env,
@@ -173,10 +193,10 @@ export const PythonServer = {
         "requirements.txt",
         "Pipfile",
         "poetry.lock",
-    ], [".pi-lens"]),
+    ]),
     async spawn(root) {
         const env = await getToolEnvironment();
-        const proc = launchViaPackageManager("pyright-langserver", ["--stdio"], {
+        const proc = await launchViaPackageManager("pyright-langserver", ["--stdio"], {
             cwd: root,
             env,
         });
@@ -210,9 +230,9 @@ export const GoServer = {
     id: "go",
     name: "gopls",
     extensions: [".go"],
-    root: createRootDetector(["go.mod", "go.sum"], [".pi-lens"]),
+    root: createRootDetector(["go.mod", "go.sum"]),
     async spawn(root) {
-        const proc = await spawnWithInteractiveInstall("go", "gopls", [], { cwd: root }, () => launchLSP("gopls", [], { cwd: root }));
+        const proc = await spawnWithInteractiveInstall("go", "gopls", [], { cwd: root }, async () => await launchLSP("gopls", [], { cwd: root }));
         return proc ? { process: proc } : undefined;
     },
 };
@@ -220,9 +240,9 @@ export const RustServer = {
     id: "rust",
     name: "rust-analyzer",
     extensions: [".rs"],
-    root: createRootDetector(["Cargo.toml", "Cargo.lock"], [".pi-lens"]),
+    root: createRootDetector(["Cargo.toml", "Cargo.lock"]),
     async spawn(root) {
-        const proc = await spawnWithInteractiveInstall("rust", "rust-analyzer", [], { cwd: root }, () => launchLSP("rust-analyzer", [], { cwd: root }));
+        const proc = await spawnWithInteractiveInstall("rust", "rust-analyzer", [], { cwd: root }, async () => await launchLSP("rust-analyzer", [], { cwd: root }));
         return proc ? { process: proc } : undefined;
     },
 };
@@ -230,15 +250,15 @@ export const RubyServer = {
     id: "ruby",
     name: "Ruby LSP",
     extensions: [".rb", ".rake", ".gemspec", ".ru"],
-    root: createRootDetector(["Gemfile", ".ruby-version"], [".pi-lens"]),
+    root: createRootDetector(["Gemfile", ".ruby-version"]),
     async spawn(root) {
         // Try ruby-lsp first, fall back to solargraph
         try {
-            const proc = launchLSP("ruby-lsp", [], { cwd: root });
+            const proc = await launchLSP("ruby-lsp", [], { cwd: root });
             return { process: proc };
         }
         catch {
-            const proc = launchViaPackageManager("solargraph", ["stdio"], {
+            const proc = await launchViaPackageManager("solargraph", ["stdio"], {
                 cwd: root,
             });
             return { process: proc };
@@ -249,9 +269,9 @@ export const PHPServer = {
     id: "php",
     name: "Intelephense",
     extensions: [".php"],
-    root: createRootDetector(["composer.json", "composer.lock"], [".pi-lens"]),
+    root: createRootDetector(["composer.json", "composer.lock"]),
     async spawn(root) {
-        const proc = launchViaPackageManager("intelephense", ["--stdio"], {
+        const proc = await launchViaPackageManager("intelephense", ["--stdio"], {
             cwd: root,
         });
         return {
@@ -264,9 +284,9 @@ export const CSharpServer = {
     id: "csharp",
     name: "csharp-ls",
     extensions: [".cs"],
-    root: createRootDetector([".sln", ".csproj", ".slnx"], [".pi-lens"]),
+    root: createRootDetector([".sln", ".csproj", ".slnx"]),
     async spawn(root) {
-        const proc = launchLSP("csharp-ls", [], { cwd: root });
+        const proc = await launchLSP("csharp-ls", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -274,9 +294,9 @@ export const FSharpServer = {
     id: "fsharp",
     name: "FSAutocomplete",
     extensions: [".fs", ".fsi", ".fsx"],
-    root: createRootDetector([".sln", ".fsproj"], [".pi-lens"]),
+    root: createRootDetector([".sln", ".fsproj"]),
     async spawn(root) {
-        const proc = launchLSP("fsautocomplete", [], { cwd: root });
+        const proc = await launchLSP("fsautocomplete", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -284,11 +304,11 @@ export const JavaServer = {
     id: "java",
     name: "JDT Language Server",
     extensions: [".java"],
-    root: createRootDetector(["pom.xml", "build.gradle", ".classpath"], [".pi-lens"]),
+    root: createRootDetector(["pom.xml", "build.gradle", ".classpath"]),
     async spawn(root) {
         // JDTLS requires special handling - paths to launcher jar
         const jdtlsPath = process.env.JDTLS_PATH || "jdtls";
-        const proc = launchLSP(jdtlsPath, [], { cwd: root });
+        const proc = await launchLSP(jdtlsPath, [], { cwd: root });
         return { process: proc };
     },
 };
@@ -296,9 +316,9 @@ export const KotlinServer = {
     id: "kotlin",
     name: "Kotlin Language Server",
     extensions: [".kt", ".kts"],
-    root: createRootDetector(["build.gradle.kts", "build.gradle", "pom.xml"], [".pi-lens"]),
+    root: createRootDetector(["build.gradle.kts", "build.gradle", "pom.xml"]),
     async spawn(root) {
-        const proc = launchLSP("kotlin-language-server", [], { cwd: root });
+        const proc = await launchLSP("kotlin-language-server", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -306,9 +326,9 @@ export const SwiftServer = {
     id: "swift",
     name: "SourceKit-LSP",
     extensions: [".swift"],
-    root: createRootDetector(["Package.swift"], [".pi-lens"]),
+    root: createRootDetector(["Package.swift"]),
     async spawn(root) {
-        const proc = launchLSP("sourcekit-lsp", [], { cwd: root });
+        const proc = await launchLSP("sourcekit-lsp", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -316,9 +336,9 @@ export const DartServer = {
     id: "dart",
     name: "Dart Analysis Server",
     extensions: [".dart"],
-    root: createRootDetector(["pubspec.yaml"], [".pi-lens"]),
+    root: createRootDetector(["pubspec.yaml"]),
     async spawn(root) {
-        const proc = launchLSP("dart", ["language-server", "--protocol=lsp"], {
+        const proc = await launchLSP("dart", ["language-server", "--protocol=lsp"], {
             cwd: root,
         });
         return { process: proc };
@@ -328,9 +348,9 @@ export const LuaServer = {
     id: "lua",
     name: "Lua Language Server",
     extensions: [".lua"],
-    root: createRootDetector([".luarc.json", ".luacheckrc"], [".pi-lens"]),
+    root: createRootDetector([".luarc.json", ".luacheckrc"]),
     async spawn(root) {
-        const proc = launchLSP("lua-language-server", [], { cwd: root });
+        const proc = await launchLSP("lua-language-server", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -345,7 +365,9 @@ export const CppServer = {
         "Makefile",
     ]),
     async spawn(root) {
-        const proc = launchLSP("clangd", ["--background-index"], { cwd: root });
+        const proc = await launchLSP("clangd", ["--background-index"], {
+            cwd: root,
+        });
         return { process: proc };
     },
 };
@@ -353,9 +375,9 @@ export const ZigServer = {
     id: "zig",
     name: "ZLS",
     extensions: [".zig", ".zon"],
-    root: createRootDetector(["build.zig"], [".pi-lens"]),
+    root: createRootDetector(["build.zig"]),
     async spawn(root) {
-        const proc = launchLSP("zls", [], { cwd: root });
+        const proc = await launchLSP("zls", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -363,9 +385,9 @@ export const HaskellServer = {
     id: "haskell",
     name: "Haskell Language Server",
     extensions: [".hs", ".lhs"],
-    root: createRootDetector(["stack.yaml", "cabal.project", "*.cabal"], [".pi-lens"]),
+    root: createRootDetector(["stack.yaml", "cabal.project", "*.cabal"]),
     async spawn(root) {
-        const proc = launchLSP("haskell-language-server-wrapper", ["--lsp"], {
+        const proc = await launchLSP("haskell-language-server-wrapper", ["--lsp"], {
             cwd: root,
         });
         return { process: proc };
@@ -375,9 +397,9 @@ export const ElixirServer = {
     id: "elixir",
     name: "ElixirLS",
     extensions: [".ex", ".exs"],
-    root: createRootDetector(["mix.exs"], [".pi-lens"]),
+    root: createRootDetector(["mix.exs"]),
     async spawn(root) {
-        const proc = launchLSP("elixir-ls", [], { cwd: root });
+        const proc = await launchLSP("elixir-ls", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -385,9 +407,9 @@ export const GleamServer = {
     id: "gleam",
     name: "Gleam LSP",
     extensions: [".gleam"],
-    root: createRootDetector(["gleam.toml"], [".pi-lens"]),
+    root: createRootDetector(["gleam.toml"]),
     async spawn(root) {
-        const proc = launchLSP("gleam", ["lsp"], { cwd: root });
+        const proc = await launchLSP("gleam", ["lsp"], { cwd: root });
         return { process: proc };
     },
 };
@@ -395,9 +417,9 @@ export const OCamlServer = {
     id: "ocaml",
     name: "ocamllsp",
     extensions: [".ml", ".mli"],
-    root: createRootDetector(["dune-project", "opam"], [".pi-lens"]),
+    root: createRootDetector(["dune-project", "opam"]),
     async spawn(root) {
-        const proc = launchLSP("ocamllsp", [], { cwd: root });
+        const proc = await launchLSP("ocamllsp", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -405,9 +427,9 @@ export const ClojureServer = {
     id: "clojure",
     name: "Clojure LSP",
     extensions: [".clj", ".cljs", ".cljc", ".edn"],
-    root: createRootDetector(["deps.edn", "project.clj"], [".pi-lens"]),
+    root: createRootDetector(["deps.edn", "project.clj"]),
     async spawn(root) {
-        const proc = launchLSP("clojure-lsp", [], { cwd: root });
+        const proc = await launchLSP("clojure-lsp", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -415,9 +437,9 @@ export const TerraformServer = {
     id: "terraform",
     name: "Terraform LSP",
     extensions: [".tf", ".tfvars"],
-    root: createRootDetector([".terraform.lock.hcl"], [".pi-lens"]),
+    root: createRootDetector([".terraform.lock.hcl"]),
     async spawn(root) {
-        const proc = launchLSP("terraform-ls", ["serve"], { cwd: root });
+        const proc = await launchLSP("terraform-ls", ["serve"], { cwd: root });
         return { process: proc };
     },
 };
@@ -425,9 +447,9 @@ export const NixServer = {
     id: "nix",
     name: "nixd",
     extensions: [".nix"],
-    root: createRootDetector(["flake.nix"], [".pi-lens"]),
+    root: createRootDetector(["flake.nix"]),
     async spawn(root) {
-        const proc = launchLSP("nixd", [], { cwd: root });
+        const proc = await launchLSP("nixd", [], { cwd: root });
         return { process: proc };
     },
 };
@@ -438,7 +460,7 @@ export const BashServer = {
     root: async () => process.cwd(),
     async spawn() {
         const cwd = process.cwd();
-        const proc = await spawnWithInteractiveInstall("bash", "bash-language-server", ["start"], { cwd }, () => launchLSP("bash-language-server", ["start"], {}));
+        const proc = await spawnWithInteractiveInstall("bash", "bash-language-server", ["start"], { cwd }, async () => await launchLSP("bash-language-server", ["start"], {}));
         return proc ? { process: proc } : undefined;
     },
 };
@@ -449,7 +471,7 @@ export const DockerServer = {
     root: async () => process.cwd(),
     async spawn() {
         // Use npx since it's not auto-installed
-        const proc = launchViaPackageManager("dockerfile-language-server-nodejs", ["--stdio"], {});
+        const proc = await launchViaPackageManager("dockerfile-language-server-nodejs", ["--stdio"], {});
         return { process: proc };
     },
 };
@@ -460,7 +482,7 @@ export const YamlServer = {
     root: async () => process.cwd(),
     async spawn() {
         const cwd = process.cwd();
-        const proc = await spawnWithInteractiveInstall("yaml", "yaml-language-server", ["--stdio"], { cwd }, () => launchLSP("yaml-language-server", ["--stdio"], {}));
+        const proc = await spawnWithInteractiveInstall("yaml", "yaml-language-server", ["--stdio"], { cwd }, async () => await launchLSP("yaml-language-server", ["--stdio"], {}));
         return proc ? { process: proc } : undefined;
     },
 };
@@ -471,7 +493,7 @@ export const JsonServer = {
     root: async () => process.cwd(),
     async spawn() {
         const cwd = process.cwd();
-        const proc = await spawnWithInteractiveInstall("json", "vscode-json-languageserver", ["--stdio"], { cwd }, () => launchLSP("vscode-json-languageserver", ["--stdio"], {}));
+        const proc = await spawnWithInteractiveInstall("json", "vscode-json-language-server", ["--stdio"], { cwd }, async () => await launchLSP("vscode-json-language-server", ["--stdio"], {}));
         return proc ? { process: proc } : undefined;
     },
 };
@@ -479,10 +501,10 @@ export const PrismaServer = {
     id: "prisma",
     name: "Prisma Language Server",
     extensions: [".prisma"],
-    root: createRootDetector(["prisma/schema.prisma"], [".pi-lens"]),
+    root: createRootDetector(["prisma/schema.prisma"]),
     async spawn(root) {
         // Use npx since it's not auto-installed
-        const proc = launchViaPackageManager("@prisma/language-server", ["--stdio"], { cwd: root });
+        const proc = await launchViaPackageManager("@prisma/language-server", ["--stdio"], { cwd: root });
         return { process: proc };
     },
 };
@@ -497,10 +519,10 @@ export const VueServer = {
         "bun.lock",
         "pnpm-lock.yaml",
         "yarn.lock",
-    ], [".pi-lens"]),
+    ]),
     async spawn(root) {
         // Use npx since it's not auto-installed
-        const proc = launchViaPackageManager("@vue/language-server", ["--stdio"], {
+        const proc = await launchViaPackageManager("@vue/language-server", ["--stdio"], {
             cwd: root,
         });
         return { process: proc };
@@ -516,10 +538,10 @@ export const SvelteServer = {
         "bun.lock",
         "pnpm-lock.yaml",
         "yarn.lock",
-    ], [".pi-lens"]),
+    ]),
     async spawn(root) {
         // Use npx since it's not auto-installed
-        const proc = launchViaPackageManager("svelte-language-server", ["--stdio"], { cwd: root });
+        const proc = await launchViaPackageManager("svelte-language-server", ["--stdio"], { cwd: root });
         return { process: proc };
     },
 };
@@ -538,7 +560,7 @@ export const ESLintServer = {
     async spawn(root) {
         // Try via package manager (npx) since it's not auto-installed
         try {
-            const proc = launchViaPackageManager("vscode-eslint-language-server", ["--stdio"], { cwd: root });
+            const proc = await launchViaPackageManager("vscode-eslint-language-server", ["--stdio"], { cwd: root });
             return { process: proc };
         }
         catch {
@@ -555,7 +577,7 @@ export const CssServer = {
     root: async () => process.cwd(),
     async spawn() {
         // Use npx since it's not auto-installed
-        const proc = launchViaPackageManager("vscode-css-languageserver", ["--stdio"], {});
+        const proc = await launchViaPackageManager("vscode-css-languageserver", ["--stdio"], {});
         return { process: proc };
     },
 };