@caupulican/pi-adaptative 0.81.42 → 0.81.43

package/dist/core/package-manager.js

@@ -22,7 +22,6 @@ function getEnv() {
 }
 import { basename, dirname, join, relative, resolve, sep } from "node:path";
 import { globSync } from "glob";
-import ignore from "ignore";
 import { CONFIG_DIR_NAME } from "../config.js";
 import { spawnProcess, spawnProcessSync, waitForChildProcessWithTermination } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
@@ -32,7 +31,10 @@ import { gitDir, npmDir } from "./agent-paths.js";
 import { createRollingOutputBuffer } from "./exec.js";
 import { isExtensionPathAllowedForImport } from "./extension-import-authority.js";
 import { isStdoutTakenOver } from "./output-guard.js";
+import { createResourceIgnoreMatcher, toPosixResourcePath } from "./resource-ignore.js";
 import { mergeResourceProfileMap, parseResourceProfileBlocks } from "./resource-profile-blocks.js";
+import { collectResourceFilesRecursively, readResourceDirectory } from "./resource-traversal.js";
+import { discoverSkillFiles } from "./skill-discovery.js";
 import { matchesCompiledPattern } from "./util/minimatch-cache.js";
 const NETWORK_TIMEOUT_MS = 10000;
 const PACKAGE_CAPTURE_TIMEOUT_MS = 30_000;
@@ -47,6 +49,12 @@ function isOfflineModeEnabled() {
         return false;
     return value === "1" || value.toLowerCase() === "true" || value.toLowerCase() === "yes";
 }
