beecork 2.5.0 → 2.5.1

package/dist/index.js

@@ -135,9 +135,10 @@ var config = {
 };
 
 // src/update.ts
-import { readFile, writeFile, mkdir } from "node:fs/promises";
+import { readFile, writeFile, mkdir, realpath } from "node:fs/promises";
 import { homedir as homedir2 } from "node:os";
-import { join, dirname } from "node:path";
+import { join, dirname, basename, delimiter } from "node:path";
+import { fileURLToPath } from "node:url";
 import { spawn } from "node:child_process";
 var CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
 var cacheFile = () => join(homedir2(), ".beecork", "update-check.json");
@@ -149,6 +150,48 @@ async function currentVersion() {
     return "0.0.0";
   }
 }
+function runningPkgRoot() {
+  return fileURLToPath(new URL("..", import.meta.url));
+}
+function prefixFromPkgRoot(pkgRoot) {
+  const nm = dirname(pkgRoot);
+  if (basename(nm) !== "node_modules") return null;
+  const up = dirname(nm);
+  return basename(up) === "lib" ? dirname(up) : up;
+}
+function installPrefix() {
+  return prefixFromPkgRoot(runningPkgRoot());
+}
+async function findShadowingInstalls() {
+  let running;
+  try {
+    running = await realpath(runningPkgRoot());
+  } catch {
+    running = runningPkgRoot();
+  }
+  const names = process.platform === "win32" ? ["beecork.cmd", "beecork"] : ["beecork"];
+  const seenRoots = /* @__PURE__ */ new Set([running]);
+  const others = [];
+  for (const dir of (process.env.PATH ?? "").split(delimiter).filter(Boolean)) {
+    for (const name of names) {
+      try {
+        const bin = join(dir, name);
+        const root = dirname(dirname(await realpath(bin)));
+        if (seenRoots.has(root)) continue;
+        seenRoots.add(root);
+        const pkg = JSON.parse(await readFile(join(root, "package.json"), "utf8"));
+        if (String(pkg.name) === "beecork") others.push({ bin, version: String(pkg.version ?? "?").replace(/[^\w.+-]/g, "") });
+      } catch {
+      }
+    }
+  }
+  return others;
+}
+async function shadowWarning() {
+  const others = await findShadowingInstalls();
+  if (!others.length) return null;
+  return "\u26A0 Another beecork is on your PATH and may shadow the version you just installed:\n" + others.map((o) => `    ${o.bin}  (v${o.version})`).join("\n") + "\n  Remove the stale one(s) so `beecork` always runs the newest install (may need sudo):\n" + others.map((o) => `    rm ${o.bin}`).join("\n");
+}
 function isNewer(a, b) {
   const pa = a.split(".").map((n) => parseInt(n, 10) || 0);
   const pb = b.split(".").map((n) => parseInt(n, 10) || 0);
@@ -195,7 +238,9 @@ async function checkForUpdate(current) {
 function selfUpdate(timeoutMs = 12e4) {
   return new Promise((resolve2) => {
     const npm = process.platform === "win32" ? "npm.cmd" : "npm";
-    const child = spawn(npm, ["install", "-g", "beecork@latest"], { stdio: ["ignore", "pipe", "pipe"] });
+    const prefix = installPrefix();
+    const args = ["install", "-g", "beecork@latest", ...prefix ? ["--prefix", prefix] : []];
+    const child = spawn(npm, args, { stdio: ["ignore", "pipe", "pipe"] });
     let out3 = "", done = false;
     const finish = (r) => {
       if (done) return;
@@ -494,8 +539,9 @@ function markLines(width) {
   }
   return lines.filter((l) => l.length > 0);
 }
-function printBanner(model, sources) {
+function printBanner(model, version, sources) {
   const safeModel = stripControl(model);
+  const safeVersion = stripControl(version);
   const word = [
     "  _                              _    ",
     " | |__   ___  ___  ___ ___  _ __| | __",
@@ -527,7 +573,7 @@ function printBanner(model, sources) {
   const mem = sources.filter((s) => s.endsWith("memory.md"));
   const cwd = tildify(process.cwd());
   const rows2 = [
-    ["", "\u{1F41D}  a tiny CLI coding agent"],
+    ["", `\u{1F41D}  a tiny CLI coding agent  \xB7  v${safeVersion}`],
     ["dir", cwd],
     ["model", safeModel],
     ["cork.md", cork.length ? cork.join(", ") : "none"],
@@ -1307,7 +1353,7 @@ async function runExplorer(task, focus, signal) {
 
 // src/safety.ts
 import { homedir as homedir3 } from "node:os";
-import { basename } from "node:path";
+import { basename as basename2 } from "node:path";
 function pathGuard(args) {
   const { abs, inRoot } = resolveInRoot(String(args.path ?? "."));
   return inRoot ? {} : { needsApproval: true, reason: `path is outside the project root: ${abs}`, cacheKey: `path:${abs}` };
@@ -1315,7 +1361,7 @@ function pathGuard(args) {
 var SECRET_FILE = /(^|\/)(\.env(\.[\w.-]+)?|[\w.-]*\.(env|pem|key|secret|pfx|p12|jks|keystore)|id_(rsa|ed25519|ecdsa|dsa)|credentials|\.git-credentials|\.pgpass|\.npmrc|\.netrc)$/i;
 function isSecretPath(userPath) {
   const { abs } = resolveInRoot(userPath);
-  return SECRET_FILE.test(abs) || SECRET_FILE.test(basename(abs));
+  return SECRET_FILE.test(abs) || SECRET_FILE.test(basename2(abs));
 }
 function secretGuard(args) {
   const p = pathGuard(args);
@@ -3664,8 +3710,11 @@ async function handleCommand(input, messages) {
   } else if (cmd === "/update") {
     console.log(color.dim("updating beecork\u2026 (npm install -g beecork@latest)"));
     const { ok, output } = await selfUpdate();
-    if (ok) console.log(color.green("\u2713 updated \u2014 restart beecork to use the new version.") + "\n");
-    else {
+    if (ok) {
+      console.log(color.green("\u2713 updated \u2014 restart beecork to use the new version.") + "\n");
+      const w = await shadowWarning();
+      if (w) console.log(color.yellow(w) + "\n");
+    } else {
       console.log(color.red("update failed: ") + output.split("\n").filter(Boolean).slice(-1)[0]);
       console.log(color.dim("  run manually: npm install -g beecork  (may need sudo / your version manager)") + "\n");
     }
@@ -3835,8 +3884,11 @@ async function main() {
   if (process.argv[2] === "update") {
     console.log("Updating beecork\u2026");
     const { ok, output } = await selfUpdate();
-    if (ok) console.log(color.green("\u2713 beecork updated. Run `beecork` to use the new version."));
-    else {
+    if (ok) {
+      console.log(color.green("\u2713 beecork updated. Run `beecork` to use the new version."));
+      const w = await shadowWarning();
+      if (w) console.log("\n" + color.yellow(w));
+    } else {
       console.error(color.red("Update failed:") + "\n" + output);
       console.error(color.dim("\nTry manually: npm install -g beecork  (you may need sudo, or your Node version manager)."));
       process.exitCode = 1;
@@ -3917,12 +3969,12 @@ ${instr.trusted}`;
   }
   const rl = tty ? null : createInterface({ input: process.stdin, output: process.stdout, completer });
   if (chromeEnabled()) process.stdout.write(ansi.clearScreen + ansi.clearScrollback + ansi.home);
-  printBanner(state.model, instr.sources.map(tildify));
+  const version = await currentVersion();
+  printBanner(state.model, version, instr.sources.map(tildify));
   if (config.dangerouslySkipPermissions) {
     console.log(color.red("\u26A0  --dangerously-skip-permissions is ON: the approval gate is OFF. Out-of-root paths and risky") + "\n" + color.red("   shell commands will RUN unprompted. Use only in a disposable sandbox. (read-only mode + catastrophic-") + "\n" + color.red("   command refusal still apply.)") + "\n");
   }
   if (tty) {
-    const version = await currentVersion();
     const newer = await checkForUpdate(version);
     if (newer) console.log(color.dim(`\u25B8 beecork ${stripControl(newer)} is available (you have ${version}) \u2014 update: npm install -g beecork`) + "\n");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "beecork",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "beecork — a from-scratch CLI coding agent: multi-model (OpenRouter), BYOK, path-confined tools, built part by part.",
   "type": "module",
   "bin": {