@indigoai-us/hq-cli 5.345.33 → 5.345.35

package/dist/utils/version-gate.js

@@ -626,8 +626,10 @@ export function buildPrefixedInstallArgv(prefix) {
 export function buildPnpmInstallArgv(install) {
     const args = ["add", "-g", LATEST_PACKAGE_SPEC];
     const dirs = install ? pnpmInstallDirs(install) : null;
-    if (dirs)
-        args.push("--store-dir", dirs.storeDir, "--virtual-store-dir", dirs.virtualStoreDir);
+    if (dirs) {
+        args.push("--global-dir", dirs.globalDir, "--store-dir", dirs.storeDir);
+        args.push("--virtual-store-dir", dirs.virtualStoreDir);
+    }
     return args;
 }
 /**
@@ -655,7 +657,10 @@ export function pnpmInstallDirs(install) {
         const virtualStoreDir = path.isAbsolute(configuredVirtualStore)
             ? configuredVirtualStore
             : path.resolve(globalNodeModules, configuredVirtualStore);
-        return { storeDir, virtualStoreDir };
+        const pnpmHome = derivePnpmHome(install);
+        if (!pnpmHome)
+            return null;
+        return { globalDir: path.join(pnpmHome, "global"), storeDir, virtualStoreDir };
     }
     catch {
         // The metadata file is absent in older pnpm global layouts. The global
@@ -664,11 +669,93 @@ export function pnpmInstallDirs(install) {
         if (!pnpmHome)
             return null;
         return {
+            globalDir: path.join(pnpmHome, "global"),
             storeDir: path.join(pnpmHome, "store", "v11"),
             virtualStoreDir: path.join(globalNodeModules, ".pnpm"),
         };
     }
 }
+/** Version recorded by pnpm for the global install that owns this package. */
+export function pnpmInstalledVersion(install) {
+    if (install.manager !== "pnpm" || !install.packageRoot)
+        return null;
+    const normalized = install.packageRoot.replace(/\\/g, "/");
+    const match = normalized.match(/^(.*\/global\/\d+\/node_modules)(?:\/|$)|^(.*\/global\/v\d+\/[^/]+\/node_modules)(?:\/|$)/);
+    const globalNodeModules = match?.[1] ?? match?.[2];
+    if (!globalNodeModules)
+        return null;
+    try {
+        const metadata = yaml.load(readFileSync(path.join(globalNodeModules, ".modules.yaml"), "utf8"));
+        const value = typeof metadata?.packageManager === "string" ? metadata.packageManager : "";
+        const version = value.match(/^pnpm@(.+)$/)?.[1];
+        return version && semver.valid(version) ? version : null;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Resolve a bounded pnpm executable probe. pnpm 10 and older reject
+ * --virtual-store-dir for global installs; pnpm 11+ accepts the flag.
+ */
+export function probePnpmVersion(cmd, args, env, cwd) {
+    try {
+        const plan = buildSpawnPlan(cmd, args);
+        const result = spawnSync(plan.cmd, plan.args, {
+            encoding: "utf8",
+            timeout: 10_000,
+            cwd,
+            env,
+            shell: plan.shell,
+            windowsHide: true,
+        });
+        if (result.error || result.status !== 0)
+            return null;
+        const match = (result.stdout ?? "").trim().match(/(?:^|\s)(\d+\.\d+\.\d+(?:-[\w.-]+)?)(?:\s|$)/);
+        return match?.[1] && semver.valid(match[1]) ? match[1] : null;
+    }
+    catch (error) {
+        console.error(chalk.dim(`hq: pnpm version probe failed (${error instanceof Error ? error.name : "unknown"}).`));
+        return null;
+    }
+}
+/** Run the install-owned pnpm first; use PATH only if that version cannot run. */
+export function performPnpmUpdate(install, runner = runUpdateCommand, env = process.env, probe = probePnpmVersion) {
+    const cwd = mkdtempSync(path.join(os.tmpdir(), "hq-cli-pnpm-update-"));
+    const updateEnv = {
+        ...env,
+        COREPACK_ENABLE_PROJECT_SPEC: "0",
+        COREPACK_ENABLE_STRICT: "0",
+        COREPACK_DEFAULT_TO_LATEST: "0",
+        npm_config_manage_package_manager_versions: "false",
+    };
+    try {
+        const installedVersion = pnpmInstalledVersion(install);
+        if (installedVersion) {
+            const command = `pnpm@${installedVersion}`;
+            if (probe("corepack", [command, "--version"], updateEnv, cwd) === installedVersion) {
+                return runner("corepack", [command, ...buildPnpmInstallArgv(install)], updateEnv, cwd);
+            }
+        }
+        const fallbackVersion = probe("pnpm", ["--version"], updateEnv, cwd);
+        if (!fallbackVersion) {
+            return { ok: false, code: "PNPM_UNAVAILABLE", detail: "pnpm not found on PATH; install-owned Corepack pnpm could not run" };
+        }
+        // pnpm 10.28.1 and earlier reject --virtual-store-dir with -g. Keep the
+        // existing global directory and store, but omit only that unsupported flag.
+        const supportsGlobalVirtualStoreDir = semver.gte(fallbackVersion, "11.0.0");
+        const args = buildPnpmInstallArgv(install);
+        if (!supportsGlobalVirtualStoreDir) {
+            const index = args.indexOf("--virtual-store-dir");
+            if (index !== -1)
+                args.splice(index, 2);
+        }
+        return runner("pnpm", args, updateEnv, cwd);
+    }
+    finally {
+        rmSync(cwd, { recursive: true, force: true });
+    }
+}
 /** Argv for updating a Bun-managed global install. */
 export function buildBunInstallArgv() {
     return ["add", "-g", LATEST_PACKAGE_SPEC];
@@ -1037,7 +1124,7 @@ export function openInstallOutput(verbose, isTty = process.stdout.isTTY === true
         },
     };
 }
-export function runSupervisedUpdateCommand(cmd, args, output, env) {
+export function runSupervisedUpdateCommand(cmd, args, output, env, cwd) {
     try {
         const plan = buildSpawnPlan(cmd, args);
         const timeoutMs = updateTimeoutMs(env);
@@ -1061,6 +1148,7 @@ export function runSupervisedUpdateCommand(cmd, args, output, env) {
         ], inOwnProcessGroup({
             stdio: output.stdio,
             ...(env ? { env } : {}),
+            ...(cwd ? { cwd } : {}),
         }));
         // spawnSync reports a missing executable via `error`, not a throw.
         if (result.error) {
@@ -1108,20 +1196,22 @@ export function runSupervisedUpdateCommand(cmd, args, output, env) {
         };
     }
 }
-export function runUpdateCommand(cmd, args, env) {
+export function runUpdateCommand(cmd, args, env, cwd) {
     const output = openInstallOutput(true);
     try {
-        return runSupervisedUpdateCommand(cmd, args, output, env);
+        return runSupervisedUpdateCommand(cmd, args, output, env, cwd);
     }
     finally {
         output.dispose();
     }
 }
-function performUpdateCommand(cmd, args, runner = runUpdateCommand, env) {
+function performUpdateCommand(cmd, args, runner = runUpdateCommand, env, cwd) {
     // Forward env only when there is one to forward, so the common path keeps the
     // two-argument runner call it has always made (and existing runner spies see
     // no phantom `undefined` third argument).
-    return env === undefined ? runner(cmd, args) : runner(cmd, args, env);
+    return env === undefined && cwd === undefined
+        ? runner(cmd, args)
+        : runner(cmd, args, env, cwd);
 }
 function performUpdate(command, runner = runUpdateCommand) {
     const parts = command.split(/\s+/).filter(Boolean);
@@ -1141,8 +1231,13 @@ function performUpdate(command, runner = runUpdateCommand) {
  * speak the running manager's language.
  */
 function manualUpdateCommand(install, decision) {
-    if (install.manager === "pnpm")
-        return `pnpm ${buildPnpmInstallArgv(install).join(" ")}`;
+    if (install.manager === "pnpm") {
+        const version = pnpmInstalledVersion(install);
+        const plan = version
+            ? `corepack pnpm@${version} ${buildPnpmInstallArgv(install).join(" ")}`
+            : `pnpm ${buildPnpmInstallArgv(install).join(" ")}`;
+        return plan;
+    }
     if (install.manager === "bun")
         return `bun ${buildBunInstallArgv().join(" ")}`;
     if (install.prefix)
@@ -1522,7 +1617,9 @@ function attemptRequiredUpdate(decision, deps, install) {
     if (isManagedOutsideNpm) {
         console.error(chalk.dim(`  Detected a ${install.manager}-managed global install; updating with ${install.manager}`));
         console.error(chalk.dim(`  Running: ${primaryCmd} ${primaryArgs.join(" ")}`));
-        result = performUpdateCommand(primaryCmd, primaryArgs, runner, updateEnv);
+        result = install.manager === "pnpm"
+            ? performPnpmUpdate(install, runner, updateEnv ?? process.env, deps.probePnpmVersion)
+            : performUpdateCommand(primaryCmd, primaryArgs, runner, updateEnv);
     }
     else if (prefix) {
         console.error(chalk.dim(`  Installing into npm prefix: ${prefix}`));
@@ -1719,6 +1816,10 @@ export const __test__ = {
     enforceUpdateRequired,
     isBunManagedPackageDir,
     pnpmUpdateEnv,
+    pnpmInstallDirs,
+    pnpmInstalledVersion,
+    performPnpmUpdate,
+    probePnpmVersion,
     isLocalDependencyInstall,
     isLocalDependencyPackageDir,
     isNewerVersion,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@indigoai-us/hq-cli",
-  "version": "5.345.33",
+  "version": "5.345.35",
   "description": "HQ by Indigo management CLI — modules and cloud sync",
   "main": "dist/index.js",
   "bin": {