@fleetagent/pi-coding-agent 0.0.5 → 0.0.7

package/dist/core/package-manager.js

@@ -56,10 +56,11 @@ 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", "rules", "prompts", "themes"];
 const FILE_PATTERNS = {
     extensions: /\.(ts|js)$/,
     skills: /\.md$/,
+    rules: /\.md$/,
     prompts: /\.md$/,
     themes: /\.json$/,
 };
@@ -244,6 +245,72 @@ function collectSkillEntries(dir, mode, ignoreMatcher, rootDir) {
 function collectAutoSkillEntries(dir, mode) {
     return collectSkillEntries(dir, mode);
 }
+function collectRuleEntries(dir, mode, ignoreMatcher, rootDir) {
+    const entries = [];
+    if (!existsSync(dir))
+        return entries;
+    const root = rootDir ?? dir;
+    const ig = ignoreMatcher ?? ignore();
+    addIgnoreRules(ig, dir, root);
+    try {
+        const dirEntries = readdirSync(dir, { withFileTypes: true });
+        for (const entry of dirEntries) {
+            if (entry.name !== "RULES.md")
+                continue;
+            const fullPath = join(dir, entry.name);
+            let isFile = entry.isFile();
+            if (entry.isSymbolicLink()) {
+                try {
+                    isFile = statSync(fullPath).isFile();
+                }
+                catch {
+                    continue;
+                }
+            }
+            const relPath = toPosixPath(relative(root, fullPath));
+            if (isFile && !ig.ignores(relPath)) {
+                entries.push(fullPath);
+                return entries;
+            }
+        }
+        for (const entry of dirEntries) {
+            if (entry.name.startsWith("."))
+                continue;
+            if (entry.name === "node_modules")
+                continue;
+            const fullPath = join(dir, entry.name);
+            let isDir = entry.isDirectory();
+            let isFile = entry.isFile();
+            if (entry.isSymbolicLink()) {
+                try {
+                    const stats = statSync(fullPath);
+                    isDir = stats.isDirectory();
+                    isFile = stats.isFile();
+                }
+                catch {
+                    continue;
+                }
+            }
+            const relPath = toPosixPath(relative(root, fullPath));
+            if (mode === "pi" && dir === root && isFile && entry.name.endsWith(".md") && !ig.ignores(relPath)) {
+                entries.push(fullPath);
+                continue;
+            }
+            if (!isDir)
+                continue;
+            if (ig.ignores(`${relPath}/`))
+                continue;
+            entries.push(...collectRuleEntries(fullPath, mode, ig, root));
+        }
+    }
+    catch {
+        // Ignore errors
+    }
+    return entries;
+}
+function collectAutoRuleEntries(dir, mode) {
+    return collectRuleEntries(dir, mode);
+}
 function findGitRepoRoot(startDir) {
     let dir = resolve(startDir);
     while (true) {
@@ -275,6 +342,24 @@ function collectAncestorAgentsSkillDirs(startDir) {
     }
     return skillDirs;
 }
+function collectAncestorAgentsRuleDirs(startDir) {
+    const ruleDirs = [];
+    const resolvedStartDir = resolve(startDir);
+    const gitRepoRoot = findGitRepoRoot(resolvedStartDir);
+    let dir = resolvedStartDir;
+    while (true) {
+        ruleDirs.push(join(dir, ".agents", "rules"));
+        if (gitRepoRoot && dir === gitRepoRoot) {
+            break;
+        }
+        const parent = dirname(dir);
+        if (parent === dir) {
+            break;
+        }
+        dir = parent;
+    }
+    return ruleDirs;
+}
 function collectAutoPromptEntries(dir) {
     const entries = [];
     if (!existsSync(dir))
@@ -444,6 +529,9 @@ function collectResourceFiles(dir, resourceType) {
     if (resourceType === "skills") {
         return collectSkillEntries(dir, "pi");
     }
+    if (resourceType === "rules") {
+        return collectRuleEntries(dir, "pi");
+    }
     if (resourceType === "extensions") {
         return collectAutoExtensionEntries(dir);
     }
@@ -453,11 +541,11 @@ function matchesAnyPattern(filePath, patterns, baseDir) {
     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 ? toPosixPath(relative(baseDir, parentDir)) : undefined;
-    const parentName = isSkillFile ? basename(parentDir) : undefined;
-    const parentDirPosix = isSkillFile ? toPosixPath(parentDir) : undefined;
+    const isDirectoryResourceFile = name === "SKILL.md" || name === "RULES.md";
+    const parentDir = isDirectoryResourceFile ? dirname(filePath) : undefined;
+    const parentRel = isDirectoryResourceFile ? toPosixPath(relative(baseDir, parentDir)) : undefined;
+    const parentName = isDirectoryResourceFile ? basename(parentDir) : undefined;
+    const parentDirPosix = isDirectoryResourceFile ? toPosixPath(parentDir) : undefined;
     return patterns.some((pattern) => {
         const normalizedPattern = toPosixPath(pattern);
         if (minimatch(rel, normalizedPattern) ||
@@ -465,7 +553,7 @@ function matchesAnyPattern(filePath, patterns, baseDir) {
             minimatch(filePathPosix, normalizedPattern)) {
             return true;
         }
-        if (!isSkillFile)
+        if (!isDirectoryResourceFile)
             return false;
         return (minimatch(parentRel, normalizedPattern) ||
             minimatch(parentName, normalizedPattern) ||
@@ -482,16 +570,16 @@ function matchesAnyExactPattern(filePath, patterns, baseDir) {
     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 ? toPosixPath(relative(baseDir, parentDir)) : undefined;
-    const parentDirPosix = isSkillFile ? toPosixPath(parentDir) : undefined;
+    const isDirectoryResourceFile = name === "SKILL.md" || name === "RULES.md";
+    const parentDir = isDirectoryResourceFile ? dirname(filePath) : undefined;
+    const parentRel = isDirectoryResourceFile ? toPosixPath(relative(baseDir, parentDir)) : undefined;
+    const parentDirPosix = isDirectoryResourceFile ? toPosixPath(parentDir) : undefined;
     return patterns.some((pattern) => {
         const normalized = normalizeExactPattern(pattern);
         if (normalized === rel || normalized === filePathPosix) {
             return true;
         }
-        if (!isSkillFile)
+        if (!isDirectoryResourceFile)
             return false;
         return normalized === parentRel || normalized === parentDirPosix;
     });
@@ -814,14 +902,16 @@ export class DefaultPackageManager {
         const gitCandidates = [];
         for (const entry of sources) {
             const parsed = this.parseSource(entry.source);
-            if (parsed.type === "local" || parsed.pinned) {
-                continue;
-            }
+            // Pinned npm versions are fixed. Pinned git refs are configured checkout targets,
+            // so include them to reconcile an existing clone when the configured ref changes.
             if (parsed.type === "npm") {
-                npmCandidates.push({ ...entry, parsed });
-                continue;
+                if (!parsed.pinned) {
+                    npmCandidates.push({ ...entry, parsed });
+                }
+            }
+            else if (parsed.type === "git") {
+                gitCandidates.push({ ...entry, parsed });
             }
-            gitCandidates.push({ ...entry, parsed });
         }
         const npmCheckTasks = npmCandidates.map((entry) => async () => ({
             entry,
@@ -1396,13 +1486,25 @@ export class DefaultPackageManager {
     }
     getNpmInstallArgs(specs, installRoot) {
         const packageManagerName = this.getPackageManagerName();
+        // Extension packages run inside pi and resolve pi APIs through loader aliases/virtual modules.
+        // Disable peer dependency resolution for managed installs (npm's --legacy-peer-deps, and
+        // equivalent bun/pnpm settings) so package managers do not install or solve host-provided
+        // @earendil-works/pi-* peers. Stale auto-installed pi peers can otherwise block updates.
         if (packageManagerName === "bun") {
-            return ["install", ...specs, "--cwd", installRoot];
+            return ["install", ...specs, "--cwd", installRoot, "--omit=peer"];
         }
         if (packageManagerName === "pnpm") {
-            return ["install", ...specs, "--prefix", installRoot, "--config.strict-dep-builds=false"];
-        }
-        return ["install", ...specs, "--prefix", installRoot];
+            return [
+                "install",
+                ...specs,
+                "--prefix",
+                installRoot,
+                "--config.auto-install-peers=false",
+                "--config.strict-peer-dependencies=false",
+                "--config.strict-dep-builds=false",
+            ];
+        }
+        return ["install", ...specs, "--prefix", installRoot, "--legacy-peer-deps"];
     }
     async installNpm(source, scope, temporary) {
         const installRoot = this.getNpmInstallRoot(scope, temporary);
@@ -1451,6 +1553,10 @@ export class DefaultPackageManager {
             await this.installGit(source, scope);
             return;
         }
+        if (source.ref) {
+            await this.ensureGitRef(targetDir, ["fetch", "origin", source.ref], "FETCH_HEAD");
+            return;
+        }
         const target = await this.getLocalGitUpdateTarget(targetDir);
         await this.ensureGitRef(targetDir, target.fetchArgs, target.ref);
     }
@@ -1461,14 +1567,15 @@ export class DefaultPackageManager {
             cwd: targetDir,
             timeoutMs: NETWORK_TIMEOUT_MS,
         });
-        const targetHead = await this.runCommandCapture("git", ["rev-parse", ref], {
+        const commitRef = `${ref}^{commit}`;
+        const targetHead = await this.runCommandCapture("git", ["rev-parse", commitRef], {
             cwd: targetDir,
             timeoutMs: NETWORK_TIMEOUT_MS,
         });
         if (localHead.trim() === targetHead.trim()) {
             return;
         }
-        await this.runCommand("git", ["reset", "--hard", ref], { cwd: targetDir });
+        await this.runCommand("git", ["reset", "--hard", commitRef], { cwd: targetDir });
         // Clean untracked files (extensions should be pristine)
         await this.runCommand("git", ["clean", "-fdx"], { cwd: targetDir });
         const packageJsonPath = join(targetDir, "package.json");
@@ -1803,29 +1910,35 @@ export class DefaultPackageManager {
         const userOverrides = {
             extensions: (globalSettings.extensions ?? []),
             skills: (globalSettings.skills ?? []),
+            rules: (globalSettings.rules ?? []),
             prompts: (globalSettings.prompts ?? []),
             themes: (globalSettings.themes ?? []),
         };
         const projectOverrides = {
             extensions: (projectSettings.extensions ?? []),
             skills: (projectSettings.skills ?? []),
+            rules: (projectSettings.rules ?? []),
             prompts: (projectSettings.prompts ?? []),
             themes: (projectSettings.themes ?? []),
         };
         const userDirs = {
             extensions: join(globalBaseDir, "extensions"),
             skills: join(globalBaseDir, "skills"),
+            rules: join(globalBaseDir, "rules"),
             prompts: join(globalBaseDir, "prompts"),
             themes: join(globalBaseDir, "themes"),
         };
         const projectDirs = {
             extensions: join(projectBaseDir, "extensions"),
             skills: join(projectBaseDir, "skills"),
+            rules: join(projectBaseDir, "rules"),
             prompts: join(projectBaseDir, "prompts"),
             themes: join(projectBaseDir, "themes"),
         };
         const userAgentsSkillsDir = join(getHomeDir(), ".agents", "skills");
+        const userAgentsRulesDir = join(getHomeDir(), ".agents", "rules");
         const projectAgentsSkillDirs = collectAncestorAgentsSkillDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsSkillsDir));
+        const projectAgentsRuleDirs = collectAncestorAgentsRuleDirs(this.cwd).filter((dir) => resolve(dir) !== resolve(userAgentsRulesDir));
         const addResources = (resourceType, paths, metadata, overrides, baseDir) => {
             const target = this.getTargetMap(accumulator, resourceType);
             for (const path of paths) {
@@ -1837,6 +1950,8 @@ export class DefaultPackageManager {
         addResources("extensions", collectAutoExtensionEntries(projectDirs.extensions), projectMetadata, projectOverrides.extensions, projectBaseDir);
         // Project skills from .pi/
         addResources("skills", collectAutoSkillEntries(projectDirs.skills, "pi"), projectMetadata, projectOverrides.skills, projectBaseDir);
+        // Project rules from .pi/
+        addResources("rules", collectAutoRuleEntries(projectDirs.rules, "pi"), projectMetadata, projectOverrides.rules, projectBaseDir);
         // Project skills from .agents/ (each with its own baseDir)
         for (const agentsSkillsDir of projectAgentsSkillDirs) {
             const agentsBaseDir = dirname(agentsSkillsDir); // the .agents directory
@@ -1846,12 +1961,23 @@ export class DefaultPackageManager {
             };
             addResources("skills", collectAutoSkillEntries(agentsSkillsDir, "agents"), agentsMetadata, projectOverrides.skills, agentsBaseDir);
         }
+        // Project rules from .agents/ (each with its own baseDir)
+        for (const agentsRulesDir of projectAgentsRuleDirs) {
+            const agentsBaseDir = dirname(agentsRulesDir); // the .agents directory
+            const agentsMetadata = {
+                ...projectMetadata,
+                baseDir: agentsBaseDir,
+            };
+            addResources("rules", collectAutoRuleEntries(agentsRulesDir, "agents"), agentsMetadata, projectOverrides.rules, 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);
         // User skills from ~/.pi/agent/
         addResources("skills", collectAutoSkillEntries(userDirs.skills, "pi"), userMetadata, userOverrides.skills, globalBaseDir);
+        // User rules from ~/.pi/agent/
+        addResources("rules", collectAutoRuleEntries(userDirs.rules, "pi"), userMetadata, userOverrides.rules, globalBaseDir);
         // User skills from ~/.agents/ (with its own baseDir)
         const userAgentsBaseDir = dirname(userAgentsSkillsDir);
         const userAgentsMetadata = {
@@ -1859,6 +1985,13 @@ export class DefaultPackageManager {
             baseDir: userAgentsBaseDir,
         };
         addResources("skills", collectAutoSkillEntries(userAgentsSkillsDir, "agents"), userAgentsMetadata, userOverrides.skills, userAgentsBaseDir);
+        // User rules from ~/.agents/ (with its own baseDir)
+        const userAgentsRulesBaseDir = dirname(userAgentsRulesDir);
+        const userAgentsRulesMetadata = {
+            ...userMetadata,
+            baseDir: userAgentsRulesBaseDir,
+        };
+        addResources("rules", collectAutoRuleEntries(userAgentsRulesDir, "agents"), userAgentsRulesMetadata, userOverrides.rules, userAgentsRulesBaseDir);
         addResources("prompts", collectAutoPromptEntries(userDirs.prompts), userMetadata, userOverrides.prompts, globalBaseDir);
         addResources("themes", collectAutoThemeEntries(userDirs.themes), userMetadata, userOverrides.themes, globalBaseDir);
     }
@@ -1888,6 +2021,8 @@ export class DefaultPackageManager {
                 return accumulator.extensions;
             case "skills":
                 return accumulator.skills;
+            case "rules":
+                return accumulator.rules;
             case "prompts":
                 return accumulator.prompts;
             case "themes":
@@ -1907,6 +2042,7 @@ export class DefaultPackageManager {
         return {
             extensions: new Map(),
             skills: new Map(),
+            rules: new Map(),
             prompts: new Map(),
             themes: new Map(),
         };
@@ -1931,6 +2067,7 @@ export class DefaultPackageManager {
         return {
             extensions: mapToResolved(accumulator.extensions),
             skills: mapToResolved(accumulator.skills),
+            rules: mapToResolved(accumulator.rules),
             prompts: mapToResolved(accumulator.prompts),
             themes: mapToResolved(accumulator.themes),
         };