@ghl-ai/aw 0.1.36-beta.111 → 0.1.36-beta.112

package/git.mjs

@@ -293,51 +293,16 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   let updated = false;
   const conflicts = [];
 
-  // ── 3. Fast-forward (no local commits ahead of remote) ───────────────────
-  // Use `merge-base --is-ancestor` to detect the fast-forward case, then
-  // advance with `git reset --hard` instead of `merge --ff-only`.
-  // Reason: `merge --ff-only` (and `merge --no-edit`) on git 2.46+ with
-  // blob:none + no-cone sparse-checkout silently drops bare-name patterns
-  // (e.g. "content", "CODEOWNERS") from the sparse-checkout config when HEAD
-  // advances.  `reset --hard` is semantically identical for a fast-forward
-  // but does NOT go through the merge machinery, so the sparse-checkout
-  // config is left untouched.  We only call reset when we've confirmed there
-  // are no local commits (is-ancestor exits 0), so push-branch commits are
-  // never lost.
-  let canFF = false;
-  try {
-    await exec(`git -C "${awHome}" merge-base --is-ancestor HEAD origin/${REGISTRY_BASE_BRANCH}`);
-    canFF = true;
-  } catch { /* local commits exist — not a fast-forward */ }
-
-  if (canFF) {
-    // Stash staged/unstaged changes to tracked files before reset --hard so
-    // they are not lost.  Untracked files (e.g. newly created skills not yet
-    // staged) are untouched by reset --hard and need no stashing.
-    let stashed = false;
-    try {
-      const { stdout } = await exec(`git -C "${awHome}" stash push -m "aw: pre-sync stash"`);
-      stashed = !stdout.includes('No local changes to save');
-    } catch { /* nothing to stash */ }
-
-    const { stdout: headBefore } = await exec(`git -C "${awHome}" rev-parse HEAD`);
-    await exec(`git -C "${awHome}" reset --hard origin/${REGISTRY_BASE_BRANCH}`);
-    const { stdout: headAfter } = await exec(`git -C "${awHome}" rev-parse HEAD`);
-    updated = headBefore.trim() !== headAfter.trim();
-
-    if (stashed) {
-      try {
-        await exec(`git -C "${awHome}" stash pop`);
-      } catch { /* conflict between stash and remote — leave markers for user */ }
-    }
-
-    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).
-  // Never uses --no-edit merge — that disables sparse checkout on blob:none.
+  // ── 3 + 4. Rebase onto remote REGISTRY_BASE_BRANCH ──────────────────────
+  // Handles both cases in one path:
+  //  • No local commits (base branch, clean tree) → fast-forward via rebase
+  //  • Local commits (push branch)                → rebases on top
+  //  • Uncommitted local changes                  → rebase refuses to run,
+  //    sync is skipped this run, changes are preserved
+  //
+  // We avoid `merge --ff-only` and `merge --no-edit` entirely: both trigger a
+  // git 2.46+ bug on blob:none + no-cone sparse-checkout repos that silently
+  // drops bare-name patterns (e.g. "content", "CODEOWNERS") when HEAD advances.
   try {
     await exec(`git -C "${awHome}" rebase origin/${REGISTRY_BASE_BRANCH}`);
     updated = true;

package/package.json

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