@aspruyt/xfg 5.1.3 → 5.1.5

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

@@ -1,4 +1,4 @@
-import type { FileContent } from "../config/types.js";
+import { type FileContent } from "../config/index.js";
 import type { IFileWriter, FileWriteContext, FileWriterDeps, FileWriteAllResult } from "./types.js";
 /**
  * Determines if a file should be marked as executable.

package/dist/sync/file-writer.js

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import { join } from "node:path";
-import { convertContentToString } from "../config/formatter.js";
+import { convertContentToString, } from "../config/index.js";
 import { interpolateXfgContent } from "../shared/xfg-template.js";
 import { getFileStatus, generateDiff, createDiffStats, incrementDiffStats, computeUnifiedDiff, isBinaryFile, } from "./diff-utils.js";
 /**
@@ -87,6 +87,8 @@ export class FileWriter {
                 gitOps.writeFile(file.fileName, fileContent);
             }
         }
+        // Separate pass for executable permissions: git add must happen after file
+        // content is written, and setExecutable needs the file to already be tracked.
         for (const file of files) {
             const tracked = fileChanges.get(file.fileName);
             if (tracked?.action === "skip") {

package/dist/sync/index.d.ts

@@ -1,4 +1,3 @@
-export type { DiffStats } from "./diff-utils.js";
-export { computeUnifiedDiff, isBinaryFile, formatDiffLine, } from "./diff-utils.js";
+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,2 @@
-export { computeUnifiedDiff, isBinaryFile, formatDiffLine, } from "./diff-utils.js";
+export { formatDiffLine } from "./diff-utils.js";
 export { RepositoryProcessor } from "./repository-processor.js";

package/dist/sync/manifest-manager.d.ts

@@ -9,7 +9,7 @@ export declare class ManifestManager implements IManifestManager {
         debug(msg: string): void;
         warn(msg: string): void;
     } | undefined);
-    processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
+    detectOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
     deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): void;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;
 }

package/dist/sync/manifest-manager.js

@@ -10,7 +10,7 @@ export class ManifestManager {
     constructor(log) {
         this.log = log;
     }
-    processOrphans(workDir, configId, filesWithDeleteOrphaned) {
+    detectOrphans(workDir, configId, filesWithDeleteOrphaned) {
         const existingManifest = loadManifest(workDir, this.log);
         const { manifest, filesToDelete } = updateManifest(existingManifest, configId, filesWithDeleteOrphaned);
         return { manifest, existingManifest, filesToDelete };

package/dist/sync/manifest.js

@@ -110,7 +110,15 @@ export function loadManifest(workDir, log) {
 export function parseManifestContent(content, log) {
     try {
         const parsed = JSON.parse(content);
-        return migrateToV4(parsed);
+        const migrated = migrateToV4(parsed);
+        if (migrated)
+            return migrated;
+        if (isV1Manifest(parsed)) {
+            log?.debug("V1 manifest detected — treating as empty (no config-ID namespace)");
+            return null;
+        }
+        log?.warn("Unrecognized manifest format in content, ignoring");
+        return null;
     }
     catch (error) {
         log?.warn(`Failed to parse manifest content: ${toErrorMessage(error)}`);

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

@@ -1,4 +1,4 @@
-import { createPR, mergePR, getPRStrategy, } from "../vcs/index.js";
+import { createPR, mergePR, createPRStrategy, } from "../vcs/index.js";
 export class PRMergeHandler {
     log;
     constructor(log) {
@@ -9,7 +9,7 @@ export class PRMergeHandler {
         this.log.info("Creating pull request...");
         const strategy = options.dryRun
             ? undefined
-            : getPRStrategy(repoInfo, options.executor, this.log);
+            : createPRStrategy(repoInfo, options.executor, this.log);
         const prResult = await createPR({
             repoInfo,
             branchName: options.branchName,

package/dist/sync/sync-workflow.d.ts

@@ -1,4 +1,4 @@
-import type { RepoConfig } from "../config/types.js";
+import type { RepoConfig } from "../config/index.js";
 import { RepoInfo } from "../shared/repo-detector.js";
 import type { DebugInfoLog } from "../shared/logger.js";
 import type { ISyncWorkflow, IWorkStrategy, IAuthOptionsBuilder, IRepositorySession, IBranchManager, ICommitPushManager, IPRMergeHandler, ProcessorOptions, ProcessorResult } from "./types.js";

package/dist/sync/types.d.ts

@@ -1,4 +1,4 @@
-import type { FileContent, RepoConfig } from "../config/types.js";
+import type { FileContent, RepoConfig } from "../config/index.js";
 import type { RepoInfo } from "../shared/repo-detector.js";
 import type { ILocalGitOps, IGitOps, GitAuthOptions, GitOpsOptions, FileAction } from "../vcs/index.js";
 import type { DiffStats } from "./diff-utils.js";
@@ -48,7 +48,7 @@ export interface OrphanDeleteDeps {
     fileChanges: Map<string, FileWriteResult>;
 }
 export interface IManifestManager {
-    processOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
+    detectOrphans(workDir: string, configId: string, filesWithDeleteOrphaned: Map<string, boolean | undefined>): OrphanProcessResult;
     deleteOrphans(filesToDelete: string[], options: OrphanDeleteOptions, deps: OrphanDeleteDeps): void;
     saveUpdatedManifest(workDir: string, manifest: XfgManifest, existingManifest: XfgManifest | null, dryRun: boolean, fileChanges: Map<string, FileWriteResult>): void;
 }

package/dist/vcs/authenticated-git-ops.d.ts

@@ -8,7 +8,7 @@ import type { GitAuthOptions, ILocalGitOps, IGitOps } from "./types.js";
  * the remote origin. Subsequent operations (fetch, push, getDefaultBranch)
  * reuse that authenticated remote URL — no extra auth setup per operation.
  */
