@aspruyt/xfg 6.0.3 → 6.2.0

package/dist/shared/retry-utils.js

@@ -1,5 +1,6 @@
 import pRetry, { AbortError } from "p-retry";
-import { sanitizeCredentials } from "../vcs/sanitize-utils.js";
+import { getStderr } from "./command-executor.js";
+import { sanitizeCredentials } from "./sanitize-utils.js";
 import { ValidationError } from "./errors.js";
 /**
  * Core permanent error patterns shared across all strategies (API, GraphQL, CLI).
@@ -24,6 +25,14 @@ export const CORE_PERMANENT_ERROR_PATTERNS = [
     /set\s+the\s+AZURE_DEVOPS_EXT_PAT\s+environment\s+variable/i,
     /GITLAB_TOKEN\s+environment\s+variable/i,
 ];
+export const BRANCH_PROTECTION_ERROR_PATTERNS = [
+    /rejected/i,
+    /protected\s*branch/i,
+    /protected/i,
+    /denied/i,
+    /required\s*status\s*check/i,
+    /push\s*rules?\s*prevent/i,
+];
 /**
  * Default patterns indicating permanent errors that should NOT be retried.
  * Extends CORE_PERMANENT_ERROR_PATTERNS with git-CLI-specific patterns.
@@ -82,8 +91,7 @@ const RATE_LIMIT_PATTERNS = [
  */
 export function isRateLimitError(error) {
     const message = error instanceof Error ? error.message : String(error ?? "");
-    const stderr = error.stderr?.toString() ?? "";
-    const combined = `${message} ${stderr}`;
+    const combined = `${message} ${getStderr(error)}`;
     for (const pattern of RATE_LIMIT_PATTERNS) {
         if (pattern.test(combined)) {
             return true;
@@ -105,8 +113,7 @@ export function isPermanentError(error, patterns = DEFAULT_PERMANENT_ERROR_PATTE
         return true;
     }
     const message = error instanceof Error ? error.message : String(error ?? "");
-    const stderr = error.stderr?.toString() ?? "";
-    const combined = `${message} ${stderr}`;
+    const combined = `${message} ${getStderr(error)}`;
     // Check permanent patterns first - these always stop retries
     for (const pattern of patterns) {
         if (pattern.test(combined)) {
@@ -120,8 +127,7 @@ export function isPermanentError(error, patterns = DEFAULT_PERMANENT_ERROR_PATTE
  */
 export function isTransientError(error, patterns = DEFAULT_TRANSIENT_ERROR_PATTERNS) {
     const message = error instanceof Error ? error.message : String(error ?? "");
-    const stderr = error.stderr?.toString() ?? "";
-    const combined = `${message} ${stderr}`;
+    const combined = `${message} ${getStderr(error)}`;
     for (const pattern of patterns) {
         if (pattern.test(combined)) {
             return true;

package/dist/sync/auth-options-builder.js

@@ -1,5 +1,5 @@
 import { isGitHubRepo } from "../repo/index.js";
-import { resolveGitHubToken } from "../shared/gh-api-utils.js";
+import { resolveGitHubToken } from "../shared/gh-token-utils.js";
 export class AuthOptionsBuilder {
     tokenManager;
     log;

package/dist/sync/branch-manager.js

@@ -15,7 +15,7 @@ export class BranchManager {
         if (!dryRun) {
             this.log.debug("Checking for existing PR...");
             const strategy = this.prStrategyFactory(repoInfo, executor, this.log);
-            const closed = await strategy.closeExistingPR({
+            const closeResult = await strategy.closeExistingPR({
                 repoInfo,
                 branchName,
                 baseBranch,
@@ -23,11 +23,13 @@ export class BranchManager {
                 retries,
                 token,
             });
-            if (closed) {
+            if (closeResult.status === "closed") {
                 this.log.info("Closed existing PR and deleted branch for fresh sync");
-                // Prune stale remote tracking refs so --force-with-lease works correctly
                 await gitOps.fetch({ prune: true });
             }
+            else if (closeResult.status === "close_failed") {
+                this.log.warn(`Failed to close existing PR: ${closeResult.message}`);
+            }
         }
         this.log.debug(`Creating branch: ${branchName}`);
         await gitOps.createBranch(branchName);

package/dist/sync/commit-push-manager.js

@@ -1,6 +1,7 @@
 import { createCommitStrategy } from "../vcs/index.js";
 import { getRepoDisplayName } from "../repo/index.js";
 import { toErrorMessage } from "../shared/type-guards.js";
+import { BRANCH_PROTECTION_ERROR_PATTERNS } from "../shared/retry-utils.js";
 export class CommitPushManager {
     log;
     commitStrategyFactory;
@@ -56,9 +57,7 @@ export class CommitPushManager {
         const repoName = getRepoDisplayName(repoInfo);
         const message = toErrorMessage(error);
         if (isDirectMode &&
-            (message.includes("rejected") ||
-                message.includes("protected") ||
-                message.includes("denied"))) {
+            BRANCH_PROTECTION_ERROR_PATTERNS.some((p) => p.test(message))) {
             return {
                 success: false,
                 errorResult: {

package/dist/sync/diff-utils.d.ts

@@ -2,7 +2,6 @@ export type { FileStatus } from "../shared/file-status.js";
 export { formatStatusBadge } from "../shared/file-status.js";
 import type { FileStatus } from "../shared/file-status.js";
 export declare function getFileStatus(exists: boolean, changed: boolean): FileStatus;
-export declare function formatDiffLine(line: string): string;
 /**
  * Check if a file is likely binary based on its extension.
  */

package/dist/sync/diff-utils.js

@@ -1,19 +1,10 @@
-import chalk from "chalk";
 export { formatStatusBadge } from "../shared/file-status.js";
+import { formatDiffLine } from "../shared/diff-format.js";
 export function getFileStatus(exists, changed) {
     if (!exists)
         return "NEW";
     return changed ? "MODIFIED" : "UNCHANGED";
 }
-export function formatDiffLine(line) {
-    if (line.startsWith("+"))
-        return chalk.green(line);
-    if (line.startsWith("-"))
-        return chalk.red(line);
-    if (line.startsWith("@@"))
-        return chalk.cyan(line);
-    return line;
-}
 const BINARY_EXTENSIONS = new Set([
     ".png",
     ".jpg",
@@ -268,5 +259,9 @@ export function incrementDiffStats(stats, status) {
         case "DELETED":
             stats.deletedCount++;
             break;
+        default: {
+            const _ = status;
+            throw new Error(`Unknown FileStatus: ${String(_)}`);
+        }
     }
 }

package/dist/sync/file-sync-orchestrator.js

@@ -41,11 +41,9 @@ export class FileSyncOrchestrator {
             else if (info.action === "delete")
                 incrementDiffStats(diffStats, "DELETED");
         }
-        // Show diff summary in dry-run
         if (dryRun) {
             this.log.diffSummary(diffStats.newCount, diffStats.modifiedCount, diffStats.unchangedCount, diffStats.deletedCount);
         }
-        // Build changed files list
         const changedFiles = Array.from(fileChanges.entries()).map(([fileName, info]) => ({ fileName, action: info.action }));
         const hasChanges = changedFiles.some((f) => f.action !== "skip");
         return { fileChanges, diffStats, changedFiles, hasChanges };

package/dist/sync/file-writer.d.ts

@@ -15,5 +15,8 @@ export declare class FileWriter implements IFileWriter {
      */
     static shouldBeExecutable: typeof shouldBeExecutable;
     writeFiles(files: FileContent[], ctx: FileWriteContext, deps: FileWriterDeps): Promise<FileWriteAllResult>;
+    private processOneFile;
+    private resolveContent;
+    private applyExecutablePermissions;
 }
 export {};

package/dist/sync/file-writer.js

@@ -2,7 +2,7 @@ import { existsSync } from "node:fs";
 import { join } from "node:path";
 import { convertContentToString, } from "../config/index.js";
 import { interpolateXfgContent } from "../shared/xfg-template.js";
-import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isBinaryFile, } from "./diff-utils.js";
+import { generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isBinaryFile, } from "./diff-utils.js";
 /**
  * Determines if a file should be marked as executable.
  * .sh files are auto-executable unless explicit executable: false is set.
@@ -26,96 +26,100 @@ export class FileWriter {
      */
     static shouldBeExecutable = shouldBeExecutable;
     async writeFiles(files, ctx, deps) {
-        const { repoInfo, baseBranch, workDir, dryRun } = ctx;
-        const { gitOps, log } = deps;
         const fileChanges = new Map();
         const diffStats = createDiffStats();
         const modeCache = new Map();
         for (const file of files) {
-            const filePath = join(workDir, file.fileName);
-            const fileExistsLocal = existsSync(filePath);
-            // Handle createOnly - check against BASE branch
-            if (file.createOnly) {
-                const existsOnBase = await gitOps.fileExistsOnBranch(file.fileName, baseBranch);
-                if (existsOnBase) {
-                    log.info(`Skipping ${file.fileName} (createOnly: exists on ${baseBranch})`);
-                    fileChanges.set(file.fileName, {
-                        fileName: file.fileName,
-                        content: null,
-                        action: "skip",
-                    });
-                    continue;
-                }
-            }
-            log.info(`Writing ${file.fileName}...`);
-            // Apply xfg templating if enabled
-            let contentToWrite = file.content;
-            if (file.template && contentToWrite !== null) {
-                contentToWrite = interpolateXfgContent(contentToWrite, {
-                    repoInfo,
-                    fileName: file.fileName,
-                    vars: file.vars,
-                }, { strict: true });
-            }
-            const fileContent = convertContentToString(contentToWrite, file.fileName, {
-                header: file.header,
-                schemaUrl: file.schemaUrl,
-            });
-            // Determine action type (create vs update) BEFORE writing
-            const action = fileExistsLocal ? "update" : "create";
-            const existingContent = gitOps.getFileContent(file.fileName);
-            const changed = gitOps.wouldChange(file.fileName, fileContent);
-            const desiredMode = shouldBeExecutable(file)
-                ? "100755"
-                : "100644";
-            const currentMode = await gitOps.getFileMode(file.fileName);
-            modeCache.set(file.fileName, currentMode);
-            const modeDiffers = currentMode !== null && currentMode !== desiredMode;
-            if (changed) {
-                const writeResult = {
-                    fileName: file.fileName,
-                    content: fileContent,
-                    action,
-                    ...(desiredMode === "100755" || modeDiffers
-                        ? { mode: desiredMode }
-                        : {}),
-                };
-                if (!isBinaryFile(file.fileName)) {
-                    writeResult.diffLines = computeUnifiedDiff(existingContent, fileContent);
-                }
-                fileChanges.set(file.fileName, writeResult);
-            }
-            else if (modeDiffers) {
+            await this.processOneFile(file, ctx, deps, fileChanges, diffStats, modeCache);
+        }
+        await this.applyExecutablePermissions(files, fileChanges, modeCache, ctx, deps);
+        return { fileChanges, diffStats };
+    }
+    async processOneFile(file, ctx, deps, fileChanges, diffStats, modeCache) {
+        const { repoInfo, baseBranch, workDir, dryRun } = ctx;
+        const { gitOps, log } = deps;
+        if (file.createOnly) {
+            const existsOnBase = await gitOps.fileExistsOnBranch(file.fileName, baseBranch);
+            if (existsOnBase) {
+                log.info(`Skipping ${file.fileName} (createOnly: exists on ${baseBranch})`);
                 fileChanges.set(file.fileName, {
                     fileName: file.fileName,
                     content: null,
-                    action: "update",
-                    mode: desiredMode,
-                    modeOnly: true,
+                    action: "skip",
                 });
+                return;
             }
-            if (dryRun) {
-                if (changed) {
-                    const status = getFileStatus(existingContent !== null, changed);
-                    incrementDiffStats(diffStats, status);
-                    const diffLines = generateDiff(existingContent, fileContent);
-                    log.fileDiff(file.fileName, status, diffLines);
-                }
-                else if (modeDiffers) {
-                    incrementDiffStats(diffStats, "MODIFIED");
-                    log.info(`Would change mode: ${file.fileName} ${currentMode} -> ${desiredMode}`);
-                }
+        }
+        log.info(`Writing ${file.fileName}...`);
+        const fileContent = this.resolveContent(file, repoInfo);
+        const fileExistsLocal = existsSync(join(workDir, file.fileName));
+        const action = fileExistsLocal ? "update" : "create";
+        const existingContent = gitOps.getFileContent(file.fileName);
+        const changed = gitOps.wouldChange(file.fileName, fileContent);
+        const desiredMode = shouldBeExecutable(file)
+            ? "100755"
+            : "100644";
+        const currentMode = await gitOps.getFileMode(file.fileName);
+        modeCache.set(file.fileName, currentMode);
+        const modeDiffers = currentMode !== null && currentMode !== desiredMode;
+        if (changed) {
+            const writeResult = {
+                fileName: file.fileName,
+                content: fileContent,
+                action,
+                ...(desiredMode === "100755" || modeDiffers
+                    ? { mode: desiredMode }
+                    : {}),
+            };
+            if (!isBinaryFile(file.fileName)) {
+                writeResult.diffLines = computeUnifiedDiff(existingContent, fileContent);
             }
-            else if (changed) {
-                incrementDiffStats(diffStats, action === "create" ? "NEW" : "MODIFIED");
-                gitOps.writeFile(file.fileName, fileContent);
+            fileChanges.set(file.fileName, writeResult);
+        }
+        else if (modeDiffers) {
+            fileChanges.set(file.fileName, {
+                fileName: file.fileName,
+                content: null,
+                action: "update",
+                mode: desiredMode,
+                modeOnly: true,
+            });
+        }
+        if (dryRun) {
+            if (changed) {
+                const status = existingContent !== null ? "MODIFIED" : "NEW";
+                incrementDiffStats(diffStats, status);
+                const diffLines = generateDiff(existingContent, fileContent);
+                log.fileDiff(file.fileName, status, diffLines);
             }
             else if (modeDiffers) {
                 incrementDiffStats(diffStats, "MODIFIED");
+                log.info(`Would change mode: ${file.fileName} ${currentMode} -> ${desiredMode}`);
             }
         }
-        // Separate pass for executable permissions: git add must happen after file
-        // content is written, and setExecutable needs the file to already be tracked.
+        else if (changed) {
+            incrementDiffStats(diffStats, action === "create" ? "NEW" : "MODIFIED");
+            gitOps.writeFile(file.fileName, fileContent);
+        }
+        else if (modeDiffers) {
+            incrementDiffStats(diffStats, "MODIFIED");
+        }
+    }
+    resolveContent(file, repoInfo) {
+        let contentToWrite = file.content;
+        if (file.template && contentToWrite !== null) {
+            contentToWrite = interpolateXfgContent(contentToWrite, {
+                repoInfo,
+                fileName: file.fileName,
+                vars: file.vars,
+            }, { strict: true });
+        }
+        return convertContentToString(contentToWrite, file.fileName, {
+            header: file.header,
+            schemaUrl: file.schemaUrl,
+        });
+    }
+    async applyExecutablePermissions(files, fileChanges, modeCache, ctx, deps) {
         for (const file of files) {
             const tracked = fileChanges.get(file.fileName);
             if (tracked?.action === "skip") {
@@ -124,18 +128,17 @@ export class FileWriter {
             const desired = shouldBeExecutable(file);
             const currentMode = modeCache.get(file.fileName) ?? null;
             if (desired && currentMode !== "100755") {
-                log.info(ctx.dryRun
+                deps.log.info(ctx.dryRun
                     ? `Would set executable: ${file.fileName}`
                     : `Setting executable: ${file.fileName}`);
-                await gitOps.setExecutable(file.fileName);
+                await deps.gitOps.setExecutable(file.fileName);
             }
             else if (!desired && currentMode === "100755") {
-                log.info(ctx.dryRun
+                deps.log.info(ctx.dryRun
                     ? `Would clear executable: ${file.fileName}`
                     : `Clearing executable: ${file.fileName}`);
-                await gitOps.clearExecutable(file.fileName);
+                await deps.gitOps.clearExecutable(file.fileName);
             }
         }
-        return { fileChanges, diffStats };
     }
 }

package/dist/sync/index.d.ts

@@ -1,3 +1,2 @@
-export { formatDiffLine } from "./diff-utils.js";
 export type { FileChangeDetail, GitOpsFactory, IAuthOptionsBuilder, IBranchManager, ICommitPushManager, IFileSyncOrchestrator, IPRMergeHandler, IRepositoryProcessor, IRepositorySession, IWorkStrategy, ProcessorResult, SessionContext, WorkResult, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/index.js

@@ -1,2 +1 @@
-export { formatDiffLine } from "./diff-utils.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/manifest.js

@@ -132,7 +132,7 @@ export function saveManifest(workDir, manifest) {
         writeFileSync(manifestPath, content, "utf-8");
     }
     catch (error) {
-        throw new SyncError(`Failed to save manifest ${manifestPath}: ${toErrorMessage(error)}`);
+        throw new SyncError(`Failed to save manifest ${manifestPath}: ${toErrorMessage(error)}`, { cause: error });
     }
 }
 export function getManagedFiles(manifest, configId) {

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

@@ -5,7 +5,7 @@ export class PRMergeHandler {
         this.log = log;
     }
     async createAndMerge(input) {
-        const { repoInfo, repoConfig, options, changedFiles, repoName, diffStats, fileChanges, } = input;
+        const { repoInfo, prOptions, options, changedFiles, repoName, diffStats, fileChanges, } = input;
         this.log.info("Creating pull request...");
         const strategy = options.dryRun
             ? undefined
@@ -21,19 +21,19 @@ export class PRMergeHandler {
             prTemplate: options.prTemplate,
             executor: options.executor,
             token: options.token,
-            labels: repoConfig.prOptions?.labels,
+            labels: prOptions?.labels,
             log: this.log,
             strategy,
         });
-        const mergeMode = repoConfig.prOptions?.merge ?? "auto";
+        const mergeMode = prOptions?.merge ?? "auto";
         let mergeResult;
         if (prResult.success && prResult.url && mergeMode !== "manual") {
             this.log.info(`Handling merge (mode: ${mergeMode})...`);
             const mergeConfig = {
                 mode: mergeMode,
-                strategy: repoConfig.prOptions?.mergeStrategy ?? "squash",
-                deleteBranch: repoConfig.prOptions?.deleteBranch ?? true,
-                bypassReason: repoConfig.prOptions?.bypassReason,
+                strategy: prOptions?.mergeStrategy ?? "squash",
+                deleteBranch: prOptions?.deleteBranch ?? true,
+                bypassReason: prOptions?.bypassReason,
             };
             const result = await mergePR({
                 repoInfo,

package/dist/sync/sync-workflow.js

@@ -98,7 +98,7 @@ export class SyncWorkflow {
             }
             return await this.prMergeHandler.createAndMerge({
                 repoInfo,
-                repoConfig,
+                prOptions: repoConfig.prOptions,
                 options: {
                     ...runCtx,
                     branchName,

package/dist/sync/types.d.ts

@@ -1,4 +1,4 @@
-import type { FileContent, RepoConfig } from "../config/index.js";
+import type { FileContent, RepoConfig, PRMergeOptions } from "../config/index.js";
 import type { RepoInfo } from "../repo/index.js";
 import type { ActiveAction } from "../settings/index.js";
 import type { ILocalGitOps, IGitOps, GitAuthOptions, GitOpsOptions, FileAction, FileActionKind } from "../vcs/index.js";
@@ -176,7 +176,7 @@ export interface PRHandlerOptions extends RunContext {
 }
 export interface CreateAndMergeInput {
     repoInfo: RepoInfo;
-    repoConfig: RepoConfig;
+    prOptions?: PRMergeOptions;
     options: PRHandlerOptions;
     changedFiles: FileAction[];
     repoName: string;

package/dist/vcs/ado-pr-strategy.d.ts

@@ -1,10 +1,8 @@
 import type { PRResult } from "./types.js";
 import { BasePRStrategy } from "./pr-strategy.js";
-import type { IPRStrategyLogger } from "./pr-strategy.js";
-import type { PRStrategyOptions, CloseExistingPROptions, MergeOptions, MergeResult } from "./types.js";
-import type { ICommandExecutor } from "../shared/command-executor.js";
+import type { PRStrategyOptions, CloseExistingPROptions, ClosePRResult, MergeOptions, MergeResult } from "./types.js";
 export declare class AdoPRStrategy extends BasePRStrategy {
-    constructor(executor: ICommandExecutor, log?: IPRStrategyLogger);
+    private readonly bodyFilePath;
     private getOrgUrl;
     private buildPRUrl;
     /**
@@ -13,7 +11,7 @@ export declare class AdoPRStrategy extends BasePRStrategy {
      */
     private findExistingPRId;
     findExistingPRUrl(options: CloseExistingPROptions): Promise<string | null>;
-    closeExistingPR(options: CloseExistingPROptions): Promise<boolean>;
+    closeExistingPR(options: CloseExistingPROptions): Promise<ClosePRResult>;
     create(options: PRStrategyOptions): Promise<PRResult>;
     /**
      * Extract PR ID and repo info from Azure DevOps PR URL.