@aspruyt/xfg 3.12.0 → 3.13.0

package/dist/config/file-reference-resolver.js

@@ -120,6 +120,26 @@ export function resolveFileReferencesInConfig(raw, options) {
             }
         }
     }
+    // Resolve group-level file content
+    if (result.groups) {
+        for (const [groupName, group] of Object.entries(result.groups)) {
+            if (group.files) {
+                for (const [fileName, fileConfig] of Object.entries(group.files)) {
+                    if (fileConfig &&
+                        typeof fileConfig === "object" &&
+                        "content" in fileConfig) {
+                        const resolved = resolveContentValue(fileConfig.content, configDir);
+                        if (resolved !== undefined) {
+                            result.groups[groupName].files[fileName] = {
+                                ...fileConfig,
+                                content: resolved,
+                            };
+                        }
+                    }
+                }
+            }
+        }
+    }
     // Resolve per-repo file content
     if (result.repos) {
         for (const repo of result.repos) {

package/dist/config/index.d.ts

@@ -1,4 +1,4 @@
-export type { MergeMode, MergeStrategy, PRMergeOptions, RulesetTarget, RulesetEnforcement, BypassActorType, BypassMode, PatternOperator, MergeMethod, AlertsThreshold, SecurityAlertsThreshold, BypassActor, RefNameCondition, RulesetConditions, StatusCheckConfig, RequiredReviewer, CodeScanningTool, WorkflowConfig, PullRequestRuleParameters, RequiredStatusChecksParameters, UpdateRuleParameters, RequiredDeploymentsParameters, CodeScanningParameters, CodeQualityParameters, WorkflowsParameters, PatternRuleParameters, FilePathRestrictionParameters, FileExtensionRestrictionParameters, MaxFilePathLengthParameters, MaxFileSizeParameters, PullRequestRule, RequiredStatusChecksRule, RequiredSignaturesRule, RequiredLinearHistoryRule, NonFastForwardRule, CreationRule, UpdateRule, DeletionRule, RequiredDeploymentsRule, CodeScanningRule, CodeQualityRule, WorkflowsRule, CommitAuthorEmailPatternRule, CommitMessagePatternRule, CommitterEmailPatternRule, BranchNamePatternRule, TagNamePatternRule, FilePathRestrictionRule, FileExtensionRestrictionRule, MaxFilePathLengthRule, MaxFileSizeRule, RulesetRule, Ruleset, SquashMergeCommitTitle, SquashMergeCommitMessage, MergeCommitTitle, MergeCommitMessage, RepoVisibility, GitHubRepoSettings, Label, RepoSettings, ContentValue, RawFileConfig, RawRepoFileOverride, RawRootSettings, RawRepoSettings, RawRepoConfig, RawConfig, FileContent, RepoConfig, Config, } from "./types.js";
+export type { MergeMode, MergeStrategy, PRMergeOptions, RulesetTarget, RulesetEnforcement, BypassActorType, BypassMode, PatternOperator, MergeMethod, AlertsThreshold, SecurityAlertsThreshold, BypassActor, RefNameCondition, RulesetConditions, StatusCheckConfig, RequiredReviewer, CodeScanningTool, WorkflowConfig, PullRequestRuleParameters, RequiredStatusChecksParameters, UpdateRuleParameters, RequiredDeploymentsParameters, CodeScanningParameters, CodeQualityParameters, WorkflowsParameters, PatternRuleParameters, FilePathRestrictionParameters, FileExtensionRestrictionParameters, MaxFilePathLengthParameters, MaxFileSizeParameters, PullRequestRule, RequiredStatusChecksRule, RequiredSignaturesRule, RequiredLinearHistoryRule, NonFastForwardRule, CreationRule, UpdateRule, DeletionRule, RequiredDeploymentsRule, CodeScanningRule, CodeQualityRule, WorkflowsRule, CommitAuthorEmailPatternRule, CommitMessagePatternRule, CommitterEmailPatternRule, BranchNamePatternRule, TagNamePatternRule, FilePathRestrictionRule, FileExtensionRestrictionRule, MaxFilePathLengthRule, MaxFileSizeRule, RulesetRule, Ruleset, SquashMergeCommitTitle, SquashMergeCommitMessage, MergeCommitTitle, MergeCommitMessage, RepoVisibility, GitHubRepoSettings, Label, RepoSettings, ContentValue, RawFileConfig, RawRepoFileOverride, RawGroupConfig, RawRootSettings, RawRepoSettings, RawRepoConfig, RawConfig, FileContent, RepoConfig, Config, } from "./types.js";
 export { RULESET_FIELD_MAP, RULESET_COMPARABLE_FIELDS } from "./types.js";
 export { loadRawConfig, loadConfig, normalizeConfig } from "./loader.js";
 export { convertContentToString, detectOutputFormat, type OutputFormat, type ConvertOptions, } from "./formatter.js";

package/dist/config/normalizer.js

@@ -1,5 +1,12 @@
 import { deepMerge, stripMergeDirectives, createMergeContext, isTextContent, mergeTextContent, } from "./merge.js";
 import { interpolateContent } from "../shared/env.js";
+/**
+ * Checks whether an object's `inherit` property is not explicitly set to false.
+ * Replaces the repeated `(x )?.inherit !== false` pattern.
+ */
+function shouldInherit(obj) {
+    return obj?.inherit !== false;
+}
 /**
  * Normalizes header to array format.
  */
@@ -67,7 +74,7 @@ function mergeLabels(rootLabels, repoLabels) {
         return undefined;
     const root = rootLabels ?? {};
     const repo = repoLabels ?? {};
-    const inheritLabels = repo?.inherit !== false;
+    const inheritLabels = shouldInherit(repo);
     const allLabelNames = new Set([
         ...Object.keys(root).filter((name) => name !== "inherit"),
         ...Object.keys(repo).filter((name) => name !== "inherit"),
@@ -100,7 +107,7 @@ export function mergeSettings(root, perRepo) {
     const rootRulesets = root?.rulesets ?? {};
     const repoRulesets = perRepo?.rulesets ?? {};
     // Check if repo opts out of all inherited rulesets
-    const inheritRulesets = repoRulesets?.inherit !== false;
+    const inheritRulesets = shouldInherit(repoRulesets);
     const allRulesetNames = new Set([
         ...Object.keys(rootRulesets).filter((name) => name !== "inherit"),
         ...Object.keys(repoRulesets).filter((name) => name !== "inherit"),
@@ -152,21 +159,196 @@ export function mergeSettings(root, perRepo) {
     }
     return Object.keys(result).length > 0 ? result : undefined;
 }
+/**
+ * Merges group file layers onto root files, producing an effective root file map.
+ * Each group layer is processed in order: inherit:false clears accumulated,
+ * file:false removes a file, otherwise deep-merge content.
+ */
+function mergeGroupFiles(rootFiles, groupNames, groupDefs) {
+    let accumulated = structuredClone(rootFiles);
+    for (const groupName of groupNames) {
+        const group = groupDefs[groupName];
+        if (!group?.files)
+            continue;
+        const inheritFiles = shouldInherit(group.files);
+        if (!inheritFiles) {
+            // Intentionally clear: "discard everything above me"
+            accumulated = {};
+        }
+        for (const [fileName, fileConfig] of Object.entries(group.files)) {
+            if (fileName === "inherit")
+                continue;
+            // file: false removes from accumulated set
+            if (fileConfig === false) {
+                delete accumulated[fileName];
+                continue;
+            }
+            if (fileConfig === undefined)
+                continue;
+            const existing = accumulated[fileName];
+            if (existing) {
+                // Deep-merge content if both sides have object content
+                const overlay = fileConfig;
+                let mergedContent;
+                if (overlay.override || !existing.content || !overlay.content) {
+                    // override:true or one side missing content — use overlay content
+                    mergedContent = overlay.content ?? existing.content;
+                }
+                else if (isTextContent(existing.content) &&
+                    isTextContent(overlay.content)) {
+                    mergedContent = mergeTextContent(existing.content, overlay.content, existing.mergeStrategy ?? "replace");
+                }
+                else if (!isTextContent(existing.content) &&
+                    !isTextContent(overlay.content)) {
+                    const ctx = createMergeContext(existing.mergeStrategy ?? "replace");
+                    mergedContent = deepMerge(structuredClone(existing.content), overlay.content, ctx);
+                    mergedContent = stripMergeDirectives(mergedContent);
+                }
+                else {
+                    // Type mismatch — overlay wins
+                    mergedContent = overlay.content;
+                }
+                const { override: _override, ...restFileConfig } = fileConfig;
+                accumulated[fileName] = {
+                    ...existing,
+                    ...restFileConfig,
+                    content: mergedContent,
+                };
+            }
+            else {
+                // New file introduced by group
+                accumulated[fileName] = structuredClone(fileConfig);
+            }
+        }
+    }
+    return accumulated;
+}
+/**
+ * Merges group PR options layers onto root PR options.
+ */
+function mergeGroupPROptions(rootPR, groupNames, groupDefs) {
+    let accumulated = rootPR;
+    for (const name of groupNames) {
+        const group = groupDefs[name];
+        if (group?.prOptions) {
+            accumulated = mergePROptions(accumulated, group.prOptions);
+        }
+    }
+    return accumulated;
+}
+/**
+ * Merges two raw settings layers (root/group into accumulated).
+ * Unlike mergeSettings(), this operates on raw types and returns raw types,
+ * preserving false values and inherit keys for downstream processing.
+ * The final accumulated result feeds into the existing mergeSettings(accumulated, repoSettings).
+ */
+function mergeRawSettings(base, overlay) {
+    if (!base && !overlay)
+        return undefined;
+    if (!overlay)
+        return structuredClone(base);
+    const result = base ? structuredClone(base) : {};
+    // Merge rulesets
+    if (overlay.rulesets) {
+        const inheritRulesets = shouldInherit(overlay.rulesets);
+        if (!inheritRulesets) {
+            // Discard accumulated rulesets, start fresh with overlay's own
+            result.rulesets = {};
+        }
+        if (!result.rulesets)
+            result.rulesets = {};
+        for (const [name, ruleset] of Object.entries(overlay.rulesets)) {
+            if (name === "inherit")
+                continue;
+            if (ruleset === false) {
+                result.rulesets[name] = false;
+            }
+            else if (typeof ruleset === "object") {
+                const existing = result.rulesets[name];
+                result.rulesets[name] = existing
+                    ? mergeRuleset(existing, ruleset)
+                    : structuredClone(ruleset);
+            }
+        }
+    }
+    // Merge repo settings: overlay replaces base (shallow merge, same as mergeSettings)
+    if (overlay.repo !== undefined) {
+        if (overlay.repo === false) {
+            result.repo = false;
+        }
+        else {
+            result.repo = {
+                ...(result.repo === false ? {} : result.repo),
+                ...overlay.repo,
+            };
+        }
+    }
+    // Merge labels
+    if (overlay.labels) {
+        const inheritLabels = shouldInherit(overlay.labels);
+        if (!inheritLabels) {
+            result.labels = {};
+        }
+        if (!result.labels)
+            result.labels = {};
+        for (const [name, label] of Object.entries(overlay.labels)) {
+            if (name === "inherit")
+                continue;
+            if (label === false) {
+                result.labels[name] = false;
+            }
+            else if (typeof label === "object") {
+                const existing = result.labels[name];
+                result.labels[name] = {
+                    ...(existing && typeof existing === "object" ? existing : {}),
+                    ...label,
+                };
+            }
+        }
+    }
+    // deleteOrphaned: overlay wins
+    if (overlay.deleteOrphaned !== undefined) {
+        result.deleteOrphaned = overlay.deleteOrphaned;
+    }
+    return result;
+}
+/**
+ * Merges group settings layers onto root settings.
+ */
+function mergeGroupSettings(rootSettings, groupNames, groupDefs) {
+    let accumulated = rootSettings;
+    for (const name of groupNames) {
+        const group = groupDefs[name];
+        if (group?.settings) {
+            accumulated = mergeRawSettings(accumulated, group.settings);
+        }
+    }
+    return accumulated;
+}
 /**
  * Normalizes raw config into expanded, merged config.
  * Pipeline: expand git arrays -> merge content -> interpolate env vars
  */
 export function normalizeConfig(raw) {
     const expandedRepos = [];
-    const fileNames = raw.files ? Object.keys(raw.files) : [];
     for (const rawRepo of raw.repos) {
         // Step 1: Expand git arrays
         const gitUrls = Array.isArray(rawRepo.git) ? rawRepo.git : [rawRepo.git];
+        // Resolve groups: build effective root files/prOptions/settings by merging group layers
+        const effectiveRootFiles = rawRepo.groups?.length
+            ? mergeGroupFiles(raw.files ?? {}, rawRepo.groups, raw.groups ?? {})
+            : (raw.files ?? {});
+        const effectivePROptions = rawRepo.groups?.length
+            ? mergeGroupPROptions(raw.prOptions, rawRepo.groups, raw.groups ?? {})
+            : raw.prOptions;
+        const effectiveSettings = rawRepo.groups?.length
+            ? mergeGroupSettings(raw.settings, rawRepo.groups, raw.groups ?? {})
+            : raw.settings;
+        const fileNames = Object.keys(effectiveRootFiles);
         for (const gitUrl of gitUrls) {
             const files = [];
             // Check if repo opts out of all inherited files
-            const inheritFiles = rawRepo.files?.inherit !==
-                false;
+            const inheritFiles = shouldInherit(rawRepo.files);
             // Step 2: Process each file definition
             for (const fileName of fileNames) {
                 // Skip reserved key
@@ -181,7 +363,7 @@ export function normalizeConfig(raw) {
                 if (!inheritFiles && !repoOverride) {
                     continue;
                 }
-                const fileConfig = raw.files[fileName];
+                const fileConfig = effectiveRootFiles[fileName];
                 const fileStrategy = fileConfig.mergeStrategy ?? "replace";
                 // Step 3: Compute merged content for this file
                 let mergedContent;
@@ -263,10 +445,10 @@ export function normalizeConfig(raw) {
                     deleteOrphaned,
                 });
             }
-            // Merge PR options: per-repo overrides global
-            const prOptions = mergePROptions(raw.prOptions, rawRepo.prOptions);
-            // Merge settings: per-repo deep merges with root settings
-            const settings = mergeSettings(raw.settings, rawRepo.settings);
+            // Merge PR options: per-repo overrides effective (root + groups)
+            const prOptions = mergePROptions(effectivePROptions, rawRepo.prOptions);
+            // Merge settings: per-repo deep merges with effective (root + groups)
+            const settings = mergeSettings(effectiveSettings, rawRepo.settings);
             expandedRepos.push({
                 git: gitUrl,
                 files,

package/dist/config/types.d.ts

@@ -305,6 +305,13 @@ export interface RawRepoFileOverride {
     vars?: Record<string, string>;
     deleteOrphaned?: boolean;
 }
+export interface RawGroupConfig {
+    files?: Record<string, RawFileConfig | RawRepoFileOverride | false> & {
+        inherit?: boolean;
+    };
+    prOptions?: PRMergeOptions;
+    settings?: RawRepoSettings;
+}
 export interface RawRootSettings {
     rulesets?: Record<string, Ruleset | false>;
     repo?: GitHubRepoSettings | false;
@@ -326,6 +333,7 @@ export interface RawRepoConfig {
     files?: Record<string, RawRepoFileOverride | false> & {
         inherit?: boolean;
     };
+    groups?: string[];
     prOptions?: PRMergeOptions;
     settings?: RawRepoSettings;
     /** Fork upstream repo if target doesn't exist */
@@ -336,6 +344,7 @@ export interface RawRepoConfig {
 export interface RawConfig {
     id: string;
     files?: Record<string, RawFileConfig>;
+    groups?: Record<string, RawGroupConfig>;
     repos: RawRepoConfig[];
     prOptions?: PRMergeOptions;
     prTemplate?: string;

package/dist/config/validator.js

@@ -155,12 +155,21 @@ export function validateRawConfig(config) {
     if (config.id.length > CONFIG_ID_MAX_LENGTH) {
         throw new Error(`Config 'id' exceeds maximum length of ${CONFIG_ID_MAX_LENGTH} characters`);
     }
-    // Validate at least one of files or settings exists
+    // Validate at least one of files or settings exists (including in groups)
     const hasFiles = config.files &&
         typeof config.files === "object" &&
         Object.keys(config.files).length > 0;
     const hasSettings = config.settings && typeof config.settings === "object";
-    if (!hasFiles && !hasSettings) {
+    const hasGroupFiles = config.groups &&
+        typeof config.groups === "object" &&
+        !Array.isArray(config.groups) &&
+        Object.values(config.groups).some((g) => g.files &&
+            Object.keys(g.files).filter((k) => k !== "inherit" && g.files[k] !== false).length > 0);
+    const hasGroupSettings = config.groups &&
+        typeof config.groups === "object" &&
+        !Array.isArray(config.groups) &&
+        Object.values(config.groups).some((g) => g.settings && typeof g.settings === "object");
+    if (!hasFiles && !hasSettings && !hasGroupFiles && !hasGroupSettings) {
         throw new Error("Config requires at least one of: 'files' or 'settings'. " +
             "Use 'files' to sync configuration files, or 'settings' to manage repository settings.");
     }
@@ -285,6 +294,56 @@ export function validateRawConfig(config) {
             }
         }
     }
+    // Validate groups
+    if (config.groups !== undefined) {
+        if (typeof config.groups !== "object" ||
+            config.groups === null ||
+            Array.isArray(config.groups)) {
+            throw new Error("groups must be an object");
+        }
+        const rootRulesetNames = config.settings?.rulesets
+            ? Object.keys(config.settings.rulesets).filter((k) => k !== "inherit")
+            : [];
+        const hasRootRepoSettings = config.settings?.repo !== undefined && config.settings.repo !== false;
+        const rootLabelNames = config.settings?.labels
+            ? Object.keys(config.settings.labels).filter((k) => k !== "inherit")
+            : [];
+        for (const [groupName, group] of Object.entries(config.groups)) {
+            if (groupName === "inherit") {
+                throw new Error("'inherit' is a reserved key and cannot be used as a group name");
+            }
+            // Validate group files
+            if (group.files) {
+                for (const [fileName, fileConfig] of Object.entries(group.files)) {
+                    if (fileName === "inherit")
+                        continue;
+                    if (fileConfig === false)
+                        continue;
+                    if (fileConfig === undefined)
+                        continue;
+                    const fc = fileConfig;
+                    if (fc.content !== undefined) {
+                        const hasText = isTextContent(fc.content);
+                        const hasObject = isObjectContent(fc.content);
+                        if (!hasText && !hasObject) {
+                            throw new Error(`groups.${groupName}: file '${fileName}' content must be an object, string, or array of strings`);
+                        }
+                        const isStructured = isStructuredFileExtension(fileName);
+                        if (isStructured && hasText) {
+                            throw new Error(`groups.${groupName}: file '${fileName}' has JSON/YAML extension but string content`);
+                        }
+                        if (!isStructured && hasObject) {
+                            throw new Error(`groups.${groupName}: file '${fileName}' has text extension but object content`);
+                        }
+                    }
+                }
+            }
+            // Validate group settings
+            if (group.settings !== undefined) {
+                validateSettings(group.settings, `groups.${groupName}`, rootRulesetNames, hasRootRepoSettings, rootLabelNames);
+            }
+        }
+    }
     // Validate each repo
     for (let i = 0; i < config.repos.length; i++) {
         const repo = config.repos[i];
@@ -321,11 +380,41 @@ export function validateRawConfig(config) {
                     `Migration from GitHub is not supported. Currently supported sources: Azure DevOps`);
             }
         }
+        // Validate per-repo groups
+        if (repo.groups !== undefined) {
+            if (!Array.isArray(repo.groups) ||
+                !repo.groups.every((g) => typeof g === "string")) {
+                throw new Error(`Repo at index ${i}: groups must be an array of strings`);
+            }
+            const seen = new Set();
+            for (const groupName of repo.groups) {
+                if (!config.groups || !config.groups[groupName]) {
+                    throw new Error(`Repo at index ${i}: group '${groupName}' is not defined in root 'groups'`);
+                }
+                if (seen.has(groupName)) {
+                    throw new Error(`Repo at index ${i}: duplicate group '${groupName}'`);
+                }
+                seen.add(groupName);
+            }
+        }
         // Validate per-repo file overrides
         if (repo.files) {
             if (typeof repo.files !== "object" || Array.isArray(repo.files)) {
                 throw new Error(`Repo at index ${i}: files must be an object`);
             }
+            // Build the set of known files once per repo (root + referenced groups)
+            const knownFiles = new Set(config.files ? Object.keys(config.files) : []);
+            if (repo.groups && config.groups) {
+                for (const groupName of repo.groups) {
+                    const group = config.groups[groupName];
+                    if (group?.files) {
+                        for (const fn of Object.keys(group.files)) {
+                            if (fn !== "inherit")
+                                knownFiles.add(fn);
+                        }
+                    }
+                }
+            }
             for (const fileName of Object.keys(repo.files)) {
                 // Skip reserved key 'inherit'
                 if (fileName === "inherit") {
@@ -335,9 +424,9 @@ export function validateRawConfig(config) {
                     }
                     continue;
                 }
-                // Ensure the file is defined at root level
-                if (!config.files || !config.files[fileName]) {
-                    throw new Error(`Repo at index ${i} references undefined file '${fileName}'. File must be defined in root 'files' object.`);
+                // Ensure the file is defined at root level or in a referenced group
+                if (!knownFiles.has(fileName)) {
+                    throw new Error(`Repo at index ${i} references undefined file '${fileName}'. File must be defined in root 'files' object or in a referenced group.`);
                 }
                 const fileOverride = repo.files[fileName];
                 // false means exclude this file for this repo - no further validation needed
@@ -414,6 +503,24 @@ export function validateRawConfig(config) {
             const rootLabelNames = config.settings?.labels
                 ? Object.keys(config.settings.labels).filter((k) => k !== "inherit")
                 : [];
+            // Augment known names with those from the repo's referenced groups
+            if (repo.groups && config.groups) {
+                for (const groupName of repo.groups) {
+                    const group = config.groups[groupName];
+                    if (group?.settings?.rulesets) {
+                        for (const name of Object.keys(group.settings.rulesets)) {
+                            if (name !== "inherit")
+                                rootRulesetNames.push(name);
+                        }
+                    }
+                    if (group?.settings?.labels) {
+                        for (const name of Object.keys(group.settings.labels)) {
+                            if (name !== "inherit")
+                                rootLabelNames.push(name);
+                        }
+                    }
+                }
+            }
             validateSettings(repo.settings, `Repo ${getGitDisplayName(repo.git)}`, rootRulesetNames, hasRootRepoSettings, rootLabelNames);
         }
     }
@@ -426,13 +533,12 @@ export function validateRawConfig(config) {
  * @throws Error if files section is missing or empty
  */
 export function validateForSync(config) {
-    if (!config.files) {
-        throw new Error("The 'sync' command requires a 'files' section with at least one file defined. " +
-            "To manage repository settings instead, use 'xfg settings'.");
-    }
-    const fileNames = Object.keys(config.files);
-    if (fileNames.length === 0) {
-        throw new Error("The 'sync' command requires a 'files' section with at least one file defined. " +
+    const hasRootFiles = config.files && Object.keys(config.files).length > 0;
+    const hasGroupFiles = config.groups &&
+        Object.values(config.groups).some((g) => g.files &&
+            Object.keys(g.files).filter((k) => k !== "inherit" && g.files[k] !== false).length > 0);
+    if (!hasRootFiles && !hasGroupFiles) {
+        throw new Error("The 'sync' command requires files defined in root 'files' or in at least one group. " +
             "To manage repository settings instead, use 'xfg settings'.");
     }
 }
@@ -463,17 +569,23 @@ export function hasActionableSettings(settings) {
  * @throws Error if no settings are defined or no actionable settings exist
  */
 export function validateForSettings(config) {
-    // Check if settings exist at root or in any repo
+    // Check if settings exist at root, in any repo, or in any group
     const hasRootSettings = config.settings !== undefined;
     const hasRepoSettings = config.repos.some((repo) => repo.settings !== undefined);
-    if (!hasRootSettings && !hasRepoSettings) {
-        throw new Error("The 'settings' command requires a 'settings' section at root level or " +
-            "in at least one repo. To sync files instead, use 'xfg sync'.");
+    const hasGroupSettings = config.groups &&
+        typeof config.groups === "object" &&
+        !Array.isArray(config.groups) &&
+        Object.values(config.groups).some((g) => g.settings && typeof g.settings === "object");
+    if (!hasRootSettings && !hasRepoSettings && !hasGroupSettings) {
+        throw new Error("The 'settings' command requires a 'settings' section at root level, " +
+            "in at least one repo, or in at least one group. To sync files instead, use 'xfg sync'.");
     }
     // Check if there's at least one actionable setting
     const rootActionable = hasActionableSettings(config.settings);
     const repoActionable = config.repos.some((repo) => hasActionableSettings(repo.settings));
-    if (!rootActionable && !repoActionable) {
+    const groupActionable = config.groups &&
+        Object.values(config.groups).some((g) => hasActionableSettings(g.settings));
+    if (!rootActionable && !repoActionable && !groupActionable) {
         throw new Error("No actionable settings configured. Currently supported: rulesets, repo, labels. " +
             "To sync files instead, use 'xfg sync'. " +
             "See docs: https://anthony-spruyt.github.io/xfg/settings");

package/dist/settings/labels/github-labels-strategy.d.ts

@@ -1,6 +1,9 @@
 import { ICommandExecutor } from "../../shared/command-executor.js";
 import { RepoInfo } from "../../shared/repo-detector.js";
 import type { ILabelsStrategy, GitHubLabel, LabelsStrategyOptions } from "./types.js";
+export interface GitHubLabelsStrategyOptions {
+    retries?: number;
+}
 /**
  * GitHub Labels Strategy for managing repository labels via GitHub REST API.
  * Uses `gh api` CLI for authentication and API calls.
@@ -10,7 +13,8 @@ import type { ILabelsStrategy, GitHubLabel, LabelsStrategyOptions } from "./type
  */
 export declare class GitHubLabelsStrategy implements ILabelsStrategy {
     private executor;
-    constructor(executor?: ICommandExecutor);
+    private retries;
+    constructor(executor?: ICommandExecutor, options?: GitHubLabelsStrategyOptions);
     /**
      * Lists all labels for a repository.
      * Uses --paginate to retrieve all labels.

package/dist/settings/labels/github-labels-strategy.js

@@ -11,8 +11,10 @@ import { withRetry } from "../../shared/retry-utils.js";
  */
 export class GitHubLabelsStrategy {
     executor;
-    constructor(executor) {
+    retries;
+    constructor(executor, options) {
         this.executor = executor ?? defaultExecutor;
+        this.retries = options?.retries ?? 3;
     }
     /**
      * Lists all labels for a repository.
@@ -93,10 +95,14 @@ export class GitHubLabelsStrategy {
         if (payload && (method === "POST" || method === "PATCH")) {
             const payloadJson = JSON.stringify(payload);
             const command = `echo ${escapeShellArg(payloadJson)} | ${tokenPrefix}${baseCommand} --input -`;
-            return await withRetry(() => this.executor.exec(command, process.cwd()));
+            return await withRetry(() => this.executor.exec(command, process.cwd()), {
+                retries: this.retries,
+            });
         }
         // For GET/DELETE, run command directly
         const command = `${tokenPrefix}${baseCommand}`;
-        return await withRetry(() => this.executor.exec(command, process.cwd()));
+        return await withRetry(() => this.executor.exec(command, process.cwd()), {
+            retries: this.retries,
+        });
     }
 }

package/dist/settings/repo-settings/github-repo-settings-strategy.d.ts

@@ -2,6 +2,9 @@ import { ICommandExecutor } from "../../shared/command-executor.js";
 import { RepoInfo } from "../../shared/repo-detector.js";
 import type { GitHubRepoSettings } from "../../config/index.js";
 import type { IRepoSettingsStrategy, RepoSettingsStrategyOptions, CurrentRepoSettings } from "./types.js";
+export interface GitHubRepoSettingsStrategyOptions {
+    retries?: number;
+}
 /**
  * GitHub Repository Settings Strategy.
  * Manages repository settings via GitHub REST API using `gh api` CLI.
@@ -10,7 +13,8 @@ import type { IRepoSettingsStrategy, RepoSettingsStrategyOptions, CurrentRepoSet
  */
 export declare class GitHubRepoSettingsStrategy implements IRepoSettingsStrategy {
     private executor;
-    constructor(executor?: ICommandExecutor);
+    private retries;
+    constructor(executor?: ICommandExecutor, options?: GitHubRepoSettingsStrategyOptions);
     getSettings(repoInfo: RepoInfo, options?: RepoSettingsStrategyOptions): Promise<CurrentRepoSettings>;
     updateSettings(repoInfo: RepoInfo, settings: GitHubRepoSettings, options?: RepoSettingsStrategyOptions): Promise<void>;
     setVulnerabilityAlerts(repoInfo: RepoInfo, enable: boolean, options?: RepoSettingsStrategyOptions): Promise<void>;

package/dist/settings/repo-settings/github-repo-settings-strategy.js

@@ -70,8 +70,10 @@ function configToGitHubPayload(settings) {
  */
 export class GitHubRepoSettingsStrategy {
     executor;
-    constructor(executor) {
+    retries;
+    constructor(executor, options) {
         this.executor = executor ?? defaultExecutor;
+        this.retries = options?.retries ?? 3;
     }
     async getSettings(repoInfo, options) {
         this.validateGitHub(repoInfo);
@@ -194,9 +196,13 @@ export class GitHubRepoSettingsStrategy {
             (method === "POST" || method === "PUT" || method === "PATCH")) {
             const payloadJson = JSON.stringify(payload);
             const command = `echo ${escapeShellArg(payloadJson)} | ${tokenPrefix}${baseCommand} --input -`;
-            return await withRetry(() => this.executor.exec(command, process.cwd()));
+            return await withRetry(() => this.executor.exec(command, process.cwd()), {
+                retries: this.retries,
+            });
         }
         const command = `${tokenPrefix}${baseCommand}`;
-        return await withRetry(() => this.executor.exec(command, process.cwd()));
+        return await withRetry(() => this.executor.exec(command, process.cwd()), {
+            retries: this.retries,
+        });
     }
 }

package/dist/settings/rulesets/github-ruleset-strategy.d.ts

@@ -47,13 +47,17 @@ export interface RulesetStrategyOptions {
     token?: string;
     host?: string;
 }
+export interface GitHubRulesetStrategyOptions {
+    retries?: number;
+}
 /**
  * GitHub Ruleset Strategy for managing repository rulesets via GitHub REST API.
  * Uses `gh api` CLI for authentication and API calls.
  */
 export declare class GitHubRulesetStrategy implements IRulesetStrategy {
     private executor;
-    constructor(executor?: ICommandExecutor);
+    private retries;
+    constructor(executor?: ICommandExecutor, options?: GitHubRulesetStrategyOptions);
     /**
      * Lists all rulesets for a repository.
      */

package/dist/settings/rulesets/github-ruleset-strategy.js

@@ -113,8 +113,10 @@ function camelToSnake(str) {
  */
 export class GitHubRulesetStrategy {
     executor;
-    constructor(executor) {
+    retries;
+    constructor(executor, options) {
         this.executor = executor ?? defaultExecutor;
+        this.retries = options?.retries ?? 3;
     }
     /**
      * Lists all rulesets for a repository.
@@ -202,10 +204,14 @@ export class GitHubRulesetStrategy {
         if (payload && (method === "POST" || method === "PUT")) {
             const payloadJson = JSON.stringify(payload);
             const command = `echo ${escapeShellArg(payloadJson)} | ${tokenPrefix}${baseCommand} --input -`;
-            return await withRetry(() => this.executor.exec(command, process.cwd()));
+            return await withRetry(() => this.executor.exec(command, process.cwd()), {
+                retries: this.retries,
+            });
         }
         // For GET/DELETE, run command directly
         const command = `${tokenPrefix}${baseCommand}`;
-        return await withRetry(() => this.executor.exec(command, process.cwd()));
+        return await withRetry(() => this.executor.exec(command, process.cwd()), {
+            retries: this.retries,
+        });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.12.0",
+  "version": "3.13.0",
   "description": "Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab — declaratively, from a single YAML config",
   "type": "module",
   "main": "dist/index.js",