-export interface AuthenticatedGitOpsOptions {
+interface AuthenticatedGitOpsOptions {
     localOps: ILocalGitOps;
     executor: ICommandExecutor;
     workDir: string;
@@ -81,3 +81,4 @@ export declare class AuthenticatedGitOps implements IGitOps {
      */
     fetchBranch(branchName: string): Promise<void>;
 }
+export {};

package/dist/vcs/commit-strategy-selector.d.ts

@@ -14,5 +14,5 @@ export declare function createTokenManager(credentials?: GitHubAppCredentials):
  * Returns GraphQLCommitStrategy for GitHub repos with App credentials (verified commits),
  * or GitCommitStrategy for all other cases.
  */
-export declare function getCommitStrategy(repoInfo: RepoInfo, executor: ICommandExecutor, hasAppCredentials?: boolean): ICommitStrategy;
+export declare function createCommitStrategy(repoInfo: RepoInfo, executor: ICommandExecutor, hasAppCredentials?: boolean): ICommitStrategy;
 export {};

package/dist/vcs/commit-strategy-selector.js

@@ -15,7 +15,7 @@ export function createTokenManager(credentials) {
  * Returns GraphQLCommitStrategy for GitHub repos with App credentials (verified commits),
  * or GitCommitStrategy for all other cases.
  */
-export function getCommitStrategy(repoInfo, executor, hasAppCredentials) {
+export function createCommitStrategy(repoInfo, executor, hasAppCredentials) {
     if (isGitHubRepo(repoInfo) && hasAppCredentials) {
         return new GraphQLCommitStrategy(executor);
     }

package/dist/vcs/git-ops.d.ts

@@ -50,7 +50,6 @@ export declare class GitOps implements ILocalGitOps {
     /**
      * Get list of files that have changes according to git status.
      * Returns relative file paths for files that are modified, added, or untracked.
-     * Uses the same this.exec() pattern as other methods in this class.
      */
     getChangedFiles(): Promise<string[]>;
     stageAll(): Promise<void>;

package/dist/vcs/git-ops.js

@@ -109,8 +109,7 @@ export class GitOps {
             if (code === "ENOENT" || code === "EACCES") {
                 return null;
             }
-            this.log?.debug(`Unexpected error reading ${fileName}: ${toErrorMessage(error)}`);
-            return null;
+            throw error;
         }
     }
     /**
@@ -130,8 +129,12 @@ export class GitOps {
             return existingContent !== newContent;
         }
         catch (error) {
-            this.log?.debug(`Failed to read ${fileName} for comparison: ${toErrorMessage(error)}`);
-            return true;
+            const code = error.code;
+            if (code === "ENOENT" || code === "EACCES") {
+                this.log?.debug(`Failed to read ${fileName} for comparison: ${toErrorMessage(error)}`);
+                return true;
+            }
+            throw error;
         }
     }
     async hasChanges() {
@@ -141,7 +144,6 @@ export class GitOps {
     /**
      * Get list of files that have changes according to git status.
      * Returns relative file paths for files that are modified, added, or untracked.
-     * Uses the same this.exec() pattern as other methods in this class.
      */
     async getChangedFiles() {
         const status = await this.exec("git status --porcelain", this._workDir);
@@ -169,9 +171,14 @@ export class GitOps {
             return true;
         }
         catch (error) {
-            // Expected when file doesn't exist on branch
-            this.log?.debug(`fileExistsOnBranch(${fileName}, ${branch}): ${toErrorMessage(error)}`);
-            return false;
+            const message = toErrorMessage(error);
+            if (message.includes("does not exist") ||
+                message.includes("did not match") ||
+                message.includes("not found")) {
+                this.log?.debug(`fileExistsOnBranch(${fileName}, ${branch}): ${message}`);
+                return false;
+            }
+            throw error;
         }
     }
     fileExists(fileName) {

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

@@ -9,9 +9,6 @@ export declare class GitHubPRStrategy extends BasePRStrategy {
      * Check if auto-merge is enabled on the repository.
      */
     private checkAutoMergeEnabled;
-    /**
-     * Build merge strategy flag for gh pr merge command.
-     */
     private getMergeStrategyFlag;
     merge(options: MergeOptions): Promise<MergeResult>;
 }

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

@@ -20,9 +20,6 @@ function getRepoFlag(repoInfo) {
     }
     return `${repoInfo.owner}/${repoInfo.repo}`;
 }
-/**
- * Build regex to match PR URLs for the given host.
- */
 function buildPRUrlRegex(host) {
     const escapedHost = escapeRegExp(host);
     return new RegExp(`https://${escapedHost}/[\\w-]+/[\\w.-]+/pull/\\d+`);
@@ -136,14 +133,14 @@ export class GitHubPRStrategy extends BasePRStrategy {
             return result.trim() === "true";
         }
         catch (error) {
-            // If we can't check, assume auto-merge is not enabled
+            if (isPermanentError(error)) {
+                throw error;
+            }
+            // If we can't check due to transient errors, assume auto-merge is not enabled
             this.log?.warn(`Could not check auto-merge status: ${toErrorMessage(error)}`);
             return false;
         }
     }
-    /**
-     * Build merge strategy flag for gh pr merge command.
-     */
     getMergeStrategyFlag(strategy) {
         switch (strategy) {
             case "squash":

package/dist/vcs/index.d.ts

@@ -1,5 +1,5 @@
-export type { PRMergeConfig, FileChange, FileAction, IGitOps, ILocalGitOps, INetworkGitOps, IPRStrategy, GitAuthOptions, PRResult, PRStrategyOptions, MergeOptions, MergeResult, CloseExistingPROptions, CommitOptions, CommitResult, ICommitStrategy, } from "./types.js";
+export type { PRMergeConfig, FileChange, FileAction, IGitOps, ILocalGitOps, IPRStrategy, GitAuthOptions, PRResult, ICommitStrategy, } from "./types.js";
 export type { GitOpsOptions } from "./git-ops.js";
-export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
-export { getPRStrategy } from "./pr-strategy-factory.js";
+export { createCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
+export { createPRStrategy } from "./pr-strategy-factory.js";
 export { createPR, mergePR } from "./pr-creator.js";

package/dist/vcs/index.js

@@ -1,6 +1,6 @@
 // Commit strategies
-export { getCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
+export { createCommitStrategy, createTokenManager, } from "./commit-strategy-selector.js";
 // PR strategy factory
-export { getPRStrategy } from "./pr-strategy-factory.js";
+export { createPRStrategy } from "./pr-strategy-factory.js";
 // PR creation and merge
 export { createPR, mergePR } from "./pr-creator.js";

package/dist/vcs/pr-creator.js

@@ -1,7 +1,7 @@
 import { readFileSync, existsSync } from "node:fs";
 import { join, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { getPRStrategy } from "./pr-strategy-factory.js";
+import { createPRStrategy } from "./pr-strategy-factory.js";
 import { PRWorkflowExecutor } from "./pr-strategy.js";
 import { interpolateXfgContent } from "../shared/xfg-template.js";
 function loadDefaultTemplate() {
@@ -95,18 +95,18 @@ export function formatPRTitle(files) {
     }
     return `chore: sync ${changedFiles.length} config files`;
 }
-export async function createPR(options) {
+export function createPR(options) {
     const { repoInfo, branchName, baseBranch, files, workDir, dryRun, retries, prTemplate, executor, token, labels, log, } = options;
     const title = formatPRTitle(files);
     const body = formatPRBody(files, repoInfo, prTemplate);
     if (dryRun) {
-        return {
+        return Promise.resolve({
             success: true,
             message: `[DRY RUN] Would create PR: "${title}"`,
-        };
+        });
     }
     // Get the appropriate strategy and execute via workflow executor
-    const resolvedStrategy = options.strategy ?? getPRStrategy(repoInfo, executor, log);
+    const resolvedStrategy = options.strategy ?? createPRStrategy(repoInfo, executor, log);
     const workflow = new PRWorkflowExecutor(resolvedStrategy);
     return workflow.execute({
         repoInfo,
@@ -120,7 +120,7 @@ export async function createPR(options) {
         labels,
     });
 }
-export async function mergePR(options) {
+export function mergePR(options) {
     const { repoInfo, prUrl, mergeConfig, workDir, dryRun, retries, executor, token, log, } = options;
     if (dryRun) {
         const modeText = mergeConfig.mode === "force"
@@ -128,14 +128,14 @@ export async function mergePR(options) {
             : mergeConfig.mode === "auto"
                 ? "enable auto-merge"
                 : "leave open for manual review";
-        return {
+        return Promise.resolve({
             success: true,
             message: `[DRY RUN] Would ${modeText}`,
             merged: false,
-        };
+        });
     }
     // Get the appropriate strategy and execute merge
-    const resolvedStrategy = options.strategy ?? getPRStrategy(repoInfo, executor, log);
+    const resolvedStrategy = options.strategy ?? createPRStrategy(repoInfo, executor, log);
     return resolvedStrategy.merge({
         prUrl,
         repoInfo,

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

@@ -2,4 +2,4 @@ import { RepoInfo } from "../shared/repo-detector.js";
 import type { IPRStrategy } from "./types.js";
 import { ICommandExecutor } from "../shared/command-executor.js";
 import type { IPRStrategyLogger } from "./pr-strategy.js";
-export declare function getPRStrategy(repoInfo: RepoInfo, executor: ICommandExecutor, log?: IPRStrategyLogger): IPRStrategy;
+export declare function createPRStrategy(repoInfo: RepoInfo, executor: ICommandExecutor, log?: IPRStrategyLogger): IPRStrategy;

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

@@ -3,7 +3,7 @@ import { SyncError } from "../shared/errors.js";
 import { GitHubPRStrategy } from "./github-pr-strategy.js";
 import { AzurePRStrategy } from "./azure-pr-strategy.js";
 import { GitLabPRStrategy } from "./gitlab-pr-strategy.js";
-export function getPRStrategy(repoInfo, executor, log) {
+export function createPRStrategy(repoInfo, executor, log) {
     if (isGitHubRepo(repoInfo)) {
         return new GitHubPRStrategy(executor, log);
     }

package/dist/vcs/pr-strategy.js

@@ -13,17 +13,12 @@ export class BasePRStrategy {
      * Shared by all platform strategies to eliminate duplicated try/catch patterns.
      */
     async executeMergeCommand(execFn, retries, successResult, errorPrefix) {
-        try {
-            await withRetry(execFn, { retries, log: this.log });
-            return successResult;
-        }
-        catch (error) {
-            return {
-                success: false,
-                message: `${errorPrefix}: ${toErrorMessage(error)}`,
-                merged: false,
-            };
-        }
+        const result = await withRetry(execFn, { retries, log: this.log }).then(() => successResult, (error) => {
+            const message = `${errorPrefix}: ${toErrorMessage(error)}`;
+            this.log?.warn(message);
+            return { success: false, message, merged: false };
+        });
+        return result;
     }
 }
 export class PRWorkflowExecutor {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "5.1.3",
+  "version": "5.1.5",
   "description": "Manage files, settings, and repositories across GitHub, Azure DevOps, and GitLab — declaratively, from a single YAML config",
   "type": "module",
   "main": "dist/index.js",

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

@@ -1,20 +0,0 @@
-import type { ProcessorResult } from "../sync/index.js";
-import { RepoConfig } from "../config/index.js";
-import { MergeOutcome, FileChanges, RepoResult } from "./github-summary.js";
-import type { DiffStats } from "../sync/index.js";
-/**
- * Determine merge outcome from repo config and processor result
- */
-export declare function getMergeOutcome(repoConfig: RepoConfig, result: ProcessorResult): MergeOutcome | undefined;
-/**
- * Convert DiffStats to FileChanges for summary output
- */
-export declare function toFileChanges(diffStats?: DiffStats): FileChanges | undefined;
-/**
- * Build a RepoResult from a ProcessorResult for the summary
- */
-export declare function buildRepoResult(repoName: string, repoConfig: RepoConfig, result: ProcessorResult): RepoResult;
-/**
- * Build a RepoResult for an error case
- */
-export declare function buildErrorResult(repoName: string, error: unknown): RepoResult;

package/dist/output/summary-utils.js

@@ -1,79 +0,0 @@
-import { toErrorMessage } from "../shared/type-guards.js";
-/**
- * Determine merge outcome from repo config and processor result
- */
-export function getMergeOutcome(repoConfig, result) {
-    if (!result.success || result.skipped)
-        return undefined;
-    const mergeMode = repoConfig.prOptions?.merge ?? "auto";
-    if (mergeMode === "direct")
-        return "direct";
-    if (result.mergeResult?.merged)
-        return "force";
-    if (result.mergeResult?.autoMergeEnabled)
-        return "auto";
-    if (result.prUrl)
-        return "manual";
-    return undefined;
-}
-/**
- * Convert DiffStats to FileChanges for summary output
- */
-export function toFileChanges(diffStats) {
-    if (!diffStats)
-        return undefined;
-    return {
-        added: diffStats.newCount,
-        modified: diffStats.modifiedCount,
-        deleted: diffStats.deletedCount,
-        unchanged: diffStats.unchangedCount,
-    };
-}
-/**
- * Build a RepoResult from a ProcessorResult for the summary
- */
-export function buildRepoResult(repoName, repoConfig, result) {
-    if (result.skipped) {
-        return {
-            repoName,
-            status: "skipped",
-            message: result.message,
-            fileChanges: toFileChanges(result.diffStats),
-        };
-    }
-    if (result.success) {
-        let message = result.prUrl ? `PR: ${result.prUrl}` : result.message;
-        if (result.mergeResult) {
-            if (result.mergeResult.merged) {
-                message += " (merged)";
-            }
-            else if (result.mergeResult.autoMergeEnabled) {
-                message += " (auto-merge enabled)";
-            }
-        }
-        return {
-            repoName,
-            status: "succeeded",
-            message,
-            prUrl: result.prUrl,
-            mergeOutcome: getMergeOutcome(repoConfig, result),
-            fileChanges: toFileChanges(result.diffStats),
-        };
-    }
-    return {
-        repoName,
-        status: "failed",
-        message: result.message,
-    };
-}
-/**
- * Build a RepoResult for an error case
- */
-export function buildErrorResult(repoName, error) {
-    const message = toErrorMessage(error);
-    return {
-        repoName,
-        status: "failed",
-        message,
-    };
-}