@kevisual/cli 0.1.9 → 0.1.11

package/dist/assistant-server.js

@@ -62905,7 +62905,7 @@ var useKey = (envKey, initKey = "context") => {
   return null;
 };
 
-// ../node_modules/.pnpm/@kevisual+router@0.0.83/node_modules/@kevisual/router/dist/router.js
+// ../node_modules/.pnpm/@kevisual+router@0.0.84/node_modules/@kevisual/router/dist/router.js
 import { createRequire as createRequire2 } from "node:module";
 import { webcrypto as crypto2 } from "node:crypto";
 import http from "node:http";
@@ -79825,6 +79825,7 @@ class QueryRouter {
     const maxNextRoute = this.maxNextRoute;
     ctx = ctx || {};
     ctx.currentPath = path;
+    ctx.currentId = route?.id;
     ctx.currentKey = key;
     ctx.currentRoute = route;
     ctx.index = (ctx.index || 0) + 1;
@@ -79838,7 +79839,7 @@ class QueryRouter {
       ctx.code = 500;
       ctx.message = "Too many nextRoute";
       ctx.body = null;
-      return;
+      return ctx;
     }
     if (route && route.middleware && route.middleware.length > 0) {
       const errorMiddleware = [];
@@ -79913,7 +79914,9 @@ class QueryRouter {
             }
             return ctx;
           }
-          if (ctx.end) {}
+          if (ctx.end) {
+            return ctx;
+          }
         }
       }
     }
