@ghl-ai/aw 0.1.36-beta.26 → 0.1.36-beta.28

package/commands/init.mjs

@@ -29,7 +29,7 @@ import {
   sparseCheckoutAsync,
   cleanup,
 } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL } from '../constants.mjs';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const VERSION = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf8')).version;
@@ -124,7 +124,7 @@ export async function initCommand(args) {
 
   // ── Detect installation state ─────────────────────────────────────────
 
-  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
+  const repoUrl = REGISTRY_URL;
   const isGitNative = isValidClone(AW_HOME, repoUrl);
   const isLegacy = !isGitNative && existsSync(GLOBAL_AW_DIR) && !lstatSync(GLOBAL_AW_DIR).isSymbolicLink();
 
@@ -309,8 +309,8 @@ export async function initCommand(args) {
   await installAwEcc(cwd, { silent });
   const instructionFiles = copyInstructions(HOME, null, team) || [];
   initAwDocs(HOME);
-  const mcpFiles = await setupMcp(HOME, team) || [];
-  if (cwd !== HOME) await setupMcp(cwd, team);
+  const mcpFiles = await setupMcp(HOME, team, { silent }) || [];
+  if (cwd !== HOME) await setupMcp(cwd, team, { silent });
   const hooksInstalled = installGlobalHooks();
   installIdeTasks();
 

package/commands/link-project.mjs

@@ -6,7 +6,7 @@ import { homedir } from 'node:os';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { addProjectWorktree, isWorktree, isValidClone } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_URL } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands } from '../integrate.mjs';
 
