@aspruyt/xfg 1.8.0 → 1.10.1

package/README.md

@@ -1,8 +1,11 @@
 # xfg
 
 [![CI](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml/badge.svg?branch=main)](https://github.com/anthony-spruyt/xfg/actions/workflows/ci.yaml)
+[![codecov](https://codecov.io/gh/anthony-spruyt/xfg/graph/badge.svg)](https://codecov.io/gh/anthony-spruyt/xfg)
 [![npm version](https://img.shields.io/npm/v/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg)
 [![npm downloads](https://img.shields.io/npm/dw/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/xfg)
+[![GitHub Marketplace](https://img.shields.io/badge/Marketplace-xfg-blue?logo=github)](https://github.com/marketplace/actions/xfg-config-file-sync)
+[![docs](https://img.shields.io/badge/docs-GitHub%20Pages-blue)](https://anthony-spruyt.github.io/xfg/)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
 
 A CLI tool that syncs JSON, JSON5, YAML, or text configuration files across multiple GitHub, Azure DevOps, and GitLab repositories. By default, changes are made via pull requests, but you can also push directly to the default branch.
@@ -11,6 +14,29 @@ A CLI tool that syncs JSON, JSON5, YAML, or text configuration files across mult
 
 ## Quick Start
 
+### GitHub Action
+
+```yaml
+# .github/workflows/sync-configs.yml
+name: Sync Configs
+on:
+  push:
+    branches: [main]
+    paths: [sync-config.yaml]
+
+jobs:
+  sync:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: anthony-spruyt/xfg@v1
+        with:
+          config: ./sync-config.yaml
+          github-token: ${{ secrets.GH_PAT }} # PAT with repo scope for cross-repo access
+```
+
+### CLI
+
 ```bash
 # Install
 npm install -g @aspruyt/xfg
@@ -18,8 +44,14 @@ npm install -g @aspruyt/xfg
 # Authenticate (GitHub)
 gh auth login
 
-# Create config.yaml
-cat > config.yaml << 'EOF'
+# Run
+xfg --config ./config.yaml
+```
+
+### Example Config
+
+```yaml
+# sync-config.yaml
 files:
   .prettierrc.json:
     content:
@@ -33,10 +65,6 @@ repos:
       - git@github.com:your-org/frontend-app.git
       - git@github.com:your-org/backend-api.git
       - git@github.com:your-org/shared-lib.git
-EOF
-
-# Run
-xfg --config ./config.yaml
 ```
 
 **Result:** PRs are created in all three repos with identical `.prettierrc.json` files.
@@ -59,6 +87,7 @@ xfg --config ./config.yaml
 - **Multi-Platform** - Works with GitHub (including GitHub Enterprise Server), Azure DevOps, and GitLab (including self-hosted)
 - **Auto-Merge PRs** - Automatically merge PRs when checks pass, or force merge with admin privileges
 - **Direct Push Mode** - Push directly to default branch without creating PRs
+- **Delete Orphaned Files** - Automatically remove files from repos when deleted from config (manifest-tracked)
 - **Dry-Run Mode** - Preview changes without creating PRs
 - **Error Resilience** - Continues processing if individual repos fail
 - **Automatic Retries** - Retries transient network errors with exponential backoff

package/dist/config-normalizer.js

@@ -121,6 +121,10 @@ export function normalizeConfig(raw) {
                 const vars = fileConfig.vars || repoOverride?.vars
                     ? { ...fileConfig.vars, ...repoOverride?.vars }
                     : undefined;
+                // deleteOrphaned: per-repo overrides per-file overrides global
+                const deleteOrphaned = repoOverride?.deleteOrphaned ??
+                    fileConfig.deleteOrphaned ??
+                    raw.deleteOrphaned;
                 files.push({
                     fileName,
                     content: mergedContent,
@@ -130,6 +134,7 @@ export function normalizeConfig(raw) {
                     schemaUrl,
                     template,
                     vars,
+                    deleteOrphaned,
                 });
             }
             // Merge PR options: per-repo overrides global
@@ -145,5 +150,6 @@ export function normalizeConfig(raw) {
         repos: expandedRepos,
         prTemplate: raw.prTemplate,
         githubHosts: raw.githubHosts,
+        deleteOrphaned: raw.deleteOrphaned,
     };
 }

package/dist/config-validator.js

@@ -95,6 +95,15 @@ export function validateRawConfig(config) {
                 }
             }
         }
+        if (fileConfig.deleteOrphaned !== undefined &&
+            typeof fileConfig.deleteOrphaned !== "boolean") {
+            throw new Error(`File '${fileName}' deleteOrphaned must be a boolean`);
+        }
+    }
+    // Validate global deleteOrphaned
+    if (config.deleteOrphaned !== undefined &&
+        typeof config.deleteOrphaned !== "boolean") {
+        throw new Error("Global deleteOrphaned must be a boolean");
     }
     if (!config.repos || !Array.isArray(config.repos)) {
         throw new Error("Config missing required field: repos (must be an array)");
@@ -196,6 +205,10 @@ export function validateRawConfig(config) {
                         }
                     }
                 }
+                if (fileOverride.deleteOrphaned !== undefined &&
+                    typeof fileOverride.deleteOrphaned !== "boolean") {
+                    throw new Error(`Repo ${getGitDisplayName(repo.git)}: file '${fileName}' deleteOrphaned must be a boolean`);
+                }
             }
         }
     }

package/dist/config.d.ts

@@ -18,6 +18,7 @@ export interface RawFileConfig {
     schemaUrl?: string;
     template?: boolean;
     vars?: Record<string, string>;
+    deleteOrphaned?: boolean;
 }
 export interface RawRepoFileOverride {
     content?: ContentValue;
@@ -28,6 +29,7 @@ export interface RawRepoFileOverride {
     schemaUrl?: string;
     template?: boolean;
     vars?: Record<string, string>;
+    deleteOrphaned?: boolean;
 }
 export interface RawRepoConfig {
     git: string | string[];
@@ -40,6 +42,7 @@ export interface RawConfig {
     prOptions?: PRMergeOptions;
     prTemplate?: string;
     githubHosts?: string[];
+    deleteOrphaned?: boolean;
 }
 export interface FileContent {
     fileName: string;
@@ -50,6 +53,7 @@ export interface FileContent {
     schemaUrl?: string;
     template?: boolean;
     vars?: Record<string, string>;
+    deleteOrphaned?: boolean;
 }
 export interface RepoConfig {
     git: string;
@@ -60,5 +64,6 @@ export interface Config {
     repos: RepoConfig[];
     prTemplate?: string;
     githubHosts?: string[];
+    deleteOrphaned?: boolean;
 }
 export declare function loadConfig(filePath: string): Config;

package/dist/diff-utils.d.ts

@@ -1,4 +1,4 @@
-export type FileStatus = "NEW" | "MODIFIED" | "UNCHANGED";
+export type FileStatus = "NEW" | "MODIFIED" | "UNCHANGED" | "DELETED";
 /**
  * Determines file status based on existence and change detection.
  */
@@ -20,6 +20,7 @@ export interface DiffStats {
     newCount: number;
     modifiedCount: number;
     unchangedCount: number;
+    deletedCount: number;
 }
 /**
  * Create an empty diff stats object.

package/dist/diff-utils.js

@@ -18,6 +18,8 @@ export function formatStatusBadge(status) {
             return chalk.yellow("[MODIFIED]");
         case "UNCHANGED":
             return chalk.gray("[UNCHANGED]");
+        case "DELETED":
+            return chalk.red("[DELETED]");
     }
 }
 /**
@@ -203,7 +205,7 @@ function groupIntoHunks(ops, oldLines, newLines, contextLines) {
  * Create an empty diff stats object.
  */
 export function createDiffStats() {
-    return { newCount: 0, modifiedCount: 0, unchangedCount: 0 };
+    return { newCount: 0, modifiedCount: 0, unchangedCount: 0, deletedCount: 0 };
 }
 /**
  * Increment the appropriate counter in diff stats.
@@ -219,5 +221,8 @@ export function incrementDiffStats(stats, status) {
         case "UNCHANGED":
             stats.unchangedCount++;
             break;
+        case "DELETED":
+            stats.deletedCount++;
+            break;
     }
 }

package/dist/git-ops.d.ts

@@ -67,6 +67,17 @@ export declare class GitOps {
      * Used for createOnly checks against the base branch (not the working directory).
      */
     fileExistsOnBranch(fileName: string, branch: string): Promise<boolean>;
+    /**
+     * Check if a file exists in the working directory.
+     */
+    fileExists(fileName: string): boolean;
+    /**
+     * Delete a file from the working directory.
+     * Does nothing in dry-run mode.
+     *
+     * @param fileName - The file path relative to the work directory
+     */
+    deleteFile(fileName: string): void;
     /**
      * Stage all changes and commit with the given message.
      * Uses --no-verify to skip pre-commit hooks (config sync should always succeed).

package/dist/git-ops.js

@@ -174,6 +174,29 @@ export class GitOps {
             return false;
         }
     }
+    /**
+     * Check if a file exists in the working directory.
+     */
+    fileExists(fileName) {
+        const filePath = this.validatePath(fileName);
+        return existsSync(filePath);
+    }
+    /**
+     * Delete a file from the working directory.
+     * Does nothing in dry-run mode.
+     *
+     * @param fileName - The file path relative to the work directory
+     */
+    deleteFile(fileName) {
+        if (this.dryRun) {
+            return;
+        }
+        const filePath = this.validatePath(fileName);
+        if (!existsSync(filePath)) {
+            return; // File doesn't exist, nothing to delete
+        }
+        rmSync(filePath);
+    }
     /**
      * Stage all changes and commit with the given message.
      * Uses --no-verify to skip pre-commit hooks (config sync should always succeed).

package/dist/index.js

@@ -41,6 +41,7 @@ program
     return value;
 })
     .option("--delete-branch", "Delete source branch after merge")
+    .option("--no-delete", "Skip deletion of orphaned files even if deleteOrphaned is configured")
     .parse();
 const options = program.opts();
 /**
@@ -134,6 +135,7 @@ async function main() {
                 dryRun: options.dryRun,
                 retries: options.retries,
                 prTemplate: config.prTemplate,
+                noDelete: options.noDelete,
             });
             if (result.skipped) {
                 logger.skip(current, repoName, result.message);

package/dist/logger.d.ts

@@ -2,7 +2,7 @@ import { FileStatus } from "./diff-utils.js";
 export interface ILogger {
     info(message: string): void;
     fileDiff(fileName: string, status: FileStatus, diffLines: string[]): void;
-    diffSummary(newCount: number, modifiedCount: number, unchangedCount: number): void;
+    diffSummary(newCount: number, modifiedCount: number, unchangedCount: number, deletedCount?: number): void;
 }
 export interface LoggerStats {
     total: number;
@@ -26,7 +26,7 @@ export declare class Logger {
     /**
      * Display summary statistics for dry-run diff.
      */
-    diffSummary(newCount: number, modifiedCount: number, unchangedCount: number): void;
+    diffSummary(newCount: number, modifiedCount: number, unchangedCount: number, deletedCount?: number): void;
     summary(): void;
     hasFailures(): boolean;
 }

package/dist/logger.js

@@ -49,12 +49,14 @@ export class Logger {
     /**
      * Display summary statistics for dry-run diff.
      */
-    diffSummary(newCount, modifiedCount, unchangedCount) {
+    diffSummary(newCount, modifiedCount, unchangedCount, deletedCount) {
         const parts = [];
         if (newCount > 0)
             parts.push(chalk.green(`${newCount} new`));
         if (modifiedCount > 0)
             parts.push(chalk.yellow(`${modifiedCount} modified`));
+        if (deletedCount && deletedCount > 0)
+            parts.push(chalk.red(`${deletedCount} deleted`));
         if (unchangedCount > 0)
             parts.push(chalk.gray(`${unchangedCount} unchanged`));
         if (parts.length > 0) {

package/dist/manifest.d.ts

@@ -0,0 +1,46 @@
+export declare const MANIFEST_FILENAME = ".xfg.json";
+export interface XfgManifest {
+    version: 1;
+    managedFiles: string[];
+}
+/**
+ * Creates an empty manifest with the current version.
+ */
+export declare function createEmptyManifest(): XfgManifest;
+/**
+ * Loads the xfg manifest from a repository's working directory.
+ * Returns null if the manifest file doesn't exist.
+ *
+ * @param workDir - The repository working directory
+ * @returns The manifest or null if not found
+ */
+export declare function loadManifest(workDir: string): XfgManifest | null;
+/**
+ * Saves the xfg manifest to a repository's working directory.
+ *
+ * @param workDir - The repository working directory
+ * @param manifest - The manifest to save
+ */
+export declare function saveManifest(workDir: string, manifest: XfgManifest): void;
+/**
+ * Gets the list of managed files from a manifest.
+ * Returns an empty array if the manifest is null.
+ *
+ * @param manifest - The manifest or null
+ * @returns Array of managed file names
+ */
+export declare function getManagedFiles(manifest: XfgManifest | null): string[];
+/**
+ * Updates the manifest with the current set of files that have deleteOrphaned enabled.
+ * Files with deleteOrphaned: true are added to managedFiles.
+ * Files with deleteOrphaned: false (explicit) are removed from managedFiles.
+ * Files not in the config but in managedFiles are candidates for deletion.
+ *
+ * @param manifest - The existing manifest (or null for new repos)
+ * @param filesWithDeleteOrphaned - Map of fileName to deleteOrphaned value (true/false/undefined)
+ * @returns Updated manifest and list of files to delete
+ */
+export declare function updateManifest(manifest: XfgManifest | null, filesWithDeleteOrphaned: Map<string, boolean | undefined>): {
+    manifest: XfgManifest;
+    filesToDelete: string[];
+};

package/dist/manifest.js

@@ -0,0 +1,105 @@
+import { readFileSync, writeFileSync, existsSync } from "node:fs";
+import { join } from "node:path";
+export const MANIFEST_FILENAME = ".xfg.json";
+/**
+ * Creates an empty manifest with the current version.
+ */
+export function createEmptyManifest() {
+    return {
+        version: 1,
+        managedFiles: [],
+    };
+}
+/**
+ * Loads the xfg manifest from a repository's working directory.
+ * Returns null if the manifest file doesn't exist.
+ *
+ * @param workDir - The repository working directory
+ * @returns The manifest or null if not found
+ */
+export function loadManifest(workDir) {
+    const manifestPath = join(workDir, MANIFEST_FILENAME);
+    if (!existsSync(manifestPath)) {
+        return null;
+    }
+    try {
+        const content = readFileSync(manifestPath, "utf-8");
+        const parsed = JSON.parse(content);
+        // Validate the manifest structure
+        if (typeof parsed !== "object" || parsed === null) {
+            return null;
+        }
+        if (parsed.version !== 1) {
+            return null;
+        }
+        if (!Array.isArray(parsed.managedFiles)) {
+            return null;
+        }
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+/**
+ * Saves the xfg manifest to a repository's working directory.
+ *
+ * @param workDir - The repository working directory
+ * @param manifest - The manifest to save
+ */
+export function saveManifest(workDir, manifest) {
+    const manifestPath = join(workDir, MANIFEST_FILENAME);
+    const content = JSON.stringify(manifest, null, 2) + "\n";
+    writeFileSync(manifestPath, content, "utf-8");
+}
+/**
+ * Gets the list of managed files from a manifest.
+ * Returns an empty array if the manifest is null.
+ *
+ * @param manifest - The manifest or null
+ * @returns Array of managed file names
+ */
+export function getManagedFiles(manifest) {
+    if (!manifest) {
+        return [];
+    }
+    return [...manifest.managedFiles];
+}
+/**
+ * Updates the manifest with the current set of files that have deleteOrphaned enabled.
+ * Files with deleteOrphaned: true are added to managedFiles.
+ * Files with deleteOrphaned: false (explicit) are removed from managedFiles.
+ * Files not in the config but in managedFiles are candidates for deletion.
+ *
+ * @param manifest - The existing manifest (or null for new repos)
+ * @param filesWithDeleteOrphaned - Map of fileName to deleteOrphaned value (true/false/undefined)
+ * @returns Updated manifest and list of files to delete
+ */
+export function updateManifest(manifest, filesWithDeleteOrphaned) {
+    const existingManaged = new Set(getManagedFiles(manifest));
+    const newManaged = new Set();
+    const filesToDelete = [];
+    // Process current config files
+    for (const [fileName, deleteOrphaned] of filesWithDeleteOrphaned) {
+        if (deleteOrphaned === true) {
+            // File has deleteOrphaned: true, add to managed set
+            newManaged.add(fileName);
+        }
+        // If deleteOrphaned is false or undefined, don't add to managed set
+        // (explicitly setting false removes from tracking)
+    }
+    // Find orphaned files: in old manifest but not in current config
+    for (const fileName of existingManaged) {
+        if (!filesWithDeleteOrphaned.has(fileName)) {
+            // File was managed before but is no longer in config - delete it
+            filesToDelete.push(fileName);
+        }
+    }
+    return {
+        manifest: {
+            version: 1,
+            managedFiles: Array.from(newManaged).sort(),
+        },
+        filesToDelete,
+    };
+}

package/dist/pr-creator.d.ts

@@ -1,9 +1,10 @@
 import { RepoInfo } from "./repo-detector.js";
 import { MergeResult, PRMergeConfig } from "./strategies/index.js";
+import { CommandExecutor } from "./command-executor.js";
 export { escapeShellArg } from "./shell-utils.js";
 export interface FileAction {
     fileName: string;
-    action: "create" | "update" | "skip";
+    action: "create" | "update" | "skip" | "delete";
 }
 export interface PROptions {
     repoInfo: RepoInfo;
@@ -16,6 +17,8 @@ export interface PROptions {
     retries?: number;
     /** Custom PR body template */
     prTemplate?: string;
+    /** Optional command executor for shell commands (for testing) */
+    executor?: CommandExecutor;
 }
 export interface PRResult {
     url?: string;
@@ -45,5 +48,7 @@ export interface MergePROptions {
     workDir: string;
     dryRun?: boolean;
     retries?: number;
+    /** Optional command executor for shell commands (for testing) */
+    executor?: CommandExecutor;
 }
 export declare function mergePR(options: MergePROptions): Promise<MergeResult>;

package/dist/pr-creator.js

@@ -37,7 +37,20 @@ function formatFileChanges(files) {
     const changedFiles = files.filter((f) => f.action !== "skip");
     return changedFiles
         .map((f) => {
-        const actionText = f.action === "create" ? "Created" : "Updated";
+        let actionText;
+        switch (f.action) {
+            case "create":
+                actionText = "Created";
+                break;
+            case "update":
+                actionText = "Updated";
+                break;
+            case "delete":
+                actionText = "Deleted";
+                break;
+            default:
+                actionText = "Changed";
+        }
         return `- ${actionText} \`${f.fileName}\``;
     })
         .join("\n");
@@ -84,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, } = options;
+    const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, } = options;
     const title = formatPRTitle(files);
     const body = formatPRBody(files, repoInfo, prTemplate);
     if (dryRun) {
@@ -94,7 +107,7 @@ export async function createPR(options) {
         };
     }
     // Get the appropriate strategy and execute
-    const strategy = getPRStrategy(repoInfo);
+    const strategy = getPRStrategy(repoInfo, executor);
     return strategy.execute({
         repoInfo,
         title,
@@ -106,7 +119,7 @@ export async function createPR(options) {
     });
 }
 export async function mergePR(options) {
-    const { repoInfo, prUrl, mergeConfig, workDir, dryRun, retries } = options;
+    const { repoInfo, prUrl, mergeConfig, workDir, dryRun, retries, executor } = options;
     if (dryRun) {
         const modeText = mergeConfig.mode === "force"
             ? "force merge"
@@ -120,7 +133,7 @@ export async function mergePR(options) {
         };
     }
     // Get the appropriate strategy and execute merge
-    const strategy = getPRStrategy(repoInfo);
+    const strategy = getPRStrategy(repoInfo, executor);
     return strategy.merge({
         prUrl,
         config: mergeConfig,

package/dist/repository-processor.d.ts

@@ -13,6 +13,8 @@ export interface ProcessorOptions {
     executor?: CommandExecutor;
     /** Custom PR body template */
     prTemplate?: string;
+    /** Skip deleting orphaned files even if deleteOrphaned is configured */
+    noDelete?: boolean;
 }
 /**
  * Factory function type for creating GitOps instances.

package/dist/repository-processor.js

@@ -9,6 +9,7 @@ import { logger } from "./logger.js";
 import { getPRStrategy } from "./strategies/index.js";
 import { defaultExecutor } from "./command-executor.js";
 import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
+import { loadManifest, saveManifest, updateManifest, MANIFEST_FILENAME, } from "./manifest.js";
 /**
  * Determines if a file should be marked as executable.
  * .sh files are auto-executable unless explicit executable: false is set.
@@ -160,9 +161,62 @@ export class RepositoryProcessor {
                     await this.gitOps.setExecutable(file.fileName);
                 }
             }
+            // Step 5c: Handle orphaned file deletion (manifest-based tracking)
+            const existingManifest = loadManifest(workDir);
+            // Build map of files with their deleteOrphaned setting
+            const filesWithDeleteOrphaned = new Map();
+            for (const file of repoConfig.files) {
+                // Skip files that were excluded (createOnly + exists)
+                if (skippedFileNames.has(file.fileName)) {
+                    continue;
+                }
+                filesWithDeleteOrphaned.set(file.fileName, file.deleteOrphaned);
+            }
+            // Update manifest and get list of files to delete
+            const { manifest: newManifest, filesToDelete } = updateManifest(existingManifest, filesWithDeleteOrphaned);
+            // Delete orphaned files (unless --no-delete flag is set)
+            if (filesToDelete.length > 0 && !options.noDelete) {
+                for (const fileName of filesToDelete) {
+                    // Only delete if file actually exists in the working directory
+                    if (this.gitOps.fileExists(fileName)) {
+                        if (dryRun) {
+                            // In dry-run, show what would be deleted
+                            this.log.fileDiff(fileName, "DELETED", []);
+                            incrementDiffStats(diffStats, "DELETED");
+                        }
+                        else {
+                            this.log.info(`Deleting orphaned file: ${fileName}`);
+                            this.gitOps.deleteFile(fileName);
+                        }
+                        changedFiles.push({ fileName, action: "delete" });
+                    }
+                }
+            }
+            else if (filesToDelete.length > 0 && options.noDelete) {
+                this.log.info(`Skipping deletion of ${filesToDelete.length} orphaned file(s) (--no-delete flag)`);
+            }
+            // Save updated manifest (tracks files with deleteOrphaned: true)
+            // Only save if there are managed files or if we had a previous manifest
+            if (newManifest.managedFiles.length > 0 || existingManifest !== null) {
+                if (!dryRun) {
+                    saveManifest(workDir, newManifest);
+                }
+                // Track manifest file as changed if it would be different
+                const existingManifestFiles = existingManifest?.managedFiles ?? [];
+                const newManifestFiles = newManifest.managedFiles;
+                const manifestChanged = JSON.stringify(existingManifestFiles) !==
+                    JSON.stringify(newManifestFiles);
+                if (manifestChanged) {
+                    const manifestExisted = existingManifest !== null;
+                    changedFiles.push({
+                        fileName: MANIFEST_FILENAME,
+                        action: manifestExisted ? "update" : "create",
+                    });
+                }
+            }
             // Show diff summary in dry-run mode
             if (dryRun) {
-                this.log.diffSummary(diffStats.newCount, diffStats.modifiedCount, diffStats.unchangedCount);
+                this.log.diffSummary(diffStats.newCount, diffStats.modifiedCount, diffStats.unchangedCount, diffStats.deletedCount);
             }
             // Step 6: Check for changes (exclude skipped files)
             let hasChanges;
@@ -261,6 +315,7 @@ export class RepositoryProcessor {
                 dryRun,
                 retries,
                 prTemplate,
+                executor,
             });
             // Step 10: Handle merge options if configured
             let mergeResult;
@@ -279,6 +334,7 @@ export class RepositoryProcessor {
                     workDir,
                     dryRun,
                     retries,
+                    executor,
                 });
                 mergeResult = {
                     merged: result.merged ?? false,
@@ -317,6 +373,16 @@ export class RepositoryProcessor {
      */
     formatCommitMessage(files) {
         const changedFiles = files.filter((f) => f.action !== "skip");
+        const deletedFiles = changedFiles.filter((f) => f.action === "delete");
+        const syncedFiles = changedFiles.filter((f) => f.action !== "delete");
+        // If only deletions, use "remove" prefix
+        if (syncedFiles.length === 0 && deletedFiles.length > 0) {
+            if (deletedFiles.length === 1) {
+                return `chore: remove ${deletedFiles[0].fileName}`;
+            }
+            return `chore: remove ${deletedFiles.length} orphaned config files`;
+        }
+        // Mixed or only syncs
         if (changedFiles.length === 1) {
             return `chore: sync ${changedFiles[0].fileName}`;
         }

package/dist/retry-utils.js

@@ -23,6 +23,10 @@ export const DEFAULT_PERMANENT_ERROR_PATTERNS = [
     /not\s*a\s*git\s*repository/i,
     /non-fast-forward/i,
     /remote\s*rejected/i,
+    /set\s+the\s+GH_TOKEN\s+environment\s+variable/i,
+    /GITHUB_TOKEN\s+environment\s+variable/i,
+    /set\s+the\s+AZURE_DEVOPS_EXT_PAT\s+environment\s+variable/i,
+    /GITLAB_TOKEN\s+environment\s+variable/i,
 ];
 /**
  * Default patterns indicating transient errors that SHOULD be retried.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "1.8.0",
+  "version": "1.10.1",
   "description": "CLI tool to sync JSON, JSON5, YAML, or text configuration files across multiple Git repositories via pull requests or direct push",
   "type": "module",
   "main": "dist/index.js",
@@ -26,10 +26,11 @@
     "build": "tsc",
     "start": "node dist/index.js",
     "dev": "ts-node src/index.ts",
-    "test": "node --import tsx --test src/config.test.ts src/merge.test.ts src/env.test.ts src/repo-detector.test.ts src/pr-creator.test.ts src/git-ops.test.ts src/logger.test.ts src/workspace-utils.test.ts src/strategies/pr-strategy.test.ts src/strategies/github-pr-strategy.test.ts src/strategies/azure-pr-strategy.test.ts src/strategies/gitlab-pr-strategy.test.ts src/repository-processor.test.ts src/retry-utils.test.ts src/command-executor.test.ts src/shell-utils.test.ts src/index.test.ts src/config-formatter.test.ts src/config-validator.test.ts src/config-normalizer.test.ts src/diff-utils.test.ts src/xfg-template.test.ts",
-    "test:integration:github": "npm run build && node --import tsx --test src/integration-github.test.ts",
-    "test:integration:ado": "npm run build && node --import tsx --test src/integration-ado.test.ts",
-    "test:integration:gitlab": "npm run build && node --import tsx --test src/integration-gitlab.test.ts",
+    "test": "node --import tsx scripts/run-tests.js",
+    "test:coverage": "c8 --check-coverage --lines 95 --reporter=text --reporter=lcov --all --src=src --exclude='src/**/*.test.ts' --exclude='scripts/**' npm test",
+    "test:integration:github": "npm run build && node --import tsx --test test/integration/github.test.ts",
+    "test:integration:ado": "npm run build && node --import tsx --test test/integration/ado.test.ts",
+    "test:integration:gitlab": "npm run build && node --import tsx --test test/integration/gitlab.test.ts",
     "prepublishOnly": "npm run build"
   },
   "keywords": [
@@ -58,6 +59,7 @@
   },
   "devDependencies": {
     "@types/node": "^25.0.7",
+    "c8": "^10.1.3",
     "tsx": "^4.15.0",
     "typescript": "^5.4.5"
   }