@ghl-ai/aw 0.1.62 → 0.1.64

package/commands/push.mjs

@@ -39,7 +39,7 @@ import {
   AW_DOCS_TEAMOFONE_ORIGIN,
   AW_DOCS_TEAMOFONE_BASE_URL,
   AW_CO_AUTHOR,
-  defaultAwDocsGithubDocsConfig,
+  defaultAwDocsConfig,
 } from '../constants.mjs';
 import { resolveInput } from '../paths.mjs';
 import { walkRegistryTree, getAllFiles } from '../registry.mjs';
@@ -246,16 +246,25 @@ function writeAwDocsConfigIfChanged(projectRoot, config) {
 
 function ensureAwDocsPublishConfig(projectRoot) {
   const config = readAwDocsConfig(projectRoot);
-  const defaultGithubDocs = defaultAwDocsGithubDocsConfig();
+  const defaultConfig = defaultAwDocsConfig();
   const next = {
     ...config,
+    docs: {
+      ...defaultConfig.docs,
+      ...(config.docs || {}),
+    },
     sync: {
+      ...defaultConfig.sync,
       ...(config.sync || {}),
       github_docs: {
-        ...defaultGithubDocs,
+        ...defaultConfig.sync.github_docs,
         ...(config.sync?.github_docs || {}),
       },
     },
+    paths: {
+      ...defaultConfig.paths,
+      ...(config.paths || {}),
+    },
   };
 
   writeAwDocsConfigIfChanged(projectRoot, next);
@@ -298,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;
@@ -331,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,
@@ -388,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/constants.mjs

@@ -45,6 +45,26 @@ export function defaultAwDocsGithubDocsConfig() {
   };
 }
 
+export function defaultAwDocsConfig() {
+  return {
+    docs: {
+      outputMode: 'dual',
+    },
+    sync: {
+      eager: true,
+      batch_threshold: 10,
+      mcp_memory_enabled: true,
+      github_docs: defaultAwDocsGithubDocsConfig(),
+    },
+    paths: {
+      runs: `${AW_DOCS_DIR}/runs`,
+      learnings: `${AW_DOCS_DIR}/learnings`,
+      tasks: `${AW_DOCS_DIR}/tasks`,
+      cache: `${AW_DOCS_DIR}/cache`,
+    },
+  };
+}
+
 /** Persistent git clone root — ~/.aw/ */
 export const AW_HOME = join(homedir(), '.aw');
 

package/integrate.mjs

@@ -15,7 +15,7 @@ import {
 import { isDefaultRoutingEnabled } from './startup.mjs';
 import {
   AW_DOCS_DIR,
-  defaultAwDocsGithubDocsConfig,
+  defaultAwDocsConfig,
 } from './constants.mjs';
 
 const AW_ROUTER_BRIDGE_HEADER = 'AW Router Bridge';
@@ -648,23 +648,7 @@ No active runs. Use \`/aw:<team>-<command>\` to start a workflow.
 
   // config.json — registry paths, sync settings
   const configPath = join(awDocsDir, 'config.json');
-  const defaultConfig = {
-    docs: {
-      outputMode: 'dual',
-    },
-    sync: {
-      eager: true,
-      batch_threshold: 10,
-      mcp_memory_enabled: true,
-      github_docs: defaultAwDocsGithubDocsConfig(),
-    },
-    paths: {
-      runs: `${AW_DOCS_DIR}/runs`,
-      learnings: `${AW_DOCS_DIR}/learnings`,
-      tasks: `${AW_DOCS_DIR}/tasks`,
-      cache: `${AW_DOCS_DIR}/cache`,
-    },
-  };
+  const defaultConfig = defaultAwDocsConfig();
   let nextConfig = defaultConfig;
   if (existsSync(configPath)) {
     try {

package/package.json

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