@aspruyt/xfg 3.9.14 → 3.10.0

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, 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, 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.d.ts

@@ -1,5 +1,5 @@
-import type { RawConfig, Config, RepoSettings, RawRepoSettings } from "./types.js";
-export declare function mergeSettings(root: RawRepoSettings | undefined, perRepo: RawRepoSettings | undefined): RepoSettings | undefined;
+import type { RawConfig, Config, RepoSettings, RawRootSettings, RawRepoSettings } from "./types.js";
+export declare function mergeSettings(root: RawRootSettings | undefined, perRepo: RawRepoSettings | undefined): RepoSettings | undefined;
 /**
  * Normalizes raw config into expanded, merged config.
  * Pipeline: expand git arrays -> merge content -> interpolate env vars

package/dist/config/normalizer.js

@@ -26,6 +26,7 @@ function mergePROptions(global, perRepo) {
     const mergeStrategy = perRepo.mergeStrategy ?? global.mergeStrategy;
     const deleteBranch = perRepo.deleteBranch ?? global.deleteBranch;
     const bypassReason = perRepo.bypassReason ?? global.bypassReason;
+    const labels = perRepo.labels ?? global.labels;
     if (merge !== undefined)
         result.merge = merge;
     if (mergeStrategy !== undefined)
@@ -34,6 +35,8 @@ function mergePROptions(global, perRepo) {
         result.deleteBranch = deleteBranch;
     if (bypassReason !== undefined)
         result.bypassReason = bypassReason;
+    if (labels !== undefined)
+        result.labels = labels;
     return Object.keys(result).length > 0 ? result : undefined;
 }
 /**

package/dist/config/types.d.ts

@@ -6,6 +6,7 @@ export interface PRMergeOptions {
     mergeStrategy?: MergeStrategy;
     deleteBranch?: boolean;
     bypassReason?: string;
+    labels?: string[];
 }
 /** Ruleset target type */
 export type RulesetTarget = "branch" | "tag";
@@ -304,6 +305,12 @@ export interface RawRepoFileOverride {
     vars?: Record<string, string>;
     deleteOrphaned?: boolean;
 }
