@aspruyt/xfg 3.9.5 → 3.9.8

package/dist/cli/settings-command.js

@@ -167,6 +167,7 @@ async function processRulesets(repos, config, options, processor, repoProcessor,
             }
             else {
                 logger.error(i + 1, repoName, result.message);
+                collector.appendError(repoName, result.message);
             }
             results.push({
                 repoName,
@@ -240,6 +241,7 @@ async function processRepoSettings(repos, config, options, processorFactory, res
             }
             else {
                 logger.error(current, repoName, result.message);
+                collector.appendError(repoName, result.message);
             }
             if (!result.skipped) {
                 const existing = results.find((r) => r.repoName === repoName);

package/dist/settings/repo-settings/github-repo-settings-strategy.js

@@ -1,6 +1,7 @@
 import { defaultExecutor, } from "../../shared/command-executor.js";
 import { isGitHubRepo, } from "../../shared/repo-detector.js";
 import { escapeShellArg } from "../../shared/shell-utils.js";
+import { withRetry } from "../../shared/retry-utils.js";
 /**
  * Converts camelCase to snake_case.
  */
@@ -155,9 +156,18 @@ export class GitHubRepoSettingsStrategy {
     }
     async getPrivateVulnerabilityReporting(github, options) {
         const endpoint = `/repos/${github.owner}/${github.repo}/private-vulnerability-reporting`;
-        const result = await this.ghApi("GET", endpoint, undefined, options);
-        const data = JSON.parse(result);
-        return data.enabled === true;
+        try {
+            const result = await this.ghApi("GET", endpoint, undefined, options);
+            const data = JSON.parse(result);
+            return data.enabled === true;
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (message.includes("HTTP 404")) {
+                return false; // 404 = not available (e.g. private repos)
+            }
+            throw error; // Re-throw other errors
+        }
     }
     validateGitHub(repoInfo) {
         if (!isGitHubRepo(repoInfo)) {
@@ -181,9 +191,9 @@ export class GitHubRepoSettingsStrategy {
             (method === "POST" || method === "PUT" || method === "PATCH")) {
             const payloadJson = JSON.stringify(payload);
             const command = `echo ${escapeShellArg(payloadJson)} | ${tokenPrefix}${baseCommand} --input -`;
-            return await this.executor.exec(command, process.cwd());
+            return await withRetry(() => this.executor.exec(command, process.cwd()));
         }
         const command = `${tokenPrefix}${baseCommand}`;
-        return await this.executor.exec(command, process.cwd());
+        return await withRetry(() => this.executor.exec(command, process.cwd()));
     }
 }

package/dist/settings/rulesets/github-ruleset-strategy.js

@@ -1,6 +1,7 @@
 import { defaultExecutor, } from "../../shared/command-executor.js";
 import { isGitHubRepo, } from "../../shared/repo-detector.js";
 import { escapeShellArg } from "../../shared/shell-utils.js";
+import { withRetry } from "../../shared/retry-utils.js";
 // =============================================================================
 // Conversion Functions
 // =============================================================================
@@ -201,10 +202,10 @@ export class GitHubRulesetStrategy {
         if (payload && (method === "POST" || method === "PUT")) {
             const payloadJson = JSON.stringify(payload);
             const command = `echo ${escapeShellArg(payloadJson)} | ${tokenPrefix}${baseCommand} --input -`;
-            return await this.executor.exec(command, process.cwd());
+            return await withRetry(() => this.executor.exec(command, process.cwd()));
         }
         // For GET/DELETE, run command directly
         const command = `${tokenPrefix}${baseCommand}`;
-        return await this.executor.exec(command, process.cwd());
+        return await withRetry(() => this.executor.exec(command, process.cwd()));
     }
 }

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

@@ -1,6 +1,7 @@
 import { defaultExecutor, } from "../shared/command-executor.js";
 import { isGitHubRepo } from "../shared/repo-detector.js";
 import { escapeShellArg } from "../shared/shell-utils.js";
+import { withRetry, DEFAULT_PERMANENT_ERROR_PATTERNS, } from "../shared/retry-utils.js";
 /**
  * Maximum payload size for GitHub GraphQL API (50MB).
  * Base64 encoding adds ~33% overhead, so raw content should be checked.
@@ -29,6 +30,16 @@ export function validateBranchName(branchName) {
             `alphanumeric characters, hyphens, underscores, dots, and forward slashes.`);
     }
 }
+/**
+ * OID mismatch error patterns that should NOT be retried by the inner withRetry.
+ * The outer retry loop in commit() handles these by fetching a fresh HEAD OID.
+ */
+const OID_MISMATCH_PATTERNS = [
+    /expected branch to point to/i,
+    /expectedheadoid/i,
+    /head oid/i,
+    /was provided invalid value/i,
+];
 /**
  * GraphQL-based commit strategy using GitHub's createCommitOnBranch mutation.
  * Used with GitHub App authentication. Commits via this strategy ARE verified
@@ -162,7 +173,12 @@ export class GraphQLCommitStrategy {
         // GH_TOKEN env var must be set for the gh command (after the pipe), not echo
         const tokenPrefix = token ? `GH_TOKEN=${token} ` : "";
         const command = `echo ${escapeShellArg(requestBody)} | ${tokenPrefix}gh api graphql ${hostnameArg} --input -`;
-        const response = await this.executor.exec(command, workDir);
+        const response = await withRetry(() => this.executor.exec(command, workDir), {
+            permanentErrorPatterns: [
+                ...DEFAULT_PERMANENT_ERROR_PATTERNS,
+                ...OID_MISMATCH_PATTERNS,
+            ],
+        });
         // Parse the response
         const parsed = JSON.parse(response);
         if (parsed.errors) {

package/package.json

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