+function collectConfiguredPackageSources(globalSettings, projectSettings) {
+    return [
+        ...(projectSettings.packages ?? []).map((pkg) => ({ pkg, scope: "project" })),
+        ...(globalSettings.packages ?? []).map((pkg) => ({ pkg, scope: "user" })),
+    ];
+}
 /**
  * Compute a numeric precedence rank for a resource based on its metadata.
  * Lower rank = higher precedence. Used to sort resolved resources so that
@@ -72,10 +80,6 @@ const FILE_PATTERNS = {
     prompts: /\.md$/,
     themes: /\.json$/,
 };
-const IGNORE_FILE_NAMES = [".gitignore", ".ignore", ".fdignore"];
-function toPosixPath(p) {
-    return p.split(sep).join("/");
-}
 function getHomeDir() {
     return process.env.HOME || homedir();
 }
@@ -84,47 +88,6 @@ export function getExtensionTempFolder(agentDir) {
     chmodSync(tempFolder, 0o700);
     return tempFolder;
 }
-function prefixIgnorePattern(line, prefix) {
-    const trimmed = line.trim();
-    if (!trimmed)
-        return null;
-    if (trimmed.startsWith("#") && !trimmed.startsWith("\\#"))
-        return null;
-    let pattern = line;
-    let negated = false;
-    if (pattern.startsWith("!")) {
-        negated = true;
-        pattern = pattern.slice(1);
-    }
-    else if (pattern.startsWith("\\!")) {
-        pattern = pattern.slice(1);
-    }
-    if (pattern.startsWith("/")) {
-        pattern = pattern.slice(1);
-    }
-    const prefixed = prefix ? `${prefix}${pattern}` : pattern;
-    return negated ? `!${prefixed}` : prefixed;
-}
-function addIgnoreRules(ig, dir, rootDir) {
-    const relativeDir = relative(rootDir, dir);
-    const prefix = relativeDir ? `${toPosixPath(relativeDir)}/` : "";
-    for (const filename of IGNORE_FILE_NAMES) {
-        const ignorePath = join(dir, filename);
-        if (!existsSync(ignorePath))
-            continue;
-        try {
-            const content = readFileSync(ignorePath, "utf-8");
-            const patterns = content
-                .split(/\r?\n/)
-                .map((line) => prefixIgnorePattern(line, prefix))
-                .filter((line) => Boolean(line));
-            if (patterns.length > 0) {
-                ig.add(patterns);
-            }
-        }
-        catch { }
-    }
-}
 function isPattern(s) {
     return s.startsWith("!") || s.startsWith("+") || s.startsWith("-") || s.includes("*") || s.includes("?");
 }
@@ -147,116 +110,17 @@ function splitPatterns(entries) {
     }
     return { plain, patterns };
 }
-function collectFiles(dir, filePattern, skipNodeModules = true, ignoreMatcher, rootDir) {
-    const files = [];
-    if (!existsSync(dir))
-        return files;
-    const root = rootDir ?? dir;
-    const ig = ignoreMatcher ?? ignore();
-    addIgnoreRules(ig, dir, root);
-    try {
-        const entries = readdirSync(dir, { withFileTypes: true });
-        for (const entry of entries) {
-            if (entry.name.startsWith("."))
-                continue;
-            if (skipNodeModules && 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));
-            const ignorePath = isDir ? `${relPath}/` : relPath;
-            if (ig.ignores(ignorePath))
-                continue;
-            if (isDir) {
-                files.push(...collectFiles(fullPath, filePattern, skipNodeModules, ig, root));
-            }
-            else if (isFile && filePattern.test(entry.name)) {
-                files.push(fullPath);
-            }
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-    return files;
-}
-function collectSkillEntries(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 !== "SKILL.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(...collectSkillEntries(fullPath, mode, ig, root));
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-    return entries;
+function collectFiles(dir, filePattern, skipNodeModules = true) {
+    return collectResourceFilesRecursively(dir, (entry) => filePattern.test(entry.name), {
+        followSymbolicLinks: true,
+        ignoreMatcher: createResourceIgnoreMatcher(),
+        rootDir: dir,
+        skipHidden: true,
+        skipNodeModules,
+    });
 }
 function collectAutoSkillEntries(dir, mode) {
-    return collectSkillEntries(dir, mode);
+    return discoverSkillFiles(dir, mode);
 }
 function findGitRepoRoot(startDir) {
     let dir = resolve(startDir);
@@ -289,77 +153,22 @@ function collectAncestorAgentsSkillDirs(startDir) {
     }
     return skillDirs;
 }
+function collectAutoFileEntries(dir, extension) {
+    return readResourceDirectory(dir, {
+        followSymbolicLinks: true,
+        ignoreMatcher: createResourceIgnoreMatcher(),
+        rootDir: dir,
+        skipHidden: true,
+        skipNodeModules: true,
+    })
+        .filter((entry) => entry.isFile && entry.name.endsWith(extension))
+        .map((entry) => entry.path);
+}
 function collectAutoPromptEntries(dir) {
-    const entries = [];
-    if (!existsSync(dir))
-        return entries;
-    const ig = ignore();
-    addIgnoreRules(ig, dir, dir);
-    try {
-        const dirEntries = readdirSync(dir, { withFileTypes: true });
-        for (const entry of dirEntries) {
-            if (entry.name.startsWith("."))
-                continue;
-            if (entry.name === "node_modules")
-                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(dir, fullPath));
-            if (ig.ignores(relPath))
-                continue;
-            if (isFile && entry.name.endsWith(".md")) {
-                entries.push(fullPath);
-            }
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-    return entries;
+    return collectAutoFileEntries(dir, ".md");
 }
 function collectAutoThemeEntries(dir) {
-    const entries = [];
-    if (!existsSync(dir))
-        return entries;
-    const ig = ignore();
-    addIgnoreRules(ig, dir, dir);
-    try {
-        const dirEntries = readdirSync(dir, { withFileTypes: true });
-        for (const entry of dirEntries) {
-            if (entry.name.startsWith("."))
-                continue;
-            if (entry.name === "node_modules")
-                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(dir, fullPath));
-            if (ig.ignores(relPath))
-                continue;
-            if (isFile && entry.name.endsWith(".json")) {
-                entries.push(fullPath);
-            }
-        }
-    }
-    catch {
-        // Ignore errors
-    }
-    return entries;
+    return collectAutoFileEntries(dir, ".json");
 }
 function readPiManifestFile(packageJsonPath) {
     try {
@@ -400,54 +209,28 @@ function resolveExtensionEntries(dir) {
 }
 function collectAutoExtensionEntries(dir) {
     const entries = [];
-    if (!existsSync(dir))
-        return entries;
     // First check if this directory itself has explicit extension entries (package.json or index)
     const rootEntries = resolveExtensionEntries(dir);
     if (rootEntries) {
         return rootEntries;
     }
     // Otherwise, discover extensions from directory contents
-    const ig = ignore();
-    addIgnoreRules(ig, dir, dir);
-    try {
-        const dirEntries = readdirSync(dir, { withFileTypes: true });
-        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(dir, fullPath));
-            const ignorePath = isDir ? `${relPath}/` : relPath;
-            if (ig.ignores(ignorePath))
-                continue;
-            if (isFile && (entry.name.endsWith(".ts") || entry.name.endsWith(".js"))) {
-                entries.push(fullPath);
-            }
-            else if (isDir) {
-                const resolvedEntries = resolveExtensionEntries(fullPath);
-                if (resolvedEntries) {
-                    entries.push(...resolvedEntries);
-                }
-            }
+    for (const entry of readResourceDirectory(dir, {
+        followSymbolicLinks: true,
+        ignoreMatcher: createResourceIgnoreMatcher(),
+        rootDir: dir,
+        skipHidden: true,
+        skipNodeModules: true,
+    })) {
+        if (entry.isFile && (entry.name.endsWith(".ts") || entry.name.endsWith(".js"))) {
+            entries.push(entry.path);
+        }
+        else if (entry.isDirectory) {
+            const resolvedEntries = resolveExtensionEntries(entry.path);
+            if (resolvedEntries)
+                entries.push(...resolvedEntries);
         }
     }
-    catch {
-        // Ignore errors
-    }
     return entries;
 }
 /**
@@ -456,53 +239,42 @@ function collectAutoExtensionEntries(dir) {
  */
 function collectResourceFiles(dir, resourceType) {
     if (resourceType === "skills") {
-        return collectSkillEntries(dir, "pi");
+        return discoverSkillFiles(dir, "pi");
     }
     if (resourceType === "extensions") {
         return collectAutoExtensionEntries(dir);
     }
     return collectFiles(dir, FILE_PATTERNS[resourceType]);
 }
