@bastani/atomic 0.8.1-1 → 0.8.2-0

package/dist/core/package-manager.js

@@ -25,7 +25,7 @@ import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { globSync } from "glob";
 import ignore from "ignore";
 import { minimatch } from "minimatch";
-import { CONFIG_DIR_NAME, ENV_OFFLINE } from "../config.js";
+import { CONFIG_DIR_NAME, ENV_OFFLINE, getAgentDir, getAgentDirs, getEnvValue, getProjectConfigDirs } from "../config.js";
 import { shouldUseWindowsShell } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
 import { canonicalizePath, isLocalPath } from "../utils/paths.js";
@@ -34,7 +34,7 @@ const NETWORK_TIMEOUT_MS = 10000;
 const UPDATE_CHECK_CONCURRENCY = 4;
 const GIT_UPDATE_CONCURRENCY = 4;
 function isOfflineModeEnabled() {
-    const value = process.env[ENV_OFFLINE];
+    const value = getEnvValue(ENV_OFFLINE);
     if (!value)
         return false;
     return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
@@ -617,17 +617,48 @@ export class DefaultPackageManager {
     getInstalledPath(source, scope) {
         const parsed = this.parseSource(source);
         if (parsed.type === "npm") {
-            const path = this.getNpmInstallPath(parsed, scope);
-            return existsSync(path) ? path : undefined;
+            return this.getExistingNpmInstallPath(parsed, scope);
         }
         if (parsed.type === "git") {
-            const path = this.getGitInstallPath(parsed, scope);
-            return existsSync(path) ? path : undefined;
+            return this.getExistingGitInstallPath(parsed, scope);
         }
         if (parsed.type === "local") {
-            const baseDir = this.getBaseDirForScope(scope);
-            const path = this.resolvePathFromBase(parsed.path, baseDir);
-            return existsSync(path) ? path : undefined;
+            for (const baseDir of this.getBaseDirsForScope(scope)) {
+                const path = this.resolvePathFromBase(parsed.path, baseDir);
+                if (existsSync(path))
+                    return path;
+            }
+        }
+        return undefined;
+    }
+    getExistingNpmInstallPath(source, scope) {
+        const candidates = [this.getNpmInstallPath(source, scope)];
+        if (scope === "project") {
+            for (const configDir of getProjectConfigDirs(this.cwd)) {
+                candidates.push(join(configDir, "npm", "node_modules", source.name));
+            }
+        }
+        for (const candidate of Array.from(new Set(candidates))) {
+            if (existsSync(candidate))
+                return candidate;
+        }
+        return undefined;
+    }
+    getExistingGitInstallPath(source, scope) {
+        const candidates = [this.getGitInstallPath(source, scope)];
+        if (scope === "project") {
+            for (const configDir of getProjectConfigDirs(this.cwd)) {
+                candidates.push(join(configDir, "git", source.host, source.path));
+            }
+        }
+        else if (scope === "user") {
+            for (const agentDir of this.getBaseDirsForScope("user")) {
+                candidates.push(join(agentDir, "git", source.host, source.path));
+            }
+        }
+        for (const candidate of Array.from(new Set(candidates))) {
+            if (existsSync(candidate))
+                return candidate;
         }
         return undefined;
     }
@@ -663,20 +694,28 @@ export class DefaultPackageManager {
         await this.resolvePackageSources(packageSources, accumulator, onMissing);
         const globalBaseDir = this.agentDir;
         const projectBaseDir = join(this.cwd, CONFIG_DIR_NAME);
+        const globalBaseDirs = this.getBaseDirsForScope("user");
+        const projectBaseDirs = this.getBaseDirsForScope("project");
         for (const resourceType of RESOURCE_TYPES) {
             const target = this.getTargetMap(accumulator, resourceType);
             const globalEntries = (globalSettings[resourceType] ?? []);
             const projectEntries = (projectSettings[resourceType] ?? []);
-            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);
+            for (const baseDir of projectBaseDirs) {
+                this.resolveLocalEntries(projectEntries, resourceType, target, {
+                    source: "local",
+                    scope: "project",
+                    origin: "top-level",
+                    baseDir,
+                }, baseDir);
+            }
+            for (const baseDir of globalBaseDirs) {
+                this.resolveLocalEntries(globalEntries, resourceType, target, {
+                    source: "local",
+                    scope: "user",
+                    origin: "top-level",
+                    baseDir,
+                }, baseDir);
+            }
         }
         this.addAutoDiscoveredResources(accumulator, globalSettings, projectSettings, globalBaseDir, projectBaseDir);
         return this.toResolvedPaths(accumulator);
@@ -839,8 +878,8 @@ export class DefaultPackageManager {
         await Promise.all(tasks);
     }
     async shouldUpdateNpmSource(source, scope) {
-        const installedPath = this.getNpmInstallPath(source, scope);
-        const installedVersion = existsSync(installedPath) ? this.getInstalledNpmVersion(installedPath) : undefined;
+        const installedPath = this.getExistingNpmInstallPath(source, scope);
+        const installedVersion = installedPath ? this.getInstalledNpmVersion(installedPath) : undefined;
         if (!installedVersion) {
             return true;
         }
@@ -896,8 +935,8 @@ export class DefaultPackageManager {
                 return undefined;
             }
             if (parsed.type === "npm") {
-                const installedPath = this.getNpmInstallPath(parsed, entry.scope);
-                if (!existsSync(installedPath)) {
+                const installedPath = this.getExistingNpmInstallPath(parsed, entry.scope);
+                if (!installedPath) {
                     return undefined;
                 }
                 const hasUpdate = await this.npmHasAvailableUpdate(parsed, installedPath);
@@ -911,8 +950,8 @@ export class DefaultPackageManager {
                     scope: entry.scope,
                 };
             }
-            const installedPath = this.getGitInstallPath(parsed, entry.scope);
-            if (!existsSync(installedPath)) {
+            const installedPath = this.getExistingGitInstallPath(parsed, entry.scope);
+            if (!installedPath) {
                 return undefined;
             }
             const hasUpdate = await this.gitHasAvailableUpdate(installedPath);
@@ -936,8 +975,9 @@ export class DefaultPackageManager {
             const parsed = this.parseSource(sourceStr);
             const metadata = { source: sourceStr, scope, origin: "package" };
             if (parsed.type === "local") {
-                const baseDir = this.getBaseDirForScope(scope);
-                this.resolveLocalExtensionSource(parsed, accumulator, filter, metadata, baseDir);
+                for (const baseDir of this.getBaseDirsForScope(scope)) {
+                    this.resolveLocalExtensionSource(parsed, accumulator, filter, { ...metadata, baseDir }, baseDir);
+                }
                 continue;
             }
             const installMissing = async () => {
@@ -957,20 +997,24 @@ export class DefaultPackageManager {
                 return true;
             };
             if (parsed.type === "npm") {
-                const installedPath = this.getNpmInstallPath(parsed, scope);
-                const needsInstall = !existsSync(installedPath) ||
+                let installedPath = this.getExistingNpmInstallPath(parsed, scope);
+                const needsInstall = !installedPath ||
                     (parsed.pinned && !(await this.installedNpmMatchesPinnedVersion(parsed, installedPath)));
+                if (needsInstall)
+                    installedPath = this.getNpmInstallPath(parsed, scope);
                 if (needsInstall) {
                     const installed = await installMissing();
                     if (!installed)
                         continue;
                 }
+                if (!installedPath)
+                    continue;
                 metadata.baseDir = installedPath;
                 this.collectPackageResources(installedPath, accumulator, filter, metadata);
                 continue;
             }
             if (parsed.type === "git") {
-                const installedPath = this.getGitInstallPath(parsed, scope);
+                let installedPath = this.getExistingGitInstallPath(parsed, scope) ?? this.getGitInstallPath(parsed, scope);
                 if (!existsSync(installedPath)) {
                     const installed = await installMissing();
                     if (!installed)
@@ -1413,7 +1457,7 @@ export class DefaultPackageManager {
         }
     }
     async updateGit(source, scope) {
-        const targetDir = this.getGitInstallPath(source, scope);
+        const targetDir = this.getExistingGitInstallPath(source, scope) ?? this.getGitInstallPath(source, scope);
         if (!existsSync(targetDir)) {
             await this.installGit(source, scope);
             return;
@@ -1564,13 +1608,16 @@ export class DefaultPackageManager {
         return join(tmpdir(), "pi-extensions", prefix, hash, suffix ?? "");
     }
     getBaseDirForScope(scope) {
+        return this.getBaseDirsForScope(scope)[0];
+    }
+    getBaseDirsForScope(scope) {
         if (scope === "project") {
-            return join(this.cwd, CONFIG_DIR_NAME);
+            return getProjectConfigDirs(this.cwd);
         }
         if (scope === "user") {
-            return this.agentDir;
+            return this.agentDir === getAgentDir() ? getAgentDirs() : [this.agentDir];
         }
-        return this.cwd;
+        return [this.cwd];
     }
     resolvePath(input) {
         const trimmed = input.trim();
@@ -1761,18 +1808,8 @@ export class DefaultPackageManager {
             prompts: (projectSettings.prompts ?? []),
             themes: (projectSettings.themes ?? []),
         };
-        const userDirs = {
-            extensions: join(globalBaseDir, "extensions"),
-            skills: join(globalBaseDir, "skills"),
-            prompts: join(globalBaseDir, "prompts"),
-            themes: join(globalBaseDir, "themes"),
-        };
-        const projectDirs = {
-            extensions: join(projectBaseDir, "extensions"),
-            skills: join(projectBaseDir, "skills"),
-            prompts: join(projectBaseDir, "prompts"),
-            themes: join(projectBaseDir, "themes"),
-        };
+        const userConfigDirs = this.getBaseDirsForScope("user");
+        const projectConfigDirs = this.getBaseDirsForScope("project");
         const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
         const projectAgentsSkillDirs = collectAncestorAgentsSkillDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsSkillsDir));
         const addResources = (resourceType, paths, metadata, overrides, baseDir) => {
@@ -1782,10 +1819,13 @@ export class DefaultPackageManager {
                 this.addResource(target, path, metadata, enabled);
             }
         };
-        // Project extensions from .atomic/
-        addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
-        // Project skills from .atomic/
-        addResources("skills", collectAutoSkillEntries(projectDirs.skills, "pi"), projectMetadata, projectOverrides.skills, projectBaseDir);
+        for (const configDir of projectConfigDirs) {
+            const metadata = { ...projectMetadata, baseDir: configDir };
+            addResources("extensions", collectAutoExtensionEntries(join(configDir, "extensions")), metadata, projectOverrides.extensions, configDir);
+            addResources("skills", collectAutoSkillEntries(join(configDir, "skills"), "pi"), metadata, projectOverrides.skills, configDir);
+            addResources("prompts", collectAutoPromptEntries(join(configDir, "prompts")), metadata, projectOverrides.prompts, configDir);
+            addResources("themes", collectAutoThemeEntries(join(configDir, "themes")), metadata, projectOverrides.themes, configDir);
+        }
         // Project skills from .agents/ (each with its own baseDir)
         for (const agentsSkillsDir of projectAgentsSkillDirs) {
             const agentsBaseDir = dirname(agentsSkillsDir); // the .agents directory
@@ -1795,12 +1835,13 @@ export class DefaultPackageManager {
             };
             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 ~/.atomic/agent/
-        addResources("extensions", collectAutoExtensionEntries(userDirs.extensions), userMetadata, userOverrides.extensions, globalBaseDir);
-        // User skills from ~/.atomic/agent/
-        addResources("skills", collectAutoSkillEntries(userDirs.skills, "pi"), userMetadata, userOverrides.skills, globalBaseDir);
+        for (const configDir of userConfigDirs) {
+            const metadata = { ...userMetadata, baseDir: configDir };
+            addResources("extensions", collectAutoExtensionEntries(join(configDir, "extensions")), metadata, userOverrides.extensions, configDir);
+            addResources("skills", collectAutoSkillEntries(join(configDir, "skills"), "pi"), metadata, userOverrides.skills, configDir);
+            addResources("prompts", collectAutoPromptEntries(join(configDir, "prompts")), metadata, userOverrides.prompts, configDir);
+            addResources("themes", collectAutoThemeEntries(join(configDir, "themes")), metadata, userOverrides.themes, configDir);
+        }
         // User skills from ~/.agents/ (with its own baseDir)
         const userAgentsBaseDir = dirname(userAgentsSkillsDir);
         const userAgentsMetadata = {
@@ -1808,8 +1849,6 @@ export class DefaultPackageManager {
             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);
     }
     collectFilesFromPaths(paths, resourceType) {
         const files = [];