@mariozechner/pi-coding-agent 0.57.1 → 0.58.1

package/dist/core/package-manager.js

@@ -25,6 +25,9 @@ const IGNORE_FILE_NAMES = [".gitignore", ".ignore", ".fdignore"];
 function toPosixPath(p) {
     return p.split(sep).join("/");
 }
+function getHomeDir() {
+    return process.env.HOME || homedir();
+}
 function prefixIgnorePattern(line, prefix) {
     const trimmed = line.trim();
     if (!trimmed)
@@ -383,43 +386,50 @@ function collectResourceFiles(dir, resourceType) {
     return collectFiles(dir, FILE_PATTERNS[resourceType]);
 }
 function matchesAnyPattern(filePath, patterns, baseDir) {
-    const rel = relative(baseDir, filePath);
+    const rel = toPosixPath(relative(baseDir, filePath));
     const name = basename(filePath);
+    const filePathPosix = toPosixPath(filePath);
     const isSkillFile = name === "SKILL.md";
     const parentDir = isSkillFile ? dirname(filePath) : undefined;
-    const parentRel = isSkillFile ? relative(baseDir, parentDir) : undefined;
+    const parentRel = isSkillFile ? toPosixPath(relative(baseDir, parentDir)) : undefined;
     const parentName = isSkillFile ? basename(parentDir) : undefined;
+    const parentDirPosix = isSkillFile ? toPosixPath(parentDir) : undefined;
     return patterns.some((pattern) => {
-        if (minimatch(rel, pattern) || minimatch(name, pattern) || minimatch(filePath, pattern)) {
+        const normalizedPattern = toPosixPath(pattern);
+        if (minimatch(rel, normalizedPattern) ||
+            minimatch(name, normalizedPattern) ||
+            minimatch(filePathPosix, normalizedPattern)) {
             return true;
         }
         if (!isSkillFile)
             return false;
-        return minimatch(parentRel, pattern) || minimatch(parentName, pattern) || minimatch(parentDir, pattern);
+        return (minimatch(parentRel, normalizedPattern) ||
+            minimatch(parentName, normalizedPattern) ||
+            minimatch(parentDirPosix, normalizedPattern));
     });
 }
 function normalizeExactPattern(pattern) {
-    if (pattern.startsWith("./") || pattern.startsWith(".\\")) {
-        return pattern.slice(2);
-    }
-    return pattern;
+    const normalized = pattern.startsWith("./") || pattern.startsWith(".\\") ? pattern.slice(2) : pattern;
+    return toPosixPath(normalized);
 }
 function matchesAnyExactPattern(filePath, patterns, baseDir) {
     if (patterns.length === 0)
         return false;
-    const rel = relative(baseDir, filePath);
+    const rel = toPosixPath(relative(baseDir, filePath));
     const name = basename(filePath);
+    const filePathPosix = toPosixPath(filePath);
     const isSkillFile = name === "SKILL.md";
     const parentDir = isSkillFile ? dirname(filePath) : undefined;
-    const parentRel = isSkillFile ? relative(baseDir, parentDir) : undefined;
+    const parentRel = isSkillFile ? toPosixPath(relative(baseDir, parentDir)) : undefined;
+    const parentDirPosix = isSkillFile ? toPosixPath(parentDir) : undefined;
     return patterns.some((pattern) => {
         const normalized = normalizeExactPattern(pattern);
-        if (normalized === rel || normalized === filePath) {
+        if (normalized === rel || normalized === filePathPosix) {
             return true;
         }
         if (!isSkillFile)
             return false;
-        return normalized === parentRel || normalized === parentDir;
+        return normalized === parentRel || normalized === parentDirPosix;
     });
 }
 function getOverridePatterns(entries) {
@@ -500,6 +510,7 @@ export class DefaultPackageManager {
     agentDir;
     settingsManager;
     globalNpmRoot;
+    globalNpmRootCommandKey;
     progressCallback;
     constructor(options) {
         this.cwd = options.cwd;
@@ -953,25 +964,44 @@ export class DefaultPackageManager {
         const version = match[2];
         return { name, version };
     }
+    getNpmCommand() {
+        const configuredCommand = this.settingsManager.getNpmCommand();
+        if (!configuredCommand || configuredCommand.length === 0) {
+            return { command: "npm", args: [] };
+        }
+        const [command, ...args] = configuredCommand;
+        if (!command) {
+            throw new Error("Invalid npmCommand: first array entry must be a non-empty command");
+        }
+        return { command, args };
+    }
+    async runNpmCommand(args, options) {
+        const npmCommand = this.getNpmCommand();
+        await this.runCommand(npmCommand.command, [...npmCommand.args, ...args], options);
+    }
+    runNpmCommandSync(args) {
+        const npmCommand = this.getNpmCommand();
+        return this.runCommandSync(npmCommand.command, [...npmCommand.args, ...args]);
+    }
     async installNpm(source, scope, temporary) {
         if (scope === "user" && !temporary) {
-            await this.runCommand("npm", ["install", "-g", source.spec]);
+            await this.runNpmCommand(["install", "-g", source.spec]);
             return;
         }
         const installRoot = this.getNpmInstallRoot(scope, temporary);
         this.ensureNpmProject(installRoot);
-        await this.runCommand("npm", ["install", source.spec, "--prefix", installRoot]);
+        await this.runNpmCommand(["install", source.spec, "--prefix", installRoot]);
     }
     async uninstallNpm(source, scope) {
         if (scope === "user") {
-            await this.runCommand("npm", ["uninstall", "-g", source.name]);
+            await this.runNpmCommand(["uninstall", "-g", source.name]);
             return;
         }
         const installRoot = this.getNpmInstallRoot(scope, false);
         if (!existsSync(installRoot)) {
             return;
         }
-        await this.runCommand("npm", ["uninstall", source.name, "--prefix", installRoot]);
+        await this.runNpmCommand(["uninstall", source.name, "--prefix", installRoot]);
     }
     async installGit(source, scope) {
         const targetDir = this.getGitInstallPath(source, scope);
@@ -989,7 +1019,7 @@ export class DefaultPackageManager {
         }
         const packageJsonPath = join(targetDir, "package.json");
         if (existsSync(packageJsonPath)) {
-            await this.runCommand("npm", ["install"], { cwd: targetDir });
+            await this.runNpmCommand(["install"], { cwd: targetDir });
         }
     }
     async updateGit(source, scope) {
@@ -1012,7 +1042,7 @@ export class DefaultPackageManager {
         await this.runCommand("git", ["clean", "-fdx"], { cwd: targetDir });
         const packageJsonPath = join(targetDir, "package.json");
         if (existsSync(packageJsonPath)) {
-            await this.runCommand("npm", ["install"], { cwd: targetDir });
+            await this.runNpmCommand(["install"], { cwd: targetDir });
         }
     }
     async refreshTemporaryGitSource(source, sourceStr) {
@@ -1088,11 +1118,14 @@ export class DefaultPackageManager {
         return join(this.getGlobalNpmRoot(), "..");
     }
     getGlobalNpmRoot() {
-        if (this.globalNpmRoot) {
+        const npmCommand = this.getNpmCommand();
+        const commandKey = [npmCommand.command, ...npmCommand.args].join("\0");
+        if (this.globalNpmRoot && this.globalNpmRootCommandKey === commandKey) {
             return this.globalNpmRoot;
         }
-        const result = this.runCommandSync("npm", ["root", "-g"]);
+        const result = this.runNpmCommandSync(["root", "-g"]);
         this.globalNpmRoot = result.trim();
+        this.globalNpmRootCommandKey = commandKey;
         return this.globalNpmRoot;
     }
     getNpmInstallPath(source, scope) {
@@ -1141,21 +1174,21 @@ export class DefaultPackageManager {
     resolvePath(input) {
         const trimmed = input.trim();
         if (trimmed === "~")
-            return homedir();
+            return getHomeDir();
         if (trimmed.startsWith("~/"))
-            return join(homedir(), trimmed.slice(2));
+            return join(getHomeDir(), trimmed.slice(2));
         if (trimmed.startsWith("~"))
-            return join(homedir(), trimmed.slice(1));
+            return join(getHomeDir(), trimmed.slice(1));
         return resolve(this.cwd, trimmed);
     }
     resolvePathFromBase(input, baseDir) {
         const trimmed = input.trim();
         if (trimmed === "~")
-            return homedir();
+            return getHomeDir();
         if (trimmed.startsWith("~/"))
-            return join(homedir(), trimmed.slice(2));
+            return join(getHomeDir(), trimmed.slice(2));
         if (trimmed.startsWith("~"))
-            return join(homedir(), trimmed.slice(1));
+            return join(getHomeDir(), trimmed.slice(1));
         return resolve(baseDir, trimmed);
     }
     collectPackageResources(packageRoot, accumulator, filter, metadata) {
@@ -1329,7 +1362,7 @@ export class DefaultPackageManager {
             prompts: join(projectBaseDir, "prompts"),
             themes: join(projectBaseDir, "themes"),
         };
-        const userAgentsSkillsDir = join(homedir(), ".agents", "skills");
+        const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
         const projectAgentsSkillDirs = collectAncestorAgentsSkillDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsSkillsDir));
         const addResources = (resourceType, paths, metadata, overrides, baseDir) => {
             const target = this.getTargetMap(accumulator, resourceType);