@ghl-ai/aw 0.1.36-beta.91 → 0.1.36-beta.93

package/git.mjs

@@ -230,79 +230,56 @@ export function removeFromSparseCheckout(awHome, removePaths) {
  * @param {{ silent?: boolean }} opts
  */
 export async function fetchAndMerge(awHome, { silent = true } = {}) {
-  // ── 1. Branch guard ──────────────────────────────────────────────────────
-  // If ~/.aw drifted off REGISTRY_BASE_BRANCH (e.g. partial init left it on
-  // `main`), repair the sparse checkout and switch back — then RETURN EARLY.
-  // We never run fetch/rebase on a wrong-branch run: a --no-edit merge or a
-  // rebase between unrelated histories can disable sparse checkout and wipe
-  // the working tree.  The NEXT aw init call (hook/IDE/user) will do the sync.
-  try {
-    const { stdout: branchOut } = await exec(
-      `git -C "${awHome}" rev-parse --abbrev-ref HEAD`,
-    );
-    const currentBranch = branchOut.trim();
-
-    // Only auto-correct if on `main` — the known partial-init drift state.
-    // Push branches (upload/, remove/, sync/, feat/) are intentional and must
-    // not be switched away from: doing so would make aw push changes disappear.
-    const isDriftBranch = currentBranch === 'main';
-    if (currentBranch !== REGISTRY_BASE_BRANCH && currentBranch !== 'HEAD' && isDriftBranch) {
-      // Re-enable sparse checkout before switching branches.
-      // If sparse-checkout was disabled (e.g. by an old --no-edit merge),
-      // `init --no-cone` restores it from the existing sparse-checkout file.
-      // If the file is also empty/gone we set a safe fallback covering the
-      // whole registry so the checkout materialises *something*.
-      try {
-        await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
-        const { stdout: listOut } = await exec(
-          `git -C "${awHome}" sparse-checkout list`,
-        );
-        if (!listOut.trim()) {
-          // Paths were cleared — restore a safe default (full registry tree)
-          await exec(
-            `git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`,
-          );
-        }
-      } catch {
-        // Completely broken sparse config — force a safe default
-        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. Branch classification ──────────────────────────────────────────────
+  // There are three possible states for ~/.aw:
+  //
+  //  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)
+    try {
+      await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+      const { stdout: listOut } = await exec(`git -C "${awHome}" sparse-checkout list`);
+      if (!listOut.trim()) {
+        await exec(`git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`);
       }
-
-      // Switch to the correct branch; this materialises files via lazy fetch.
+    } catch {
       try {
-        await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
-      } catch {
-        // checkout failed — repo is in a bad state we cannot repair here.
-        // Return without touching anything; the user can run `aw init` to
-        // trigger a full re-clone via initPersistentClone.
-        return { updated: false, conflicts: [] };
-      }
-
-      // Branch repaired.  Do NOT continue to fetch/rebase on this same run —
-      // that combination is what caused the original wipe.
-      return { updated: false, conflicts: [] };
+        await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
+        await exec(`git -C "${awHome}" sparse-checkout set "${REGISTRY_DIR}/"`);
+      } catch { /* best effort */ }
     }
-  } catch { /* branch detection failed — proceed with normal sync */ }
 
-  // ── 2. Repair sparse checkout if disabled on correct branch ──────────────
-  // Guard: if something disabled sparse checkout while on the right branch
-  // (should be rare), re-enable before fetch so the working tree stays intact.
-  try {
-    await exec(`git -C "${awHome}" sparse-checkout list`);
-  } catch {
+    // Switch to the correct branch — materialises files via lazy blob fetch
     try {
-      await exec(`git -C "${awHome}" sparse-checkout init --no-cone`);
-      // Re-checkout to materialise files according to restored sparse config
       await exec(`git -C "${awHome}" checkout ${REGISTRY_BASE_BRANCH}`);
-    } catch { /* best effort */ }
+    } catch {
+      return { updated: false, conflicts: [] }; // can't repair; leave for full re-init
+    }
+
+    // Drift repaired. Continue below to also fetch + fast-forward this run.
   }
 
-  // ── 3. Fetch ──────────────────────────────────────────────────────────────
+  // ── 2. Fetch ──────────────────────────────────────────────────────────────
   try {
     await exec(`git -C "${awHome}" fetch origin ${REGISTRY_BASE_BRANCH}`);
   } catch (e) {
@@ -312,36 +289,33 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   let updated = false;
   const conflicts = [];
 
-  // ── 4. Fast-forward (clean case — 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`,
     );
     updated = !stdout.includes('Already up to date');
     return { updated, conflicts };
-  } catch { /* ff-only failed — local commits exist, fall through to rebase */ }
+  } catch { /* local commits exist — fall through to rebase */ }
 
-  // ── 5. Rebase local commits onto remote ───────────────────────────────────
-  // Rebase keeps history linear 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 {
-    // Rebase has conflicts — collect them
     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) {
-      // In background (hook/IDE) mode: abort to leave the repo in a clean,
-      // usable state. The next explicit `aw init` will surface the conflict.
+      // Background: abort so repo stays usable; surface on next explicit aw init
       try { await exec(`git -C "${awHome}" rebase --abort`); } catch { /* best effort */ }
     }
-    // In interactive mode: leave conflict markers in place so the user can
-    // resolve them directly in their 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.91",
+  "version": "0.1.36-beta.93",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
   "bin": "bin.js",