@ghl-ai/aw 0.1.11 → 0.1.13

package/commands/nuke.mjs

@@ -1,4 +1,4 @@
-// commands/nuke.mjs — Safe cleanup: reads manifest, removes only what AW created
+// commands/nuke.mjs — Safe cleanup: removes only what AW created
 //
 // Safety guarantee: NEVER deletes files that AW didn't create.
 
@@ -13,31 +13,28 @@ const HOME = homedir();
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 const MANIFEST_PATH = join(GLOBAL_AW_DIR, '.aw-manifest.json');
 
-// IDE dirs where AW creates symlinks
 const IDE_DIRS = ['.claude', '.cursor', '.codex'];
 const CONTENT_TYPES = ['agents', 'skills', 'commands', 'blueprints', 'evals'];
 
 function loadManifest() {
   if (!existsSync(MANIFEST_PATH)) return null;
-  try {
-    return JSON.parse(readFileSync(MANIFEST_PATH, 'utf8'));
-  } catch { return null; }
+  try { return JSON.parse(readFileSync(MANIFEST_PATH, 'utf8')); }
+  catch { return null; }
 }
 
-// Remove AW-created files listed in manifest
+// 1. Remove AW-created files listed in manifest
 function removeCreatedFiles(manifest) {
   if (!manifest?.createdFiles?.length) return;
   let removed = 0;
   for (const rel of manifest.createdFiles) {
     const p = join(HOME, rel);
-    try {
-      if (existsSync(p)) { rmSync(p); removed++; }
-    } catch { /* best effort */ }
+    try { if (existsSync(p)) { rmSync(p); removed++; } }
+    catch { /* best effort */ }
   }
   if (removed > 0) fmt.logStep(`Removed ${removed} generated file${removed > 1 ? 's' : ''}`);
 }
 
-// Remove symlinks from IDE dirs that point into .aw_registry
+// 2. Remove symlinks from IDE dirs that point into .aw_registry
 function removeIdeSymlinks() {
   let removed = 0;
 
@@ -60,42 +57,118 @@ function removeIdeSymlinks() {
       // Remove dir if now empty
       try { if (readdirSync(dir).length === 0) rmSync(dir); } catch {}
     }
+
+    // Also clean CLAUDE.md / AGENTS.md if they're AW-generated
+    for (const file of ['CLAUDE.md', 'AGENTS.md']) {
+      const p = join(HOME, ide, file);
+      try {
+        if (lstatSync(p).isSymbolicLink()) {
+          const target = readlinkSync(p);
+          if (target.includes('.aw_registry') || target.includes('aw_registry')) {
+            unlinkSync(p); removed++;
+          }
+        }
+      } catch { /* not a symlink or doesn't exist */ }
+    }
   }
 
   if (removed > 0) fmt.logStep(`Removed ${removed} IDE symlink${removed > 1 ? 's' : ''}`);
 }
 
