@ghl-ai/aw 0.1.83 → 0.1.84

package/commands/push.mjs

@@ -416,30 +416,28 @@ function resolveAwDocsPublishConfig(projectRoot) {
 }
 
 async function removeTrackedAwSymlink(cloneDir) {
+  const awPath = join(cloneDir, '.aw');
+  // Only ever touch a STRAY on-disk `.aw` symlink (e.g. one the IDE/worktree
+  // `aw link` hook drops into the cache clone). Remove it from the WORKTREE
+  // ONLY, with a filesystem unlink — never a git command.
+  //
+  // The docs repo may track a real `.aw/` tree (ghl-aw-docs tracks
+  // `.aw/.aw_rules/**`). A `git rm .aw` here would stage a deletion of that
+  // committed content and push it away (this is exactly what corrupted
+  // master-sync). A plain unlink cannot stage anything, so it can never delete
+  // the committed tree — and since `.aw` is kept out of the sparse cone, the
+  // tracked tree is SKIP_WORKTREE and unaffected by removing the disk symlink.
   try {
-    if (!lstatSync(join(cloneDir, '.aw')).isSymbolicLink()) return false;
+    if (!lstatSync(awPath).isSymbolicLink()) return false;
   } catch {
     return false;
   }
-
   try {
-    await execFile('git', ['ls-files', '--error-unmatch', '.aw'], {
-      cwd: cloneDir,
-      encoding: 'utf8',
-    });
+    rmSync(awPath, { force: true });
+    return true;
   } catch {
     return false;
   }
-
-  // `.aw` is always kept inside the sparse-checkout cone (see AW_DOCS_CACHE_PATH
-  // in ensureAwDocsRepoClone) so this remove works even on blobless/sparse
-  // clones. Without that, git rejects the rm with "outside sparse-checkout
-  // definition" against repos that track a real .aw/ tree (e.g. ghl-aw-docs).
-  await execFile('git', ['rm', '-f', '.aw'], {
-    cwd: cloneDir,
-    encoding: 'utf8',
-  });
-  return true;
 }
 
 function parseStatusPaths(status) {
@@ -484,9 +482,24 @@ async function selfHealManagedAwCacheDirtiness(cloneDir, status) {
   });
 
   if (await hasTrackedAwCachePaths(cloneDir)) {
+    // Restore a dirty tracked `.aw` from HEAD. In a full clone this cleans the
+    // worktree + index (the original behaviour). Best-effort (.catch): when `.aw`
+    // is sparse-excluded (out of cone) this pathspec can't match and the call is
+    // a no-op — but a sparse-excluded `.aw` is SKIP_WORKTREE and won't be dirty
+    // in the first place. This can only restore/un-stage, never delete tracked
+    // content.
     await execFile('git', ['restore', '--staged', '--worktree', '--', '.aw'], {
       cwd: cloneDir,
       encoding: 'utf8',
+    }).catch((e) => {
+      const msg = (e?.stderr || e?.message || '').toString();
+      // Expected + ignorable: when `.aw` is sparse-excluded (out of cone) the
+      // pathspec cannot match, so the restore is simply a no-op.
+      if (/did not match any file|outside .*sparse-checkout/i.test(msg)) return;
+      // Anything else (permissions, index corruption, ...) is unexpected —
+      // surface it so a future `.aw` cache issue is diagnosable, but don't
+      // block the publish on a best-effort cleanup step.
+      fmt.logWarn(`AW docs cache: could not restore .aw (${msg.trim()})`);
     });
   }
 
@@ -583,12 +596,11 @@ async function getProjectSourceRepo(projectRoot) {
 const AW_DOCS_GIT_ENV = { ...process.env, GIT_TERMINAL_PROMPT: '0', GCM_INTERACTIVE: 'never' };
 const AW_DOCS_CLONE_TIMEOUT_MS = Number(process.env.AW_DOCS_GIT_TIMEOUT_MS) || 180000;
 const AW_DOCS_NET_TIMEOUT_MS = Number(process.env.AW_DOCS_GIT_TIMEOUT_MS) || 120000;
-// `.aw` is always kept in the sparse-checkout cone. The docs repo may track a
-// real `.aw/` tree (e.g. ghl-aw-docs tracks `.aw/.aw_rules/**`), and the
-// cache-management code (removeTrackedAwSymlink, selfHeal*) runs write git ops
-// on `.aw`. Excluding it from the cone makes those ops fail with "outside
-// sparse-checkout definition" and breaks every publish against such a repo.
-const AW_DOCS_CACHE_PATH = '.aw';
+// NOTE: `.aw` is intentionally NOT added to the sparse cone. The docs repo may
+// track a real `.aw/` tree (ghl-aw-docs tracks `.aw/.aw_rules/**`); keeping it
+// out of the cone leaves that tree SKIP_WORKTREE so no publish can materialise
+// or (crucially) stage a deletion of it. Any stray on-disk `.aw` symlink is
+// removed worktree-only via a filesystem unlink (see removeTrackedAwSymlink).
 
 async function awDocsSparseEnabled(cloneDir) {
   try {
@@ -625,7 +637,7 @@ async function ensureAwDocsRepoClone(home, publishConfig, sparseIncludePaths = [
       timeout: AW_DOCS_CLONE_TIMEOUT_MS,
     });
     if (wantSparse) {
-      await execFile('git', ['sparse-checkout', 'set', '--cone', ...sparseIncludePaths, AW_DOCS_CACHE_PATH], {
+      await execFile('git', ['sparse-checkout', 'set', '--cone', ...sparseIncludePaths], {
         cwd: cloneDir,
         encoding: 'utf8',
       }).catch(() => { /* sparse unsupported → full checkout below */ });
@@ -661,7 +673,7 @@ async function ensureAwDocsRepoClone(home, publishConfig, sparseIncludePaths = [
   // clones that already use sparse-checkout (i.e. the blobless clones we
   // created) — legacy full clones are left untouched so there is no regression.
   if (wantSparse && await awDocsSparseEnabled(cloneDir)) {
-    await execFile('git', ['sparse-checkout', 'add', ...sparseIncludePaths, AW_DOCS_CACHE_PATH], {
+    await execFile('git', ['sparse-checkout', 'add', ...sparseIncludePaths], {
       cwd: cloneDir,
       encoding: 'utf8',
     }).catch(() => { /* best effort — checkout below still works */ });

package/package.json

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