-function matchesAnyPattern(filePath, patterns, baseDir) {
-    const rel = toPosixPath(relative(baseDir, filePath));
-    const name = basename(filePath);
-    const filePathPosix = toPosixPath(filePath);
+function getResourceMatchCandidates(filePath, baseDir) {
     const parentDir = dirname(filePath);
-    const parentRel = toPosixPath(relative(baseDir, parentDir));
-    const parentName = basename(parentDir);
-    const parentDirPosix = toPosixPath(parentDir);
+    return [
+        toPosixResourcePath(relative(baseDir, filePath)),
+        basename(filePath),
+        toPosixResourcePath(filePath),
+        toPosixResourcePath(relative(baseDir, parentDir)),
+        basename(parentDir),
+        toPosixResourcePath(parentDir),
+    ];
+}
+function matchesAnyPattern(filePath, patterns, baseDir) {
+    const candidates = getResourceMatchCandidates(filePath, baseDir);
     return patterns.some((pattern) => {
-        const normalizedPattern = toPosixPath(pattern);
-        if (matchesCompiledPattern(rel, normalizedPattern) ||
-            matchesCompiledPattern(name, normalizedPattern) ||
-            matchesCompiledPattern(filePathPosix, normalizedPattern)) {
-            return true;
-        }
-        return (matchesCompiledPattern(parentRel, normalizedPattern) ||
-            matchesCompiledPattern(parentName, normalizedPattern) ||
-            matchesCompiledPattern(parentDirPosix, normalizedPattern));
+        const normalizedPattern = toPosixResourcePath(pattern);
+        return candidates.some((candidate) => matchesCompiledPattern(candidate, normalizedPattern));
     });
 }
 function normalizeExactPattern(pattern) {
     const normalized = pattern.startsWith("./") || pattern.startsWith(".\\") ? pattern.slice(2) : pattern;
-    return toPosixPath(normalized);
+    return toPosixResourcePath(normalized);
 }
 function matchesAnyExactPattern(filePath, patterns, baseDir) {
     if (patterns.length === 0)
         return false;
-    const rel = toPosixPath(relative(baseDir, filePath));
-    const name = basename(filePath);
-    const filePathPosix = toPosixPath(filePath);
-    const parentDir = dirname(filePath);
-    const parentRel = toPosixPath(relative(baseDir, parentDir));
-    const parentName = basename(parentDir);
-    const parentDirPosix = toPosixPath(parentDir);
+    const candidates = getResourceMatchCandidates(filePath, baseDir);
     return patterns.some((pattern) => {
         const normalized = normalizeExactPattern(pattern);
-        if (normalized === rel || normalized === name || normalized === filePathPosix) {
-            return true;
-        }
-        return normalized === parentRel || normalized === parentName || normalized === parentDirPosix;
+        return candidates.includes(normalized);
     });
 }
 function getOverridePatterns(entries) {
@@ -597,12 +369,6 @@ function applyPatterns(allPaths, patterns, baseDir) {
     return new Set(result);
 }
 export class DefaultPackageManager {
-    cwd;
-    agentDir;
-    settingsManager;
-    globalNpmRoot;
-    globalNpmRootCommandKey;
-    progressCallback;
     constructor(options) {
         this.cwd = resolvePath(options.cwd);
         this.agentDir = resolvePath(options.agentDir);
@@ -611,10 +377,13 @@ export class DefaultPackageManager {
     setProgressCallback(callback) {
         this.progressCallback = callback;
     }
-    addSourceToSettings(source, options) {
+    getConfiguredPackages(options) {
         const scope = options?.local ? "project" : "user";
-        const currentSettings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
-        const currentPackages = currentSettings.packages ?? [];
+        const settings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
+        return { scope, packages: settings.packages ?? [] };
+    }
+    addSourceToSettings(source, options) {
+        const { scope, packages: currentPackages } = this.getConfiguredPackages(options);
         const normalizedSource = this.normalizePackageSourceForSettings(source, scope);
         const matchIndex = currentPackages.findIndex((existing) => this.packageSourcesMatch(existing, source, scope));
         if (matchIndex !== -1) {
@@ -643,9 +412,7 @@ export class DefaultPackageManager {
         return true;
     }
     removeSourceFromSettings(source, options) {
-        const scope = options?.local ? "project" : "user";
-        const currentSettings = scope === "project" ? this.settingsManager.getProjectSettings() : this.settingsManager.getGlobalSettings();
-        const currentPackages = currentSettings.packages ?? [];
+        const { scope, packages: currentPackages } = this.getConfiguredPackages(options);
         const nextPackages = currentPackages.filter((existing) => !this.packageSourcesMatch(existing, source, scope));
         const changed = nextPackages.length !== currentPackages.length;
         if (!changed) {
@@ -695,16 +462,8 @@ export class DefaultPackageManager {
         const accumulator = this.createAccumulator();
         const globalSettings = this.settingsManager.getGlobalSettings();
         const projectSettings = this.settingsManager.getProjectSettings();
-        // Collect all packages with scope (project first so cwd resources win collisions)
-        const allPackages = [];
-        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);
+        const packageSources = this.dedupePackages(collectConfiguredPackageSources(globalSettings, projectSettings));
         await this.resolvePackageSources(packageSources, accumulator, onMissing);
         const globalBaseDir = this.agentDir;
         const projectBaseDir = join(this.cwd, CONFIG_DIR_NAME);
@@ -926,14 +685,7 @@ export class DefaultPackageManager {
         }
         const globalSettings = this.settingsManager.getGlobalSettings();
         const projectSettings = this.settingsManager.getProjectSettings();
-        const allPackages = [];
-        for (const pkg of projectSettings.packages ?? []) {
-            allPackages.push({ pkg, scope: "project" });
-        }
-        for (const pkg of globalSettings.packages ?? []) {
-            allPackages.push({ pkg, scope: "user" });
-        }
-        const packageSources = this.dedupePackages(allPackages);
+        const packageSources = this.dedupePackages(collectConfiguredPackageSources(globalSettings, projectSettings));
         const checks = packageSources
             .filter((entry) => entry.scope !== "temporary")
             .map((entry) => async () => {
@@ -1069,26 +821,20 @@ export class DefaultPackageManager {
     getPackageSourceString(pkg) {
         return typeof pkg === "string" ? pkg : pkg.source;
     }
-    getSourceMatchKeyForInput(source) {
-        const parsed = this.parseSource(source);
-        if (parsed.type === "npm") {
+    getParsedSourceIdentity(parsed, resolveLocal) {
+        if (parsed.type === "npm")
             return `npm:${parsed.name}`;
-        }
-        if (parsed.type === "git") {
+        if (parsed.type === "git")
             return `git:${parsed.host}/${parsed.path}`;
-        }
-        return `local:${this.resolvePath(parsed.path)}`;
+        return `local:${resolveLocal(parsed.path)}`;
+    }
+    getSourceMatchKeyForInput(source) {
+        const parsed = this.parseSource(source);
+        return this.getParsedSourceIdentity(parsed, (path) => this.resolvePath(path));
     }
     getSourceMatchKeyForSettings(source, scope) {
         const parsed = this.parseSource(source);
-        if (parsed.type === "npm") {
-            return `npm:${parsed.name}`;
-        }
-        if (parsed.type === "git") {
-            return `git:${parsed.host}/${parsed.path}`;
-        }
-        const baseDir = this.getBaseDirForScope(scope);
-        return `local:${this.resolvePathFromBase(parsed.path, baseDir)}`;
+        return this.getParsedSourceIdentity(parsed, (path) => this.resolvePathFromBase(path, this.getBaseDirForScope(scope)));
     }
     buildNoMatchingPackageMessage(source, configuredPackages) {
         const suggestion = this.findSuggestedConfiguredSource(source, configuredPackages);
@@ -1350,18 +1096,9 @@ export class DefaultPackageManager {
      */
     getPackageIdentity(source, scope) {
         const parsed = this.parseSource(source);
-        if (parsed.type === "npm") {
-            return `npm:${parsed.name}`;
-        }
-        if (parsed.type === "git") {
-            // Use host/path for identity to normalize SSH and HTTPS
-            return `git:${parsed.host}/${parsed.path}`;
-        }
-        if (scope) {
-            const baseDir = this.getBaseDirForScope(scope);
-            return `local:${this.resolvePathFromBase(parsed.path, baseDir)}`;
-        }
-        return `local:${this.resolvePath(parsed.path)}`;
+        return this.getParsedSourceIdentity(parsed, (path) => {
+            return scope ? this.resolvePathFromBase(path, this.getBaseDirForScope(scope)) : this.resolvePath(path);
+        });
     }
     /**
      * Dedupe packages: if same package identity appears in both global and project,
@@ -1478,12 +1215,7 @@ export class DefaultPackageManager {
     async installGit(source, scope) {
         const targetDir = this.getGitInstallPath(source, scope);
         if (existsSync(targetDir)) {
-            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);
+            await this.updateInstalledGitSource(source, targetDir);
             return;
         }
         const gitRoot = this.getGitInstallRoot(scope);
@@ -1506,6 +1238,9 @@ export class DefaultPackageManager {
             await this.installGit(source, scope);
             return;
         }
+        await this.updateInstalledGitSource(source, targetDir);
+    }
+    async updateInstalledGitSource(source, targetDir) {
         if (source.ref) {
             await this.ensureGitRef(targetDir, ["fetch", "origin", source.ref], "FETCH_HEAD");
             return;