@bivy/bivy 0.16.9-staging.7 → 0.16.9-staging.9

package/bin/bivy.mjs

@@ -41,7 +41,7 @@ import { renderManagedBlock, upsertManagedBlock, removeManagedBlock, rcFileForSh
 import { removeInstallAndState } from "./uninstall-paths.mjs";
 import { findAvailablePort, reconcilePort } from "./port-picker.mjs";
 import { resolveAttachSessionId } from "./attach-session-id.mjs";
-import { detectInstallKind as classifyInstallKind } from "./install-kind.mjs";
+import { detectInstallKind as classifyInstallKind, npmGlobalPrefix } from "./install-kind.mjs";
 import { hasConfiguredService as configuredServiceExists } from "./service-state.mjs";
 
 const selfScript = fileURLToPath(import.meta.url);
@@ -4447,7 +4447,13 @@ async function runUpdate(args = []) {
 
   if (kind === "npm-global") {
     console.log(c.dim(`Updating the globally-installed bivy package (channel: ${channel})…`));
-    const code = await run("npm", ["install", "-g", `@bivy/bivy@${channel}`, "--no-audit", "--no-fund"]);
+    // npm's configured global prefix may not be the prefix that owns this
+    // executable (for example, `npm config get prefix` can remain /usr after
+    // installing Bivy with --prefix ~/.local). Always update the installation
+    // that is actually running this command.
+    const prefix = npmGlobalPrefix(repoRoot);
+    const prefixArgs = prefix ? ["--prefix", prefix] : [];
+    const code = await run("npm", ["install", "-g", ...prefixArgs, `@bivy/bivy@${channel}`, "--no-audit", "--no-fund"]);
     if (code !== 0) {
       console.log(c.yellow(`npm reported an issue (exit ${code}). Try: sudo npm i -g @bivy/bivy@${channel}`));
       process.exit(code);

package/bin/install-kind.mjs

@@ -18,3 +18,23 @@ export function detectInstallKind(repoRoot, existsSync = fs.existsSync) {
   if (inNodeModules) return "npm-global";
   return "packaged";
 }
+
+/**
+ * Return the npm prefix that owns a package installed below node_modules.
+ * npm uses <prefix>/lib/node_modules on Unix and <prefix>/node_modules on
+ * other platforms. The running npm process may have a different configured
+ * prefix, so deriving it from the package path is important for user-local
+ * installs.
+ */
+export function npmGlobalPrefix(repoRoot) {
+  let current = path.resolve(repoRoot);
+  while (true) {
+    if (path.basename(current) === "node_modules") {
+      const parent = path.dirname(current);
+      return path.basename(parent) === "lib" ? path.dirname(parent) : parent;
+    }
+    const parent = path.dirname(current);
+    if (parent === current) return undefined;
+    current = parent;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.16.9-staging.7",
+  "version": "0.16.9-staging.9",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",