@ghl-ai/aw 0.1.36-beta.92 → 0.1.36-beta.94

package/git.mjs

@@ -230,19 +230,60 @@ export function removeFromSparseCheckout(awHome, removePaths) {
  * @param {{ silent?: boolean }} opts
  */
 export async function fetchAndMerge(awHome, { silent = true } = {}) {
-  // Design: always rebase the CURRENT branch (whatever it is) onto
-  // origin/REGISTRY_BASE_BRANCH.  We never switch branches here.
+  // ── 1. Branch classification ──────────────────────────────────────────────
+  // There are three possible states for ~/.aw:
   //
-  // - On REGISTRY_BASE_BRANCH: fast-forward (normal case)
-  // - On a push branch (upload/, sync/, remove/...): rebase so remote
-  //   changes land under our local commits — stacked PR model
-  // - On any other branch (e.g. main from a failed init): fast-forward
-  //   or rebase brings it up to date without wiping sparse checkout
-  //
-  // The old wipe bug was caused by `--no-edit` merge between unrelated
-  // histories, which disabled sparse checkout.  Rebase never does this.
+  //  A. REGISTRY_BASE_BRANCH  — normal, fast-forward sync
+  //  B. Push branch (upload/ sync/ remove/) — intentional, rebase remote
+  //     changes under our local commits (stacked PR model)
+  //  C. Anything else (e.g. `main` from a failed initPersistentClone) —
+  //     drift/broken state; re-enable sparse checkout and switch back to
+  //     REGISTRY_BASE_BRANCH before syncing.  We must NOT rebase here:
+  //     `main` and REGISTRY_BASE_BRANCH are unrelated trees in platform-docs
+  //     and rebasing between them on a blob:none clone wipes the working tree.
+
+  const PUSH_PREFIXES = ['upload/', 'remove/', 'sync/'];
+
+  let currentBranch = REGISTRY_BASE_BRANCH; // assume good unless detection succeeds
+  try {
+    const { stdout } = await exec(`git -C "${awHome}" rev-parse --abbrev-ref HEAD`);
+    currentBranch = stdout.trim();
+  } catch { /* proceed with assumption */ }
+
+  const isPushBranch = PUSH_PREFIXES.some(p => currentBranch.startsWith(p));
+  const isBaseBranch = currentBranch === REGISTRY_BASE_BRANCH;
+  const isDrift = !isBaseBranch && !isPushBranch && currentBranch !== 'HEAD';
+
+  if (isDrift) {
+    // Re-enable sparse checkout (may have been disabled by an old --no-edit merge).
+    // After `git sparse-checkout init --no-cone`, git resets paths to `/*` + `!/*/`
+    // (root files only, no subdirectories) — which excludes .aw_registry/.
+    // We must explicitly set the registry path so files materialise on checkout.
+    try {
+      await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+      const { stdout: listOut } = await exec(`git -C "${awHome}" sparse-checkout list`);
+      const hasPaths = listOut.trim().split('\n').filter(Boolean).some(p => p.includes(REGISTRY_DIR));
+      if (!hasPaths) {
+        await exec(`git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`);
+      }
+    } catch {
+      try {
+        await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+        await exec(`git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`);
+      } catch { /* best effort */ }
+    }
 
-  // ── 1. Fetch ──────────────────────────────────────────────────────────────
+    // Switch to the correct branch — materialises files via lazy blob fetch
+    try {
+      await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
+    } catch {
+      return { updated: false, conflicts: [] }; // can't repair; leave for full re-init
+    }
+
+    // Drift repaired. Continue below to also fetch + fast-forward this run.
+  }
+
+  // ── 2. Fetch ──────────────────────────────────────────────────────────────
   try {
     await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`);
   } catch (e) {
@@ -252,7 +293,7 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   let updated = false;
   const conflicts = [];
 
-  // ── 2. Fast-forward (no local commits ahead of remote) ───────────────────
+  // ── 3. Fast-forward (no local commits ahead of remote) ───────────────────
   try {
     const { stdout } = await exec(
       `git -C "${awHome}" merge origin/${REGISTRY_BASE_BRANCH} --ff-only`,
@@ -261,27 +302,24 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
     return { updated, conflicts };
   } catch { /* local commits exist — fall through to rebase */ }
 
-  // ── 3. Rebase current branch onto remote REGISTRY_BASE_BRANCH ────────────
-  // Keeps history linear.  Works for push branches (stacks our commits on
-  // top of latest remote) and never disables sparse checkout.
+  // ── 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.
   try {
     await exec(`git -C "${awHome}" rebase origin/${REGISTRY_BASE_BRANCH}`);
     updated = true;
   } catch {
-    // Collect conflicting files
     try {
-      const { stdout } = await exec(
-        `git -C "${awHome}" diff --name-only --diff-filter=U`,
-      );
+      const { stdout } = await exec(`git -C "${awHome}" diff --name-only --diff-filter=U`);
       conflicts.push(...stdout.trim().split('\n').filter(Boolean));
     } catch { /* best effort */ }
 
     if (silent) {
-      // Background (hook/IDE): abort so repo stays usable.
-      // Conflicts will surface on next explicit `aw init`.
+      // Background: abort so repo stays usable; surface on next explicit aw init
       try { await exec(`git -C "${awHome}" rebase --abort`); } catch { /* best effort */ }
     }
-    // Interactive: leave conflict markers for the user to resolve in editor.
+    // Interactive: leave conflict markers for the user to resolve
   }
 
   return { updated, conflicts };

package/package.json

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