@aspruyt/xfg 3.5.5 → 3.5.6

package/dist/ruleset-diff.js

@@ -37,14 +37,15 @@ function normalizeValue(value) {
 export function normalizeRuleset(obj) {
     const normalized = {};
     for (const [key, value] of Object.entries(obj)) {
-        if (value == null) {
+        if (value === undefined) {
             continue;
         }
         const snakeKey = camelToSnake(key);
         if (!RULESET_COMPARABLE_FIELDS.has(snakeKey)) {
             continue;
         }
-        normalized[snakeKey] = normalizeValue(value);
+        // Preserve null explicitly — it means "API couldn't read this field"
+        normalized[snakeKey] = value === null ? null : normalizeValue(value);
     }
     return normalized;
 }
@@ -122,7 +123,13 @@ function projectObjects(current, desired) {
     const result = {};
     for (const key of Object.keys(desired)) {
         if (key in current) {
-            result[key] = projectToDesiredShape(current[key], desired[key]);
+            if (current[key] === null) {
+                // null means "API token can't read this field" — assume it matches desired
+                result[key] = desired[key];
+            }
+            else {
+                result[key] = projectToDesiredShape(current[key], desired[key]);
+            }
         }
         else if (Array.isArray(desired[key]) &&
             desired[key].length === 0) {

package/dist/ruleset-processor.d.ts

@@ -35,6 +35,7 @@ export interface RulesetProcessorResult {
  */
 export declare class RulesetProcessor implements IRulesetProcessor {
     private readonly strategy;
+    private readonly tokenManager;
     constructor(strategy?: GitHubRulesetStrategy);
     /**
      * Process rulesets for a single repository.
@@ -49,4 +50,9 @@ export declare class RulesetProcessor implements IRulesetProcessor {
      * Only rulesets with deleteOrphaned enabled should be tracked.
      */
     private computeManifestUpdate;
+    /**
+     * Resolves a GitHub App installation token for the given repo.
+     * Returns undefined if no token manager or token resolution fails.
+     */
+    private getInstallationToken;
 }

package/dist/ruleset-processor.js

@@ -2,6 +2,8 @@ import { isGitHubRepo, getRepoDisplayName } from "./repo-detector.js";
 import { GitHubRulesetStrategy, } from "./strategies/github-ruleset-strategy.js";
 import { diffRulesets } from "./ruleset-diff.js";
 import { formatRulesetPlan, } from "./ruleset-plan-formatter.js";
+import { hasGitHubAppCredentials } from "./strategies/index.js";
+import { GitHubAppTokenManager } from "./github-app-token-manager.js";
 // =============================================================================
 // Processor Implementation
 // =============================================================================
@@ -11,8 +13,15 @@ import { formatRulesetPlan, } from "./ruleset-plan-formatter.js";
  */
 export class RulesetProcessor {
     strategy;
+    tokenManager;
     constructor(strategy) {
         this.strategy = strategy ?? new GitHubRulesetStrategy();
+        if (hasGitHubAppCredentials()) {
+            this.tokenManager = new GitHubAppTokenManager(process.env.XFG_GITHUB_APP_ID, process.env.XFG_GITHUB_APP_PRIVATE_KEY);
+        }
+        else {
+            this.tokenManager = null;
+        }
     }
     /**
      * Process rulesets for a single repository.
@@ -44,8 +53,9 @@ export class RulesetProcessor {
             };
         }
         try {
-            // Fetch current rulesets
-            const strategyOptions = { token, host: githubRepo.host };
+            // Resolve App token if available, fall back to provided token
+            const effectiveToken = token ?? (await this.getInstallationToken(githubRepo));
+            const strategyOptions = { token: effectiveToken, host: githubRepo.host };
             const currentRulesets = await this.strategy.list(githubRepo, strategyOptions);
             // Convert desired rulesets to Map
             const desiredMap = new Map(Object.entries(desiredRulesets));
@@ -159,4 +169,20 @@ export class RulesetProcessor {
         const rulesetNames = Object.keys(rulesets).sort();
         return { rulesets: rulesetNames };
     }
+    /**
+     * Resolves a GitHub App installation token for the given repo.
+     * Returns undefined if no token manager or token resolution fails.
+     */
+    async getInstallationToken(repoInfo) {
+        if (!this.tokenManager) {
+            return undefined;
+        }
+        try {
+            const token = await this.tokenManager.getTokenForRepo(repoInfo);
+            return token ?? undefined;
+        }
+        catch {
+            return undefined;
+        }
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.5.5",
+  "version": "3.5.6",
   "description": "CLI tool for repository-as-code",
   "type": "module",
   "main": "dist/index.js",