-// Find and remove .aw_registry symlinks from project directories
+// 3. Find and remove ALL .aw_registry symlinks from project directories
 function removeProjectSymlinks() {
   let removed = 0;
-  const dirsToCheck = new Set([process.cwd()]);
 
-  // Scan ~/Documents, ~/Projects, ~/Desktop, ~/dev and their children
-  for (const parent of ['Documents', 'Projects', 'Desktop', 'dev', 'repos', 'src', 'code', 'work']) {
-    const p = join(HOME, parent);
-    if (!existsSync(p)) continue;
-    try {
-      for (const sub of readdirSync(p)) {
-        dirsToCheck.add(join(p, sub));
+  // Use find command for thorough search — much more reliable than manual scanning
+  try {
+    const result = execSync(
+      `find "${HOME}" -maxdepth 4 -name ".aw_registry" -type l 2>/dev/null`,
+      { encoding: 'utf8', timeout: 10000 }
+    ).trim();
+
+    if (result) {
+      for (const linkPath of result.split('\n').filter(Boolean)) {
+        try {
+          unlinkSync(linkPath);
+          removed++;
+        } catch { /* best effort */ }
       }
-    } catch {}
-  }
+    }
+  } catch {
+    // Fallback: manual scan of common dirs
+    const dirsToCheck = new Set([process.cwd()]);
+    for (const parent of ['Documents', 'Projects', 'Desktop', 'dev', 'repos', 'src', 'code', 'work']) {
+      const p = join(HOME, parent);
+      if (!existsSync(p)) continue;
+      try {
+        for (const sub of readdirSync(p)) {
+          const sp = join(p, sub);
+          dirsToCheck.add(sp);
+          // Also check one level deeper
+          try {
+            for (const sub2 of readdirSync(sp)) {
+              dirsToCheck.add(join(sp, sub2));
+            }
+          } catch {}
+        }
+      } catch {}
+    }
 
-  for (const dir of dirsToCheck) {
-    const link = join(dir, '.aw_registry');
-    try {
-      if (lstatSync(link).isSymbolicLink()) { unlinkSync(link); removed++; }
-    } catch { /* doesn't exist or not a symlink */ }
+    for (const dir of dirsToCheck) {
+      const link = join(dir, '.aw_registry');
+      try {
+        if (lstatSync(link).isSymbolicLink()) { unlinkSync(link); removed++; }
+      } catch {}
+    }
   }
 
   if (removed > 0) fmt.logStep(`Removed ${removed} project .aw_registry symlink${removed > 1 ? 's' : ''}`);
 }
 
+// 4. Remove git template hook
+function removeGitTemplate(manifest) {
+  const gitTemplateDir = manifest?.gitTemplate || join(HOME, '.git-templates', 'aw');
+  if (!existsSync(gitTemplateDir)) return;
+
+  rmSync(gitTemplateDir, { recursive: true, force: true });
+  try {
+    const current = execSync('git config --global init.templateDir', {
+      encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe']
+    }).trim();
+    if (current === gitTemplateDir) {
+      execSync('git config --global --unset init.templateDir', { stdio: 'pipe' });
+    }
+  } catch { /* not set */ }
+  fmt.logStep('Removed git template hook');
+}
+
+// 5. Remove IDE auto-init tasks
+function removeIdeTasks() {
+  for (const ide of ['Code', 'Cursor']) {
+    const tasksPath = join(HOME, 'Library', 'Application Support', ide, 'User', 'tasks.json');
+    if (!existsSync(tasksPath)) continue;
+    try {
+      const data = JSON.parse(readFileSync(tasksPath, 'utf8'));
+      const before = data.tasks?.length || 0;
+      data.tasks = (data.tasks || []).filter(t =>
+        t.label !== 'aw: sync registry' && t.label !== 'aw: pull registry'
+      );
+      if (data.tasks.length < before) {
+        if (data.tasks.length === 0) {
+          unlinkSync(tasksPath);
+        } else {
+          writeFileSync(tasksPath, JSON.stringify(data, null, 2) + '\n');
+        }
+        fmt.logStep(`Removed auto-sync task from ${ide}`);
+      }
+    } catch { /* best effort */ }
+  }
+}
+
 export function nukeCommand(args) {
   fmt.intro('aw nuke');
 
   if (!existsSync(GLOBAL_AW_DIR)) {
-    // Check cwd for local symlink
     const local = join(process.cwd(), '.aw_registry');
     if (existsSync(local) && lstatSync(local).isSymbolicLink()) {
       unlinkSync(local);
@@ -114,71 +187,46 @@ export function nukeCommand(args) {
     manifest ? `${chalk.dim('installed:')} ${manifest.installedAt}` : null,
   ].filter(Boolean).join('\n'), 'Cleaning up');
 
+  // Order matters: remove symlinks BEFORE removing the source
+
   // 1. Remove AW-created files (instruction files, MCP configs)
   removeCreatedFiles(manifest);
 
   // 2. Remove IDE symlinks (only those pointing to .aw_registry)
   removeIdeSymlinks();
 
-  // 3. Remove .aw_registry symlinks from project directories
+  // 3. Remove .aw_registry symlinks from ALL project directories
   removeProjectSymlinks();
 
   // 4. Remove git template hook
-  const gitTemplateDir = manifest?.gitTemplate || join(HOME, '.git-templates', 'aw');
-  if (existsSync(gitTemplateDir)) {
-    rmSync(gitTemplateDir, { recursive: true, force: true });
-    // Unset git config if it pointed to our template
-    try {
-      const current = execSync('git config --global init.templateDir', {
-        encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe']
-      }).trim();
-      if (current === gitTemplateDir) {
-        execSync('git config --global --unset init.templateDir', { stdio: 'pipe' });
-      }
-    } catch { /* not set */ }
-    fmt.logStep('Removed git template hook');
-  }
+  removeGitTemplate(manifest);
 
-  // 5. Remove IDE auto-pull tasks
-  for (const ide of ['Code', 'Cursor']) {
-    const tasksPath = join(HOME, 'Library', 'Application Support', ide, 'User', 'tasks.json');
-    if (!existsSync(tasksPath)) continue;
-    try {
-      const data = JSON.parse(readFileSync(tasksPath, 'utf8'));
-      const before = data.tasks?.length || 0;
-      data.tasks = (data.tasks || []).filter(t => t.label !== 'aw: sync registry' && t.label !== 'aw: pull registry');
-      if (data.tasks.length < before) {
-        if (data.tasks.length === 0) {
-          unlinkSync(tasksPath);
-        } else {
-          writeFileSync(tasksPath, JSON.stringify(data, null, 2) + '\n');
-        }
-        fmt.logStep(`Removed auto-pull task from ${ide}`);
-      }
-    } catch { /* best effort */ }
-  }
+  // 5. Remove IDE auto-init tasks
+  removeIdeTasks();
 
-  // 7. Remove ~/.aw_docs/
+  // 6. Remove ~/.aw_docs/
   const awDocs = join(HOME, '.aw_docs');
   if (existsSync(awDocs)) {
     rmSync(awDocs, { recursive: true, force: true });
     fmt.logStep('Removed ~/.aw_docs/');
   }
 
-  // 8. Remove ~/.aw_registry/ itself
+  // 7. Remove ~/.aw_registry/ itself (source of truth — last!)
   rmSync(GLOBAL_AW_DIR, { recursive: true, force: true });
   fmt.logStep('Removed ~/.aw_registry/');
 
   fmt.outro([
     'Fully removed',
     '',
+    `  ${chalk.green('✓')} Generated files cleaned`,
     `  ${chalk.green('✓')} IDE symlinks cleaned`,
     `  ${chalk.green('✓')} Project symlinks cleaned`,
     `  ${chalk.green('✓')} Git template hook removed`,
-    `  ${chalk.green('✓')} IDE auto-pull tasks removed`,
+    `  ${chalk.green('✓')} IDE auto-sync tasks removed`,
     `  ${chalk.green('✓')} Source of truth deleted`,
     '',
     `  ${chalk.dim('No existing files were touched.')}`,
-    `  ${chalk.dim('Run')} ${chalk.bold('aw init')} ${chalk.dim('to reinstall.')}`,
+    `  ${chalk.dim('To reinstall:')} ${chalk.bold('aw init')}`,
+    `  ${chalk.dim('To uninstall CLI:')} ${chalk.bold('npm uninstall -g @ghl-ai/aw')}`,
   ].join('\n'));
 }

package/commands/pull.mjs

@@ -28,28 +28,27 @@ export function pullCommand(args) {
   const silent = args['--silent'] === true || args._silent === true;
   const renameNamespace = args._renameNamespace || null;
 
-  // Silent mode: suppress all output and exit cleanly on errors
-  if (silent) {
-    const origCancel = fmt.cancel;
-    fmt.cancel = () => { process.exit(0); };
-    fmt.logInfo = () => {};
-    fmt.logSuccess = () => {};
-    fmt.logStep = () => {};
-    fmt.logWarn = () => {};
-    fmt.logMessage = () => {};
-    fmt.note = () => {};
-    fmt.outro = () => {};
-    fmt.spinner = () => ({ start: () => {}, stop: () => {} });
-  }
+  // Silent mode: wrap fmt to suppress all output and exit cleanly on errors
+  const log = {
+    cancel: silent ? () => { process.exit(0); } : fmt.cancel,
+    logInfo: silent ? () => {} : fmt.logInfo,
+    logSuccess: silent ? () => {} : fmt.logSuccess,
+    logStep: silent ? () => {} : fmt.logStep,
+    logWarn: silent ? () => {} : fmt.logWarn,
+    logMessage: silent ? () => {} : fmt.logMessage,
+    note: silent ? () => {} : fmt.note,
+    outro: silent ? () => {} : fmt.outro,
+    spinner: silent ? () => ({ start: () => {}, stop: () => {} }) : fmt.spinner,
+  };
 
   // No args = re-pull everything in sync config
   if (!input) {
     const cfg = config.load(workspaceDir);
-    if (!cfg) fmt.cancel('No .sync-config.json found. Run: aw init');
+    if (!cfg) log.cancel('No .sync-config.json found. Run: aw init');
     if (cfg.include.length === 0) {
-      fmt.cancel('Nothing to pull. Add paths first:\n\n  aw pull <path>');
+      log.cancel('Nothing to pull. Add paths first:\n\n  aw pull <path>');
     }
-    fmt.logInfo(`Pulling ${chalk.cyan(cfg.include.length)} synced path${cfg.include.length > 1 ? 's' : ''}...`);
+    log.logInfo(`Pulling ${chalk.cyan(cfg.include.length)} synced path${cfg.include.length > 1 ? 's' : ''}...`);
     for (const p of cfg.include) {
       pullCommand({ ...args, _positional: [p], _skipIntegrate: true });
     }
@@ -65,7 +64,7 @@ export function pullCommand(args) {
   let pattern = resolved.registryPath;
 
   if (!pattern) {
-    fmt.cancel(`Could not resolve "${input}" to a registry path`);
+    log.cancel(`Could not resolve "${input}" to a registry path`);
   }
 
   // Ensure workspace exists
@@ -76,11 +75,11 @@ export function pullCommand(args) {
   // Load config
   const cfg = config.load(workspaceDir);
   if (!cfg) {
-    fmt.cancel('No .sync-config.json found. Run: aw init');
+    log.cancel('No .sync-config.json found. Run: aw init');
   }
 
   // Fetch from registry
-  const s = fmt.spinner();
+  const s = log.spinner();
   s.start('Fetching from registry...');
 
   const sparsePaths = includeToSparsePaths([pattern]);
@@ -89,7 +88,7 @@ export function pullCommand(args) {
     tempDir = sparseCheckout(cfg.repo, sparsePaths);
   } catch (e) {
     s.stop(chalk.red('Fetch failed'));
-    fmt.cancel(e.message);
+    log.cancel(e.message);
   }
 
   try {
@@ -104,8 +103,8 @@ export function pullCommand(args) {
 
     if (registryDirs.length === 0) {
       s.stop(chalk.red('Not found'));
-      if (args._silent) return;
-      fmt.cancel(`Nothing found in registry for ${chalk.cyan(pattern)}`);
+      if (silent) return;
+      log.cancel(`Nothing found in registry for ${chalk.cyan(pattern)}`);
     }
 
     // Rename namespace if requested (e.g., [template] → dev)
@@ -132,8 +131,8 @@ export function pullCommand(args) {
     if (!hasMatch) {
       s.stop(chalk.red('Not found'));
       cleanup(tempDir);
-      if (args._silent) return;
-      fmt.cancel(`Nothing found in registry for ${chalk.cyan(pattern)}\n\n  Check the pattern exists in the registry repo.`);
+      if (silent) return;
+      log.cancel(`Nothing found in registry for ${chalk.cyan(pattern)}\n\n  Check the pattern exists in the registry repo.`);
     }
 
     const fetched = registryDirs.map(d => chalk.cyan(d.name)).join(', ');
@@ -142,7 +141,7 @@ export function pullCommand(args) {
     // Add to config if not already there
     if (!cfg.include.includes(pattern)) {
       config.addPattern(workspaceDir, pattern);
-      fmt.logSuccess(`Added ${chalk.cyan(pattern)} to config`);
+      log.logSuccess(`Added ${chalk.cyan(pattern)} to config`);
     }
 
     // Compute plan
@@ -156,7 +155,7 @@ export function pullCommand(args) {
     }
 
     // Apply
-    const s2 = fmt.spinner();
+    const s2 = log.spinner();
     s2.start('Applying changes...');
     const conflictCount = applyActions(actions);
     updateManifest(workspaceDir, actions, cfg.namespace);

package/package.json

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