pi-extmgr 0.2.1 → 0.3.0

package/README.md

@@ -20,6 +20,28 @@ If Pi is already running, use `/reload`.
 
 Requires Node.js `>=22.20.0`.
 
+### npm prefix permissions
+
+Pi global package installs use `npm install -g`. If `npm_config_prefix` points at an
+unwritable prefix such as `/usr/local`, install or reload can fail with `EACCES`.
+Use a writable npm prefix, configure Pi's `npmCommand` setting for your Node
+version manager, or install project-local with `pi install npm:pi-extmgr -l`.
+
+`npmCommand` examples for `~/.pi/agent/settings.json`:
+
+```jsonc
+{
+  // mise: run npm through Node 22
+  // "npmCommand": ["mise", "exec", "node@22", "--", "npm"]
+
+  // bun: use Bun as Pi's package-manager command
+  // "npmCommand": ["bun"]
+
+  // nvm: start Pi from an nvm-enabled shell and use npm on PATH
+  // "npmCommand": ["npm"]
+}
+```
+
 ## Features
 
 - **Unified manager UI**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-extmgr",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Enhanced UX for managing local Pi extensions and community packages",
   "keywords": [
     "pi-package",
@@ -44,13 +44,13 @@
     "image": "https://i.imgur.com/Ce513Br.png"
   },
   "peerDependencies": {
-    "@mariozechner/pi-coding-agent": "*",
-    "@mariozechner/pi-tui": "*"
+    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-tui": "*"
   },
   "devDependencies": {
     "@biomejs/biome": "^2.4.9",
-    "@mariozechner/pi-coding-agent": "^0.70.6",
-    "@mariozechner/pi-tui": "^0.70.6",
+    "@earendil-works/pi-coding-agent": "^0.74.0",
+    "@earendil-works/pi-tui": "^0.74.0",
     "@release-it/conventional-changelog": "^10.0.5",
     "@types/node": "^22.19.10",
     "husky": "^9.1.7",

package/src/commands/auto-update.ts

@@ -2,7 +2,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
   disableAutoUpdate,
   enableAutoUpdate,

package/src/commands/cache.ts

@@ -1,4 +1,4 @@
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { clearSearchCache } from "../packages/discovery.js";
 import { clearRemotePackageInfoCache } from "../ui/remote.js";
 import { clearCache } from "../utils/cache.js";

package/src/commands/history.ts

@@ -1,4 +1,4 @@
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import {
   type ChangeAction,
   formatChangeEntry,

package/src/commands/install.ts

@@ -1,4 +1,4 @@
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { type InstallScope, installPackage } from "../packages/install.js";
 import { notify } from "../utils/notify.js";
 

package/src/commands/registry.ts

@@ -1,5 +1,5 @@
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
-import { type AutocompleteItem } from "@mariozechner/pi-tui";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
+import { type AutocompleteItem } from "@earendil-works/pi-tui";
 import {
   promptRemove,
   removePackage,

package/src/commands/types.ts

@@ -1,4 +1,4 @@
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
 export type CommandId =
   | "local"

package/src/index.ts

@@ -7,7 +7,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { createAutoUpdateNotificationHandler } from "./commands/auto-update.js";
 import {
   getExtensionsAutocompleteItems,

package/src/packages/catalog.ts

@@ -4,7 +4,7 @@ import {
   type PackageSource,
   type ProgressEvent,
   SettingsManager,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { type InstalledPackage, type Scope } from "../types/index.js";
 import { normalizePackageIdentity, parsePackageNameAndVersion } from "../utils/package-source.js";
 

package/src/packages/discovery.ts

@@ -8,7 +8,7 @@ import {
   type ExtensionCommandContext,
   type ExtensionContext,
   getAgentDir,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { CACHE_TTL, TIMEOUTS } from "../constants.js";
 import { type InstalledPackage, type NpmPackage, type SearchCache } from "../types/index.js";
 import { parseNpmSource } from "../utils/format.js";

package/src/packages/extensions.ts

@@ -5,7 +5,7 @@ import { homedir } from "node:os";
 import { dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
-import { getAgentDir } from "@mariozechner/pi-coding-agent";
+import { getAgentDir } from "@earendil-works/pi-coding-agent";
 import {
   type InstalledPackage,
   type PackageExtensionEntry,
@@ -19,7 +19,7 @@ import {
   normalizeRelativePath,
   resolveRelativePathSelection,
 } from "../utils/relative-path-selection.js";
-import { resolveNpmCommand } from "../utils/npm-exec.js";
+import { resolveConfiguredNpmRootCommand } from "../utils/npm-exec.js";
 
 interface PackageSettingsObject {
   source: string;
@@ -39,7 +39,7 @@ export interface PackageManifest {
 }
 
 const execFileAsync = promisify(execFile);
-let globalNpmRootCache: string | null | undefined;
+let globalNpmRootCache: { key: string; root: string | null } | undefined;
 
 function normalizeSource(source: string): string {
   return source
@@ -58,24 +58,32 @@ function normalizePackageRootCandidate(candidate: string): string {
   return resolved;
 }
 
-async function getGlobalNpmRoot(): Promise<string | undefined> {
-  if (globalNpmRootCache !== undefined) {
-    return globalNpmRootCache ?? undefined;
+async function getGlobalNpmRoot(cwd: string): Promise<string | undefined> {
+  let npmCommand: ReturnType<typeof resolveConfiguredNpmRootCommand>;
+  try {
+    npmCommand = resolveConfiguredNpmRootCommand(cwd);
+  } catch {
+    return undefined;
+  }
+
+  const cacheKey = [npmCommand.command, ...npmCommand.args].join("\0");
+
+  if (globalNpmRootCache?.key === cacheKey) {
+    return globalNpmRootCache.root ?? undefined;
   }
 
   try {
-    const npmCommand = resolveNpmCommand(["root", "-g"]);
     const { stdout } = await execFileAsync(npmCommand.command, npmCommand.args, {
       timeout: 2_000,
       windowsHide: true,
     });
-    const root = stdout.trim();
-    globalNpmRootCache = root || null;
+    const root = npmCommand.getRoot(stdout);
+    globalNpmRootCache = { key: cacheKey, root: root || null };
   } catch {
-    globalNpmRootCache = null;
+    globalNpmRootCache = { key: cacheKey, root: null };
   }
 
-  return globalNpmRootCache ?? undefined;
+  return globalNpmRootCache.root ?? undefined;
 }
 
 async function resolveNpmPackageRoot(
@@ -96,7 +104,7 @@ async function resolveNpmPackageRoot(
   const packageDir = process.env.PI_PACKAGE_DIR || join(homedir(), ".pi", "agent");
   const globalCandidates = [join(packageDir, "npm", "node_modules", packageName)];
 
-  const npmGlobalRoot = await getGlobalNpmRoot();
+  const npmGlobalRoot = await getGlobalNpmRoot(cwd);
   if (npmGlobalRoot) {
     globalCandidates.unshift(join(npmGlobalRoot, packageName));
   }

package/src/packages/install.ts

@@ -8,7 +8,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ProgressEvent,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { TIMEOUTS } from "../constants.js";
 import { runTaskWithLoader } from "../ui/async-task.js";
 import { parseChoiceByLabel } from "../utils/command.js";

package/src/packages/management.ts

@@ -6,7 +6,7 @@ import {
   type ExtensionCommandContext,
   getAgentDir,
   type ProgressEvent,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { UI } from "../constants.js";
 import { type InstalledPackage } from "../types/index.js";
 import { runTaskWithLoader } from "../ui/async-task.js";

package/src/ui/async-task.ts

@@ -3,8 +3,15 @@ import {
   type ExtensionCommandContext,
   type ExtensionContext,
   type Theme,
-} from "@mariozechner/pi-coding-agent";
-import { CancellableLoader, Container, Loader, Spacer, Text, type TUI } from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-coding-agent";
+import {
+  CancellableLoader,
+  Container,
+  Loader,
+  Spacer,
+  Text,
+  type TUI,
+} from "@earendil-works/pi-tui";
 import { hasCustomUI } from "../utils/mode.js";
 
 type AnyContext = ExtensionCommandContext | ExtensionContext;

package/src/ui/help.ts

@@ -1,7 +1,7 @@
 /**
  * Help display
  */
-import { type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { notify } from "../utils/notify.js";
 
 export function showHelp(ctx: ExtensionCommandContext): void {

package/src/ui/package-config.ts

@@ -7,7 +7,7 @@ import {
   type ExtensionCommandContext,
   getSettingsListTheme,
   type Theme,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
   Container,
   Key,
@@ -16,7 +16,7 @@ import {
   SettingsList,
   Spacer,
   Text,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import { UI } from "../constants.js";
 import {
   applyPackageExtensionStateChanges,

package/src/ui/remote.ts

@@ -5,13 +5,13 @@ import {
   DynamicBorder,
   type ExtensionAPI,
   type ExtensionCommandContext,
+  type KeybindingsManager,
   type Theme,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
   Container,
   fuzzyMatch,
   type Focusable,
-  getKeybindings,
   Input,
   Key,
   matchesKey,
@@ -19,7 +19,7 @@ import {
   Text,
   truncateToWidth,
   wrapTextWithAnsi,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import { CACHE_LIMITS, PAGE_SIZE, TIMEOUTS, UI } from "../constants.js";
 import {
   clearSearchCache,
@@ -552,6 +552,7 @@ class RemotePackageBrowser implements Focusable {
   constructor(
     private readonly packages: NpmPackage[],
     private readonly theme: Theme,
+    private readonly keybindings: KeybindingsManager,
     private readonly browseSource: RemoteBrowseSource,
     private readonly queryLabel: string,
     private readonly totalResults: number,
@@ -578,8 +579,6 @@ class RemotePackageBrowser implements Focusable {
   }
 
   handleBrowseInput(data: string): boolean {
-    const kb = getKeybindings();
-
     if (this.searchActive) {
       if (matchesKey(data, Key.enter)) {
         this.searchActive = false;
@@ -606,22 +605,22 @@ class RemotePackageBrowser implements Focusable {
       return true;
     }
 
-    if (kb.matches(data, "tui.select.up")) {
+    if (this.keybindings.matches(data, "tui.select.up")) {
       this.moveSelection(-1);
       return true;
     }
 
-    if (kb.matches(data, "tui.select.down")) {
+    if (this.keybindings.matches(data, "tui.select.down")) {
       this.moveSelection(1);
       return true;
     }
 
-    if (kb.matches(data, "tui.select.pageUp")) {
+    if (this.keybindings.matches(data, "tui.select.pageUp")) {
       this.moveSelection(-Math.max(1, this.maxVisibleItems - 1));
       return true;
     }
 
-    if (kb.matches(data, "tui.select.pageDown")) {
+    if (this.keybindings.matches(data, "tui.select.pageDown")) {
       this.moveSelection(Math.max(1, this.maxVisibleItems - 1));
       return true;
     }
@@ -811,12 +810,13 @@ async function selectBrowseAction(
   if (!ctx.hasUI) return undefined;
 
   return runCustomUI(ctx, "Remote package browsing", () =>
-    ctx.ui.custom<BrowseAction>((tui, theme, _keybindings, done) => {
+    ctx.ui.custom<BrowseAction>((tui, theme, keybindings, done) => {
       const container = new Container();
       const title = new Text("", 2, 0);
       const browser = new RemotePackageBrowser(
         packages,
         theme,
+        keybindings,
         browseSource,
         plan.displayQuery,
         totalResults,

package/src/ui/theme.ts

@@ -1,7 +1,7 @@
 /**
  * Theme utilities for consistent UI styling across dark/light themes
  */
-import { type Theme } from "@mariozechner/pi-coding-agent";
+import { type Theme } from "@earendil-works/pi-coding-agent";
 
 /**
  * Status icons that work across themes

package/src/ui/unified.ts

@@ -8,13 +8,13 @@ import {
   DynamicBorder,
   type ExtensionAPI,
   type ExtensionCommandContext,
+  type KeybindingsManager,
   type Theme,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import {
   Container,
   type Focusable,
   fuzzyMatch,
-  getKeybindings,
   Input,
   Key,
   matchesKey,
@@ -22,7 +22,7 @@ import {
   Text,
   truncateToWidth,
   wrapTextWithAnsi,
-} from "@mariozechner/pi-tui";
+} from "@earendil-works/pi-tui";
 import { UI } from "../constants.js";
 import {
   discoverExtensions,
@@ -164,7 +164,7 @@ async function showInteractiveOnce(
       ctx,
       "The unified extensions manager",
       () =>
-        ctx.ui.custom<UnifiedAction>((tui, theme, _keybindings, done) => {
+        ctx.ui.custom<UnifiedAction>((tui, theme, keybindings, done) => {
           const container = new Container();
 
           const titleText = new Text("", 2, 0);
@@ -179,6 +179,7 @@ async function showInteractiveOnce(
             items,
             staged,
             theme,
+            keybindings,
             ctx.cwd,
             Math.max(4, Math.min(UI.maxListHeight, tui.terminal.rows - 12)),
             complete,
@@ -637,6 +638,7 @@ class UnifiedManagerBrowser implements Focusable {
     private readonly items: UnifiedItem[],
     private readonly staged: Map<string, State>,
     private readonly theme: Theme,
+    private readonly keybindings: KeybindingsManager,
     private readonly cwd: string,
     private readonly maxVisibleItems: number,
     private readonly onAction: (action: UnifiedAction) => void,
@@ -695,8 +697,6 @@ class UnifiedManagerBrowser implements Focusable {
   }
 
   handleManagerInput(data: string): boolean {
-    const kb = getKeybindings();
-
     if (this.searchActive) {
       if (matchesKey(data, Key.enter)) {
         this.searchActive = false;
@@ -745,22 +745,22 @@ class UnifiedManagerBrowser implements Focusable {
       return true;
     }
 
-    if (kb.matches(data, "tui.select.up")) {
+    if (this.keybindings.matches(data, "tui.select.up")) {
       this.moveSelection(-1);
       return true;
     }
 
-    if (kb.matches(data, "tui.select.down")) {
+    if (this.keybindings.matches(data, "tui.select.down")) {
       this.moveSelection(1);
       return true;
     }
 
-    if (kb.matches(data, "tui.select.pageUp")) {
+    if (this.keybindings.matches(data, "tui.select.pageUp")) {
       this.moveSelection(-Math.max(1, this.maxVisibleItems - 1));
       return true;
     }
 
-    if (kb.matches(data, "tui.select.pageDown")) {
+    if (this.keybindings.matches(data, "tui.select.pageDown")) {
       this.moveSelection(Math.max(1, this.maxVisibleItems - 1));
       return true;
     }

package/src/utils/auto-update.ts

@@ -5,7 +5,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { getPackageCatalog } from "../packages/catalog.js";
 import { parseChoiceByLabel } from "./command.js";
 import { logAutoUpdateConfig } from "./history.js";

package/src/utils/history.ts

@@ -7,7 +7,7 @@ import { type Dirent } from "node:fs";
 import { readdir, readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import { type ExtensionAPI, type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 
 export type ChangeAction =
   | "extension_toggle"

package/src/utils/mode.ts

@@ -1,7 +1,10 @@
 /**
  * UI capability helpers
  */
-import { type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
+import {
+  type ExtensionCommandContext,
+  type ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
 import { notify } from "./notify.js";
 
 type AnyContext = ExtensionCommandContext | ExtensionContext;

package/src/utils/notify.ts

@@ -1,7 +1,10 @@
 /**
  * Centralized notification handling for UI and non-UI modes
  */
-import { type ExtensionCommandContext, type ExtensionContext } from "@mariozechner/pi-coding-agent";
+import {
+  type ExtensionCommandContext,
+  type ExtensionContext,
+} from "@earendil-works/pi-coding-agent";
 
 export type NotifyLevel = "info" | "warning" | "error";
 

package/src/utils/npm-exec.ts

@@ -1,10 +1,23 @@
+import { existsSync, readFileSync } from "node:fs";
+import { homedir } from "node:os";
 import path from "node:path";
 import { execPath, platform } from "node:process";
-import { type ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { type ExtensionAPI, getAgentDir, SettingsManager } from "@earendil-works/pi-coding-agent";
 
 interface NpmCommandResolutionOptions {
   platform?: NodeJS.Platform;
   nodeExecPath?: string;
+  npmCommand?: readonly string[] | undefined;
+  cwd?: string;
+}
+
+interface ResolvedNpmCommand {
+  command: string;
+  args: string[];
+}
+
+interface ResolvedNpmRootCommand extends ResolvedNpmCommand {
+  getRoot(stdout: string): string;
 }
 
 interface NpmExecOptions {
@@ -12,15 +25,148 @@ interface NpmExecOptions {
   signal?: AbortSignal;
 }
 
+const settingsManagersByPath = new Map<string, SettingsManager>();
+let warnedAboutBunGlobalDirHeuristic = false;
+
 function getNpmCliPath(nodeExecPath: string, runtimePlatform: NodeJS.Platform): string {
   const pathImpl = runtimePlatform === "win32" ? path.win32 : path;
   return pathImpl.join(pathImpl.dirname(nodeExecPath), "node_modules", "npm", "bin", "npm-cli.js");
 }
 
+function getConfiguredNpmBase(
+  npmCommand?: readonly string[] | undefined
+): ResolvedNpmCommand | undefined {
+  if (!npmCommand || npmCommand.length === 0) {
+    return undefined;
+  }
+
+  const [command, ...args] = npmCommand;
+  if (!command?.trim()) {
+    throw new Error("Invalid npmCommand: first array entry must be a non-empty command");
+  }
+
+  return { command, args: [...args] };
+}
+
+function getSettingsNpmCommand(cwd: string): string[] | undefined {
+  const agentDir = getAgentDir();
+  const cacheKey = `${agentDir}\0${cwd}`;
+  const cached = settingsManagersByPath.get(cacheKey);
+  if (cached) {
+    return cached.getNpmCommand();
+  }
+
+  const settingsManager = SettingsManager.create(cwd, agentDir);
+  settingsManagersByPath.set(cacheKey, settingsManager);
+  return settingsManager.getNpmCommand();
+}
+
+function getCommandName(command: string): string {
+  return (command.split(/[\\/]/).pop() ?? "").replace(/\.(cmd|exe)$/i, "");
+}
+
+function expandHome(input: string): string {
+  if (input === "~") return homedir();
+  if (input.startsWith("~/")) return path.join(homedir(), input.slice(2));
+  return input;
+}
+
+function resolveBunConfigPath(value: string, baseDir: string): string {
+  const expanded = expandHome(value.trim());
+  return path.isAbsolute(expanded) ? expanded : path.resolve(baseDir, expanded);
+}
+
+function stripTomlComment(line: string): string {
+  return line.replace(/\s+#.*$/, "").trim();
+}
+
+function readBunGlobalDirFromBunfig(configPath: string): string | undefined {
+  if (!existsSync(configPath)) return undefined;
+
+  let content: string;
+  try {
+    content = readFileSync(configPath, "utf8");
+  } catch {
+    return undefined;
+  }
+
+  let inInstallSection = false;
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = stripTomlComment(rawLine);
+    if (!line) continue;
+
+    const sectionMatch = line.match(/^\[([^\]]+)]$/);
+    if (sectionMatch) {
+      inInstallSection = sectionMatch[1]?.trim() === "install";
+      continue;
+    }
+
+    const keyMatch = line.match(/^(install\.)?globalDir\s*=\s*(["'])(.*?)\2/);
+    if (!keyMatch) continue;
+    if (!inInstallSection && !keyMatch[1]) continue;
+
+    const value = keyMatch[3]?.trim();
+    return value ? resolveBunConfigPath(value, path.dirname(configPath)) : undefined;
+  }
+
+  return undefined;
+}
+
+function getBunGlobalDir(cwd?: string): string | undefined {
+  const envGlobalDir = process.env.BUN_INSTALL_GLOBAL_DIR?.trim();
+  if (envGlobalDir) {
+    return resolveBunConfigPath(envGlobalDir, process.cwd());
+  }
+
+  const candidates = [
+    path.join(homedir(), ".bunfig.toml"),
+    ...(process.env.XDG_CONFIG_HOME
+      ? [path.join(process.env.XDG_CONFIG_HOME, ".bunfig.toml")]
+      : []),
+    ...(cwd ? [path.join(cwd, "bunfig.toml")] : []),
+  ];
+
+  let globalDir: string | undefined;
+  for (const configPath of candidates) {
+    globalDir = readBunGlobalDirFromBunfig(configPath) ?? globalDir;
+  }
+  return globalDir;
+}
+
+function warnAboutBunGlobalDirHeuristic(): void {
+  if (warnedAboutBunGlobalDirHeuristic) return;
+  warnedAboutBunGlobalDirHeuristic = true;
+  console.warn(
+    "[extmgr] Could not read Bun globalDir from BUN_INSTALL_GLOBAL_DIR or bunfig.toml; " +
+      "guessing from `bun pm bin -g`. If Bun's globalDir is customized, set BUN_INSTALL_GLOBAL_DIR."
+  );
+}
+
+function getBunNodeModulesRoot(globalBinDir: string, cwd?: string): string {
+  const globalDir = getBunGlobalDir(cwd);
+  if (globalDir) {
+    return path.join(globalDir, "node_modules");
+  }
+
+  // Best-effort fallback for Bun's default layout: globalBinDir is usually
+  // ~/.bun/bin and globalDir is usually ~/.bun/install/global. This may be
+  // wrong when [install].globalDir is customized in bunfig.toml.
+  warnAboutBunGlobalDirHeuristic();
+  return path.join(path.dirname(globalBinDir), "install", "global", "node_modules");
+}
+
 export function resolveNpmCommand(
   npmArgs: string[],
   options?: NpmCommandResolutionOptions
-): { command: string; args: string[] } {
+): ResolvedNpmCommand {
+  const configured = getConfiguredNpmBase(options?.npmCommand);
+  if (configured) {
+    return {
+      command: configured.command,
+      args: [...configured.args, ...npmArgs],
+    };
+  }
+
   const runtimePlatform = options?.platform ?? platform;
 
   if (runtimePlatform === "win32") {
@@ -34,13 +180,44 @@ export function resolveNpmCommand(
   return { command: "npm", args: npmArgs };
 }
 
+export function resolveConfiguredNpmCommand(npmArgs: string[], cwd: string): ResolvedNpmCommand {
+  return resolveNpmCommand(npmArgs, { npmCommand: getSettingsNpmCommand(cwd) });
+}
+
+export function resolveNpmRootCommand(
+  options?: NpmCommandResolutionOptions
+): ResolvedNpmRootCommand {
+  const configured = getConfiguredNpmBase(options?.npmCommand);
+
+  if (configured && getCommandName(configured.command) === "bun") {
+    return {
+      command: configured.command,
+      args: [...configured.args, "pm", "bin", "-g"],
+      getRoot: (stdout) => {
+        const binDir = stdout.trim();
+        return binDir ? getBunNodeModulesRoot(binDir, options?.cwd) : "";
+      },
+    };
+  }
+
+  const resolved = resolveNpmCommand(["root", "-g"], options);
+  return {
+    ...resolved,
+    getRoot: (stdout) => stdout.trim(),
+  };
+}
+
+export function resolveConfiguredNpmRootCommand(cwd: string): ResolvedNpmRootCommand {
+  return resolveNpmRootCommand({ npmCommand: getSettingsNpmCommand(cwd), cwd });
+}
+
 export async function execNpm(
   pi: ExtensionAPI,
   npmArgs: string[],
   ctx: { cwd: string },
   options: NpmExecOptions
 ): Promise<{ code: number; stdout: string; stderr: string; killed: boolean }> {
-  const resolved = resolveNpmCommand(npmArgs);
+  const resolved = resolveConfiguredNpmCommand(npmArgs, ctx.cwd);
   return pi.exec(resolved.command, resolved.args, {
     timeout: options.timeout,
     cwd: ctx.cwd,

package/src/utils/settings.ts

@@ -10,7 +10,7 @@ import {
   type ExtensionAPI,
   type ExtensionCommandContext,
   type ExtensionContext,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { parseScheduleDuration } from "./duration.js";
 import { fileExists } from "./fs.js";
 import { normalizePackageIdentity } from "./package-source.js";

package/src/utils/status.ts

@@ -6,7 +6,7 @@ import {
   type ExtensionCommandContext,
   type ExtensionContext,
   getAgentDir,
-} from "@mariozechner/pi-coding-agent";
+} from "@earendil-works/pi-coding-agent";
 import { getPackageCatalog, type PackageCatalog } from "../packages/catalog.js";
 import { getAutoUpdateStatus } from "./auto-update.js";
 import { normalizePackageIdentity } from "./package-source.js";

package/src/utils/ui-helpers.ts

@@ -1,9 +1,9 @@
 /**
  * Common UI helper patterns
  */
-import { type ExtensionCommandContext } from "@mariozechner/pi-coding-agent";
+import { type ExtensionCommandContext } from "@earendil-works/pi-coding-agent";
 import { UI } from "../constants.js";
-import { notify } from "./notify.js";
+import { error as notifyError, notify } from "./notify.js";
 
 /**
  * Confirm and trigger reload
@@ -20,12 +20,18 @@ export async function confirmReload(
 
   const confirmed = await ctx.ui.confirm("Reload Required", `${reason}\nReload pi now?`);
 
-  if (confirmed) {
+  if (!confirmed) {
+    return false;
+  }
+
+  try {
     await ctx.reload();
     return true;
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    notifyError(ctx, `Reload failed: ${message}`);
+    return false;
   }
-
-  return false;
 }
 
 /**