@@ -80107,7 +80110,7 @@ class QueryRouter {
         description: "列出当前应用下的所有的路由信息",
         middleware: opts?.middleware || [],
         run: async (ctx) => {
-          const tokenUser = ctx.state.tokenUser;
+          const tokenUser = ctx.state;
           let isUser = !!tokenUser;
           const list = this.getList(opts?.filter).filter((item) => {
             if (item.id === "auth" || item.id === "auth-can" || item.id === "check-auth-admin" || item.id === "auth-admin") {
@@ -80137,6 +80140,56 @@ class QueryRouter {
   toJSONSchema = toJSONSchema3;
   fromJSONSchema = fromJSONSchema3;
 }
+
+class QueryRouterServer extends QueryRouter {
+  handle;
+  constructor(opts) {
+    super();
+    const initHandle = opts?.initHandle ?? true;
+    if (initHandle || opts?.handleFn) {
+      this.handle = this.getHandle(this, opts?.handleFn, opts?.context);
+    }
+    this.setContext({ needSerialize: false, ...opts?.context });
+    if (opts?.appId) {
+      this.appId = opts.appId;
+    } else {
+      this.appId = randomId(16);
+    }
+  }
+  setHandle(wrapperFn, ctx) {
+    this.handle = this.getHandle(this, wrapperFn, ctx);
+  }
+  addRoute(route, opts) {
+    this.add(route, opts);
+  }
+  Route = Route;
+  route(...args) {
+    const [path, key, opts] = args;
+    if (typeof path === "object") {
+      return new Route(path.path, path.key, path);
+    }
+    if (typeof path === "string") {
+      if (opts) {
+        return new Route(path, key, opts);
+      }
+      if (key && typeof key === "object") {
+        return new Route(path, key?.key || "", key);
+      }
+      return new Route(path, key);
+    }
+    return new Route(path, key, opts);
+  }
+  prompt(description) {
+    return new Route(undefined, undefined, { description });
+  }
+  async run(msg, ctx) {
+    const handle = this.handle;
+    if (handle) {
+      return handle(msg, ctx);
+    }
+    return super.run(msg, ctx);
+  }
+}
 var isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
 var isBrowser3 = typeof window !== "undefined" && typeof document !== "undefined" && typeof document.createElement === "function";
 var isDeno = typeof Deno !== "undefined" && typeof Deno.version === "object" && typeof Deno.version.deno === "string";
@@ -81004,11 +81057,11 @@ class BunServer extends ServerBase {
   }
 }
 
-class App extends QueryRouter {
+class App extends QueryRouterServer {
   router;
   server;
   constructor(opts) {
-    super();
+    super({ initHandle: false, context: { needSerialize: true, ...opts?.routerContext } });
     const router = this;
     let server = opts?.server;
     if (!server) {
@@ -81020,7 +81073,6 @@ class App extends QueryRouter {
       }
     }
     server.setHandle(router.getHandle(router, opts?.routerHandle, opts?.routerContext));
-    router.setContext({ needSerialize: true, ...opts?.routerContext });
     this.router = router;
     this.server = server;
     if (opts?.appId) {
@@ -81033,42 +81085,7 @@ class App extends QueryRouter {
   listen(...args) {
     this.server.listen(...args);
   }
-  addRoute(route, opts) {
-    super.add(route, opts);
-  }
   Route = Route;
-  route(...args) {
-    const [path, key, opts] = args;
-    if (typeof path === "object") {
-      return new Route(path.path, path.key, path);
-    }
-    if (typeof path === "string") {
-      if (opts) {
-        return new Route(path, key, opts);
-      }
-      if (key && typeof key === "object") {
-        return new Route(path, key?.key || "", key);
-      }
-      return new Route(path, key);
-    }
-    return new Route(path, key, opts);
-  }
-  prompt(...args) {
-    const [desc] = args;
-    let description = "";
-    if (typeof desc === "string") {
-      description = desc;
-    } else if (typeof desc === "function") {
-      description = desc() || "";
-    }
-    return new Route("", "", { description });
-  }
-  async call(message, ctx) {
-    return await super.call(message, ctx);
-  }
-  async run(msg, ctx) {
-    return await super.run(msg, ctx);
-  }
   static handleRequest(req, res) {
     return handleServer(req, res);
   }
@@ -81083,7 +81100,7 @@ class App extends QueryRouter {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+router@0.0.83/node_modules/@kevisual/router/dist/router-simple.js
+// ../node_modules/.pnpm/@kevisual+router@0.0.84/node_modules/@kevisual/router/dist/router-simple.js
 import url3 from "node:url";
 var __create3 = Object.create;
 var __getProtoOf3 = Object.getPrototypeOf;
@@ -92291,7 +92308,7 @@ class Query {
   }
 }
 
-// ../node_modules/.pnpm/@kevisual+router@0.0.83/node_modules/@kevisual/router/dist/router-browser.js
+// ../node_modules/.pnpm/@kevisual+router@0.0.84/node_modules/@kevisual/router/dist/router-browser.js
 var __create5 = Object.create;
 var __getProtoOf5 = Object.getPrototypeOf;
 var __defProp5 = Object.defineProperty;
@@ -122870,6 +122887,15 @@ var installDeps = async (opts) => {
     syncSpawn("npm", params, { cwd: appPath, stdio: "inherit", env: process.env, shell: true });
   }
 };
+var execCommand = (command, options = {}) => {
+  const { cwd } = options;
+  return spawnSync(command, {
+    stdio: "inherit",
+    shell: true,
+    cwd,
+    env: process.env
+  });
+};
 
 // src/services/init/update-pkgs.ts
 var import_semver = __toESM(require_semver2(), 1);
@@ -123401,7 +123427,8 @@ app.route({
       title: "查看客户端 IP 地址",
       summary: "获取当前客户端的 IP 地址信息"
     })
-  }
+  },
+  middleware: ["auth-admin"]
 }).define(async (ctx) => {
   const networkInterfaces = os3.networkInterfaces();
   const ipAddresses = [];
@@ -124963,11 +124990,7 @@ app.route({
       message: "客户端重启命令已执行"
     };
   } catch (error54) {
-    ctx.status = 500;
-    ctx.body = {
-      message: "重启客户端失败",
-      error: error54.message
-    };
+    ctx.throw(500, "重启客户端失败");
   }
 }).addTo(app);
 
@@ -125140,11 +125163,11 @@ app.route({
     })
   }
 }).define(async (ctx) => {
-  const { path: path18, key = "" } = ctx.query;
+  const { path: path18, key = "" } = ctx.args;
   if (!path18) {
     ctx.throw("路径path不能为空");
   }
-  const res = await ctx.run({ path: path18, key, payload: ctx.query.payload || {} }, {
+  const res = await ctx.run({ path: path18, key, payload: ctx.args.payload || {} }, {
     ...ctx
   });
   ctx.forward(res);
@@ -127033,27 +127056,32 @@ app.route({
 // src/routes/cnb-board/live/live-content.ts
 var import_dayjs = __toESM(require_dayjs_min(), 1);
 import os7 from "node:os";
+import { execSync as execSync3 } from "node:child_process";
 var getLiveMdContent = (opts) => {
   const more = opts?.more ?? false;
   const url4 = useKey("CNB_VSCODE_PROXY_URI") || "";
   const token = useKey("CNB_TOKEN") || "";
   const openclawPort = useKey("OPENCLAW_PORT") || "80";
-  const openclawUrl = url4?.replace("{{port}}", openclawPort);
+  const openclawUrl = url4.replace("{{port}}", openclawPort);
   const openclawUrlSecret = openclawUrl + "/openclaw?token=" + token;
   const opencodePort = useKey("OPENCODE_PORT") || "100";
-  const opencodeUrl = url4?.replace("{{port}}", opencodePort);
+  const opencodeUrl = url4.replace("{{port}}", opencodePort);
   const _opencodeURL = new URL(opencodeUrl);
   _opencodeURL.username = "root";
   _opencodeURL.password = token;
   const opencodeUrlSecret = _opencodeURL.toString();
-  const kevisualUrl = url4?.replace("{{port}}", "51515");
+  const kevisualUrl = url4.replace("{{port}}", "51515");
+  const openWebUrl = url4.replace("{{port}}", "200");
   const vscodeWebUrl = useKey("CNB_VSCODE_WEB_URL") || "";
   const TEMPLATE = `# 开发环境模式配置
 
 ### 服务访问地址
 #### nginx 反向代理访问（推荐）
-- OpenClaw: ${openclawUrl}
+- OpenClaw: ${openclawUrl + "/openclaw"}
 - OpenCode: ${opencodeUrl}
+- VSCode Web: ${vscodeWebUrl}
+- OpenWebUI: ${openWebUrl}
+- Kevisual: ${kevisualUrl}
 
 ### 直接访问
 - Kevisual: ${kevisualUrl}
@@ -127077,7 +127105,7 @@ var getLiveMdContent = (opts) => {
 - wss: vscode web的websocket地址
 - cookie: vscode web的cookie，保持和浏览器一致
 - url: vscode web的访问地址，可以直接访问vscode web
-4. 运行cli命令，ev cnb live -c /workspace/live/keep.json
+4. 运行cli命令，ev cnb live -c /workspace/live/keep.json.(直接对话opencode或者openclaw调用cnb-live技能即可)
 
 `;
   const labels = [
@@ -127096,6 +127124,11 @@ var getLiveMdContent = (opts) => {
       value: token,
       description: "CNB 临时 Token，保持和环境变量 CNB_TOKEN 一致"
     },
+    {
+      title: "openWebUrl",
+      value: openWebUrl,
+      description: "OpenWebUI 的访问地址，可以通过该地址访问 OpenWebUI 服务"
+    },
     {
       title: "openclawUrl",
       value: openclawUrl,
@@ -127128,7 +127161,7 @@ var getLiveMdContent = (opts) => {
 };
 var createOSInfo = (more = false) => {
   const labels = [];
-  const startTimer = useKey("CNB_BUILD_START_TIME") || 0;
+  const startTimer = useKey("CNB_BUILD_START_TIME") || "";
   const cpus = os7.cpus();
   let totalIdle = 0;
   let totalTick = 0;
@@ -127139,10 +127172,26 @@ var createOSInfo = (more = false) => {
     totalIdle += cpu.times.idle;
   });
   const cpuUsage = ((1 - totalIdle / totalTick) * 100).toFixed(2);
-  const totalMem = os7.totalmem();
-  const freeMem = os7.freemem();
-  const usedMem = totalMem - freeMem;
-  const memUsage = (usedMem / totalMem * 100).toFixed(2);
+  let memUsed = 0;
+  let memTotal = 0;
+  let memFree = 0;
+  try {
+    const freeOutput = execSync3("free -b", { encoding: "utf-8" });
+    const lines = freeOutput.trim().split(`
+`);
+    const memLine = lines.find((line) => line.startsWith("Mem:"));
+    if (memLine) {
+      const parts = memLine.split(/\s+/);
+      memTotal = parseInt(parts[1]);
+      memUsed = parseInt(parts[2]);
+      memFree = parseInt(parts[3]);
+    }
+  } catch (e) {
+    memTotal = os7.totalmem();
+    memFree = os7.freemem();
+    memUsed = memTotal - memFree;
+  }
+  const memUsage = memTotal > 0 ? (memUsed / memTotal * 100).toFixed(2) : "0.00";
   const formatBytes = (bytes) => {
     const sizes = ["B", "KB", "MB", "GB", "TB"];
     if (bytes === 0)
@@ -127151,8 +127200,6 @@ var createOSInfo = (more = false) => {
     return (bytes / Math.pow(1024, i)).toFixed(2) + " " + sizes[i];
   };
   const bootTime = os7.uptime();
-  const bootTimeDate = new Date(Date.now() - bootTime * 1000);
-  const bootTimeStr = import_dayjs.default(bootTimeDate).format("YYYY-MM-DD HH:mm:ss");
   const formatUptime = (seconds) => {
     const days = Math.floor(seconds / 86400);
     const hours = Math.floor(seconds % 86400 / 3600);
@@ -127160,7 +127207,13 @@ var createOSInfo = (more = false) => {
     const secs = Math.floor(seconds % 60);
     return `${days}天 ${hours}小时 ${minutes}分钟 ${secs}秒`;
   };
-  const diskInfo = "可通过 df -h 命令获取";
+  let diskUsage = "";
+  try {
+    const duOutput = execSync3("du -sh .", { encoding: "utf-8" });
+    diskUsage = duOutput.trim().split("\t")[0];
+  } catch (e) {
+    diskUsage = "获取失败";
+  }
   labels.push({
     title: "cpuUsage",
     value: `${cpuUsage}%`,
@@ -127171,33 +127224,35 @@ var createOSInfo = (more = false) => {
     description: "CPU 核心数"
   }, {
     title: "memoryUsed",
-    value: formatBytes(usedMem),
+    value: formatBytes(memUsed),
     description: "已使用内存"
   }, {
     title: "memoryTotal",
-    value: formatBytes(totalMem),
+    value: formatBytes(memTotal),
     description: "总内存"
+  }, {
+    title: "memoryFree",
+    value: formatBytes(memFree),
+    description: "空闲内存"
   }, {
     title: "memoryUsage",
     value: `${memUsage}%`,
     description: "内存使用率"
   }, {
-    title: "diskInfo",
-    value: diskInfo,
-    description: "磁盘信息 (请使用 df -h 命令查看)"
-  }, {
-    title: "bootTime",
-    value: bootTimeStr,
-    description: "系统启动时间"
+    title: "diskUsage",
+    value: diskUsage,
+    description: "当前目录磁盘使用情况"
   }, {
     title: "uptime",
     value: formatUptime(bootTime),
     description: "系统运行时间"
   });
   if (startTimer) {
-    const buildStartTime = import_dayjs.default(parseInt(startTimer)).format("YYYY-MM-DD HH:mm:ss");
-    const buildUptime = Date.now() - parseInt(startTimer);
+    const buildStartTime = import_dayjs.default(startTimer).format("YYYY-MM-DD HH:mm:ss");
+    const buildStartTimestamp = import_dayjs.default(startTimer).valueOf();
+    const buildUptime = Date.now() - buildStartTimestamp;
     const buildUptimeStr = formatUptime(Math.floor(buildUptime / 1000));
+    const maxRunTime = useKey("CNB_PIPELINE_MAX_RUN_TIME") || 0;
     labels.push({
       title: "buildStartTime",
       value: buildStartTime,
@@ -127207,6 +127262,25 @@ var createOSInfo = (more = false) => {
       value: buildUptimeStr,
       description: "构建已运行时间"
     });
+    if (maxRunTime > 0) {
+      const now = import_dayjs.default();
+      const today4am = now.hour(4).minute(0).second(0).millisecond(0);
+      let timeTo4 = today4am.valueOf() - now.valueOf();
+      if (timeTo4 < 0) {
+        timeTo4 = today4am.add(1, "day").valueOf() - now.valueOf();
+      }
+      const timeTo4Str = `[距离晚上4点重启时间: ${formatUptime(Math.floor(timeTo4 / 1000))}]`;
+      labels.push({
+        title: "buildMaxRunTime",
+        value: formatUptime(Math.floor(maxRunTime / 1000)),
+        description: "构建最大运行时间(限制时间)"
+      });
+      labels.unshift({
+        title: "剩余时间",
+        value: formatUptime(Math.floor((maxRunTime - buildUptime) / 1000)) + " " + timeTo4Str,
+        description: "构建剩余时间"
+      });
+    }
   }
   if (more) {
     const loadavg = os7.loadavg();
@@ -127245,8 +127319,26 @@ var createOSInfo = (more = false) => {
 
 // src/routes/cnb-board/cnb-dev-env.ts
 app.route({
-  path: "cnb-board",
-  key: "live-repo-info",
+  path: "cnb_board",
+  key: "live",
+  description: "获取cnb-board live的mdContent内容",
+  middleware: ["auth-admin"],
+  metadata: {
+    args: {
+      more: zod_default.boolean().optional().describe("是否获取更多系统信息，默认false")
+    }
+  }
+}).define(async (ctx) => {
+  const more = ctx.query?.more ?? false;
+  const list4 = getLiveMdContent({ more });
+  ctx.body = {
+    title: "开发环境模式配置",
+    list: list4
+  };
+}).addTo(app);
+app.route({
+  path: "cnb_board",
+  key: "live_repo_info",
   description: "获取cnb-board live的repo信息",
   middleware: ["auth-admin"]
 }).define(async (ctx) => {
@@ -127293,8 +127385,8 @@ app.route({
   };
 }).addTo(app);
 app.route({
-  path: "cnb-board",
-  key: "live-build-info",
+  path: "cnb_board",
+  key: "live_build_info",
   description: "获取cnb-board live的构建信息",
   middleware: ["auth-admin"]
 }).define(async (ctx) => {
@@ -127436,8 +127528,8 @@ app.route({
   };
 }).addTo(app);
 app.route({
-  path: "cnb-board",
-  key: "live-pull-info",
+  path: "cnb_board",
+  key: "live_pull_info",
   description: "获取cnb-board live的PR信息",
   middleware: ["auth-admin"]
 }).define(async (ctx) => {
@@ -127534,8 +127626,8 @@ app.route({
   };
 }).addTo(app);
 app.route({
-  path: "cnb-board",
-  key: "live-npc-info",
+  path: "cnb_board",
+  key: "live_npc_info",
   description: "获取cnb-board live的NPC信息",
   middleware: ["auth-admin"]
 }).define(async (ctx) => {
@@ -127577,8 +127669,8 @@ app.route({
   };
 }).addTo(app);
 app.route({
-  path: "cnb-board",
-  key: "live-comment-info",
+  path: "cnb_board",
+  key: "live_comment_info",
   description: "获取cnb-board live的评论信息",
   middleware: ["auth-admin"]
 }).define(async (ctx) => {
@@ -127623,22 +127715,24 @@ app.route({
 // src/routes/cnb-board/index.ts
 app.route({
   path: "cnb-board",
-  key: "live",
-  description: "获取cnb-board live的mdContent内容",
-  middleware: ["auth-admin"],
-  metadata: {
-    args: {
-      more: zod_default.boolean().optional().describe("是否获取更多系统信息，默认false")
-    }
-  }
+  key: "is-cnb-board",
+  description: "检查是否是 cnb-board 环境",
+  middleware: ["auth-admin"]
 }).define(async (ctx) => {
-  const more = ctx.query?.more ?? false;
-  const list4 = getLiveMdContent({ more });
+  const isCNB = useKey("CNB");
   ctx.body = {
-    title: "开发环境模式配置",
-    list: list4
+    isCNB: !!isCNB
   };
 }).addTo(app);
+app.route({
+  path: "cnb-board",
+  key: "exit",
+  description: "cnb的工作环境退出程序",
+  middleware: ["auth-admin"]
+}).define(async (ctx) => {
+  const cmd = "kill 1";
+  execCommand(cmd);
+}).addTo(app);
 
 // ../node_modules/.pnpm/lru-cache@11.2.6/node_modules/lru-cache/dist/esm/index.min.js
 var M = typeof performance == "object" && performance && typeof performance.now == "function" ? performance : Date;
@@ -128738,11 +128832,17 @@ class LiveCode {
   }
 }
 
+// src/routes/cnb-board/modules/is-cnb.ts
+var isCnb = () => {
+  const CNB = useKey("CNB");
+  return !!CNB;
+};
+
 // src/services/proxy/proxy-page-index.ts
 var localProxy = new LocalProxy({});
 localProxy.initFromAssistantConfig(assistantConfig2);
 var isOpenPath = (pathname) => {
-  const openPaths = ["/root/home", "/root/cli", "/root/login"];
+  const openPaths = ["/root/home", "/root/cli", "/root/login", "/root/cli-center"];
   for (const openPath of openPaths) {
     if (pathname.startsWith(openPath)) {
       return true;
@@ -128801,11 +128901,22 @@ var authFilter = async (req, res) => {
 };
 var proxyRoute = async (req, res) => {
   const _assistantConfig = assistantConfig2.getCacheAssistantConfig();
-  const home = _assistantConfig?.home || "/root/home";
+  let home = _assistantConfig?.home;
   const auth = _assistantConfig?.auth || {};
   let noAdmin = !auth.username;
-  const toSetting = () => {
-    res.writeHead(302, { Location: `/root/cli-center/` });
+  if (!home) {
+    if (isCnb()) {
+      home = "/root/cli-center/cnb-board";
+    } else {
+      home = "/root/cli-center/";
+    }
+  } else {
+    if (!home.startsWith("/")) {
+      home = "/" + home;
+    }
+  }
+  const toLogin = (redirect) => {
+    res.writeHead(302, { Location: `/root/login/` + (redirect ? `?redirect=${encodeURIComponent(redirect)}` : "") });
     res.end();
     return true;
   };
@@ -128813,10 +128924,11 @@ var proxyRoute = async (req, res) => {
   const pathname = decodeURIComponent(url4.pathname);
   if (pathname === "/") {
     if (noAdmin) {
-      return toSetting();
+      return toLogin(home + "/");
     }
-    res.writeHead(302, { Location: `${home}/` });
-    return res.end();
+    res.writeHead(302, { Location: home });
+    res.end();
+    return;
   }
   if (pathname.startsWith("/favicon.ico")) {
     res.statusCode = 404;
@@ -128877,7 +128989,7 @@ var proxyRoute = async (req, res) => {
   const isOpen = isOpenPath(pathname);
   logger.debug("proxyRoute", { _user, _app, pathname, noAdmin, isOpen });
   if (noAdmin && !isOpen) {
-    return toSetting();
+    return toLogin();
   }
   if (_app && urls.length === 3) {
     res.writeHead(302, { Location: `${req.url}/` });
@@ -129013,7 +129125,7 @@ var import_busboy = __toESM(require_lib2(), 1);
 import path20 from "path";
 import fs23 from "fs";
 
-// ../node_modules/.pnpm/@kevisual+router@0.0.83/node_modules/@kevisual/router/src/server/cookie.ts
+// ../node_modules/.pnpm/@kevisual+router@0.0.84/node_modules/@kevisual/router/src/server/cookie.ts
 var NullObject2 = /* @__PURE__ */ (() => {
   const C2 = function() {};
   C2.prototype = Object.create(null);
@@ -129361,7 +129473,7 @@ import path22 from "node:path";
 // src/module/get-bun-path.ts
 import fs24 from "node:fs";
 import path21 from "node:path";
-import { execSync as execSync3 } from "node:child_process";
+import { execSync as execSync4 } from "node:child_process";
 var getBunPath = () => {
   const isWindows = process.platform === "win32";
   const bunExecutableName = isWindows ? "bun.exe" : "bun";
@@ -129370,14 +129482,14 @@ var getBunPath = () => {
   }
   if (isWindows) {
     try {
-      const globalNodeModules = execSync3("npm root -g", { encoding: "utf-8" }).trim();
+      const globalNodeModules = execSync4("npm root -g", { encoding: "utf-8" }).trim();
       const bunExePath = path21.join(globalNodeModules, "bun", "bin", "bun.exe");
       if (fs24.existsSync(bunExePath)) {
         return bunExePath;
       }
     } catch (error54) {}
     try {
-      const bunPath = execSync3("where bun", { encoding: "utf-8" }).trim().split(`
+      const bunPath = execSync4("where bun", { encoding: "utf-8" }).trim().split(`
 `)[0];
       if (bunPath && bunPath.endsWith(".exe")) {
         return bunPath;
@@ -129392,7 +129504,7 @@ var getBunPath = () => {
     } catch (error54) {}
   } else {
     try {
-      const bunPath = execSync3("which bun", { encoding: "utf-8" }).trim();
+      const bunPath = execSync4("which bun", { encoding: "utf-8" }).trim();
       if (bunPath && fs24.existsSync(bunPath)) {
         return bunPath;
       }