pybao-cli 1.4.7 → 1.4.9

package/dist/{chunk-TXBGJHRH.js → chunk-TG2OJPT2.js}

@@ -2,15 +2,15 @@ import { createRequire as __pybCreateRequire } from "node:module";
 const require = __pybCreateRequire(import.meta.url);
 import {
   loadSettingsWithLegacyFallback
-} from "./chunk-XUI3VI56.js";
+} from "./chunk-OQEZE2RG.js";
 import {
   debug
-} from "./chunk-SJ2OFXCY.js";
+} from "./chunk-DFET2PYQ.js";
 import {
   env,
   getCwd,
   resolveXdgDataPath
-} from "./chunk-CHICDAKI.js";
+} from "./chunk-AKGLH4UH.js";
 import {
   __require
 } from "./chunk-I3J4JYES.js";
@@ -20,6 +20,9 @@ import { join as join2, dirname, basename } from "path";
 import { fileURLToPath } from "url";
 import { existsSync as existsSync2, mkdirSync, mkdtempSync, rmSync, readdirSync, writeFileSync, chmodSync, renameSync, statSync as statSync2 } from "fs";
 import { tmpdir } from "os";
+import { spawn } from "child_process";
+import { createRequire } from "module";
+import which from "which";
 
 // src/tools/search/LspTool/utils.ts
 import { join, relative } from "path";
