@aspruyt/xfg 3.10.1 → 3.10.3

package/dist/settings/rulesets/diff.js

@@ -163,15 +163,27 @@ function matchByType(current, desired) {
                 currentByType.set(type, item);
         }
     }
+    const desiredTypes = new Set();
     const result = [];
     for (const desiredItem of desired) {
         const type = desiredItem.type;
+        desiredTypes.add(type);
         const currentItem = currentByType.get(type);
         if (currentItem) {
             result.push(projectToDesiredShape(currentItem, desiredItem));
         }
         // If no match in current, skip — diff handles additions
     }
+    // Append current items not in desired — these are removals that
+    // deepEqual must detect (length mismatch). Fixes #549.
+    for (const item of current) {
+        if (isPlainObject(item)) {
+            const type = item.type;
+            if (type && !desiredTypes.has(type)) {
+                result.push(item);
+            }
+        }
+    }
     return result;
 }
 function matchByIndex(current, desired) {

package/dist/vcs/authenticated-git-ops.js

@@ -130,7 +130,7 @@ export class AuthenticatedGitOps {
     async fetchBranch(branchName) {
         // Remote URL already has auth from clone
         const safeBranch = escapeShellArg(branchName);
-        await this.execWithRetry(`git fetch origin ${safeBranch}:refs/remotes/origin/${safeBranch}`);
+        await this.execWithRetry(`git fetch origin +${safeBranch}:refs/remotes/origin/${safeBranch}`);
     }
     // ============================================================
     // Local operations - delegate directly to GitOps

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

@@ -115,7 +115,7 @@ export class GraphQLCommitStrategy {
                     await gitOps.fetchBranch(branchName);
                 }
                 else {
-                    await this.executor.exec(`git fetch origin ${safeBranch}:refs/remotes/origin/${safeBranch}`, workDir);
+                    await this.executor.exec(`git fetch origin +${safeBranch}:refs/remotes/origin/${safeBranch}`, workDir);
                 }
                 // Get the remote HEAD SHA for this branch (not local HEAD)
                 const headSha = await this.executor.exec(`git rev-parse origin/${safeBranch}`, workDir);

package/package.json

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