@ghl-ai/aw 0.1.47-beta.10 → 0.1.47-beta.11

package/commands/push.mjs

@@ -2,6 +2,7 @@
 
 import {
   existsSync,
+  lstatSync,
   statSync,
   readFileSync,
   appendFileSync,
@@ -36,6 +37,7 @@ import {
   AW_DOCS_PUBLISH_DIR,
   AW_DOCS_PUBLIC_BASE_URL,
   AW_CO_AUTHOR,
+  defaultAwDocsGithubDocsConfig,
 } from '../constants.mjs';
 import { resolveInput } from '../paths.mjs';
 import { walkRegistryTree, getAllFiles } from '../registry.mjs';
@@ -172,6 +174,34 @@ function readAwDocsConfig(projectRoot) {
   }
 }
 
+function writeAwDocsConfigIfChanged(projectRoot, config) {
+  const configPath = join(projectRoot, AW_DOCS_DIR, 'config.json');
+  const nextText = JSON.stringify(config, null, 2) + '\n';
+  const existingText = existsSync(configPath) ? readFileSync(configPath, 'utf8') : '';
+  if (existingText !== nextText) {
+    mkdirSync(dirname(configPath), { recursive: true });
+    writeFileSync(configPath, nextText);
+  }
+}
+
+function ensureAwDocsPublishConfig(projectRoot) {
+  const config = readAwDocsConfig(projectRoot);
+  const defaultGithubDocs = defaultAwDocsGithubDocsConfig();
+  const next = {
+    ...config,
+    sync: {
+      ...(config.sync || {}),
+      github_docs: {
+        ...defaultGithubDocs,
+        ...(config.sync?.github_docs || {}),
+      },
+    },
+  };
+
+  writeAwDocsConfigIfChanged(projectRoot, next);
+  return next;
+}
+
 function repoCloneUrl(repo) {
   const value = String(repo || '').trim();
   if (!value) return AW_DOCS_URL;
@@ -180,7 +210,7 @@ function repoCloneUrl(repo) {
 }
 
 function resolveAwDocsPublishConfig(projectRoot) {
-  const config = readAwDocsConfig(projectRoot);
+  const config = ensureAwDocsPublishConfig(projectRoot);
   const githubDocs = config.sync?.github_docs || {};
   const repo = process.env.AW_DOCS_REPO || githubDocs.repo || AW_DOCS_REPO;
   const branch = AW_DOCS_BASE_BRANCH;
@@ -201,6 +231,24 @@ 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 getGitStatus(repoDir) {
+  const { stdout } = await execFile('git', ['status', '--porcelain'], {
+    cwd: repoDir,
+    encoding: 'utf8',
+  });
+  return stdout;
+}
+
 function parseGitHubRepo(remoteUrl) {
   const match = remoteUrl.trim().match(/github\.com[:/]([^/]+)\/(.+?)(?:\.git)?$/);
   if (!match) return null;
@@ -249,12 +297,17 @@ async function ensureAwDocsRepoClone(home, publishConfig) {
     });
   }
 
-  const { stdout: status } = await execFile('git', ['status', '--porcelain'], {
-    cwd: cloneDir,
-    encoding: 'utf8',
-  });
+  let status = await getGitStatus(cloneDir);
+  if (status.trim() && isOnlyUntrackedAwSymlink(status, cloneDir)) {
+    rmSync(join(cloneDir, '.aw'), { force: true });
+    status = await getGitStatus(cloneDir);
+  }
   if (status.trim()) {
-    throw new Error(`AW docs repo worktree is dirty: ${cloneDir}`);
+    throw new Error([
+      `AW docs repo worktree is dirty: ${cloneDir}`,
+      status.trim(),
+      'Clean the cached docs repo or set AW_DOCS_WORKTREE to a clean clone before publishing.',
+    ].join('\n'));
   }
 
   await execFile('git', ['fetch', 'origin'], {

package/constants.mjs

@@ -34,6 +34,14 @@ 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 function defaultAwDocsGithubDocsConfig() {
+  return {
+    enabled: true,
+    repo: AW_DOCS_REPO,
+    dest: AW_DOCS_PUBLISH_DIR,
+  };
+}
+
 /** Persistent git clone root — ~/.aw/ */
 export const AW_HOME = join(homedir(), '.aw');
 

package/integrate.mjs

@@ -13,6 +13,10 @@ import {
   resolveRulesSourceDir,
 } from './render-rules.mjs';
 import { isDefaultRoutingEnabled } from './startup.mjs';
+import {
+  AW_DOCS_DIR,
+  defaultAwDocsGithubDocsConfig,
+} from './constants.mjs';
 
 const AW_ROUTER_BRIDGE_HEADER = 'AW Router Bridge';
 const AW_ROUTER_BRIDGE_START_MARKER = '<!-- aw-managed:start router-bridge -->';
@@ -610,14 +614,14 @@ Run with: \`/platform:eval agent:<slug>\` or \`/platform:eval skill:<slug>\`
  * Creates run tracking, learnings, task board, and cache directories.
  */
 export function initAwDocs(cwd) {
-  const awDocsDir = join(cwd, '.aw_docs');
-  if (existsSync(awDocsDir)) return; // Already initialized
+  const awDocsDir = join(cwd, AW_DOCS_DIR);
+  const alreadyInitialized = existsSync(awDocsDir);
 
   const dirs = [
-    '.aw_docs/runs',
-    '.aw_docs/learnings',
-    '.aw_docs/tasks',
-    '.aw_docs/cache',
+    `${AW_DOCS_DIR}/runs`,
+    `${AW_DOCS_DIR}/learnings`,
+    `${AW_DOCS_DIR}/tasks`,
+    `${AW_DOCS_DIR}/cache`,
   ];
 
   for (const dir of dirs) {
@@ -625,7 +629,9 @@ export function initAwDocs(cwd) {
   }
 
   // STATE.md — workspace state
-  writeFileSync(join(awDocsDir, 'STATE.md'), `---
+  const statePath = join(awDocsDir, 'STATE.md');
+  if (!existsSync(statePath)) {
+    writeFileSync(statePath, `---
 active_run: null
 last_run: null
 last_workflow: null
@@ -638,24 +644,60 @@ pending_sync_count: 0
 
 No active runs. Use \`/aw:<team>-<command>\` to start a workflow.
 `);
+  }
 
   // config.json — registry paths, sync settings
-  writeFileSync(join(awDocsDir, 'config.json'), JSON.stringify({
+  const configPath = join(awDocsDir, 'config.json');
+  const defaultConfig = {
     sync: {
       eager: true,
       batch_threshold: 10,
       mcp_memory_enabled: true,
+      github_docs: defaultAwDocsGithubDocsConfig(),
     },
     paths: {
-      runs: '.aw_docs/runs',
-      learnings: '.aw_docs/learnings',
-      tasks: '.aw_docs/tasks',
-      cache: '.aw_docs/cache',
+      runs: `${AW_DOCS_DIR}/runs`,
+      learnings: `${AW_DOCS_DIR}/learnings`,
+      tasks: `${AW_DOCS_DIR}/tasks`,
+      cache: `${AW_DOCS_DIR}/cache`,
     },
-  }, null, 2) + '\n');
+  };
+  let nextConfig = defaultConfig;
+  if (existsSync(configPath)) {
+    try {
+      const existing = JSON.parse(readFileSync(configPath, 'utf8'));
+      nextConfig = {
+        ...existing,
+        sync: {
+          ...defaultConfig.sync,
+          ...(existing.sync || {}),
+          github_docs: {
+            ...defaultConfig.sync.github_docs,
+            ...(existing.sync?.github_docs || {}),
+          },
+        },
+        paths: {
+          ...defaultConfig.paths,
+          ...(existing.paths || {}),
+        },
+      };
+    } catch (e) {
+      fmt.logWarn(`Could not migrate ${AW_DOCS_DIR}/config.json: ${e.message}`);
+      nextConfig = null;
+    }
+  }
+  if (nextConfig) {
+    const nextConfigText = JSON.stringify(nextConfig, null, 2) + '\n';
+    const existingText = existsSync(configPath) ? readFileSync(configPath, 'utf8') : '';
+    if (existingText !== nextConfigText) {
+      writeFileSync(configPath, nextConfigText);
+    }
+  }
 
   // BOARD.md — task board
-  writeFileSync(join(awDocsDir, 'tasks', 'BOARD.md'), `---
+  const boardPath = join(awDocsDir, 'tasks', 'BOARD.md');
+  if (!existsSync(boardPath)) {
+    writeFileSync(boardPath, `---
 tasks: []
 updated_at: null
 ---
@@ -664,11 +706,17 @@ updated_at: null
 
 No active tasks. Tasks are created during workflow execution.
 `);
+  }
 
   // _pending-sync.jsonl — sync queue (empty)
-  writeFileSync(join(awDocsDir, 'learnings', '_pending-sync.jsonl'), '');
+  const pendingSyncPath = join(awDocsDir, 'learnings', '_pending-sync.jsonl');
+  if (!existsSync(pendingSyncPath)) {
+    writeFileSync(pendingSyncPath, '');
+  }
 
-  fmt.logSuccess('Orchestration state ready');
+  if (!alreadyInitialized) {
+    fmt.logSuccess('Orchestration state ready');
+  }
 }
 
 /**

package/package.json

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