@aspruyt/xfg 1.7.0 → 1.8.0

package/README.md

@@ -5,7 +5,7 @@
 [![npm downloads](https://img.shields.io/npm/dw/@aspruyt/xfg.svg)](https://www.npmjs.com/package/@aspruyt/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 creating pull requests.
+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.
 
 **[Full Documentation](https://anthony-spruyt.github.io/xfg/)**
 
@@ -58,6 +58,7 @@ xfg --config ./config.yaml
 - **YAML Comments** - Add header comments and schema directives to YAML files
 - **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
 - **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.d.ts

@@ -1,6 +1,6 @@
 import type { ArrayMergeStrategy } from "./merge.js";
 export { convertContentToString } from "./config-formatter.js";
-export type MergeMode = "manual" | "auto" | "force";
+export type MergeMode = "manual" | "auto" | "force" | "direct";
 export type MergeStrategy = "merge" | "squash" | "rebase";
 export interface PRMergeOptions {
     merge?: MergeMode;

package/dist/index.js

@@ -26,8 +26,8 @@ program
     .option("-w, --work-dir <path>", "Temporary directory for cloning", "./tmp")
     .option("-r, --retries <number>", "Number of retries for network operations (0 to disable)", (v) => parseInt(v, 10), 3)
     .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)", (value) => {
-    const valid = ["manual", "auto", "force"];
+    .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) => {
+    const valid = ["manual", "auto", "force", "direct"];
     if (!valid.includes(value)) {
         throw new Error(`Invalid merge mode: ${value}. Valid: ${valid.join(", ")}`);
     }

package/dist/repository-processor.js

@@ -41,6 +41,13 @@ export class RepositoryProcessor {
         const { branchName, workDir, dryRun, retries, prTemplate } = options;
         const executor = options.executor ?? defaultExecutor;
         this.gitOps = this.gitOpsFactory({ workDir, dryRun, retries });
+        // Determine merge mode early - affects workflow steps
+        const mergeMode = repoConfig.prOptions?.merge ?? "auto";
+        const isDirectMode = mergeMode === "direct";
+        // Warn if mergeStrategy is set with direct mode (irrelevant)
+        if (isDirectMode && repoConfig.prOptions?.mergeStrategy) {
+            this.log.info(`Warning: mergeStrategy '${repoConfig.prOptions.mergeStrategy}' is ignored in direct mode (no PR created)`);
+        }
         try {
             // Step 1: Clean workspace
             this.log.info("Cleaning workspace...");
@@ -53,7 +60,8 @@ export class RepositoryProcessor {
             this.log.info(`Default branch: ${baseBranch} (detected via ${detectionMethod})`);
             // Step 3.5: Close existing PR if exists (fresh start approach)
             // This ensures isolated sync attempts - each run starts from clean state
-            if (!dryRun) {
+            // Skip for direct mode - no PR involved
+            if (!dryRun && !isDirectMode) {
                 this.log.info("Checking for existing PR...");
                 const strategy = getPRStrategy(repoInfo, executor);
                 const closed = await strategy.closeExistingPR({
@@ -68,8 +76,14 @@ export class RepositoryProcessor {
                 }
             }
             // Step 4: Create branch (always fresh from base branch)
-            this.log.info(`Creating branch: ${branchName}`);
-            await this.gitOps.createBranch(branchName);
+            // Skip for direct mode - stay on default branch
+            if (!isDirectMode) {
+                this.log.info(`Creating branch: ${branchName}`);
+                await this.gitOps.createBranch(branchName);
+            }
+            else {
+                this.log.info(`Direct mode: staying on ${baseBranch}`);
+            }
             // Step 5: Write all config files and track changes
             //
             // DESIGN NOTE: Change detection differs between dry-run and normal mode:
@@ -205,9 +219,38 @@ export class RepositoryProcessor {
             }
             this.log.info(`Committed: ${commitMessage}`);
             // Step 8: Push
-            this.log.info("Pushing to remote...");
-            await this.gitOps.push(branchName);
-            // Step 9: Create PR
+            // In direct mode, push to default branch; otherwise push to sync branch
+            const pushBranch = isDirectMode ? baseBranch : branchName;
+            this.log.info(`Pushing to ${pushBranch}...`);
+            try {
+                await this.gitOps.push(pushBranch);
+            }
+            catch (error) {
+                // Handle branch protection errors in direct mode
+                if (isDirectMode) {
+                    const errorMessage = error instanceof Error ? error.message : String(error);
+                    if (errorMessage.includes("rejected") ||
+                        errorMessage.includes("protected") ||
+                        errorMessage.includes("denied")) {
+                        return {
+                            success: false,
+                            repoName,
+                            message: `Push to '${baseBranch}' was rejected (likely branch protection). To use 'direct' mode, the target branch must allow direct pushes. Use 'merge: force' to create a PR and merge with admin privileges.`,
+                        };
+                    }
+                }
+                throw error;
+            }
+            // Direct mode: no PR creation, return success
+            if (isDirectMode) {
+                this.log.info(`Changes pushed directly to ${baseBranch}`);
+                return {
+                    success: true,
+                    repoName,
+                    message: `Pushed directly to ${baseBranch}`,
+                };
+            }
+            // Step 9: Create PR (non-direct modes only)
             this.log.info("Creating pull request...");
             const prResult = await createPR({
                 repoInfo,
@@ -220,7 +263,6 @@ export class RepositoryProcessor {
                 prTemplate,
             });
             // Step 10: Handle merge options if configured
-            const mergeMode = repoConfig.prOptions?.merge ?? "auto";
             let mergeResult;
             if (prResult.success && prResult.url && mergeMode !== "manual") {
                 this.log.info(`Handling merge (mode: ${mergeMode})...`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "1.7.0",
-  "description": "CLI tool to sync JSON, JSON5, YAML, or text configuration files across multiple Git repositories by creating pull requests",
+  "version": "1.8.0",
+  "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",
   "bin": {