+export interface RawRootSettings {
+    rulesets?: Record<string, Ruleset | false>;
+    repo?: GitHubRepoSettings | false;
+    labels?: Record<string, Label | false>;
+    deleteOrphaned?: boolean;
+}
 export interface RawRepoSettings {
     rulesets?: Record<string, Ruleset | false> & {
         inherit?: boolean;
@@ -334,7 +341,7 @@ export interface RawConfig {
     prTemplate?: string;
     githubHosts?: string[];
     deleteOrphaned?: boolean;
-    settings?: RawRepoSettings;
+    settings?: RawRootSettings;
 }
 export interface FileContent {
     fileName: string;

package/dist/config/validator.d.ts

@@ -1,4 +1,4 @@
-import type { RawConfig, RawRepoSettings } from "./types.js";
+import type { RawConfig, RawRepoSettings, RawRootSettings } from "./types.js";
 /**
  * Validates settings object containing rulesets, labels, and repo settings.
  */
@@ -16,7 +16,7 @@ export declare function validateForSync(config: RawConfig): void;
 /**
  * Checks if settings contain actionable configuration.
  */
-export declare function hasActionableSettings(settings: RawRepoSettings | undefined): boolean;
+export declare function hasActionableSettings(settings: RawRootSettings | RawRepoSettings | undefined): boolean;
 /**
  * Validates that config is suitable for the settings command.
  * @throws Error if no settings are defined or no actionable settings exist

package/dist/config/validator.js

@@ -274,6 +274,17 @@ export function validateRawConfig(config) {
             }
         }
     }
+    // Validate prOptions.labels if present
+    if (config.prOptions?.labels !== undefined) {
+        if (!Array.isArray(config.prOptions.labels)) {
+            throw new Error("prOptions.labels must be an array of strings");
+        }
+        for (const label of config.prOptions.labels) {
+            if (typeof label !== "string" || label.length === 0) {
+                throw new Error("prOptions.labels entries must be non-empty strings");
+            }
+        }
+    }
     // Validate each repo
     for (let i = 0; i < config.repos.length; i++) {
         const repo = config.repos[i];

package/dist/lifecycle/github-lifecycle-provider.js

@@ -1,6 +1,6 @@
 import { escapeShellArg } from "../shared/shell-utils.js";
 import { defaultExecutor, } from "../shared/command-executor.js";
-import { withRetry } from "../shared/retry-utils.js";
+import { withRetry, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "../shared/retry-utils.js";
 import { isGitHubRepo, } from "../shared/repo-detector.js";
 import { logger } from "../shared/logger.js";
 /**
@@ -304,11 +304,20 @@ export class GitHubLifecycleProvider {
         const hostnameFlag = getHostnameFlag(repoInfo);
         const hostnamePart = hostnameFlag ? `${hostnameFlag} ` : "";
         const apiPath = `repos/${escapeShellArg(repoInfo.owner)}/${escapeShellArg(repoInfo.repo)}`;
+        // After repo creation, GitHub may return 404 due to eventual consistency.
+        // Exclude 404/not-found from permanent errors so withRetry retries them.
+        const postCreatePermanentPatterns = DEFAULT_PERMANENT_ERROR_PATTERNS.filter((p) => !p.test("404 Not Found"));
         // Get the SHA of the README.md created by --add-readme
-        const fileInfo = await withRetry(() => this.executor.exec(`${tokenPrefix}gh api ${hostnamePart}${apiPath}/contents/README.md --jq '.sha'`, this.cwd), { retries: this.retries });
+        const fileInfo = await withRetry(() => this.executor.exec(`${tokenPrefix}gh api ${hostnamePart}${apiPath}/contents/README.md --jq '.sha'`, this.cwd), {
+            retries: this.retries,
+            permanentErrorPatterns: postCreatePermanentPatterns,
+        });
         const sha = fileInfo.trim();
         // Delete the README.md to leave the repo clean
         await withRetry(() => this.executor.exec(`${tokenPrefix}gh api ${hostnamePart}${apiPath}/contents/README.md ` +
-            `--method DELETE -f message='Remove initialization file' -f sha=${escapeShellArg(sha)}`, this.cwd), { retries: this.retries });
+            `--method DELETE -f message='Remove initialization file' -f sha=${escapeShellArg(sha)}`, this.cwd), {
+            retries: this.retries,
+            permanentErrorPatterns: postCreatePermanentPatterns,
+        });
     }
 }

package/dist/sync/pr-merge-handler.js

@@ -17,6 +17,7 @@ export class PRMergeHandler {
             prTemplate: options.prTemplate,
             executor: options.executor,
             token: options.token,
+            labels: repoConfig.prOptions?.labels,
         });
         const mergeMode = repoConfig.prOptions?.merge ?? "auto";
         let mergeResult;

package/dist/vcs/github-pr-strategy.js

@@ -114,7 +114,7 @@ export class GitHubPRStrategy extends BasePRStrategy {
         }
     }
     async create(options) {
-        const { repoInfo, title, body, branchName, baseBranch, workDir, retries = 3, token, } = options;
+        const { repoInfo, title, body, branchName, baseBranch, workDir, retries = 3, token, labels, } = options;
         if (!isGitHubRepo(repoInfo)) {
             throw new Error("Expected GitHub repository");
         }
@@ -123,7 +123,13 @@ export class GitHubPRStrategy extends BasePRStrategy {
         writeFileSync(bodyFile, body, "utf-8");
         // Token is passed via env var to avoid shell injection
         const tokenEnv = buildTokenEnv(token);
-        const command = `gh pr create --title ${escapeShellArg(title)} --body-file ${escapeShellArg(bodyFile)} --base ${escapeShellArg(baseBranch)} --head ${escapeShellArg(branchName)}`;
+        let command = `gh pr create --title ${escapeShellArg(title)} --body-file ${escapeShellArg(bodyFile)} --base ${escapeShellArg(baseBranch)} --head ${escapeShellArg(branchName)}`;
+        // Append label flags
+        if (labels && labels.length > 0) {
+            for (const label of labels) {
+                command += ` --label ${escapeShellArg(label)}`;
+            }
+        }
         try {
             const result = await withRetry(() => this.executor.exec(command, workDir, { env: tokenEnv }), { retries });
             // Extract URL from output - use strict regex for valid PR URLs only

package/dist/vcs/pr-creator.d.ts

@@ -21,6 +21,8 @@ export interface PROptions {
     executor?: ICommandExecutor;
     /** GitHub App installation token for authentication */
     token?: string;
+    /** Labels to apply to the created PR */
+    labels?: string[];
 }
 export interface PRResult {
     url?: string;

package/dist/vcs/pr-creator.js

@@ -97,7 +97,7 @@ export function formatPRTitle(files) {
     return `chore: sync ${changedFiles.length} config files`;
 }
 export async function createPR(options) {
-    const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, token, } = options;
+    const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, token, labels, } = options;
     const title = formatPRTitle(files);
     const body = formatPRBody(files, repoInfo, prTemplate);
     if (dryRun) {
@@ -117,6 +117,7 @@ export async function createPR(options) {
         workDir,
         retries,
         token,
+        labels,
     });
 }
 export async function mergePR(options) {

package/dist/vcs/types.d.ts

@@ -25,6 +25,8 @@ export interface PRStrategyOptions {
     retries?: number;
     /** GitHub App installation token for authentication */
     token?: string;
+    /** Labels to apply to the created PR */
+    labels?: string[];
 }
 export interface MergeOptions {
     prUrl: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.9.14",
+  "version": "3.10.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",