@caupulican/pi-adaptative 0.80.21 → 0.80.23

package/dist/core/package-manager.js

@@ -28,6 +28,7 @@ import { CONFIG_DIR_NAME } from "../config.js";
 import { spawnProcess, spawnProcessSync } from "../utils/child-process.js";
 import { parseGitUrl } from "../utils/git.js";
 import { canonicalizePath, isLocalPath, markPathIgnoredByCloudSync, resolvePath } from "../utils/paths.js";
+import { createRollingOutputBuffer } from "./exec.js";
 import { isStdoutTakenOver } from "./output-guard.js";
 const NETWORK_TIMEOUT_MS = 10000;
 const UPDATE_CHECK_CONCURRENCY = 4;
@@ -459,11 +460,10 @@ 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 parentDir = dirname(filePath);
+    const parentRel = toPosixPath(relative(baseDir, parentDir));
+    const parentName = basename(parentDir);
+    const parentDirPosix = toPosixPath(parentDir);
     return patterns.some((pattern) => {
         const normalizedPattern = toPosixPath(pattern);
         if (minimatch(rel, normalizedPattern) ||
@@ -471,8 +471,6 @@ function matchesAnyPattern(filePath, patterns, baseDir) {
             minimatch(filePathPosix, normalizedPattern)) {
             return true;
         }
-        if (!isSkillFile)
-            return false;
         return (minimatch(parentRel, normalizedPattern) ||
             minimatch(parentName, normalizedPattern) ||
             minimatch(parentDirPosix, normalizedPattern));
@@ -488,23 +486,39 @@ 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 parentDir = dirname(filePath);
+    const parentRel = toPosixPath(relative(baseDir, parentDir));
+    const parentName = basename(parentDir);
+    const parentDirPosix = toPosixPath(parentDir);
     return patterns.some((pattern) => {
         const normalized = normalizeExactPattern(pattern);
-        if (normalized === rel || normalized === filePathPosix) {
+        if (normalized === rel || normalized === name || normalized === filePathPosix) {
             return true;
         }
-        if (!isSkillFile)
-            return false;
-        return normalized === parentRel || normalized === parentDirPosix;
+        return normalized === parentRel || normalized === parentName || normalized === parentDirPosix;
     });
 }
 function getOverridePatterns(entries) {
     return entries.filter((pattern) => pattern.startsWith("!") || pattern.startsWith("+") || pattern.startsWith("-"));
 }
+function toDisabledOverride(pattern) {
+    const trimmed = pattern.trim();
+    if (!trimmed)
+        return null;
+    if (trimmed.startsWith("!") || trimmed.startsWith("-"))
+        return trimmed;
+    if (trimmed.startsWith("+"))
+        return `-${trimmed.slice(1)}`;
+    return `!${trimmed}`;
+}
+function mergeResourceOverrides(settings, resourceType) {
+    const base = Array.isArray(settings[resourceType]) ? settings[resourceType] : [];
+    const disabledResources = settings.disabledResources;
+    const disabled = Array.isArray(disabledResources?.[resourceType])
+        ? disabledResources[resourceType].map(toDisabledOverride).filter((value) => Boolean(value))
+        : [];
+    return [...base, ...disabled];
+}
 function isEnabledByOverrides(filePath, patterns, baseDir) {
     const overrides = getOverridePatterns(patterns);
     const excludes = overrides.filter((pattern) => pattern.startsWith("!")).map((pattern) => pattern.slice(1));
@@ -1847,16 +1861,16 @@ export class DefaultPackageManager {
             baseDir: projectBaseDir,
         };
         const userOverrides = {
-            extensions: (globalSettings.extensions ?? []),
-            skills: (globalSettings.skills ?? []),
-            prompts: (globalSettings.prompts ?? []),
-            themes: (globalSettings.themes ?? []),
+            extensions: mergeResourceOverrides(globalSettings, "extensions"),
+            skills: mergeResourceOverrides(globalSettings, "skills"),
+            prompts: mergeResourceOverrides(globalSettings, "prompts"),
+            themes: mergeResourceOverrides(globalSettings, "themes"),
         };
         const projectOverrides = {
-            extensions: (projectSettings.extensions ?? []),
-            skills: (projectSettings.skills ?? []),
-            prompts: (projectSettings.prompts ?? []),
-            themes: (projectSettings.themes ?? []),
+            extensions: mergeResourceOverrides(projectSettings, "extensions"),
+            skills: mergeResourceOverrides(projectSettings, "skills"),
+            prompts: mergeResourceOverrides(projectSettings, "prompts"),
+            themes: mergeResourceOverrides(projectSettings, "themes"),
         };
         const userDirs = {
             extensions: join(globalBaseDir, "extensions"),
@@ -2008,8 +2022,11 @@ export class DefaultPackageManager {
     runCommandCapture(command, args, options) {
         return new Promise((resolvePromise, reject) => {
             const child = this.spawnCaptureCommand(command, args, options);
-            let stdout = "";
-            let stderr = "";
+            // Callers parse stdout, so a silently truncated tail would corrupt results.
+            // Bound retention and fail loudly in the (pathological) overflow case.
+            const maxCapturedOutput = 16 * 1024 * 1024;
+            const stdout = createRollingOutputBuffer(maxCapturedOutput);
+            const stderr = createRollingOutputBuffer(maxCapturedOutput);
             let timedOut = false;
             const timeout = typeof options?.timeoutMs === "number"
                 ? setTimeout(() => {
@@ -2018,10 +2035,10 @@ export class DefaultPackageManager {
                 }, options.timeoutMs)
                 : undefined;
             child.stdout?.on("data", (data) => {
-                stdout += data.toString();
+                stdout.push(data.toString());
             });
             child.stderr?.on("data", (data) => {
-                stderr += data.toString();
+                stderr.push(data.toString());
             });
             child.once("error", (error) => {
                 if (timeout)
@@ -2036,11 +2053,15 @@ export class DefaultPackageManager {
                     return;
                 }
                 if (code === 0) {
-                    resolvePromise(stdout.trim());
+                    if (stdout.truncated()) {
+                        reject(new Error(`${command} ${args.join(" ")} produced more than ${maxCapturedOutput} bytes of output`));
+                        return;
+                    }
+                    resolvePromise(stdout.text().trim());
                     return;
                 }
                 const exitStatus = code === null ? `signal ${signal ?? "unknown"}` : `code ${code}`;
-                reject(new Error(`${command} ${args.join(" ")} failed with ${exitStatus}: ${stderr || stdout}`));
+                reject(new Error(`${command} ${args.join(" ")} failed with ${exitStatus}: ${stderr.text() || stdout.text()}`));
             });
         });
     }