@@ -18,8 +18,7 @@ export function linkProjectCommand(args) {
 
   fmt.intro('aw link');
 
-  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
-  if (!isValidClone(AW_HOME, repoUrl)) {
+  if (!isValidClone(AW_HOME, REGISTRY_URL)) {
     fmt.cancel('Registry not initialized. Run: aw init');
     return;
   }
@@ -39,9 +38,9 @@ export function linkProjectCommand(args) {
     // Worktree exists — refresh global IDE symlinks pointing to this project's registry
     const projectRegistryDir = join(worktreeDir, REGISTRY_DIR);
     const awDirForLinks = existsSync(projectRegistryDir) ? projectRegistryDir : null;
-    linkWorkspace(HOME, awDirForLinks);
-    generateCommands(HOME);
-    fmt.logSuccess(`Already linked — refreshed IDE symlinks`);
+    const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
+    const commands = generateCommands(HOME, { silent: true });
+    fmt.logSuccess(`Already linked — refreshed ${chalk.bold(symlinks)} IDE symlinks · ${chalk.bold(commands)} commands`);
     return;
   }
 
@@ -49,10 +48,10 @@ export function linkProjectCommand(args) {
     addProjectWorktree(AW_HOME, cwd);
     const projectRegistryDir = join(worktreeDir, REGISTRY_DIR);
     const awDirForLinks = existsSync(projectRegistryDir) ? projectRegistryDir : null;
-    linkWorkspace(HOME, awDirForLinks);
-    generateCommands(HOME);
+    const symlinks = linkWorkspace(HOME, awDirForLinks, { silent: true });
+    const commands = generateCommands(HOME, { silent: true });
     fmt.logSuccess([
-      `Linked project as git worktree`,
+      `Project linked — ${chalk.bold(symlinks)} IDE symlinks · ${chalk.bold(commands)} commands`,
       '',
       `  ${chalk.green('✓')} ${chalk.dim('.aw/')}                  git worktree (IDE git panel enabled)`,
       `  ${chalk.green('✓')} ${chalk.dim(`.aw/${REGISTRY_DIR}/`)} registry content`,
@@ -62,5 +61,5 @@ export function linkProjectCommand(args) {
     fmt.cancel(`Failed to link project: ${e.message}`);
   }
 
-  fmt.outro('Done');
+  fmt.outro('⟁  Done');
 }

package/commands/pull.mjs

@@ -8,7 +8,7 @@ import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
 import { fetchAndMerge, addToSparseCheckout, isValidClone, isWorktree, rebaseOntoOriginMain } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO, DOCS_SOURCE_DIR } from '../constants.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL, DOCS_SOURCE_DIR } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions } from '../integrate.mjs';
 
@@ -33,7 +33,9 @@ export async function pullCommand(args) {
     spinner: silent ? () => ({ start: () => {}, stop: () => {} }) : fmt.spinner,
   };
 
-  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
+  if (!silent) fmt.intro('aw pull');
+
+  const repoUrl = REGISTRY_URL;
   const hasClone = isValidClone(AW_HOME, repoUrl);
 
   if (!hasClone) {
@@ -128,14 +130,14 @@ export async function pullCommand(args) {
     // so edits to project/.aw/.aw_registry/ are instantly visible in global IDE dirs.
     const projectRegistryDir = cwd !== HOME ? join(cwd, '.aw', REGISTRY_DIR) : null;
     const awDirForLinks = (projectRegistryDir && existsSync(projectRegistryDir)) ? projectRegistryDir : null;
-    linkWorkspace(HOME, awDirForLinks);
-    generateCommands(HOME);
+    linkWorkspace(HOME, awDirForLinks, { silent });
+    generateCommands(HOME, { silent });
     copyInstructions(HOME, null, cfg.namespace);
   }
 
   if (!silent) {
     registerMcp(cfg.namespace);
-    log.outro('Pull complete');
+    log.outro('⟁  Pull complete');
   }
 }
 

package/commands/push.mjs

@@ -6,7 +6,7 @@ import { execSync, execFileSync } from 'node:child_process';
 import { homedir } from 'node:os';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { REGISTRY_REPO, REGISTRY_BASE_BRANCH, REGISTRY_DIR } from '../constants.mjs';
+import { REGISTRY_REPO, REGISTRY_URL, REGISTRY_BASE_BRANCH, REGISTRY_DIR } from '../constants.mjs';
 import { resolveInput } from '../paths.mjs';
 import { walkRegistryTree } from '../registry.mjs';
 import {
@@ -179,8 +179,8 @@ function generatePrBody(files, newNamespaces, awHome = null) {
 function generateCommitMsg(files) {
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
-  const addedParts = Object.entries(groupBy(added, 'type')).map(([t, items]) => `${items.length} ${t}`);
-  const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${t} removed`);
+  const addedParts = Object.entries(groupBy(added, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)}`);
+  const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)} removed`);
   const countParts = [...addedParts, ...deletedParts];
 
   if (files.length === 1) {
@@ -284,7 +284,7 @@ function createOrUpdatePR(awHome, branch, prTitle, prBody) {
   try {
     const url = execFileSync('gh', [
       'pr', 'view', branch, '--json', 'url', '--jq', '.url',
-    ], { cwd: awHome, encoding: 'utf8' }).trim();
+    ], { cwd: awHome, encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
     if (url) return { url, updated: true };
   } catch { /* no existing PR */ }
 
@@ -316,8 +316,8 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
   const added = files.filter(f => !f.deleted);
   const deleted = files.filter(f => f.deleted);
 
-  const addedParts = Object.entries(groupBy(added, 'type')).map(([t, items]) => `${items.length} ${t}`);
-  const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${t} removed`);
+  const addedParts = Object.entries(groupBy(added, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)}`);
+  const deletedParts = Object.entries(groupBy(deleted, 'type')).map(([t, items]) => `${items.length} ${singular(t, items.length)} removed`);
   const countParts = [...addedParts, ...deletedParts];
 
   if (files.length === 0) {
@@ -401,7 +401,7 @@ function doPush(files, awHome, dryRun, worktreeFlow = false, preStaged = false)
     fmt.logInfo(chalk.dim(`On branch ${finalBranch} — run aw push again to open a new PR`));
   }
   fmt.logSuccess(`PR: ${chalk.cyan(prUrl)}`);
-  fmt.outro('Push complete');
+  fmt.outro('⟁  Push complete');
 }
 
 // ── Main command ─────────────────────────────────────────────────────
@@ -426,7 +426,7 @@ export function pushCommand(args) {
 
   fmt.intro('aw push');
 
-  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
+  const repoUrl = REGISTRY_URL;
   if (!hasWorktree && !isValidClone(awHome, repoUrl)) {
     fmt.cancel('Registry not initialized. Run: aw init');
     return;
@@ -475,7 +475,6 @@ export function pushCommand(args) {
     }
 
     const files = allEntries
-      .filter(f => parseRegistryPath(f.registryPath) !== null)
       .map(f => {
         const meta = parseRegistryPath(f.registryPath);
         const parts = f.registryPath.split('/');

package/commands/status.mjs

@@ -5,8 +5,8 @@ import { homedir } from 'node:os';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { detectChanges, getCurrentBranch, isValidClone, isWorktree } from '../git.mjs';
-import { REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
+import { detectChanges, getCurrentBranch, commitsAheadOfMain, isValidClone, isWorktree } from '../git.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO, REGISTRY_URL } from '../constants.mjs';
 
 export function statusCommand(args) {
   const HOME = homedir();
@@ -20,8 +20,7 @@ export function statusCommand(args) {
 
   fmt.intro('aw status');
 
-  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
-  if (!isWorktree(localAw) && !isValidClone(AW_HOME, repoUrl)) {
+  if (!isWorktree(localAw) && !isValidClone(AW_HOME, REGISTRY_URL)) {
     fmt.cancel('Registry not initialized. Run: aw init');
     return;
   }
@@ -93,7 +92,9 @@ export function statusCommand(args) {
   }
 
   if (!isOnMain) {
-    fmt.logWarn(`On branch ${chalk.yellow(branch)} — run ${chalk.dim('aw pull')} to sync or checkout main first`);
+    const ahead = commitsAheadOfMain(AW_HOME);
+    const aheadStr = ahead > 0 ? ` (${chalk.yellow(`${ahead} commit${ahead !== 1 ? 's' : ''} ahead`)})` : '';
+    fmt.logWarn(`On branch ${chalk.yellow(branch)}${aheadStr} — run ${chalk.dim('aw push')} to open a PR or ${chalk.dim('aw pull')} to sync`);
   }
 
   // Hints
@@ -101,5 +102,5 @@ export function statusCommand(args) {
     fmt.logInfo(`Push changes: ${chalk.dim('aw push')} or ${chalk.dim('aw push <path>')}`);
   }
 
-  fmt.outro(`${chalk.dim('aw pull')} to fetch latest`);
+  fmt.outro(`⟁  ${chalk.dim('aw pull')} to fetch latest`);
 }

package/constants.mjs

@@ -9,6 +9,13 @@ export const REGISTRY_BASE_BRANCH = 'main';
 /** Default registry repository */
 export const REGISTRY_REPO = 'GoHighLevel/platform-docs';
 
+/**
+ * Full registry clone URL.
+ * Tests override via AW_REGISTRY_URL env var (file:// bare repo).
+ */
+export const REGISTRY_URL = process.env.AW_REGISTRY_URL
+  || `https://github.com/${REGISTRY_REPO}.git`;
+
 /** Directory inside the registry repo that holds platform/ and [template]/ */
 export const REGISTRY_DIR = '.aw_registry';
 

package/ecc.mjs

@@ -61,6 +61,7 @@ export async function installAwEcc(
   cwd,
   { targets = ["cursor", "claude", "codex"], silent = false } = {},
 ) {
+  if (process.env.AW_NO_ECC === '1') return;
   if (!silent) fmt.logStep("Installing aw-ecc engine...");
 
   const repoDir = eccDir();

package/fmt.mjs

@@ -33,7 +33,7 @@ export function banner(text, opts = {}) {
 
 // ─── Clack wrappers ───
 
-export const intro    = (msg) => p.intro(chalk.bgCyan.black(` ${msg} `));
+export const intro    = (msg) => p.intro(chalk.bgHex('#FF6B35').black(` ⟁  ${msg} `));
 export const outro    = (msg) => p.outro(chalk.green(msg));
 export const spinner  = () => p.spinner();
 export const select   = p.select;

package/hooks.mjs

@@ -111,6 +111,10 @@ exit 0
  * @returns {boolean} true if hooks were installed
  */
 export function installGlobalHooks() {
+  // AW_NO_HOOKS=1 lets test environments skip hook installation to prevent
+  // recursive aw init calls during git commits in tests.
+  if (process.env.AW_NO_HOOKS === '1') return false;
+
   try {
     mkdirSync(HOOKS_DIR, { recursive: true });
 

package/integrate.mjs

@@ -11,7 +11,7 @@ import { getLocalRegistryDir } from './git.mjs';
  * Count hand-written commands already present in the registry.
  * No CLI stub generation — all commands come from the registry itself.
  */
-export function generateCommands(cwd) {
+export function generateCommands(cwd, { silent = false } = {}) {
   const awDir = getLocalRegistryDir(cwd, join(homedir(), '.aw_registry'));
 
   // Clean old .generated-commands if it exists (migration)
@@ -29,7 +29,7 @@ export function generateCommands(cwd) {
     }
   }
 
-  if (count > 0) {
+  if (count > 0 && !silent) {
     fmt.logSuccess(`Generated ${count} aw commands`);
   }
 

package/link.mjs

@@ -1,6 +1,6 @@
 // link.mjs — Create symlinks from IDE dirs → .aw_registry/
 
-import { existsSync, lstatSync, mkdirSync, readdirSync, unlinkSync, symlinkSync, rmdirSync } from 'node:fs';
+import { existsSync, lstatSync, mkdirSync, readdirSync, unlinkSync, symlinkSync, rmdirSync, realpathSync } from 'node:fs';
 import { join, relative } from 'node:path';
 import { homedir } from 'node:os';
 import * as fmt from './fmt.mjs';
@@ -129,9 +129,14 @@ function flatName(ns, name) {
  * @param {string} cwd - Directory where IDE dirs (.claude/.cursor/.codex) live
  * @param {string|null} awDirOverride - Explicit registry dir; overrides auto-detection
  */
-export function linkWorkspace(cwd, awDirOverride = null) {
+export function linkWorkspace(cwd, awDirOverride = null, { silent = false } = {}) {
+  // Normalize cwd to real path so relative() produces valid symlink targets on macOS
+  // where $HOME may be /var/... but process.cwd() resolves to /private/var/...
+  try { cwd = realpathSync(cwd); } catch { /* use as-is */ }
+
   const GLOBAL_AW_DIR = join(homedir(), '.aw_registry');
-  const awDir = awDirOverride || getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
+  let awDir = awDirOverride || getLocalRegistryDir(cwd, GLOBAL_AW_DIR);
+  try { awDir = realpathSync(awDir); } catch { /* use as-is if it doesn't exist */ }
   if (!existsSync(awDir)) return 0;
 
   let created = 0;
@@ -255,7 +260,7 @@ export function linkWorkspace(cwd, awDirOverride = null) {
     }
   }
 
-  if (created > 0) {
+  if (created > 0 && !silent) {
     fmt.logSuccess(`Linked ${created} IDE symlink${created > 1 ? 's' : ''}`);
   }
 

package/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@ghl-ai/aw",
-  "version": "0.1.36-beta.26",
+  "version": "0.1.36-beta.28",
   "description": "Agentic Workspace CLI — pull, push & manage agents, skills and commands from the registry",
   "type": "module",
-  "bin": {
-    "aw": "bin.js"
-  },
+  "bin": "bin.js",
   "files": [
     "bin.js",
     "cli.mjs",
@@ -40,6 +38,8 @@
   "author": "GoHighLevel",
   "license": "MIT",
   "scripts": {
+    "test": "vitest run --reporter=verbose",
+    "test:watch": "vitest --reporter=verbose",
     "preuninstall": "node bin.js nuke 2>/dev/null || true"
   },
   "publishConfig": {
@@ -49,5 +49,8 @@
     "@clack/prompts": "0.8.2",
     "chalk": "^5.6.2",
     "figlet": "^1.11.0"
+  },
+  "devDependencies": {
+    "vitest": "^4.1.2"
   }
 }