@agentprojectcontext/apx 1.22.0 → 1.22.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentprojectcontext/apx",
-  "version": "1.22.0",
+  "version": "1.22.2",
   "description": "APX — unified CLI + daemon for the Agent Project Context (APC) standard.",
   "publishConfig": {
     "access": "public"

package/src/cli/commands/update.js

@@ -1,5 +1,6 @@
 import { spawnSync } from "node:child_process";
 import readline from "node:readline";
+import { fileURLToPath } from "node:url";
 import { getLatestVersion } from "../../core/update-check.js";
 
 const PACKAGE_NAME = "@agentprojectcontext/apx";
@@ -17,11 +18,38 @@ function isNewer(cur, lat) {
 function hasPnpmGlobal() {
   const r = spawnSync("pnpm", ["--version"], { encoding: "utf8", stdio: "pipe" });
   if (r.status !== 0) return false;
-  // pnpm needs PNPM_HOME configured to manage global packages
-  const check = spawnSync("pnpm", ["root", "-g"], { encoding: "utf8", stdio: "pipe" });
+  // `pnpm add -g` needs a configured global *bin* directory (PNPM_HOME / the
+  // result of `pnpm setup`). `pnpm root -g` succeeds even without it, so probe
+  // `pnpm bin -g` instead — it fails with ERR_PNPM_NO_GLOBAL_BIN_DIR when the
+  // global bin directory is missing.
+  const check = spawnSync("pnpm", ["bin", "-g"], { encoding: "utf8", stdio: "pipe" });
   return check.status === 0 && !!check.stdout?.trim();
 }
 
+// Detect which package manager actually owns this apx install, by checking
+// where the running files live. Most installs are npm (it was the recommended
+// installer before the project moved to pnpm), so npm is the safe default
+// when detection is inconclusive.
+function detectInstaller() {
+  let selfDir;
+  try {
+    selfDir = fileURLToPath(import.meta.url);
+  } catch {
+    selfDir = "";
+  }
+  const probe = (cmd) => {
+    const r = spawnSync(cmd, ["root", "-g"], { encoding: "utf8", stdio: "pipe" });
+    return r.status === 0 ? r.stdout?.trim() || "" : "";
+  };
+  const pnpmRoot = probe("pnpm");
+  const npmRoot = probe("npm");
+  if (pnpmRoot && selfDir.startsWith(pnpmRoot)) return "pnpm";
+  if (npmRoot && selfDir.startsWith(npmRoot)) return "npm";
+  // pnpm's global store path contains a "/pnpm/" segment.
+  if (/[\\/]pnpm[\\/]/.test(selfDir)) return "pnpm";
+  return "npm";
+}
+
 function daemonRunning() {
   const r = spawnSync("apx", ["daemon", "status", "--json"], { encoding: "utf8", stdio: "pipe" });
   try { return JSON.parse(r.stdout)?.running === true; } catch { return false; }
@@ -62,15 +90,32 @@ export async function cmdUpdate(args, currentVersion) {
     console.log("stopped.");
   }
 
-  // Prefer pnpm global if configured, fall back to npm.
-  const usePnpm = hasPnpmGlobal();
-  const pm = usePnpm ? "pnpm" : "npm";
-  const installArgs = usePnpm
-    ? ["add", "-g", `${PACKAGE_NAME}@${latest}`]
-    : ["install", "-g", `${PACKAGE_NAME}@${latest}`];
-
-  console.log(`\nInstalling ${PACKAGE_NAME}@${latest} via ${pm}...\n`);
-  const result = spawnSync(pm, installArgs, { stdio: "inherit" });
+  // Install with whichever package manager owns this apx install. npm is the
+  // default (most installs predate the move to pnpm). pnpm is used first only
+  // when it owns the install AND its global bin directory is configured.
+  // The other package manager is always kept as a fallback so a misconfigured
+  // pnpm never blocks the update.
+  const pnpmStep = ["pnpm", ["add", "-g", `${PACKAGE_NAME}@${latest}`]];
+  const npmStep = ["npm", ["install", "-g", `${PACKAGE_NAME}@${latest}`]];
+  const pnpmUsable = hasPnpmGlobal();
+  const steps =
+    detectInstaller() === "pnpm" && pnpmUsable
+      ? [pnpmStep, npmStep]
+      : pnpmUsable
+        ? [npmStep, pnpmStep]
+        : [npmStep];
+
+  let result;
+  for (let i = 0; i < steps.length; i++) {
+    const [pm, installArgs] = steps[i];
+    console.log(`\nInstalling ${PACKAGE_NAME}@${latest} via ${pm}...\n`);
+    result = spawnSync(pm, installArgs, { stdio: "inherit" });
+    if (result.status === 0) break;
+    const next = steps[i + 1];
+    if (next) {
+      console.log(`\n⚠️  ${pm} install failed — retrying with ${next[0]}...`);
+    }
+  }
 
   if (result.status !== 0) {
     console.error(`\n❌ Update failed (exit ${result.status})`);