@aspruyt/xfg 2.2.0 → 2.2.1

package/dist/repository-processor.js

@@ -101,19 +101,10 @@ export class RepositoryProcessor {
             // - Dry-run: Uses wouldChange() for read-only content comparison (no side effects)
             // - Normal: Uses git status after writing (source of truth for what git will commit)
             //
-            // This is intentional. git status is more accurate because it respects .gitattributes
-            // (line ending normalization, filters) and detects executable bit changes. However,
-            // it requires actually writing files, which defeats dry-run's purpose.
-            //
-            // For config files (JSON/YAML), these approaches produce identical results in practice.
-            // Edge cases (repos with unusual git attributes on config files) are essentially nonexistent.
-            const changedFiles = [];
-            const diffStats = createDiffStats();
-            // Track pre-write actions for non-dry-run mode (issue #252)
-            // We need to know if a file was created vs updated BEFORE writing it
-            const preWriteActions = new Map();
-            // Track file changes for commit strategy (path -> content, null for deletion)
+            // Track all file changes with content and action - single source of truth
+            // Used for both commit message generation and actual commit
             const fileChangesForCommit = new Map();
+            const diffStats = createDiffStats();
             for (const file of repoConfig.files) {
                 const filePath = join(workDir, file.fileName);
                 const fileExistsLocal = existsSync(filePath);
@@ -123,7 +114,10 @@ export class RepositoryProcessor {
                     const existsOnBase = await this.gitOps.fileExistsOnBranch(file.fileName, baseBranch);
                     if (existsOnBase) {
                         this.log.info(`Skipping ${file.fileName} (createOnly: exists on ${baseBranch})`);
-                        changedFiles.push({ fileName: file.fileName, action: "skip" });
+                        fileChangesForCommit.set(file.fileName, {
+                            content: null,
+                            action: "skip",
+                        });
                         continue;
                     }
                 }
@@ -141,37 +135,37 @@ export class RepositoryProcessor {
                     header: file.header,
                     schemaUrl: file.schemaUrl,
                 });
-                // Determine action type (create vs update)
+                // Determine action type (create vs update) BEFORE writing
                 const action = fileExistsLocal
                     ? "update"
                     : "create";
+                // Check if file would change (needed for both modes)
+                const existingContent = this.gitOps.getFileContent(file.fileName);
+                const changed = this.gitOps.wouldChange(file.fileName, fileContent);
+                if (changed) {
+                    // Track in single source of truth
+                    fileChangesForCommit.set(file.fileName, {
+                        content: fileContent,
+                        action,
+                    });
+                }
                 if (dryRun) {
-                    // In dry-run, check if file would change and show diff
-                    const existingContent = this.gitOps.getFileContent(file.fileName);
-                    const changed = this.gitOps.wouldChange(file.fileName, fileContent);
+                    // In dry-run, show diff but don't write
                     const status = getFileStatus(existingContent !== null, changed);
-                    // Track stats
                     incrementDiffStats(diffStats, status);
-                    if (changed) {
-                        changedFiles.push({ fileName: file.fileName, action });
-                    }
-                    // Generate and display diff
                     const diffLines = generateDiff(existingContent, fileContent, file.fileName);
                     this.log.fileDiff(file.fileName, status, diffLines);
                 }
                 else {
-                    // Write the file and store pre-write action for stats calculation
-                    preWriteActions.set(file.fileName, action);
+                    // Write the file
                     this.gitOps.writeFile(file.fileName, fileContent);
-                    // Track content for commit strategy
-                    fileChangesForCommit.set(file.fileName, fileContent);
                 }
             }
             // Step 5b: Set executable permission for files that need it