@@ -75,11 +78,76 @@ async function findNearestRoot(startDir, markers, options) {
 // src/tools/search/LspTool/registry.ts
 var __filename = fileURLToPath(import.meta.url);
 var __dirname = dirname(__filename);
+var nodeRequire = createRequire(import.meta.url);
 var lspInstallDir = getLspBinDir();
 var getEnvPackageRoot = () => {
   const root = process.env.PYB_PACKAGE_ROOT?.trim();
   return root || "";
 };
+var getBunRuntime = () => globalThis.Bun;
+var safeWhich = (cmd) => {
+  const bun = getBunRuntime();
+  if (bun?.which) return bun.which(cmd);
+  try {
+    return which.sync(cmd);
+  } catch {
+    return null;
+  }
+};
+var safeResolvePackage = async (name, rootPath) => {
+  const bun = getBunRuntime();
+  if (bun?.resolve) {
+    await bun.resolve(name, rootPath);
+    return true;
+  }
+  try {
+    nodeRequire.resolve(name, { paths: [rootPath] });
+    return true;
+  } catch {
+    return false;
+  }
+};
+var spawnProcess = async (cmd, options) => {
+  const bun = getBunRuntime();
+  if (bun?.spawn) {
+    const proc = bun.spawn({
+      cmd,
+      cwd: options.cwd,
+      env: options.env,
+      stdout: "pipe",
+      stderr: "pipe",
+      stdin: "pipe"
+    });
+    const [stdout, stderr, exitCode] = await Promise.all([
+      new Response(proc.stdout).text(),
+      new Response(proc.stderr).text(),
+      proc.exited
+    ]);
+    return { stdout, stderr, exitCode };
+  }
+  return await new Promise((resolve) => {
+    const [command, ...args] = cmd;
+    const child = spawn(command, args, {
+      cwd: options.cwd,
+      env: options.env,
+      stdio: ["ignore", "pipe", "pipe"]
+    });
+    let stdout = "";
+    let stderr = "";
+    child.stdout?.on("data", (chunk) => {
+      stdout += chunk.toString();
+    });
+    child.stderr?.on("data", (chunk) => {
+      stderr += chunk.toString();
+    });
+    child.on("error", (error) => {
+      resolve({ stdout, stderr: `${stderr}${String(error)}`, exitCode: 1 });
+    });
+    child.on("close", (code) => {
+      resolve({ stdout, stderr, exitCode: code ?? 1 });
+    });
+  });
+};
 var installNotices = [];
 var HEAVY_LSP_SERVERS = /* @__PURE__ */ new Set([
   "eslint",
@@ -134,11 +202,11 @@ function resolveRuntimeCommand() {
       return process.execPath;
     }
   }
-  const nodeBin = Bun.which("node");
+  const nodeBin = safeWhich("node");
   if (nodeBin && existsSync2(nodeBin)) {
     return nodeBin;
   }
-  const bunBin = Bun.which("bun");
+  const bunBin = safeWhich("bun");
   if (bunBin && existsSync2(bunBin)) {
     return bunBin;
   }
@@ -150,7 +218,7 @@ function resolveBunRuntimePath() {
   if (process.execPath && existsSync2(process.execPath) && isBunExecutablePath(process.execPath)) {
     return process.execPath;
   }
-  const bunBin = Bun.which("bun");
+  const bunBin = safeWhich("bun");
   if (bunBin && existsSync2(bunBin)) return bunBin;
   return "";
 }
@@ -264,37 +332,23 @@ async function bunInstall(packages, cwd = lspInstallDir) {
   if (!existsSync2(cwd)) {
     mkdirSync(cwd, { recursive: true });
   }
-  const proc = Bun.spawn({
-    cmd: [bunBin, "install", ...packages],
+  const result = await spawnProcess([bunBin, "install", ...packages], {
     cwd,
     env: {
       ...process.env,
       BUN_BE_BUN: "1"
-    },
-    stdout: "pipe",
-    stderr: "pipe",
-    stdin: "pipe"
+    }
   });
-  const exitCode = await proc.exited;
-  return exitCode === 0;
+  return result.exitCode === 0;
 }
 async function runBinary(cmd, extraEnv, cwd = lspInstallDir) {
-  const proc = Bun.spawn({
-    cmd,
+  const { stdout, stderr, exitCode } = await spawnProcess(cmd, {
     cwd,
     env: {
       ...process.env,
       ...extraEnv
-    },
-    stdout: "pipe",
-    stderr: "pipe",
-    stdin: "pipe"
+    }
   });
-  const [stdout, stderr, exitCode] = await Promise.all([
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text(),
-    proc.exited
-  ]);
   if (exitCode === 0) {
     return { ok: true };
   }
@@ -316,17 +370,7 @@ async function runBinaryWithTimeout(cmd, extraEnv, cwd, timeoutMs) {
   return result;
 }
 async function getJavaMajorVersion() {
-  const proc = Bun.spawn({
-    cmd: ["java", "-version"],
-    stdout: "pipe",
-    stderr: "pipe",
-    stdin: "pipe"
-  });
-  const [stdout, stderr, exitCode] = await Promise.all([
-    new Response(proc.stdout).text(),
-    new Response(proc.stderr).text(),
-    proc.exited
-  ]);
+  const { stdout, stderr, exitCode } = await spawnProcess(["java", "-version"], {});
   if (exitCode !== 0) return null;
   const output = `${stderr}
 ${stdout}`;
@@ -350,6 +394,7 @@ async function installEslintServer(installDir = lspInstallDir) {
   if (!existsSync2(installDir)) {
     mkdirSync(installDir, { recursive: true });
   }
+  const runtime = getBunRuntime() ? "bun" : "node";
   debug.info("LSP_INSTALL", { server: "eslint", action: "start" });
   try {
     await downloadAndExtractArchive({
@@ -361,7 +406,7 @@ async function installEslintServer(installDir = lspInstallDir) {
     const extractedPath = join2(installDir, "vscode-eslint-main");
     const finalPath = getEslintInstallDir(installDir);
     if (!existsSync2(extractedPath)) {
-      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: "extracted path missing" });
+      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: "extracted path missing", runtime });
       return false;
     }
     if (existsSync2(finalPath)) {
@@ -369,29 +414,29 @@ async function installEslintServer(installDir = lspInstallDir) {
     }
     renameSync(extractedPath, finalPath);
     const npmCmd = process.platform === "win32" ? "npm.cmd" : "npm";
-    if (!Bun.which(npmCmd)) {
-      debug.error("LSP_MISSING_DEP", { server: "eslint", error: `${npmCmd} not found` });
+    if (!safeWhich(npmCmd)) {
+      debug.error("LSP_MISSING_DEP", { server: "eslint", error: `${npmCmd} not found`, runtime });
       return false;
     }
     const timeoutMs = getInstallTimeoutMs();
     const installResult = await runBinaryWithTimeout([npmCmd, "install"], void 0, finalPath, timeoutMs);
     if (!installResult.ok) {
-      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: installResult.error });
+      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: installResult.error, runtime });
       return false;
     }
     const compileResult = await runBinaryWithTimeout([npmCmd, "run", "compile"], void 0, finalPath, timeoutMs);
     if (!compileResult.ok) {
-      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: compileResult.error });
+      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: compileResult.error, runtime });
       return false;
     }
     if (!existsSync2(serverPath)) {
-      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: "eslintServer.js not found" });
+      debug.error("LSP_INSTALL_FAILED", { server: "eslint", error: "eslintServer.js not found", runtime });
       return false;
     }
     debug.info("LSP_INSTALL", { server: "eslint", action: "success" });
     return true;
   } catch (e) {
-    debug.error("LSP_INSTALL_ERROR", { server: "eslint", error: String(e) });
+    debug.error("LSP_INSTALL_ERROR", { server: "eslint", error: String(e), runtime });
     return false;
   }
 }
