@earendil-works/pi-coding-agent 0.74.0 → 0.75.0

package/dist/core/package-manager.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()) {
@@ -963,13 +959,14 @@ export class DefaultPackageManager {
                 return true;
             };
             if (parsed.type === "npm") {
-                const installedPath = this.getNpmInstallPath(parsed, scope);
+                let installedPath = this.getNpmInstallPath(parsed, scope);
                 const needsInstall = !existsSync(installedPath) ||
                     (parsed.pinned && !(await this.installedNpmMatchesPinnedVersion(parsed, installedPath)));
                 if (needsInstall) {
                     const installed = await installMissing();
                     if (!installed)
                         continue;
+                    installedPath = this.getNpmInstallPath(parsed, scope);
                 }
                 metadata.baseDir = installedPath;
                 this.collectPackageResources(installedPath, accumulator, filter, metadata);
@@ -1363,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);
@@ -1378,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) {
@@ -1515,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();
@@ -1523,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");
         }
@@ -1534,14 +1543,43 @@ export class DefaultPackageManager {
         this.globalNpmRootCommandKey = commandKey;
         return this.globalNpmRoot;
     }
-    getNpmInstallPath(source, scope) {
+    getPnpmGlobalPackagePath(packageName) {
+        if (this.getPackageManagerName() !== "pnpm") {
+            return undefined;
+        }
+        const output = this.runNpmCommandSync(["list", "-g", "--depth", "0", "--json"]);
+        const entries = JSON.parse(output);
+        for (const entry of entries) {
+            const path = entry.dependencies?.[packageName]?.path;
+            if (path)
+                return path;
+        }
+        return undefined;
+    }
+    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 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") {
@@ -1787,15 +1825,32 @@ export class DefaultPackageManager {
                 this.addResource(target, path, metadata, enabled);
             }
         };
+        // Project extensions from .pi/
         addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
-        addResources("skills", [
-            ...collectAutoSkillEntries(projectDirs.skills, "pi"),
-            ...projectAgentsSkillDirs.flatMap((dir) => collectAutoSkillEntries(dir, "agents")),
-        ], projectMetadata, projectOverrides.skills, projectBaseDir);
+        // Project skills from .pi/
+        addResources("skills", collectAutoSkillEntries(projectDirs.skills, "pi"), projectMetadata, projectOverrides.skills, projectBaseDir);
+        // Project skills from .agents/ (each with its own baseDir)
+        for (const agentsSkillsDir of projectAgentsSkillDirs) {
+            const agentsBaseDir = dirname(agentsSkillsDir); // the .agents directory
+            const agentsMetadata = {
+                ...projectMetadata,
+                baseDir: agentsBaseDir,
+            };
+            addResources("skills", collectAutoSkillEntries(agentsSkillsDir, "agents"), agentsMetadata, projectOverrides.skills, agentsBaseDir);
+        }
         addResources("prompts", collectAutoPromptEntries(projectDirs.prompts), projectMetadata, projectOverrides.prompts, projectBaseDir);
         addResources("themes", collectAutoThemeEntries(projectDirs.themes), projectMetadata, projectOverrides.themes, projectBaseDir);
+        // User extensions from ~/.pi/agent/
         addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
-        addResources("skills", [...collectAutoSkillEntries(userDirs.skills, "pi"), ...collectAutoSkillEntries(userAgentsSkillsDir, "agents")], userMetadata, userOverrides.skills, globalBaseDir);
+        // User skills from ~/.pi/agent/
+        addResources("skills", collectAutoSkillEntries(userDirs.skills, "pi"), userMetadata, userOverrides.skills, globalBaseDir);
+        // User skills from ~/.agents/ (with its own baseDir)
+        const userAgentsBaseDir = dirname(userAgentsSkillsDir);
+        const userAgentsMetadata = {
+            ...userMetadata,
+            baseDir: userAgentsBaseDir,
+        };
+        addResources("skills", collectAutoSkillEntries(userAgentsSkillsDir, "agents"), userAgentsMetadata, userOverrides.skills, userAgentsBaseDir);
         addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
         addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
     }