-            const skippedFileNames = new Set(changedFiles.filter((f) => f.action === "skip").map((f) => f.fileName));
             for (const file of repoConfig.files) {
                 // Skip files that were excluded (createOnly + exists)
-                if (skippedFileNames.has(file.fileName)) {
+                const tracked = fileChangesForCommit.get(file.fileName);
+                if (tracked?.action === "skip") {
                     continue;
                 }
                 if (shouldBeExecutable(file)) {
@@ -195,6 +189,11 @@ export class RepositoryProcessor {
                 for (const fileName of filesToDelete) {
                     // Only delete if file actually exists in the working directory
                     if (this.gitOps.fileExists(fileName)) {
+                        // Track deletion in single source of truth
+                        fileChangesForCommit.set(fileName, {
+                            content: null,
+                            action: "delete",
+                        });
                         if (dryRun) {
                             // In dry-run, show what would be deleted
                             this.log.fileDiff(fileName, "DELETED", []);
@@ -203,10 +202,7 @@ export class RepositoryProcessor {
                         else {
                             this.log.info(`Deleting orphaned file: ${fileName}`);
                             this.gitOps.deleteFile(fileName);
-                            // Track deletion for commit strategy
-                            fileChangesForCommit.set(fileName, null);
                         }
-                        changedFiles.push({ fileName, action: "delete" });
                     }
                 }
             }
@@ -217,85 +213,41 @@ export class RepositoryProcessor {
             // Only save if there are managed files for any config, or if we had a previous manifest
             const hasAnyManagedFiles = Object.keys(newManifest.configs).length > 0;
             if (hasAnyManagedFiles || existingManifest !== null) {
-                if (!dryRun) {
-                    saveManifest(workDir, newManifest);
-                    // Track manifest content for commit strategy
-                    const manifestContent = JSON.stringify(newManifest, null, 2) + "\n";
-                    fileChangesForCommit.set(MANIFEST_FILENAME, manifestContent);
-                }
                 // Track manifest file as changed if it would be different
                 const existingConfigs = existingManifest?.configs ?? {};
                 const manifestChanged = JSON.stringify(existingConfigs) !==
                     JSON.stringify(newManifest.configs);
                 if (manifestChanged) {
                     const manifestExisted = existsSync(join(workDir, MANIFEST_FILENAME));
-                    changedFiles.push({
-                        fileName: MANIFEST_FILENAME,
+                    const manifestContent = JSON.stringify(newManifest, null, 2) + "\n";
+                    fileChangesForCommit.set(MANIFEST_FILENAME, {
+                        content: manifestContent,
                         action: manifestExisted ? "update" : "create",
                     });
                 }
+                if (!dryRun) {
+                    saveManifest(workDir, newManifest);
+                }
             }
             // Show diff summary in dry-run mode
             if (dryRun) {
                 this.log.diffSummary(diffStats.newCount, diffStats.modifiedCount, diffStats.unchangedCount, diffStats.deletedCount);
             }
-            // Step 6: Check for changes (exclude skipped files)
-            let hasChanges;
-            if (dryRun) {
-                hasChanges = changedFiles.filter((f) => f.action !== "skip").length > 0;
-            }
-            else {
-                hasChanges = await this.gitOps.hasChanges();
-                // If there are changes, determine which files changed
-                if (hasChanges) {
-                    // Get the actual list of changed files from git status
-                    const gitChangedFiles = new Set(await this.gitOps.getChangedFiles());
-                    // Build set of files already tracked (skip, delete, manifest updates added earlier)
-                    const alreadyTracked = new Set(changedFiles.map((f) => f.fileName));
-                    // Add config files that actually changed according to git
-                    for (const file of repoConfig.files) {
-                        if (alreadyTracked.has(file.fileName)) {
-                            continue; // Already tracked (skipped, deleted, or manifest)
-                        }
-                        // Only include files that git reports as changed
-                        if (!gitChangedFiles.has(file.fileName)) {
-                            continue; // File didn't actually change
-                        }
-                        // Use pre-write action (issue #252) - we stored whether file existed
-                        // BEFORE writing, which is the correct basis for create vs update
-                        const action = preWriteActions.get(file.fileName) ?? "update";
-                        changedFiles.push({ fileName: file.fileName, action });
-                    }
-                    // Add any other files from git status that aren't already tracked
-                    // This catches files like .xfg.json when manifestChanged was false
-                    // but git still reports a change (e.g., due to formatting differences)
-                    for (const gitFile of gitChangedFiles) {
-                        if (changedFiles.some((f) => f.fileName === gitFile)) {
-                            continue; // Already tracked
-                        }
-                        const filePath = join(workDir, gitFile);
-                        const action = existsSync(filePath)
-                            ? "update"
-                            : "create";
-                        changedFiles.push({ fileName: gitFile, action });
-                    }
-                    // Calculate diff stats from changedFiles (issue #252)
-                    for (const file of changedFiles) {
-                        switch (file.action) {
-                            case "create":
-                                incrementDiffStats(diffStats, "NEW");
-                                break;
-                            case "update":
-                                incrementDiffStats(diffStats, "MODIFIED");
-                                break;
-                            case "delete":
-                                incrementDiffStats(diffStats, "DELETED");
-                                break;
-                            // "skip" files are not counted in stats
-                        }
-                    }
+            // Step 6: Derive changedFiles from single source of truth
+            // This ensures dry-run and non-dry-run modes use identical logic
+            const changedFiles = Array.from(fileChangesForCommit.entries()).map(([fileName, info]) => ({ fileName, action: info.action }));
+            // Calculate diff stats for non-dry-run mode (dry-run already calculated above)
+            if (!dryRun) {
+                for (const [, info] of fileChangesForCommit) {
+                    if (info.action === "create")
+                        incrementDiffStats(diffStats, "NEW");
+                    else if (info.action === "update")
+                        incrementDiffStats(diffStats, "MODIFIED");
+                    else if (info.action === "delete")
+                        incrementDiffStats(diffStats, "DELETED");
                 }
             }
+            const hasChanges = changedFiles.filter((f) => f.action !== "skip").length > 0;
             if (!hasChanges) {
                 return {
                     success: true,
@@ -315,11 +267,10 @@ export class RepositoryProcessor {
                 this.log.info(`Would push to ${pushBranch}...`);
             }
             else {
-                // Build file changes for commit strategy
-                const fileChanges = [];
-                for (const [path, content] of fileChangesForCommit.entries()) {
-                    fileChanges.push({ path, content });
-                }
+                // Build file changes for commit strategy (filter out skipped files)
+                const fileChanges = Array.from(fileChangesForCommit.entries())
+                    .filter(([, info]) => info.action !== "skip")
+                    .map(([path, info]) => ({ path, content: info.content }));
                 // Check if there are actually staged changes (edge case handling)
                 // This handles scenarios where git status shows changes but git add doesn't stage anything
                 // (e.g., due to .gitattributes normalization)

package/dist/strategies/graphql-commit-strategy.js

@@ -149,7 +149,14 @@ export class GraphQLCommitStrategy {
         const hostnameArg = repoInfo.host !== "github.com"
             ? `--hostname ${escapeShellArg(repoInfo.host)}`
             : "";
-        const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${hostnameArg} --input -`;
+        // Use GH_INSTALLATION_TOKEN explicitly for authentication (issue #268)
+        // This ensures the GitHub App is used as the commit author, not github-actions[bot]
+        // The token is passed via Authorization header rather than relying on GH_TOKEN env var
+        const installationToken = process.env.GH_INSTALLATION_TOKEN;
+        const authArg = installationToken
+            ? `-H "Authorization: token ${installationToken}"`
+            : "";
+        const command = `echo ${escapeShellArg(requestBody)} | gh api graphql ${authArg} ${hostnameArg} --input -`;
         const response = await this.executor.exec(command, workDir);
         // Parse the response
         const parsed = JSON.parse(response);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "2.2.0",
+  "version": "2.2.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",