@@ -681,7 +726,7 @@ function hasDenoConfig(rootPath) {
   return ["deno.json", "deno.jsonc"].some((name) => existsSync2(join2(rootPath, name)));
 }
 function resolveTyBinary(rootPath) {
-  const direct = Bun.which("ty");
+  const direct = safeWhich("ty");
   if (direct) return direct;
   const venvPaths = [process.env.VIRTUAL_ENV, join2(rootPath, ".venv"), join2(rootPath, "venv")].filter(
     (value) => Boolean(value)
@@ -794,7 +839,7 @@ function multiResolveBinary(options) {
   const cwd = options.cwd ?? process.cwd();
   const localBinDir = join2(cwd, "node_modules", ".bin");
   for (const binName of options.binNames) {
-    if (Bun.which(binName)) {
+    if (safeWhich(binName)) {
       return { command: binName, args: options.args ?? [] };
     }
     const localBin = resolveBinInDir(localBinDir, binName);
@@ -807,7 +852,8 @@ function multiResolveBinary(options) {
     }
   }
   if (options.packageName) {
-    const bunBin = Bun.which("bun") ?? process.execPath;
+    const bunBin = resolveBunRuntimePath();
+    if (!bunBin) return null;
     return { command: bunBin, args: ["x", options.packageName, ...options.args ?? []] };
   }
   return null;
@@ -938,7 +984,7 @@ async function installLuaLs(installDir) {
   return true;
 }
 async function installZls(installDir) {
-  if (!Bun.which("zig")) {
+  if (!safeWhich("zig")) {
     throw new Error("zig not found");
   }
   const plan = planZlsDownload(installDir);
@@ -953,7 +999,7 @@ async function installZls(installDir) {
   return true;
 }
 async function installElixirLs(installDir) {
-  if (!Bun.which("elixir") || !Bun.which("mix")) {
+  if (!safeWhich("elixir") || !safeWhich("mix")) {
     throw new Error("elixir or mix not found");
   }
   const plan = planElixirLsDownload(installDir);
@@ -973,7 +1019,7 @@ async function installElixirLs(installDir) {
   return true;
 }
 async function installJdtls(installDir) {
-  if (!Bun.which("java")) {
+  if (!safeWhich("java")) {
     throw new Error("java not found");
   }
   const javaMajor = await getJavaMajorVersion();
@@ -990,13 +1036,13 @@ async function installJdtls(installDir) {
   return true;
 }
 function resolveMetalsBinary(installDir) {
-  const direct = Bun.which("metals");
+  const direct = safeWhich("metals");
   if (direct) return direct;
   const local = resolveBinInDir(installDir, "metals");
   return local || null;
 }
 async function installMetals(installDir) {
-  if (!Bun.which("java")) {
+  if (!safeWhich("java")) {
     throw new Error("java not found");
   }
   const javaMajor = await getJavaMajorVersion();
@@ -1004,7 +1050,7 @@ async function installMetals(installDir) {
     throw new Error("java 17 or newer required");
   }
   if (resolveMetalsBinary(installDir)) return true;
-  const installer = Bun.which("cs") ?? Bun.which("coursier");
+  const installer = safeWhich("cs") ?? safeWhich("coursier");
   if (!installer) {
     throw new Error("coursier not found");
   }
@@ -1051,7 +1097,7 @@ function getJdtlsConfigDir(installDir) {
 }
 var BaseLspServer = class {
   isInPath(cmd) {
-    return Boolean(Bun.which(cmd));
+    return Boolean(safeWhich(cmd));
   }
   getLocalBinPath(binName, npmPackageName) {
     const envPackageRoot = getEnvPackageRoot();
@@ -1441,7 +1487,7 @@ var LspServerRegistry = class _LspServerRegistry {
       rootMarkers: ["deno.json", "deno.jsonc"],
       isEnabled: async (rootPath) => hasDenoConfig(rootPath),
       spawn: async (rootPath) => {
-        const deno = Bun.which("deno");
+        const deno = safeWhich("deno");
         if (!deno) return null;
         return { command: deno, args: ["lsp"] };
       },
@@ -1503,13 +1549,10 @@ var LspServerRegistry = class _LspServerRegistry {
       spawn: async (rootPath) => {
         const serverPath = getEslintServerPath();
         if (!existsSync2(serverPath)) return null;
-        try {
-          await Bun.resolve("eslint", rootPath);
-        } catch {
-          return null;
-        }
-        const bunBin = Bun.which("bun") ?? process.execPath;
-        return { command: bunBin, args: [serverPath, "--stdio"] };
+        const hasEslint = await safeResolvePackage("eslint", rootPath);
+        if (!hasEslint) return null;
+        const runtimeCommand = resolveBunRuntimePath() || resolveRuntimeCommand();
+        return { command: runtimeCommand, args: [serverPath, "--stdio"] };
       },
       priority: -10,
       group: "lint"
@@ -1690,7 +1733,7 @@ var LspServerRegistry = class _LspServerRegistry {
         }
       },
       spawn: async () => {
-        const java = Bun.which("java");
+        const java = safeWhich("java");
         if (!java) return null;
         const javaMajor = await getJavaMajorVersion();
         if (!javaMajor || javaMajor < 21) return null;
@@ -1754,7 +1797,7 @@ var LspServerRegistry = class _LspServerRegistry {
           process.platform === "win32" ? "lua-language-server.exe" : "lua-language-server"
         );
         if (existing) return true;
-        if (Bun.which("lua-language-server") || Bun.which("lua-ls")) return true;
+        if (safeWhich("lua-language-server") || safeWhich("lua-ls")) return true;
         const canInstall = await isAutoInstallEnabled();
         if (!canInstall) return false;
         ensureInstallDir();
@@ -1806,7 +1849,7 @@ var LspServerRegistry = class _LspServerRegistry {
           process.platform === "win32" ? "language_server.bat" : "language_server.sh"
         );
         if (existing) return true;
-        if (Bun.which("elixir-ls")) return true;
+        if (safeWhich("elixir-ls")) return true;
         const canInstall = await isAutoInstallEnabled();
         if (!canInstall) return false;
         ensureInstallDir();
@@ -1819,7 +1862,7 @@ var LspServerRegistry = class _LspServerRegistry {
         }
       },
       spawn: async (rootPath) => {
-        if (Bun.which("elixir-ls")) {
+        if (safeWhich("elixir-ls")) {
           return { command: "elixir-ls", args: [] };
         }
         const installDir = join2(lspInstallDir, "elixir-ls");
@@ -1836,7 +1879,7 @@ var LspServerRegistry = class _LspServerRegistry {
         const installDir = join2(lspInstallDir, "zls");
         const existing = findFileRecursive(installDir, process.platform === "win32" ? "zls.exe" : "zls");
         if (existing) return true;
-        if (Bun.which("zls")) return true;
+        if (safeWhich("zls")) return true;
         const canInstall = await isAutoInstallEnabled();
         if (!canInstall) return false;
         ensureInstallDir();