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

package/git.mjs

@@ -311,21 +311,26 @@ export async function fetchAndMerge(awHome, { silent = true } = {}) {
   } catch { /* local commits exist — not a fast-forward */ }
 
   if (canFF) {
-    // Skip reset if there are local staged/unstaged changes — reset --hard
-    // would wipe them.  The user needs to push first; we'll sync on the next
-    // pull after they do.
-    let hasLocalChanges = false;
+    // 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: statusOut } = await exec(`git -C "${awHome}" status --porcelain`);
-      hasLocalChanges = statusOut.trim().length > 0;
-    } catch { /* ignore */ }
-
-    if (hasLocalChanges) return { updated: false, conflicts };
+      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 };
   }
 

package/package.json

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