@bastani/atomic 0.8.4 → 0.8.5

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, getAgentDir, getAgentDirs, getEnvValue, getProjectConfigDirs } from "../config.js";
+import { APP_NAME, 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";
@@ -57,12 +57,13 @@ function resourcePrecedenceRank(m) {
     const scopeBase = m.scope === "project" ? 0 : 2;
     return scopeBase + (m.source === "local" ? 0 : 1);
 }
-const RESOURCE_TYPES = ["extensions", "skills", "prompts", "themes"];
+const RESOURCE_TYPES = ["extensions", "skills", "prompts", "themes", "workflows"];
 const FILE_PATTERNS = {
     extensions: /\.(ts|js)$/,
     skills: /\.md$/,
     prompts: /\.md$/,
     themes: /\.json$/,
+    workflows: /\.(ts|js|mjs|cjs)$/,
 };
 const IGNORE_FILE_NAMES = [".gitignore", ".ignore", ".fdignore"];
 function toPosixPath(p) {
@@ -348,11 +349,22 @@ function collectAutoThemeEntries(dir) {
     }
     return entries;
 }
+function getManifestFromPackageJson(pkg) {
+    const appManifest = pkg[APP_NAME];
+    if (appManifest && typeof appManifest === "object" && !Array.isArray(appManifest)) {
+        return appManifest;
+    }
+    const legacyManifest = pkg.pi;
+    if (legacyManifest && typeof legacyManifest === "object" && !Array.isArray(legacyManifest)) {
+        return legacyManifest;
+    }
+    return null;
+}
 function readPiManifestFile(packageJsonPath) {
     try {
         const content = readFileSync(packageJsonPath, "utf-8");
         const pkg = JSON.parse(content);
-        return pkg.pi ?? null;
+        return getManifestFromPackageJson(pkg);
     }
     catch {
         return null;
@@ -450,6 +462,19 @@ function collectResourceFiles(dir, resourceType) {
     }
     return collectFiles(dir, FILE_PATTERNS[resourceType]);
 }
+function conventionDirsForResource(packageRoot, resourceType) {
+    if (resourceType === "workflows") {
+        return [join(packageRoot, "workflows"), join(packageRoot, "workflow")];
+    }
+    return [join(packageRoot, resourceType)];
+}
+function manifestEntriesForResource(manifest, resourceType) {
+    if (!manifest)
+        return undefined;
+    if (resourceType === "workflows")
+        return manifest.workflows ?? manifest.workflow;
+    return manifest[resourceType];
+}
 function matchesAnyPattern(filePath, patterns, baseDir) {
     const rel = toPosixPath(relative(baseDir, filePath));
     const name = basename(filePath);
@@ -1534,7 +1559,7 @@ export class DefaultPackageManager {
         this.ensureGitIgnore(installRoot);
         const packageJsonPath = join(installRoot, "package.json");
         if (!existsSync(packageJsonPath)) {
-            const pkgJson = { name: "pi-extensions", private: true };
+            const pkgJson = { name: `${APP_NAME}-extensions`, private: true };
             writeFileSync(packageJsonPath, JSON.stringify(pkgJson, null, 2), "utf-8");
         }
     }
@@ -1656,38 +1681,46 @@ export class DefaultPackageManager {
         const manifest = this.readPiManifest(packageRoot);
         if (manifest) {
             for (const resourceType of RESOURCE_TYPES) {
-                const entries = manifest[resourceType];
-                this.addManifestEntries(entries, packageRoot, resourceType, this.getTargetMap(accumulator, resourceType), metadata);
+                const entries = manifestEntriesForResource(manifest, resourceType);
+                if (entries !== undefined) {
+                    this.addManifestEntries(entries, packageRoot, resourceType, this.getTargetMap(accumulator, resourceType), metadata);
+                    continue;
+                }
+                if (resourceType === "workflows") {
+                    this.collectDefaultResources(packageRoot, resourceType, this.getTargetMap(accumulator, resourceType), metadata);
+                }
             }
             return true;
         }
         let hasAnyDir = false;
         for (const resourceType of RESOURCE_TYPES) {
-            const dir = join(packageRoot, resourceType);
-            if (existsSync(dir)) {
-                // Collect all files from the directory (all enabled by default)
-                const files = collectResourceFiles(dir, resourceType);
-                for (const f of files) {
-                    this.addResource(this.getTargetMap(accumulator, resourceType), f, metadata, true);
+            for (const dir of conventionDirsForResource(packageRoot, resourceType)) {
+                if (existsSync(dir)) {
+                    // Collect all files from the directory (all enabled by default)
+                    const files = collectResourceFiles(dir, resourceType);
+                    for (const f of files) {
+                        this.addResource(this.getTargetMap(accumulator, resourceType), f, metadata, true);
+                    }
+                    hasAnyDir = true;
                 }
-                hasAnyDir = true;
             }
         }
         return hasAnyDir;
     }
     collectDefaultResources(packageRoot, resourceType, target, metadata) {
         const manifest = this.readPiManifest(packageRoot);
-        const entries = manifest?.[resourceType];
-        if (entries) {
+        const entries = manifestEntriesForResource(manifest, resourceType);
+        if (entries !== undefined) {
             this.addManifestEntries(entries, packageRoot, resourceType, target, metadata);
             return;
         }
-        const dir = join(packageRoot, resourceType);
-        if (existsSync(dir)) {
-            // Collect all files from the directory (all enabled by default)
-            const files = collectResourceFiles(dir, resourceType);
-            for (const f of files) {
-                this.addResource(target, f, metadata, true);
+        for (const dir of conventionDirsForResource(packageRoot, resourceType)) {
+            if (existsSync(dir)) {
+                // Collect all files from the directory (all enabled by default)
+                const files = collectResourceFiles(dir, resourceType);
+                for (const f of files) {
+                    this.addResource(target, f, metadata, true);
+                }
             }
         }
     }
@@ -1714,18 +1747,14 @@ export class DefaultPackageManager {
      */
     collectManifestFiles(packageRoot, resourceType) {
         const manifest = this.readPiManifest(packageRoot);
-        const entries = manifest?.[resourceType];
+        const entries = manifestEntriesForResource(manifest, resourceType);
         if (entries && entries.length > 0) {
             const allFiles = this.collectFilesFromManifestEntries(entries, packageRoot, resourceType);
             const manifestPatterns = entries.filter(isOverridePattern);
             const enabledByManifest = manifestPatterns.length > 0 ? applyPatterns(allFiles, manifestPatterns, packageRoot) : new Set(allFiles);
             return { allFiles: Array.from(enabledByManifest), enabledByManifest };
         }
-        const conventionDir = join(packageRoot, resourceType);
-        if (!existsSync(conventionDir)) {
-            return { allFiles: [], enabledByManifest: new Set() };
-        }
-        const allFiles = collectResourceFiles(conventionDir, resourceType);
+        const allFiles = conventionDirsForResource(packageRoot, resourceType).flatMap((dir) => existsSync(dir) ? collectResourceFiles(dir, resourceType) : []);
         return { allFiles, enabledByManifest: new Set(allFiles) };
     }
     readPiManifest(packageRoot) {
@@ -1736,7 +1765,7 @@ export class DefaultPackageManager {
         try {
             const content = readFileSync(packageJsonPath, "utf-8");
             const pkg = JSON.parse(content);
-            return pkg.pi ?? null;
+            return getManifestFromPackageJson(pkg);
         }
         catch {
             return null;
@@ -1801,12 +1830,14 @@ export class DefaultPackageManager {
             skills: (globalSettings.skills ?? []),
             prompts: (globalSettings.prompts ?? []),
             themes: (globalSettings.themes ?? []),
+            workflows: (globalSettings.workflows ?? []),
         };
         const projectOverrides = {
             extensions: (projectSettings.extensions ?? []),
             skills: (projectSettings.skills ?? []),
             prompts: (projectSettings.prompts ?? []),
             themes: (projectSettings.themes ?? []),
+            workflows: (projectSettings.workflows ?? []),
         };
         const userConfigDirs = this.getBaseDirsForScope("user");
         const projectConfigDirs = this.getBaseDirsForScope("project");
@@ -1825,6 +1856,7 @@ export class DefaultPackageManager {
             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);
+            addResources("workflows", collectResourceFiles(join(configDir, "workflows"), "workflows"), metadata, projectOverrides.workflows, configDir);
         }
         // Project skills from .agents/ (each with its own baseDir)
         for (const agentsSkillsDir of projectAgentsSkillDirs) {
@@ -1841,6 +1873,7 @@ export class DefaultPackageManager {
             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);
+            addResources("workflows", collectResourceFiles(join(configDir, "workflows"), "workflows"), metadata, userOverrides.workflows, configDir);
         }
         // User skills from ~/.agents/ (with its own baseDir)
         const userAgentsBaseDir = dirname(userAgentsSkillsDir);
@@ -1880,6 +1913,8 @@ export class DefaultPackageManager {
                 return accumulator.prompts;
             case "themes":
                 return accumulator.themes;
+            case "workflows":
+                return accumulator.workflows;
             default:
                 throw new Error(`Unknown resource type: ${resourceType}`);
         }
@@ -1897,6 +1932,7 @@ export class DefaultPackageManager {
             skills: new Map(),
             prompts: new Map(),
             themes: new Map(),
+            workflows: new Map(),
         };
     }
     toResolvedPaths(accumulator) {
@@ -1921,6 +1957,7 @@ export class DefaultPackageManager {
             skills: mapToResolved(accumulator.skills),
             prompts: mapToResolved(accumulator.prompts),
             themes: mapToResolved(accumulator.themes),
+            workflows: mapToResolved(accumulator.workflows),
         };
     }
     spawnCommand(command, args, options) {