@aspruyt/xfg 4.0.4 → 5.0.0

package/README.md

@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: anthony-spruyt/xfg@v4
+      - uses: anthony-spruyt/xfg@v5
         with:
           config: ./sync-config.yaml
           github-token: ${{ secrets.GH_PAT }} # PAT with repo scope for cross-repo access

package/dist/cli/program.d.ts

@@ -1,2 +1,5 @@
 import { program } from "commander";
+import { MergeMode, MergeStrategy } from "../config/index.js";
+export declare function parseMergeMode(value: string): MergeMode;
+export declare function parseMergeStrategy(value: string): MergeStrategy;
 export { program };

package/dist/cli/program.js

@@ -28,30 +28,35 @@ function addSharedOptions(cmd) {
         .option("--no-delete", "Skip deletion of orphaned resources even if deleteOrphaned is configured");
 }
 // =============================================================================
-// CLI Program
+// Validators
 // =============================================================================
-program
-    .name("xfg")
-    .description("Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab")
-    .version(packageJson.version);
-// Sync command (file synchronization)
-const syncCommand = new Command("sync")
-    .description("Sync configuration files across repositories")
-    .option("-b, --branch <name>", "Override the branch name (default: chore/sync-{filename} or chore/sync-config)")
-    .option("-m, --merge <mode>", "PR merge mode: manual, auto (default, merge when checks pass), force (bypass requirements), direct (push to default branch, no PR)", (value) => {
+export function parseMergeMode(value) {
     const valid = ["manual", "auto", "force", "direct"];
     if (!valid.includes(value)) {
         throw new ValidationError(`Invalid merge mode: ${value}. Valid: ${valid.join(", ")}`);
     }
     return value;
-})
-    .option("--merge-strategy <strategy>", "Merge strategy: merge, squash (default), rebase", (value) => {
+}
+export function parseMergeStrategy(value) {
     const valid = ["merge", "squash", "rebase"];
     if (!valid.includes(value)) {
         throw new ValidationError(`Invalid merge strategy: ${value}. Valid: ${valid.join(", ")}`);
     }
     return value;
-})
+}
+// =============================================================================
+// CLI Program
+// =============================================================================
+program
+    .name("xfg")
+    .description("Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab")
+    .version(packageJson.version);
+// Sync command (file synchronization)
+const syncCommand = new Command("sync")
+    .description("Sync configuration files across repositories")
+    .option("-b, --branch <name>", "Override the branch name (default: chore/sync-{filename} or chore/sync-config)")
+    .option("-m, --merge <mode>", "PR merge mode: manual, auto (default, merge when checks pass), force (bypass requirements), direct (push to default branch, no PR)", parseMergeMode)
+    .option("--merge-strategy <strategy>", "Merge strategy: merge, squash (default), rebase", parseMergeStrategy)
     .option("--delete-branch", "Delete source branch after merge")
     .action((opts) => {
     runSync(opts).catch((error) => {

package/dist/cli/sync-command.js

@@ -11,12 +11,26 @@ import { RulesetProcessor, RepoSettingsProcessor, LabelsProcessor, GitHubRuleset
 import { ShellCommandExecutor } from "../shared/command-executor.js";
 import { Logger } from "../shared/logger.js";
 import { generateWorkspaceName } from "../shared/workspace-utils.js";
-const defaultExecutor = new ShellCommandExecutor(process.env);
-const logger = new Logger(!!(process.env.DEBUG || process.env.XFG_DEBUG));
-const cwd = process.cwd();
-const defaultRulesetProcessorFactory = () => new RulesetProcessor(new GitHubRulesetStrategy(defaultExecutor, { cwd }));
-const defaultRepoSettingsProcessorFactory = () => new RepoSettingsProcessor(new GitHubRepoSettingsStrategy(defaultExecutor, { cwd }));
-const defaultLabelsProcessorFactory = () => new LabelsProcessor(new GitHubLabelsStrategy(defaultExecutor, { cwd }));
+let _defaultExecutor;
+let _logger;
+function getDefaultExecutor() {
+    return (_defaultExecutor ??= new ShellCommandExecutor(process.env));
+}
+function getLogger() {
+    return (_logger ??= new Logger(!!(process.env.DEBUG || process.env.XFG_DEBUG)));
+}
+function createDefaultRulesetProcessorFactory() {
+    const cwd = process.cwd();
+    return () => new RulesetProcessor(new GitHubRulesetStrategy(getDefaultExecutor(), { cwd }));
+}
+function createDefaultRepoSettingsProcessorFactory() {
+    const cwd = process.cwd();
+    return () => new RepoSettingsProcessor(new GitHubRepoSettingsStrategy(getDefaultExecutor(), { cwd }));
+}
+function createDefaultLabelsProcessorFactory() {
+    const cwd = process.cwd();
+    return () => new LabelsProcessor(new GitHubLabelsStrategy(getDefaultExecutor(), { cwd }));
+}
 import { ResultsCollector } from "./results-collector.js";
 import { buildSettingsReport } from "./settings-report-builder.js";
 import { formatSettingsReportCLI } from "../output/settings-report.js";
@@ -73,22 +87,22 @@ function determineMergeOutcome(result) {
 }
 function logSettingsResult(result, label, current, repoName, settingsCollector) {
     if (result.planOutput?.lines?.length) {
-        logger.info("");
-        logger.info(`${repoName} - ${label}:`);
+        getLogger().info("");
+        getLogger().info(`${repoName} - ${label}:`);
         for (const line of result.planOutput.lines) {
-            logger.info(line);
+            getLogger().info(line);
         }
         if (result.warnings?.length) {
             for (const warning of result.warnings) {
-                logger.warn(warning);
+                getLogger().warn(warning);
             }
         }
     }
     else if (!result.skipped && result.success) {
-        logger.success(current, repoName, `${label}: ${result.message}`);
+        getLogger().success(current, repoName, `${label}: ${result.message}`);
     }
     if (!result.success && !result.skipped) {
-        logger.error(current, repoName, `${label}: ${result.message}`);
+        getLogger().error(current, repoName, `${label}: ${result.message}`);
         settingsCollector.appendError(repoName, result.message);
     }
 }
@@ -148,7 +162,7 @@ async function applyRepoSettings(ctx) {
             logSettingsResult(result, desc.label, current, repoName, settingsCollector);
         }
         catch (error) {
-            logger.error(current, repoName, `${desc.label}: ${toErrorMessage(error)}`);
+            getLogger().error(current, repoName, `${desc.label}: ${toErrorMessage(error)}`);
             settingsCollector.appendError(repoName, error);
         }
     }
@@ -156,15 +170,15 @@ async function applyRepoSettings(ctx) {
 function displayReports(reportResults, lifecycleReportInputs, settingsCollector, dryRun) {
     const lifecycleReport = buildLifecycleReport(lifecycleReportInputs);
     if (hasLifecycleChanges(lifecycleReport)) {
-        logger.log("");
+        getLogger().log("");
         for (const line of formatLifecycleReportCLI(lifecycleReport)) {
-            logger.log(line);
+            getLogger().log(line);
         }
     }
     const report = buildSyncReport(reportResults);
-    logger.log("");
+    getLogger().log("");
     for (const line of formatSyncReportCLI(report)) {
-        logger.log(line);
+        getLogger().log(line);
     }
     // Build and display settings report (if any settings were processed)
     const settingsResults = settingsCollector.getAll();
@@ -173,9 +187,9 @@ function displayReports(reportResults, lifecycleReportInputs, settingsCollector,
         settingsReport = buildSettingsReport(settingsResults);
         const settingsLines = formatSettingsReportCLI(settingsReport);
         if (settingsLines.length > 0) {
-            logger.log("");
+            getLogger().log("");
             for (const line of settingsLines) {
-                logger.log(line);
+                getLogger().log(line);
             }
         }
     }
@@ -206,7 +220,7 @@ async function processSingleRepo(repoConfig, index, ctx) {
     }
     const mergeMode = repoConfig.prOptions?.merge ?? "auto";
     if (mergeMode === "direct" && repoConfig.prOptions?.mergeStrategy) {
-        logger.warn(`mergeStrategy '${repoConfig.prOptions.mergeStrategy}' is ignored in direct mode for ${repoConfig.git}`);
+        getLogger().warn(`mergeStrategy '${repoConfig.prOptions.mergeStrategy}' is ignored in direct mode for ${repoConfig.git}`);
     }
     let repoInfo;
     try {
@@ -215,7 +229,7 @@ async function processSingleRepo(repoConfig, index, ctx) {
         });
     }
     catch (error) {
-        logger.error(current, repoConfig.git, toErrorMessage(error));
+        getLogger().error(current, repoConfig.git, toErrorMessage(error));
         ctx.reportResults.push({
             repoName: repoConfig.git,
             success: false,
@@ -227,7 +241,13 @@ async function processSingleRepo(repoConfig, index, ctx) {
     const repoName = getRepoDisplayName(repoInfo);
     const workDir = resolve(join(options.workDir ?? "./tmp", generateWorkspaceName(index)));
     const repoToken = isGitHubRepo(repoInfo)
-        ? (await resolveGitHubToken(repoInfo, ctx.tokenManager, repoName, logger, process.env.GH_TOKEN)).token
+        ? (await resolveGitHubToken({
+            repoInfo: repoInfo,
+            tokenManager: ctx.tokenManager,
+            context: repoName,
+            log: getLogger(),
+            envToken: process.env.GH_TOKEN,
+        })).token
         : undefined;
     const repo = {
         repoConfig,
@@ -273,7 +293,7 @@ async function runLifecyclePhase(repo, ctx) {
             repoSettings: ctx.config.settings?.repo,
         });
         for (const line of outputLines) {
-            logger.info(line);
+            getLogger().info(line);
         }
         const createSettings = toCreateRepoSettings(ctx.config.settings?.repo);
         ctx.lifecycleReportInputs.push({
@@ -300,7 +320,7 @@ async function runLifecyclePhase(repo, ctx) {
         return false;
     }
     catch (error) {
-        logger.error(current, repo.repoName, `Lifecycle error: ${toErrorMessage(error)}`);
+        getLogger().error(current, repo.repoName, `Lifecycle error: ${toErrorMessage(error)}`);
         ctx.reportResults.push({
             repoName: repo.repoName,
             success: false,
@@ -316,14 +336,14 @@ async function runLifecyclePhase(repo, ctx) {
 async function runFileSyncPhase(repo, ctx) {
     const current = repo.index + 1;
     try {
-        logger.progress(current, repo.repoName, "Processing...");
+        getLogger().progress(current, repo.repoName, "Processing...");
         const result = await ctx.processor.process(repo.repoConfig, repo.repoInfo, {
             branchName: ctx.branchName,
             workDir: repo.workDir,
             configId: ctx.config.id,
             dryRun: ctx.options.dryRun,
             retries: ctx.options.retries,
-            executor: defaultExecutor,
+            executor: getDefaultExecutor(),
             prTemplate: ctx.config.prTemplate,
             noDelete: ctx.options.noDelete,
             token: repo.token,
@@ -342,17 +362,17 @@ async function runFileSyncPhase(repo, ctx) {
             error: result.success ? undefined : result.message,
         });
         if (result.skipped) {
-            logger.skip(current, repo.repoName, result.message);
+            getLogger().skip(current, repo.repoName, result.message);
         }
         else if (result.success) {
-            logger.success(current, repo.repoName, result.message);
+            getLogger().success(current, repo.repoName, result.message);
         }
         else {
-            logger.error(current, repo.repoName, result.message);
+            getLogger().error(current, repo.repoName, result.message);
         }
     }
     catch (error) {
-        logger.error(current, repo.repoName, toErrorMessage(error));
+        getLogger().error(current, repo.repoName, toErrorMessage(error));
         ctx.reportResults.push({
             repoName: repo.repoName,
             success: false,
@@ -362,14 +382,17 @@ async function runFileSyncPhase(repo, ctx) {
     }
 }
 export async function runSync(options, deps = {}) {
-    const { lifecycleManager, rulesetProcessorFactory = defaultRulesetProcessorFactory, repoSettingsProcessorFactory = defaultRepoSettingsProcessorFactory, labelsProcessorFactory = defaultLabelsProcessorFactory, } = deps;
+    // Reset module-level singletons to ensure fresh state per invocation
+    _defaultExecutor = undefined;
+    _logger = undefined;
+    const { lifecycleManager, rulesetProcessorFactory = createDefaultRulesetProcessorFactory(), repoSettingsProcessorFactory = createDefaultRepoSettingsProcessorFactory(), labelsProcessorFactory = createDefaultLabelsProcessorFactory(), } = deps;
     const configPath = resolve(options.config);
     if (!existsSync(configPath)) {
         throw new ValidationError(`Config file not found: ${configPath}`);
     }
-    logger.log(`Loading config from: ${configPath}`);
+    getLogger().log(`Loading config from: ${configPath}`);
     if (options.dryRun) {
-        logger.log("Running in DRY RUN mode - no changes will be made\n");
+        getLogger().log("Running in DRY RUN mode - no changes will be made\n");
     }
     const rawConfig = loadRawConfig(configPath);
     validateForSync(rawConfig);
@@ -383,10 +406,10 @@ export async function runSync(options, deps = {}) {
     else {
         branchName = generateBranchName(fileNames);
     }
-    logger.setTotal(config.repos.length);
-    logger.log(`Found ${config.repos.length} repositories to process`);
-    logger.log(`Target files: ${formatFileNames(fileNames)}`);
-    logger.log(`Branch: ${branchName}\n`);
+    getLogger().setTotal(config.repos.length);
+    getLogger().log(`Found ${config.repos.length} repositories to process`);
+    getLogger().log(`Target files: ${formatFileNames(fileNames)}`);
+    getLogger().log(`Branch: ${branchName}\n`);
     const tokenManager = createTokenManager(process.env.XFG_GITHUB_APP_ID && process.env.XFG_GITHUB_APP_PRIVATE_KEY
         ? {
             appId: process.env.XFG_GITHUB_APP_ID,
@@ -395,7 +418,7 @@ export async function runSync(options, deps = {}) {
         : undefined);
     const processor = deps.processorFactory
         ? deps.processorFactory()
-        : new RepositoryProcessor(undefined, logger, {
+        : new RepositoryProcessor(undefined, getLogger(), {
             tokenManager,
             envToken: process.env.GH_TOKEN,
         });
@@ -405,7 +428,7 @@ export async function runSync(options, deps = {}) {
         branchName,
         processor,
         lifecycleManager: lifecycleManager ??
-            new RepoLifecycleManager(undefined, defaultExecutor, options.retries, cwd, logger),
+            new RepoLifecycleManager(undefined, getDefaultExecutor(), options.retries, process.cwd(), getLogger()),
         tokenManager,
         reportResults: [],
         lifecycleReportInputs: [],

package/dist/cli/sync-report-builder.js

@@ -4,10 +4,13 @@ export function buildSyncReport(results) {
         files: { create: 0, update: 0, delete: 0 },
     };
     for (const result of results) {
-        const files = result.fileChanges.map((f) => ({
-            path: f.path,
-            action: f.action,
-        }));
+        const files = result.fileChanges.map((f) => {
+            const entry = { path: f.path, action: f.action };
+            if (f.diffLines) {
+                entry.diffLines = f.diffLines;
+            }
+            return entry;
+        });
         // Count totals
         for (const file of files) {
             if (file.action === "create")

package/dist/config/formatter.js

@@ -1,4 +1,4 @@
-import { Document, stringify } from "yaml";
+import { Document, isScalar, Scalar, stringify, visit } from "yaml";
 export function detectOutputFormat(fileName) {
     const ext = fileName.toLowerCase().split(".").pop();
     if (ext === "yaml" || ext === "yml") {
@@ -16,11 +16,9 @@ export function detectOutputFormat(fileName) {
  */
 function buildHeaderComment(header, schemaUrl) {
     const lines = [];
-    // Add yaml-language-server schema directive first (if present)
     if (schemaUrl) {
         lines.push(` yaml-language-server: $schema=${schemaUrl}`);
     }
-    // Add custom header lines (with space prefix for proper formatting)
     if (header && header.length > 0) {
         lines.push(...header.map((h) => ` ${h}`));
     }
@@ -34,11 +32,9 @@ function buildHeaderComment(header, schemaUrl) {
  */
 function buildCommentOnlyYaml(header, schemaUrl) {
     const lines = [];
-    // Add yaml-language-server schema directive first (if present)
     if (schemaUrl) {
         lines.push(`# yaml-language-server: $schema=${schemaUrl}`);
     }
-    // Add custom header lines
     if (header && header.length > 0) {
         lines.push(...header.map((h) => `# ${h}`));
     }
@@ -79,10 +75,19 @@ export function convertContentToString(content, fileName, options) {
                 doc.commentBefore = headerComment;
             }
         }
-        // Quote all string values for YAML 1.1 compatibility.
-        // The yaml library outputs YAML 1.2 where "06:00" is a plain string,
-        // but many tools (e.g., Dependabot) use YAML 1.1 parsers that interpret
-        // unquoted values like "06:00" as sexagesimal (360) or "yes"/"no" as booleans.
+        // Use BLOCK_LITERAL (|) for multi-line string values to preserve readability.
+        // Single-line strings remain QUOTE_DOUBLE via defaultStringType for YAML 1.1
+        // compatibility (prevents "06:00" as sexagesimal, "yes"/"no" as booleans).
+        visit(doc, {
+            Scalar(key, node) {
+                if (key === "value" &&
+                    isScalar(node) &&
+                    typeof node.value === "string" &&
+                    node.value.includes("\n")) {
+                    node.type = Scalar.BLOCK_LITERAL;
+                }
+            },
+        });
         return stringify(doc, {
             indent: 2,
             defaultStringType: "QUOTE_DOUBLE",

package/dist/config/merge.d.ts

@@ -1,10 +1,9 @@
 /**
  * Deep merge utilities for JSON configuration objects.
- * Supports configurable array merge strategies via $arrayMerge directive.
+ * Supports per-field array merge strategies via $arrayMerge + $values directives.
  */
 export type ArrayMergeStrategy = "replace" | "append" | "prepend";
 export interface MergeContext {
-    arrayStrategies: Map<string, ArrayMergeStrategy>;
     defaultArrayStrategy: ArrayMergeStrategy;
 }
 /**
@@ -13,9 +12,8 @@ export interface MergeContext {
  * @param base - The base object
  * @param overlay - The overlay object (values override base)
  * @param ctx - Merge context with array strategies
- * @param path - Current path for strategy lookup (internal)
  */
-export declare function deepMerge(base: Record<string, unknown>, overlay: Record<string, unknown>, ctx: MergeContext, path?: string): Record<string, unknown>;
+export declare function deepMerge(base: Record<string, unknown>, overlay: Record<string, unknown>, ctx: MergeContext): Record<string, unknown>;
 /**
  * Strip merge directive keys ($arrayMerge, $override, etc.) from an object.
  * Works recursively on nested objects and arrays.

package/dist/config/merge.js

@@ -1,6 +1,6 @@
 /**
  * Deep merge utilities for JSON configuration objects.
- * Supports configurable array merge strategies via $arrayMerge directive.
+ * Supports per-field array merge strategies via $arrayMerge + $values directives.
  */
 import { isPlainObject } from "../shared/type-guards.js";
 /**
@@ -23,92 +23,41 @@ function mergeArrays(base, overlay, strategy) {
     // Fallback to replace for unknown strategies
     return overlay;
 }
-/**
- * Extract array values from an overlay object that uses the directive syntax:
- * { $arrayMerge: 'append', values: [1, 2, 3] }
- *
- * Or just return the array if it's already an array.
- */
-function extractArrayFromOverlay(overlay) {
-    if (Array.isArray(overlay)) {
-        return overlay;
-    }
-    if (isPlainObject(overlay) && "values" in overlay) {
-        const values = overlay.values;
-        if (Array.isArray(values)) {
-            return values;
-        }
-    }
-    return null;
-}
-/**
- * Get merge strategy from an overlay object's $arrayMerge directive.
- */
-function getStrategyFromOverlay(overlay) {
-    if (isPlainObject(overlay) && "$arrayMerge" in overlay) {
-        const strategy = overlay.$arrayMerge;
-        if (strategy === "replace" ||
-            strategy === "append" ||
-            strategy === "prepend") {
-            return strategy;
-        }
-    }
-    return null;
-}
 /**
  * Deep merge two objects with configurable array handling.
  *
  * @param base - The base object
  * @param overlay - The overlay object (values override base)
  * @param ctx - Merge context with array strategies
- * @param path - Current path for strategy lookup (internal)
  */
-export function deepMerge(base, overlay, ctx, path = "") {
+export function deepMerge(base, overlay, ctx) {
     const result = { ...base };
-    // Check for $arrayMerge directive at this level (applies to child arrays)
-    const levelStrategy = getStrategyFromOverlay(overlay);
     for (const [key, overlayValue] of Object.entries(overlay)) {
         // Skip directive keys in output
         if (key.startsWith("$"))
             continue;
-        const currentPath = path ? `${path}.${key}` : key;
         const baseValue = base[key];
-        // If overlay is an object with $arrayMerge directive for an array field
+        // Per-field $arrayMerge + $values directive
         if (isPlainObject(overlayValue) && "$arrayMerge" in overlayValue) {
-            const strategy = getStrategyFromOverlay(overlayValue);
-            const overlayArray = extractArrayFromOverlay(overlayValue);
-            if (strategy && overlayArray && Array.isArray(baseValue)) {
-                result[key] = mergeArrays(baseValue, overlayArray, strategy);
+            const strategy = overlayValue.$arrayMerge;
+            const values = overlayValue.$values;
+            if ((strategy === "replace" ||
+                strategy === "append" ||
+                strategy === "prepend") &&
+                Array.isArray(values) &&
+                Array.isArray(baseValue)) {
+                result[key] = mergeArrays(baseValue, values, strategy);
                 continue;
             }
         }
-        // Both are arrays - apply strategy
+        // Both are arrays — use default strategy
         if (Array.isArray(baseValue) && Array.isArray(overlayValue)) {
-            // Check for level-specific strategy, then path-specific, then default
-            const strategy = levelStrategy ??
-                ctx.arrayStrategies.get(currentPath) ??
-                ctx.defaultArrayStrategy;
-            result[key] = mergeArrays(baseValue, overlayValue, strategy);
+            result[key] = mergeArrays(baseValue, overlayValue, ctx.defaultArrayStrategy);
             continue;
         }
-        // Both are plain objects - recurse
+        // Both are plain objects — recurse
         if (isPlainObject(baseValue) && isPlainObject(overlayValue)) {
-            // Extract $arrayMerge for child paths if present
-            if ("$arrayMerge" in overlayValue) {
-                const childStrategy = getStrategyFromOverlay(overlayValue);
-                if (childStrategy) {
-                    // Apply to all immediate child arrays
-                    for (const childKey of Object.keys(overlayValue)) {
-                        if (!childKey.startsWith("$")) {
-                            const childPath = currentPath
-                                ? `${currentPath}.${childKey}`
-                                : childKey;
-                            ctx.arrayStrategies.set(childPath, childStrategy);
-                        }
-                    }
-                }
-            }
-            result[key] = deepMerge(baseValue, overlayValue, ctx, currentPath);
+            result[key] = deepMerge(baseValue, overlayValue, ctx);
             continue;
         }
         // Otherwise, overlay wins (including null values)
@@ -143,7 +92,6 @@ export function stripMergeDirectives(obj) {
  */
 export function createMergeContext(defaultStrategy = "replace") {
     return {
-        arrayStrategies: new Map(),
         defaultArrayStrategy: defaultStrategy,
     };
 }

package/dist/config/validator.js

@@ -12,15 +12,8 @@ const CONFIG_ID_MAX_LENGTH = 64;
  * Supports SSH (git@host:path) and HTTPS (https://host/path) formats.
  */
 function isValidGitUrl(url) {
-    // SSH format: git@hostname:path
-    if (/^git@[^:]+:.+$/.test(url)) {
-        return true;
-    }
-    // HTTPS format: https://hostname/path
-    if (/^https?:\/\/[^/]+\/.+$/.test(url)) {
-        return true;
-    }
-    return false;
+    // SSH format: git@hostname:path  OR  HTTPS format: https://hostname/path
+    return /^git@[^:]+:.+$/.test(url) || /^https?:\/\/[^/]+\/.+$/.test(url);
 }
 /**
  * Check if a git URL points to GitHub (github.com).

package/dist/lifecycle/repo-lifecycle-factory.js

@@ -15,12 +15,10 @@ export class RepoLifecycleFactory {
         this.log = log;
     }
     getProvider(platform) {
-        // Check cache first
         const cached = this.providers.get(platform);
         if (cached) {
             return cached;
         }
-        // Create provider
         let provider;
         switch (platform) {
             case "github":
@@ -39,12 +37,10 @@ export class RepoLifecycleFactory {
         return provider;
     }
     getMigrationSource(platform) {
-        // Check cache first
         const cached = this.sources.get(platform);
         if (cached) {
             return cached;
         }
-        // Create source
         let source;
         switch (platform) {
             case "azure-devops":

package/dist/output/github-summary.d.ts

@@ -1,4 +1,5 @@
 import type { DebugLog } from "../shared/logger.js";
+import type { SettingsAction } from "../settings/index.js";
 export type MergeOutcome = "manual" | "auto" | "force" | "direct";
 export interface FileChanges {
     added: number;
@@ -8,7 +9,7 @@ export interface FileChanges {
 }
 export interface RulesetPlanDetail {
     name: string;
-    action: "create" | "update" | "delete" | "unchanged";
+    action: SettingsAction;
     propertyCount?: number;
     propertyChanges?: {
         added: number;
@@ -22,7 +23,7 @@ export interface RepoSettingsPlanDetail {
 }
 export interface LabelsPlanDetail {
     name: string;
-    action: "create" | "update" | "delete" | "unchanged";
+    action: SettingsAction;
     newName?: string;
 }
 export interface RepoResult {

package/dist/output/github-summary.js

@@ -179,13 +179,7 @@ export function formatSummary(data) {
                 lines.push("| Label | Action |");
                 lines.push("|-------|--------|");
                 for (const detail of result.labelsPlanDetails) {
-                    const action = detail.action === "create"
-                        ? "+ Create"
-                        : detail.action === "update"
-                            ? "~ Update"
-                            : detail.action === "delete"
-                                ? "- Delete"
-                                : "No change";
+                    const action = formatRulesetAction(detail.action);
                     const name = detail.newName
                         ? `${detail.name} \u2192 ${detail.newName}`
                         : detail.name;

package/dist/output/lifecycle-report.js

@@ -1,6 +1,6 @@
-// src/output/lifecycle-report.ts
 import chalk from "chalk";
 import { writeGitHubStepSummary } from "./github-summary.js";
+import { formatCountEntry } from "./settings-report.js";
 export function buildLifecycleReport(results) {
     const actions = [];
     const totals = { created: 0, forked: 0, migrated: 0, existed: 0 };
@@ -17,19 +17,12 @@ export function buildLifecycleReport(results) {
     return { actions, totals };
 }
 function formatLifecycleSummary(totals) {
-    const total = totals.created + totals.forked + totals.migrated;
-    if (total === 0) {
-        return "No changes";
-    }
-    const parts = [];
-    if (totals.created > 0)
-        parts.push(`${totals.created} to create`);
-    if (totals.forked > 0)
-        parts.push(`${totals.forked} to fork`);
-    if (totals.migrated > 0)
-        parts.push(`${totals.migrated} to migrate`);
-    const repoWord = total === 1 ? "repo" : "repos";
-    return `Plan: ${total} ${repoWord} (${parts.join(", ")})`;
+    const entry = formatCountEntry("repo", "repos", [
+        { label: "to create", value: totals.created },
+        { label: "to fork", value: totals.forked },
+        { label: "to migrate", value: totals.migrated },
+    ]);
+    return entry ? `Plan: ${entry}` : "No changes";
 }
 /**
  * Returns true if the report has any non-"existed" actions worth displaying.