@entelligentsia/forgecli 0.7.9 → 0.8.4

package/node_modules/@earendil-works/pi-coding-agent/dist/core/package-manager.js

@@ -26,7 +26,7 @@ import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
 import { CONFIG_DIR_NAME } from "../config.js";
-import { shouldUseWindowsShell } from "../utils/child-process.js";
+import { resolveSpawnCommand } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
 import { canonicalizePath, isLocalPath } from "../utils/paths.js";
 import { isStdoutTakenOver } from "./output-guard.js";
@@ -845,7 +845,7 @@ export class DefaultPackageManager {
         await Promise.all(tasks);
     }
     async shouldUpdateNpmSource(source, scope) {
-        const installedPath = this.getNpmInstallPath(source, scope);
+        const installedPath = this.getManagedNpmInstallPath(source, scope);
         const installedVersion = existsSync(installedPath) ? this.getInstalledNpmVersion(installedPath) : undefined;
         if (!installedVersion) {
             return true;
@@ -871,13 +871,9 @@ export class DefaultPackageManager {
         });
     }
     async installNpmBatch(specs, scope) {
-        if (scope === "user") {
-            await this.runNpmCommand(["install", "-g", ...specs]);
-            return;
-        }
         const installRoot = this.getNpmInstallRoot(scope, false);
         this.ensureNpmProject(installRoot);
-        await this.runNpmCommand(["install", ...specs, "--prefix", installRoot]);
+        await this.runNpmCommand(this.getNpmInstallArgs(specs, installRoot));
     }
     async checkForAvailableUpdates() {
         if (isOfflineModeEnabled()) {
@@ -1364,6 +1360,13 @@ export class DefaultPackageManager {
         }
         return { command, args };
     }
+    getPackageManagerName() {
+        const npmCommand = this.getNpmCommand();
+        const commandParts = [npmCommand.command, ...npmCommand.args];
+        const separatorIndex = commandParts.lastIndexOf("--");
+        const packageManagerCommand = separatorIndex >= 0 ? commandParts[separatorIndex + 1] : npmCommand.command;
+        return packageManagerCommand ? basename(packageManagerCommand).replace(/\.(cmd|exe)$/i, "") : "";
+    }
     async runNpmCommand(args, options) {
         const npmCommand = this.getNpmCommand();
         await this.runCommand(npmCommand.command, [...npmCommand.args, ...args], options);
@@ -1379,24 +1382,30 @@ export class DefaultPackageManager {
         const npmCommand = this.getNpmCommand();
         return this.runCommandSync(npmCommand.command, [...npmCommand.args, ...args]);
     }
-    async installNpm(source, scope, temporary) {
-        if (scope === "user" && !temporary) {
-            await this.runNpmCommand(["install", "-g", source.spec]);
-            return;
+    getNpmInstallArgs(specs, installRoot) {
+        const packageManagerName = this.getPackageManagerName();
+        if (packageManagerName === "bun") {
+            return ["install", ...specs, "--cwd", installRoot];
         }
+        if (packageManagerName === "pnpm") {
+            return ["install", ...specs, "--prefix", installRoot, "--config.strict-dep-builds=false"];
+        }
+        return ["install", ...specs, "--prefix", installRoot];
+    }
+    async installNpm(source, scope, temporary) {
         const installRoot = this.getNpmInstallRoot(scope, temporary);
         this.ensureNpmProject(installRoot);
-        await this.runNpmCommand(["install", source.spec, "--prefix", installRoot]);
+        await this.runNpmCommand(this.getNpmInstallArgs([source.spec], installRoot));
     }
     async uninstallNpm(source, scope) {
-        if (scope === "user") {
-            await this.runNpmCommand(["uninstall", "-g", source.name]);
-            return;
-        }
         const installRoot = this.getNpmInstallRoot(scope, false);
         if (!existsSync(installRoot)) {
             return;
         }
+        if (this.getPackageManagerName() === "bun") {
+            await this.runNpmCommand(["uninstall", source.name, "--cwd", installRoot]);
+            return;
+        }
         await this.runNpmCommand(["uninstall", source.name, "--prefix", installRoot]);
     }
     async installGit(source, scope) {
@@ -1516,7 +1525,7 @@ export class DefaultPackageManager {
         if (scope === "project") {
             return join(this.cwd, CONFIG_DIR_NAME, "npm");
         }
-        return join(this.getGlobalNpmRoot(), "..");
+        return join(this.agentDir, "npm");
     }
     getGlobalNpmRoot() {
         const npmCommand = this.getNpmCommand();
@@ -1524,8 +1533,7 @@ export class DefaultPackageManager {
         if (this.globalNpmRoot && this.globalNpmRootCommandKey === commandKey) {
             return this.globalNpmRoot;
         }
-        const isBunPackageManager = npmCommand.command === "bun";
-        if (isBunPackageManager) {
+        if (this.getPackageManagerName() === "bun") {
             const binDir = this.runNpmCommandSync(["pm", "bin", "-g"]).trim();
             this.globalNpmRoot = join(dirname(binDir), "install", "global", "node_modules");
         }
@@ -1536,14 +1544,7 @@ export class DefaultPackageManager {
         return this.globalNpmRoot;
     }
     getPnpmGlobalPackagePath(packageName) {
-        const npmCommand = this.getNpmCommand();
-        const commandParts = [npmCommand.command, ...npmCommand.args];
-        const separatorIndex = commandParts.lastIndexOf("--");
-        const packageManagerCommand = separatorIndex >= 0 ? commandParts[separatorIndex + 1] : npmCommand.command;
-        const packageManagerName = packageManagerCommand
-            ? basename(packageManagerCommand).replace(/\.(cmd|exe)$/i, "")
-            : "";
-        if (packageManagerName !== "pnpm") {
+        if (this.getPackageManagerName() !== "pnpm") {
             return undefined;
         }
         const output = this.runNpmCommandSync(["list", "-g", "--depth", "0", "--json"]);
@@ -1555,14 +1556,30 @@ export class DefaultPackageManager {
         }
         return undefined;
     }
-    getNpmInstallPath(source, scope) {
+    getManagedNpmInstallPath(source, scope) {
         if (scope === "temporary") {
             return join(this.getTemporaryDir("npm"), "node_modules", source.name);
         }
         if (scope === "project") {
             return join(this.cwd, CONFIG_DIR_NAME, "npm", "node_modules", source.name);
         }
-        return this.getPnpmGlobalPackagePath(source.name) ?? join(this.getGlobalNpmRoot(), source.name);
+        return join(this.agentDir, "npm", "node_modules", source.name);
+    }
+    getLegacyGlobalNpmInstallPath(source) {
+        try {
+            return this.getPnpmGlobalPackagePath(source.name) ?? join(this.getGlobalNpmRoot(), source.name);
+        }
+        catch {
+            return undefined;
+        }
+    }
+    getNpmInstallPath(source, scope) {
+        const managedPath = this.getManagedNpmInstallPath(source, scope);
+        if (scope !== "user" || existsSync(managedPath)) {
+            return managedPath;
+        }
+        const legacyPath = this.getLegacyGlobalNpmInstallPath(source);
+        return legacyPath && existsSync(legacyPath) ? legacyPath : managedPath;
     }
     getGitInstallPath(source, scope) {
         if (scope === "temporary") {
@@ -1911,20 +1928,22 @@ export class DefaultPackageManager {
         };
     }
     spawnCommand(command, args, options) {
-        return spawn(command, args, {
+        const env = getEnv();
+        const resolved = resolveSpawnCommand(command, args, { env });
+        return spawn(resolved.command, resolved.args, {
             cwd: options?.cwd,
             stdio: isStdoutTakenOver() ? ["ignore", 2, 2] : "inherit",
-            shell: shouldUseWindowsShell(command),
-            env: getEnv(),
+            env,
         });
     }
     spawnCaptureCommand(command, args, options) {
         const baseEnv = getEnv();
-        return spawn(command, args, {
+        const env = options?.env ? { ...baseEnv, ...options.env } : baseEnv;
+        const resolved = resolveSpawnCommand(command, args, { env });
+        return spawn(resolved.command, resolved.args, {
             cwd: options?.cwd,
             stdio: ["ignore", "pipe", "pipe"],
-            shell: shouldUseWindowsShell(command),
-            env: options?.env ? { ...baseEnv, ...options.env } : baseEnv,
+            env,
         });
     }
     runCommandCapture(command, args, options) {
@@ -1981,11 +2000,12 @@ export class DefaultPackageManager {
         });
     }
     runCommandSync(command, args) {
-        const result = spawnSync(command, args, {
+        const env = getEnv();
+        const resolved = resolveSpawnCommand(command, args, { env });
+        const result = spawnSync(resolved.command, resolved.args, {
             stdio: ["ignore", "pipe", "pipe"],
             encoding: "utf-8",
-            shell: shouldUseWindowsShell(command),
-            env: getEnv(),
+            env,
         });
         if (result.error || result.status !== 0) {
             throw new Error(`Failed to run ${command} ${args.join(" ")}: ${result.error?.message || result.stderr || result.stdout}`);