@ghl-ai/aw 0.1.36-beta.102 → 0.1.36-beta.103

package/git.mjs

@@ -294,14 +294,39 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   const conflicts = [];
 
   // ── 3. Fast-forward (no local commits ahead of remote) ───────────────────
+  // Snapshot sparse paths before merge — git 2.46+ silently disables
+  // sparse-checkout on blob:none repos when ff-only actually advances HEAD.
+  let sparsePaths = [];
+  try {
+    const { stdout: listOut } = await exec(`git -C "${awHome}" sparse-checkout list`);
+    sparsePaths = listOut.trim().split('\n').filter(Boolean);
+  } catch { /* sparse checkout not active */ }
+
+  let ffSucceeded = false;
   try {
     const { stdout } = await exec(
       `git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --ff-only`,
     );
     updated = !stdout.includes('Already up to date');
-    return { updated, conflicts };
+    ffSucceeded = true;
   } catch { /* local commits exist — fall through to rebase */ }
 
+  if (ffSucceeded) {
+    // Restore sparse checkout if git disabled it during the fast-forward
+    if (updated && sparsePaths.length > 0) {
+      try {
+        await exec(`git -C "${awHome}" sparse-checkout list`);
+      } catch {
+        try {
+          await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+          await exec(`git -C "${awHome}" sparse-checkout set ${sparsePaths.map(p => `"${p}"`).join(' ')}`);
+          await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
+        } catch { /* best effort */ }
+      }
+    }
+    return { updated, conflicts };
+  }
+
   // ── 4. Rebase current branch onto remote REGISTRY_BASE_BRANCH ────────────
   // For push branches: stacks our local commits on top of latest remote.
   // For base branch:   only reached if local commits exist (unusual).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.36-beta.102",
+  "version": "0.1.36-beta.103",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": "bin.js",