@aspruyt/xfg 3.13.0 → 4.0.0

package/dist/settings/rulesets/diff.js

@@ -201,13 +201,12 @@ function matchByIndex(current, desired) {
  *
  * @param current - Current rulesets from GitHub API
  * @param desired - Desired rulesets from config (name → ruleset)
- * @param managedNames - Names of rulesets managed by xfg (from manifest)
+ * @param deleteOrphaned - When true, delete ALL current rulesets not in desired (desired-state model)
  * @returns Array of changes to apply
  */
-export function diffRulesets(current, desired, managedNames) {
+export function diffRulesets(current, desired, deleteOrphaned) {
     const changes = [];
     const currentByName = new Map(current.map((r) => [r.name, r]));
-    const managedSet = new Set(managedNames);
     // Check each desired ruleset
     for (const [name, desiredRuleset] of desired) {
         const currentRuleset = currentByName.get(name);
@@ -244,11 +243,10 @@ export function diffRulesets(current, desired, managedNames) {
             }
         }
     }
-    // Check for orphaned rulesets (in manifest but not in desired config)
-    for (const name of managedSet) {
-        if (!desired.has(name)) {
-            const currentRuleset = currentByName.get(name);
-            if (currentRuleset) {
+    // Desired-state: delete ALL current rulesets not in desired when deleteOrphaned is true
+    if (deleteOrphaned) {
+        for (const [name, currentRuleset] of currentByName) {
+            if (!desired.has(name)) {
                 changes.push({
                     action: "delete",
                     name,

package/dist/settings/rulesets/processor.d.ts

@@ -6,9 +6,7 @@ export interface IRulesetProcessor {
     process(repoConfig: RepoConfig, repoInfo: RepoInfo, options: RulesetProcessorOptions): Promise<RulesetProcessorResult>;
 }
 export interface RulesetProcessorOptions {
-    configId: string;
     dryRun?: boolean;
-    managedRulesets: string[];
     noDelete?: boolean;
     token?: string;
 }
@@ -24,9 +22,6 @@ export interface RulesetProcessorResult {
         delete: number;
         unchanged: number;
     };
-    manifestUpdate?: {
-        rulesets: string[];
-    };
     planOutput?: RulesetPlanResult;
 }
 /**
@@ -45,11 +40,6 @@ export declare class RulesetProcessor implements IRulesetProcessor {
      * Format change counts into a summary string.
      */
     private formatChangeSummary;
-    /**
-     * Compute manifest update based on current config.
-     * 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.

package/dist/settings/rulesets/processor.js

@@ -28,7 +28,7 @@ export class RulesetProcessor {
      */
     async process(repoConfig, repoInfo, options) {
         const repoName = getRepoDisplayName(repoInfo);
-        const { dryRun, managedRulesets, noDelete, token } = options;
+        const { dryRun, noDelete, token } = options;
         // Check if this is a GitHub repo
         if (!isGitHubRepo(repoInfo)) {
             return {
@@ -43,8 +43,7 @@ export class RulesetProcessor {
         const desiredRulesets = settings?.rulesets ?? {};
         const deleteOrphaned = settings?.deleteOrphaned ?? false;
         // If no rulesets configured, skip
-        if (Object.keys(desiredRulesets).length === 0 &&
-            managedRulesets.length === 0) {
+        if (Object.keys(desiredRulesets).length === 0) {
             return {
                 success: true,
                 repoName,
@@ -73,7 +72,7 @@ export class RulesetProcessor {
                 }
             }
             // Compute diff
-            const changes = diffRulesets(fullRulesets, desiredMap, managedRulesets);
+            const changes = diffRulesets(fullRulesets, desiredMap, deleteOrphaned);
             // Count changes by type
             const changeCounts = {
                 create: changes.filter((c) => c.action === "create").length,
@@ -92,7 +91,6 @@ export class RulesetProcessor {
                     dryRun: true,
                     changes: changeCounts,
                     planOutput,
-                    manifestUpdate: this.computeManifestUpdate(desiredRulesets, deleteOrphaned),
                 };
             }
             // Apply changes
@@ -130,7 +128,6 @@ export class RulesetProcessor {
                 message: appliedCount > 0 ? `Applied: ${summary}` : "No changes needed",
                 changes: changeCounts,
                 planOutput,
-                manifestUpdate: this.computeManifestUpdate(desiredRulesets, deleteOrphaned),
             };
         }
         catch (error) {
@@ -157,18 +154,6 @@ export class RulesetProcessor {
             parts.push(`${counts.unchanged} unchanged`);
         return parts.length > 0 ? parts.join(", ") : "no changes";
     }
-    /**
-     * Compute manifest update based on current config.
-     * Only rulesets with deleteOrphaned enabled should be tracked.
-     */
-    computeManifestUpdate(rulesets, deleteOrphaned) {
-        if (!deleteOrphaned) {
-            return undefined;
-        }
-        // Track all ruleset names when deleteOrphaned is enabled
-        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.

package/dist/sync/index.d.ts

@@ -8,10 +8,9 @@ export { formatCommitMessage } from "./commit-message.js";
 export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
 export { PRMergeHandler } from "./pr-merge-handler.js";
 export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { ManifestStrategy, type ManifestUpdateParams, } from "./manifest-strategy.js";
 export { SyncWorkflow } from "./sync-workflow.js";
 export type { IFileWriter, FileWriteContext, FileWriterDeps, FileWriteAllResult, FileWriteResult, IManifestManager, OrphanProcessResult, OrphanDeleteOptions, OrphanDeleteDeps, IBranchManager, BranchSetupOptions, IAuthOptionsBuilder, AuthResult, IRepositorySession, SessionOptions, SessionContext, ICommitPushManager, CommitPushOptions, CommitPushResult, GitOpsFactory, IRepositoryProcessor, ProcessorOptions, ProcessorResult, FileChangeDetail, IFileSyncOrchestrator, FileSyncResult, IPRMergeHandler, PRHandlerOptions, WorkResult, IWorkStrategy, ISyncWorkflow, } from "./types.js";
 export { RepositoryProcessor } from "./repository-processor.js";
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, getManagedRulesets, getManagedLabels, updateManifest, updateManifestRulesets, updateManifestLabels, MANIFEST_FILENAME, type XfgManifest, type XfgManifestConfigEntry, } from "./manifest.js";
+export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, updateManifest, MANIFEST_FILENAME, type XfgManifest, type XfgManifestConfigEntry, } from "./manifest.js";
 export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, type FileStatus, type DiffStats, } from "./diff-utils.js";
 export { interpolateXfgContent, type XfgTemplateContext, type XfgInterpolationOptions, } from "./xfg-template.js";

package/dist/sync/index.js

@@ -9,12 +9,11 @@ export { FileSyncOrchestrator } from "./file-sync-orchestrator.js";
 export { PRMergeHandler } from "./pr-merge-handler.js";
 // Strategy pattern components
 export { FileSyncStrategy } from "./file-sync-strategy.js";
-export { ManifestStrategy, } from "./manifest-strategy.js";
 export { SyncWorkflow } from "./sync-workflow.js";
 // Repository processor
 export { RepositoryProcessor } from "./repository-processor.js";
 // Manifest handling
-export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, getManagedRulesets, getManagedLabels, updateManifest, updateManifestRulesets, updateManifestLabels, MANIFEST_FILENAME, } from "./manifest.js";
+export { createEmptyManifest, loadManifest, saveManifest, getManagedFiles, updateManifest, MANIFEST_FILENAME, } from "./manifest.js";
 // Diff utilities
 export { getFileStatus, formatStatusBadge, formatDiffLine, generateDiff, createDiffStats, incrementDiffStats, } from "./diff-utils.js";
 // XFG templating

package/dist/sync/manifest.d.ts

@@ -1,11 +1,9 @@
 export declare const MANIFEST_FILENAME = ".xfg.json";
 export interface XfgManifestConfigEntry {
     files?: string[];
-    rulesets?: string[];
-    labels?: string[];
 }
 export interface XfgManifest {
-    version: 3;
+    version: 4;
     configs: Record<string, XfgManifestConfigEntry>;
 }
 /**
@@ -18,9 +16,9 @@ export declare function createEmptyManifest(): XfgManifest;
  *
  * V1 manifests are treated as non-existent because they lack the config ID
  * namespace required for multi-config support. The next run will create
- * a fresh v3 manifest.
+ * a fresh v4 manifest.
  *
- * V2 manifests are automatically migrated to V3 format.
+ * V2/V3 manifests are automatically migrated to V4 format.
  *
  * @param workDir - The repository working directory
  * @returns The manifest or null if not found or incompatible
@@ -47,20 +45,6 @@ export declare function saveManifest(workDir: string, manifest: XfgManifest): vo
  * @returns Array of managed file names for the given config
  */
 export declare function getManagedFiles(manifest: XfgManifest | null, configId: string): string[];
-/**
- * Gets the list of managed rulesets for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get rulesets for
- * @returns Array of managed ruleset names for the given config
- */
-export declare function getManagedRulesets(manifest: XfgManifest | null, configId: string): string[];
-/**
- * Gets the list of managed labels for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- */
-export declare function getManagedLabels(manifest: XfgManifest | null, configId: string): string[];
 /**
  * Updates the manifest with the current set of files that have deleteOrphaned enabled
  * for a specific config. Only modifies that config's files namespace - other configs are untouched.
@@ -78,29 +62,3 @@ export declare function updateManifest(manifest: XfgManifest | null, configId: s
     manifest: XfgManifest;
     filesToDelete: string[];
 };
-/**
- * Updates the manifest with the current set of rulesets that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's rulesets namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param rulesetsWithDeleteOrphaned - Map of ruleset name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of rulesets to delete
- */
-export declare function updateManifestRulesets(manifest: XfgManifest | null, configId: string, rulesetsWithDeleteOrphaned: Map<string, boolean | undefined>): {
-    manifest: XfgManifest;
-    rulesetsToDelete: string[];
-};
-/**
- * Updates the manifest with the current set of labels that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's labels namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param labelsWithDeleteOrphaned - Map of label name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of labels to delete
- */
-export declare function updateManifestLabels(manifest: XfgManifest | null, configId: string, labelsWithDeleteOrphaned: Map<string, boolean | undefined>): {
-    manifest: XfgManifest;
-    labelsToDelete: string[];
-};

package/dist/sync/manifest.js

@@ -30,10 +30,20 @@ function isV3Manifest(manifest) {
         typeof manifest.configs === "object" &&
         manifest.configs !== null);
 }
+/**
+ * Type guard to check if a manifest is v4 format.
+ */
+function isV4Manifest(manifest) {
+    return (typeof manifest === "object" &&
+        manifest !== null &&
+        manifest.version === 4 &&
+        typeof manifest.configs === "object" &&
+        manifest.configs !== null);
+}
 /**
  * Migrates a V2 manifest to V3 format.
  * V2: configs is Record<string, string[]>
- * V3: configs is Record<string, { files?: string[], rulesets?: string[] }>
+ * V3: configs is Record<string, { files?: string[], rulesets?: string[], labels?: string[] }>
  */
 function migrateV2ToV3(v2) {
     const v3Configs = {};
@@ -47,12 +57,27 @@ function migrateV2ToV3(v2) {
         configs: v3Configs,
     };
 }
+/**
+ * Migrates a V3 manifest to V4 format.
+ * V3: configs have files, rulesets, labels
+ * V4: configs have files only — rulesets and labels are dropped
+ */
+function migrateV3ToV4(v3) {
+    const v4Configs = {};
+    for (const [configId, entry] of Object.entries(v3.configs)) {
+        // Only preserve files — rulesets and labels are dropped
+        if (entry.files && entry.files.length > 0) {
+            v4Configs[configId] = { files: entry.files };
+        }
+    }
+    return { version: 4, configs: v4Configs };
+}
 /**
  * Creates an empty manifest with the current version.
  */
 export function createEmptyManifest() {
     return {
-        version: 3,
+        version: 4,
         configs: {},
     };
 }
@@ -62,9 +87,9 @@ export function createEmptyManifest() {
  *
  * V1 manifests are treated as non-existent because they lack the config ID
  * namespace required for multi-config support. The next run will create
- * a fresh v3 manifest.
+ * a fresh v4 manifest.
  *
- * V2 manifests are automatically migrated to V3 format.
+ * V2/V3 manifests are automatically migrated to V4 format.
  *
  * @param workDir - The repository working directory
  * @returns The manifest or null if not found or incompatible
@@ -77,15 +102,19 @@ export function loadManifest(workDir) {
     try {
         const content = readFileSync(manifestPath, "utf-8");
         const parsed = JSON.parse(content);
-        // V3 manifest - return as-is
-        if (isV3Manifest(parsed)) {
+        // V4 manifest - return as-is
+        if (isV4Manifest(parsed)) {
             return parsed;
         }
-        // V2 manifest - migrate to V3
+        // V3 manifest - migrate to V4
+        if (isV3Manifest(parsed)) {
+            return migrateV3ToV4(parsed);
+        }
+        // V2 manifest - migrate to V3, then to V4
         if (isV2Manifest(parsed)) {
-            return migrateV2ToV3(parsed);
+            return migrateV3ToV4(migrateV2ToV3(parsed));
         }
-        // V1 manifest - treat as no manifest (will be overwritten with v3)
+        // V1 manifest - treat as no manifest (will be overwritten with v4)
         if (isV1Manifest(parsed)) {
             return null;
         }
@@ -103,11 +132,14 @@ export function loadManifest(workDir) {
 export function parseManifestContent(content) {
     try {
         const parsed = JSON.parse(content);
-        if (isV3Manifest(parsed)) {
+        if (isV4Manifest(parsed)) {
             return parsed;
         }
+        if (isV3Manifest(parsed)) {
+            return migrateV3ToV4(parsed);
+        }
         if (isV2Manifest(parsed)) {
-            return migrateV2ToV3(parsed);
+            return migrateV3ToV4(migrateV2ToV3(parsed));
         }
         return null;
     }
@@ -140,30 +172,6 @@ export function getManagedFiles(manifest, configId) {
     }
     return [...(manifest.configs[configId]?.files ?? [])];
 }
-/**
- * Gets the list of managed rulesets for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- *
- * @param manifest - The manifest or null
- * @param configId - The config ID to get rulesets for
- * @returns Array of managed ruleset names for the given config
- */
-export function getManagedRulesets(manifest, configId) {
-    if (!manifest) {
-        return [];
-    }
-    return [...(manifest.configs[configId]?.rulesets ?? [])];
-}
-/**
- * Gets the list of managed labels for a specific config from a manifest.
- * Returns an empty array if the manifest is null or the config isn't found.
- */
-export function getManagedLabels(manifest, configId) {
-    if (!manifest) {
-        return [];
-    }
-    return [...(manifest.configs[configId]?.labels ?? [])];
-}
 /**
  * Updates the manifest with the current set of files that have deleteOrphaned enabled
  * for a specific config. Only modifies that config's files namespace - other configs are untouched.
@@ -202,147 +210,19 @@ export function updateManifest(manifest, configId, filesWithDeleteOrphaned) {
     const updatedConfigs = {
         ...(manifest?.configs ?? {}),
     };
-    // Preserve existing rulesets and labels for this config
-    const existingEntry = manifest?.configs[configId];
-    const existingRulesets = existingEntry?.rulesets;
-    const existingLabels = existingEntry?.labels;
     // Update this config's managed files
     const sortedManaged = Array.from(newManaged).sort();
-    if (sortedManaged.length > 0 ||
-        (existingRulesets && existingRulesets.length > 0) ||
-        (existingLabels && existingLabels.length > 0)) {
-        updatedConfigs[configId] = {
-            ...(sortedManaged.length > 0 ? { files: sortedManaged } : {}),
-            ...(existingRulesets && existingRulesets.length > 0
-                ? { rulesets: existingRulesets }
-                : {}),
-            ...(existingLabels && existingLabels.length > 0
-                ? { labels: existingLabels }
-                : {}),
-        };
+    if (sortedManaged.length > 0) {
+        updatedConfigs[configId] = { files: sortedManaged };
     }
     else {
-        // Remove config entry if no managed files, rulesets, or labels
         delete updatedConfigs[configId];
     }
     return {
         manifest: {
-            version: 3,
+            version: 4,
             configs: updatedConfigs,
         },
         filesToDelete,
     };
 }
-/**
- * Updates the manifest with the current set of rulesets that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's rulesets namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param rulesetsWithDeleteOrphaned - Map of ruleset name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of rulesets to delete
- */
-export function updateManifestRulesets(manifest, configId, rulesetsWithDeleteOrphaned) {
-    // Get existing managed rulesets for this config only
-    const existingManaged = new Set(getManagedRulesets(manifest, configId));
-    const newManaged = new Set();
-    const rulesetsToDelete = [];
-    // Process current config rulesets
-    for (const [rulesetName, deleteOrphaned] of rulesetsWithDeleteOrphaned) {
-        if (deleteOrphaned === true) {
-            newManaged.add(rulesetName);
-        }
-    }
-    // Find orphaned rulesets: in old manifest for this config but not in current config
-    for (const rulesetName of existingManaged) {
-        if (!rulesetsWithDeleteOrphaned.has(rulesetName)) {
-            rulesetsToDelete.push(rulesetName);
-        }
-    }
-    // Build updated manifest, preserving other configs
-    const updatedConfigs = {
-        ...(manifest?.configs ?? {}),
-    };
-    // Preserve existing files and labels for this config
-    const existingEntry = manifest?.configs[configId];
-    const existingFiles = existingEntry?.files;
-    const existingLabels = existingEntry?.labels;
-    // Update this config's managed rulesets
-    const sortedManaged = Array.from(newManaged).sort();
-    if (sortedManaged.length > 0 ||
-        (existingFiles && existingFiles.length > 0) ||
-        (existingLabels && existingLabels.length > 0)) {
-        updatedConfigs[configId] = {
-            ...(existingFiles && existingFiles.length > 0
-                ? { files: existingFiles }
-                : {}),
-            ...(sortedManaged.length > 0 ? { rulesets: sortedManaged } : {}),
-            ...(existingLabels && existingLabels.length > 0
-                ? { labels: existingLabels }
-                : {}),
-        };
-    }
-    else {
-        // Remove config entry if no managed files, rulesets, or labels
-        delete updatedConfigs[configId];
-    }
-    return {
-        manifest: {
-            version: 3,
-            configs: updatedConfigs,
-        },
-        rulesetsToDelete,
-    };
-}
-/**
- * Updates the manifest with the current set of labels that have deleteOrphaned enabled
- * for a specific config. Only modifies that config's labels namespace - other configs are untouched.
- *
- * @param manifest - The existing manifest (or null for new repos)
- * @param configId - The config ID to update
- * @param labelsWithDeleteOrphaned - Map of label name to deleteOrphaned value (true/false/undefined)
- * @returns Updated manifest and list of labels to delete
- */
-export function updateManifestLabels(manifest, configId, labelsWithDeleteOrphaned) {
-    const existingManaged = new Set(getManagedLabels(manifest, configId));
-    const newManaged = new Set();
-    const labelsToDelete = [];
-    for (const [labelName, deleteOrphaned] of labelsWithDeleteOrphaned) {
-        if (deleteOrphaned === true) {
-            newManaged.add(labelName);
-        }
-    }
-    for (const labelName of existingManaged) {
-        if (!labelsWithDeleteOrphaned.has(labelName)) {
-            labelsToDelete.push(labelName);
-        }
-    }
-    const updatedConfigs = {
-        ...(manifest?.configs ?? {}),
-    };
-    // Preserve existing files and rulesets for this config
-    const existingEntry = manifest?.configs[configId];
-    const existingFiles = existingEntry?.files;
-    const existingRulesets = existingEntry?.rulesets;
-    const sortedManaged = Array.from(newManaged).sort();
-    if (sortedManaged.length > 0 ||
-        (existingFiles && existingFiles.length > 0) ||
-        (existingRulesets && existingRulesets.length > 0)) {
-        updatedConfigs[configId] = {
-            ...(existingFiles && existingFiles.length > 0
-                ? { files: existingFiles }
-                : {}),
-            ...(existingRulesets && existingRulesets.length > 0
-                ? { rulesets: existingRulesets }
-                : {}),
-            ...(sortedManaged.length > 0 ? { labels: sortedManaged } : {}),
-        };
-    }
-    else {
-        delete updatedConfigs[configId];
-    }
-    return {
-        manifest: { version: 3, configs: updatedConfigs },
-        labelsToDelete,
-    };
-}

package/dist/sync/repository-processor.d.ts

@@ -3,8 +3,7 @@ import type { RepoInfo } from "../shared/repo-detector.js";
 import { ILogger } from "../shared/logger.js";
 import { type IFileWriter, type IManifestManager, type IBranchManager, type IAuthOptionsBuilder, type IRepositorySession, type ICommitPushManager, type IFileSyncOrchestrator, type IPRMergeHandler, type ISyncWorkflow, type IRepositoryProcessor, type GitOpsFactory, type ProcessorOptions, type ProcessorResult } from "./index.js";
 /**
- * Thin facade that delegates to SyncWorkflow with appropriate strategy.
- * process() uses FileSyncStrategy, updateManifestOnly() uses ManifestStrategy.
+ * Thin facade that delegates to SyncWorkflow with FileSyncStrategy.
  */
 export declare class RepositoryProcessor implements IRepositoryProcessor {
     private readonly syncWorkflow;
@@ -22,8 +21,4 @@ export declare class RepositoryProcessor implements IRepositoryProcessor {
         syncWorkflow?: ISyncWorkflow;
     });
     process(repoConfig: RepoConfig, repoInfo: RepoInfo, options: ProcessorOptions): Promise<ProcessorResult>;
-    updateManifestOnly(repoInfo: RepoInfo, repoConfig: RepoConfig, options: ProcessorOptions, manifestUpdate: {
-        rulesets?: string[];
-        labels?: string[];
-    }): Promise<ProcessorResult>;
 }

package/dist/sync/repository-processor.js

@@ -3,11 +3,9 @@ import { AuthenticatedGitOps } from "../vcs/authenticated-git-ops.js";
 import { logger } from "../shared/logger.js";
 import { hasGitHubAppCredentials } from "../vcs/index.js";
 import { GitHubAppTokenManager } from "../vcs/github-app-token-manager.js";
-import { FileWriter, ManifestManager, BranchManager, AuthOptionsBuilder, RepositorySession, CommitPushManager, FileSyncOrchestrator, PRMergeHandler, FileSyncStrategy, ManifestStrategy, SyncWorkflow, loadManifest, updateManifestRulesets, updateManifestLabels, MANIFEST_FILENAME, } from "./index.js";
-import { getRepoDisplayName } from "../shared/repo-detector.js";
+import { FileWriter, ManifestManager, BranchManager, AuthOptionsBuilder, RepositorySession, CommitPushManager, FileSyncOrchestrator, PRMergeHandler, FileSyncStrategy, SyncWorkflow, } from "./index.js";
 /**
- * Thin facade that delegates to SyncWorkflow with appropriate strategy.
- * process() uses FileSyncStrategy, updateManifestOnly() uses ManifestStrategy.
+ * Thin facade that delegates to SyncWorkflow with FileSyncStrategy.
  */
 export class RepositoryProcessor {
     syncWorkflow;
@@ -42,52 +40,4 @@ export class RepositoryProcessor {
         const strategy = new FileSyncStrategy(this.fileSyncOrchestrator);
         return this.syncWorkflow.execute(repoConfig, repoInfo, options, strategy);
     }
-    async updateManifestOnly(repoInfo, repoConfig, options, manifestUpdate) {
-        const repoName = getRepoDisplayName(repoInfo);
-        const { workDir, dryRun } = options;
-        // Pre-check manifest changes (preserves original early-return behavior)
-        const existingManifest = loadManifest(workDir);
-        let simulatedManifest = existingManifest;
-        if (manifestUpdate.rulesets) {
-            const rulesetsWithDeleteOrphaned = new Map(manifestUpdate.rulesets.map((name) => [name, true]));
-            const result = updateManifestRulesets(simulatedManifest, options.configId, rulesetsWithDeleteOrphaned);
-            simulatedManifest = result.manifest;
-        }
-        if (manifestUpdate.labels) {
-            const labelsWithDeleteOrphaned = new Map(manifestUpdate.labels.map((name) => [name, true]));
-            const result = updateManifestLabels(simulatedManifest, options.configId, labelsWithDeleteOrphaned);
-            simulatedManifest = result.manifest;
-        }
-        const existingConfigs = existingManifest?.configs ?? {};
-        if (JSON.stringify(existingConfigs) ===
-            JSON.stringify(simulatedManifest.configs)) {
-            return {
-                success: true,
-                repoName,
-                message: "No manifest changes detected",
-                skipped: true,
-            };
-        }
-        const manifestFileChange = [
-            { path: MANIFEST_FILENAME, action: "update" },
-        ];
-        if (dryRun) {
-            const parts = [];
-            if (manifestUpdate.rulesets)
-                parts.push("ruleset");
-            if (manifestUpdate.labels)
-                parts.push("labels");
-            const trackingType = parts.join("/") || "settings";
-            this.log.info(`Would update ${MANIFEST_FILENAME} with ${trackingType} tracking`);
-            return {
-                success: true,
-                repoName,
-                message: "Would update manifest (dry-run)",
-                fileChanges: manifestFileChange,
-            };
-        }
-        // Delegate to workflow for actual commit/push/PR
-        const strategy = new ManifestStrategy(manifestUpdate, this.log);
-        return this.syncWorkflow.execute(repoConfig, repoInfo, options, strategy);
-    }
 }

package/dist/sync/types.d.ts

@@ -257,10 +257,6 @@ export interface ProcessorResult {
  */
 export interface IRepositoryProcessor {
     process(repoConfig: RepoConfig, repoInfo: RepoInfo, options: ProcessorOptions): Promise<ProcessorResult>;
-    updateManifestOnly(repoInfo: RepoInfo, repoConfig: RepoConfig, options: ProcessorOptions, manifestUpdate: {
-        rulesets?: string[];
-        labels?: string[];
-    }): Promise<ProcessorResult>;
 }
 /**
  * Result of file synchronization

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

@@ -65,6 +65,7 @@ export class GraphQLCommitStrategy {
         /403\b/,
         /does\s*not\s*exist/i,
         /could\s*not\s*resolve/i,
+        /already\s*exists/i,
     ];
     executor;
     constructor(executor) {
@@ -243,8 +244,21 @@ export class GraphQLCommitStrategy {
         }
         else if (!refId) {
             // Branch doesn't exist: create from local HEAD
+            // Race condition: on newly created forks, queryRemoteRef may return null
+            // due to eventual consistency, but the branch may exist by the time we
+            // try to create it. Treat "already exists" as success.
             const sha = (await this.executor.exec("git rev-parse HEAD", workDir)).trim();
-            await this.createRemoteRef(repositoryId, branchName, sha, workDir, repoInfo, token);
+            try {
+                await this.createRemoteRef(repositoryId, branchName, sha, workDir, repoInfo, token);
+            }
+            catch (error) {
+                const msg = error instanceof Error ? error.message : String(error);
+                if (/already exists/i.test(msg)) {
+                    // Branch was created between our query and create — that's fine
+                    return;
+                }
+                throw error;
+            }
         }
         // refId exists + !force: no-op (branch already exists)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aspruyt/xfg",
-  "version": "3.13.0",
+  "version": "4.0.0",
   "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/cli/settings/lifecycle-checks.d.ts

@@ -1,11 +0,0 @@
-import type { GitHubAppTokenManager } from "../../vcs/index.js";
-import type { RepoResult } from "../../output/github-summary.js";
-import type { IRepoLifecycleManager } from "../../lifecycle/index.js";
-import type { Config, RepoConfig } from "../../config/types.js";
-import type { ResultsCollector } from "./results-collector.js";
-import type { SettingsOptions } from "../settings-command.js";
-/**
- * Run lifecycle checks for all unique repos before processing.
- * Returns a Set of git URLs to skip (lifecycle errors or repos that would be created in dry-run).
- */
-export declare function runLifecycleChecks(allRepos: RepoConfig[], config: Config, options: SettingsOptions, lifecycleManager: IRepoLifecycleManager, results: RepoResult[], collector: ResultsCollector, tokenManager: GitHubAppTokenManager | null): Promise<Set<string>>;