@ghl-ai/aw 0.1.63 → 0.1.64

package/commands/push.mjs

@@ -307,16 +307,6 @@ function resolveAwDocsPublishConfig(projectRoot) {
   };
 }
 
-function isOnlyUntrackedAwSymlink(status, cloneDir) {
-  const lines = status.trim().split('\n').filter(Boolean);
-  if (lines.length !== 1 || !/^\?\?\s+\.aw\/?$/.test(lines[0])) return false;
-  try {
-    return lstatSync(join(cloneDir, '.aw')).isSymbolicLink();
-  } catch {
-    return false;
-  }
-}
-
 async function removeTrackedAwSymlink(cloneDir) {
   try {
     if (!lstatSync(join(cloneDir, '.aw')).isSymbolicLink()) return false;
@@ -340,6 +330,49 @@ async function removeTrackedAwSymlink(cloneDir) {
   return true;
 }
 
+function parseStatusPaths(status) {
+  return status
+    .split('\n')
+    .filter(line => line.trim())
+    .flatMap(line => line.slice(3).trim().split(' -> '));
+}
+
+function isManagedAwCachePath(path) {
+  return path === '.aw' || path.startsWith('.aw/');
+}
+
+function isOnlyManagedAwCacheDirtiness(status) {
+  const paths = parseStatusPaths(status);
+  return paths.length > 0 && paths.every(isManagedAwCachePath);
+}
+
+async function hasTrackedAwCachePaths(cloneDir) {
+  const { stdout } = await execFile('git', ['ls-files', '--', '.aw'], {
+    cwd: cloneDir,
+    encoding: 'utf8',
+  });
+  return stdout.trim().length > 0;
+}
+
+async function selfHealManagedAwCacheDirtiness(cloneDir, status) {
+  if (!isOnlyManagedAwCacheDirtiness(status)) return false;
+
+  rmSync(join(cloneDir, '.aw'), { recursive: true, force: true });
+  await execFile('git', ['clean', '-fd', '--', '.aw'], {
+    cwd: cloneDir,
+    encoding: 'utf8',
+  });
+
+  if (await hasTrackedAwCachePaths(cloneDir)) {
+    await execFile('git', ['restore', '--staged', '--worktree', '--', '.aw'], {
+      cwd: cloneDir,
+      encoding: 'utf8',
+    });
+  }
+
+  return true;
+}
+
 async function getGitStatus(repoDir) {
   const { stdout } = await execFile('git', ['status', '--porcelain'], {
     cwd: repoDir,
@@ -397,8 +430,7 @@ async function ensureAwDocsRepoClone(home, publishConfig) {
   }
 
   let status = await getGitStatus(cloneDir);
-  if (status.trim() && isOnlyUntrackedAwSymlink(status, cloneDir)) {
-    rmSync(join(cloneDir, '.aw'), { force: true });
+  if (status.trim() && await selfHealManagedAwCacheDirtiness(cloneDir, status)) {
     status = await getGitStatus(cloneDir);
   }
   if (status.trim()) {

package/package.json

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