@ghl-ai/aw 0.1.63 → 0.1.65

package/commands/push.mjs

@@ -10,6 +10,7 @@ import {
   readdirSync,
   copyFileSync,
   rmSync,
+  renameSync,
   writeFileSync,
 } from 'node:fs';
 import { join, dirname, basename } from 'node:path';
@@ -307,16 +308,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 +331,93 @@ 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 treeHasAwCachePaths(repoDir, treeish) {
+  const { stdout } = await execFile('git', ['ls-tree', '-r', '--name-only', treeish, '--', '.aw'], {
+    cwd: repoDir,
+    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;
+}
+
+function moveLocalAwCachePathAside(cloneDir) {
+  const awPath = join(cloneDir, '.aw');
+  if (!existsSync(awPath)) return null;
+
+  const parentDir = dirname(cloneDir);
+  const cloneName = basename(cloneDir);
+  const stamp = new Date().toISOString().replace(/[^0-9T]/g, '').slice(0, 15);
+  let backupPath = join(parentDir, `${cloneName}.untracked-aw-backup-${stamp}`);
+  let suffix = 1;
+  while (existsSync(backupPath)) {
+    backupPath = join(parentDir, `${cloneName}.untracked-aw-backup-${stamp}-${suffix}`);
+    suffix += 1;
+  }
+
+  renameSync(awPath, backupPath);
+  if (process.env.AW_DEBUG) {
+    fmt.logWarn(`Moved ignored AW docs cache .aw path aside: ${backupPath}`);
+  }
+  return backupPath;
+}
+
+async function selfHealIgnoredAwCachePath(cloneDir) {
+  const awPath = join(cloneDir, '.aw');
+  if (!existsSync(awPath)) return null;
+  if (await hasTrackedAwCachePaths(cloneDir)) return null;
+  return moveLocalAwCachePathAside(cloneDir);
+}
+
+function isCheckoutOverwrittenByAwPathError(error) {
+  const text = [error?.message, error?.stderr, error?.stdout]
+    .filter(Boolean)
+    .join('\n');
+  return /untracked working tree files would be overwritten/i.test(text)
+    && /(?:^|\s)\.aw(?:\/|$)/m.test(text);
+}
+
 async function getGitStatus(repoDir) {
   const { stdout } = await execFile('git', ['status', '--porcelain'], {
     cwd: repoDir,
@@ -397,8 +475,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()) {
@@ -419,10 +496,27 @@ async function ensureAwDocsRepoClone(home, publishConfig) {
     ? `origin/${publishConfig.branch}`
     : `origin/${publishConfig.seedBranch}`;
 
-  await execFile('git', ['checkout', '-B', publishConfig.branch, checkoutStart], {
-    cwd: cloneDir,
-    encoding: 'utf8',
-  });
+  if (await treeHasAwCachePaths(cloneDir, checkoutStart)) {
+    await selfHealIgnoredAwCachePath(cloneDir);
+  }
+
+  try {
+    await execFile('git', ['checkout', '-B', publishConfig.branch, checkoutStart], {
+      cwd: cloneDir,
+      encoding: 'utf8',
+    });
+  } catch (e) {
+    const healedPath = isCheckoutOverwrittenByAwPathError(e)
+      ? await selfHealIgnoredAwCachePath(cloneDir)
+      : null;
+    if (!healedPath) {
+      throw e;
+    }
+    await execFile('git', ['checkout', '-B', publishConfig.branch, checkoutStart], {
+      cwd: cloneDir,
+      encoding: 'utf8',
+    });
+  }
 
   if (hasPublishBranch) {
     await execFile('git', ['pull', '--ff-only', 'origin', publishConfig.branch], {
@@ -501,7 +595,7 @@ function printAwDocsLinks(links, limit = 10) {
   fmt.logInfo(chalk.bold('Remote Docs'));
   for (const link of links.slice(0, limit)) {
     fmt.logInfo(`  ${chalk.dim(link.relPath)}`);
-    fmt.logInfo(`    TeamOfOne: ${chalk.cyan(link.remoteUrl)}`);
+    fmt.logInfo(`    Devtools: ${chalk.cyan(link.remoteUrl)}`);
     if (link.repositoryUrl && link.repositoryUrl !== link.remoteUrl) {
       fmt.logInfo(`    GitHub: ${chalk.cyan(link.repositoryUrl)}`);
     }

package/constants.mjs

@@ -33,7 +33,7 @@ export const AW_DOCS_BASE_BRANCH = 'master-sync';
 export const AW_DOCS_SEED_BRANCH = process.env.AW_DOCS_SEED_BRANCH || 'scaffold';
 export const AW_DOCS_PUBLISH_DIR = 'aw_docs';
 export const AW_DOCS_PUBLIC_BASE_URL = process.env.AW_DOCS_PUBLIC_BASE_URL || `https://github.com/${AW_DOCS_REPO}/blob/${AW_DOCS_BASE_BRANCH}`;
-export const AW_DOCS_TEAMOFONE_ORIGIN = process.env.AW_DOCS_TEAMOFONE_ORIGIN || 'https://teamofone.msgsndr.net';
+export const AW_DOCS_TEAMOFONE_ORIGIN = process.env.AW_DOCS_TEAMOFONE_ORIGIN || 'https://devtools.servers.stg.msgsndr.net';
 export const AW_DOCS_TEAMOFONE_BASE_URL = process.env.AW_DOCS_TEAMOFONE_BASE_URL || `${AW_DOCS_TEAMOFONE_ORIGIN}/too/docs/GoHighLevel/ghl-aw-docs`;
 
 export function defaultAwDocsGithubDocsConfig() {

package/package.json

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