@mariozechner/pi-coding-agent 0.54.2 → 0.55.0

package/dist/core/package-manager.js

@@ -573,14 +573,14 @@ export class DefaultPackageManager {
         const accumulator = this.createAccumulator();
         const globalSettings = this.settingsManager.getGlobalSettings();
         const projectSettings = this.settingsManager.getProjectSettings();
-        // Collect all packages with scope
+        // Collect all packages with scope (project first so cwd resources win collisions)
         const allPackages = [];
-        for (const pkg of globalSettings.packages ?? []) {
-            allPackages.push({ pkg, scope: "user" });
-        }
         for (const pkg of projectSettings.packages ?? []) {
             allPackages.push({ pkg, scope: "project" });
         }
+        for (const pkg of globalSettings.packages ?? []) {
+            allPackages.push({ pkg, scope: "user" });
+        }
         // Dedupe: project scope wins over global for same package identity
         const packageSources = this.dedupePackages(allPackages);
         await this.resolvePackageSources(packageSources, accumulator, onMissing);
@@ -590,16 +590,16 @@ export class DefaultPackageManager {
             const target = this.getTargetMap(accumulator, resourceType);
             const globalEntries = (globalSettings[resourceType] ?? []);
             const projectEntries = (projectSettings[resourceType] ?? []);
-            this.resolveLocalEntries(globalEntries, resourceType, target, {
-                source: "local",
-                scope: "user",
-                origin: "top-level",
-            }, globalBaseDir);
             this.resolveLocalEntries(projectEntries, resourceType, target, {
                 source: "local",
                 scope: "project",
                 origin: "top-level",
             }, projectBaseDir);
+            this.resolveLocalEntries(globalEntries, resourceType, target, {
+                source: "local",
+                scope: "user",
+                origin: "top-level",
+            }, globalBaseDir);
         }
         this.addAutoDiscoveredResources(accumulator, globalSettings, projectSettings, globalBaseDir, projectBaseDir);
         return this.toResolvedPaths(accumulator);
@@ -1317,10 +1317,6 @@ export class DefaultPackageManager {
                 this.addResource(target, path, metadata, enabled);
             }
         };
-        addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
-        addResources("skills", [...collectAutoSkillEntries(userDirs.skills), ...collectAutoSkillEntries(userAgentsSkillsDir)], userMetadata, userOverrides.skills, globalBaseDir);
-        addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
-        addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
         addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
         addResources("skills", [
             ...collectAutoSkillEntries(projectDirs.skills),
@@ -1328,6 +1324,10 @@ export class DefaultPackageManager {
         ], projectMetadata, projectOverrides.skills, projectBaseDir);
         addResources("prompts", collectAutoPromptEntries(projectDirs.prompts), projectMetadata, projectOverrides.prompts, projectBaseDir);
         addResources("themes", collectAutoThemeEntries(projectDirs.themes), projectMetadata, projectOverrides.themes, projectBaseDir);
+        addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
+        addResources("skills", [...collectAutoSkillEntries(userDirs.skills), ...collectAutoSkillEntries(userAgentsSkillsDir)], userMetadata, userOverrides.skills, globalBaseDir);
+        addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
+        addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
     }
     collectFilesFromPaths(paths, resourceType) {
         const files = [];