@ghl-ai/aw 0.1.34-beta.14 → 0.1.34-beta.15

package/apply.mjs

@@ -0,0 +1,60 @@
+// apply.mjs — Apply sync plan (file operations). Zero dependencies.
+
+import { readFileSync, writeFileSync, mkdirSync, cpSync, existsSync } from 'node:fs';
+import { dirname } from 'node:path';
+
+function writeConflictMarkers(filePath, localContent, registryContent) {
+  writeFileSync(filePath, [
+    '<<<<<<< LOCAL',
+    localContent.trimEnd(),
+    '=======',
+    registryContent.trimEnd(),
+    '>>>>>>> REGISTRY',
+    '',
+  ].join('\n'));
+}
+
+/**
+ * Apply actions to the workspace.
+ * All actions are file-level (no directory-level operations).
+ *
+ * @param {Array} actions
+ * @param {{ teamNS?: string }} opts
+ *   teamNS — when set, replaces all occurrences of `$TEAM_NS` in file content
+ *   with this value. Used when pulling [template] as a renamed team namespace.
+ * @returns {number} count of files with conflicts
+ */
+export function applyActions(actions, { teamNS } = {}) {
+  let conflicts = 0;
+
+  for (const act of actions) {
+    switch (act.action) {
+      case 'ADD':
+      case 'UPDATE':
+        mkdirSync(dirname(act.targetPath), { recursive: true });
+        if (teamNS && act.sourcePath.endsWith('.md')) {
+          const content = readFileSync(act.sourcePath, 'utf8').replaceAll('$TEAM_NS', teamNS);
+          writeFileSync(act.targetPath, content);
+        } else {
+          cpSync(act.sourcePath, act.targetPath);
+        }
+        break;
+
+      case 'CONFLICT': {
+        const local = existsSync(act.targetPath) ? readFileSync(act.targetPath, 'utf8') : '';
+        let registry = readFileSync(act.sourcePath, 'utf8');
+        if (teamNS) registry = registry.replaceAll('$TEAM_NS', teamNS);
+        mkdirSync(dirname(act.targetPath), { recursive: true });
+        writeConflictMarkers(act.targetPath, local, registry);
+        conflicts++;
+        break;
+      }
+
+      case 'ORPHAN':
+      case 'UNCHANGED':
+        break;
+    }
+  }
+
+  return conflicts;
+}

package/commands/drop.mjs

@@ -1,21 +1,18 @@
 // commands/drop.mjs — Remove file or synced path from workspace
 
-import { join } from 'node:path';
+import { join, resolve } from 'node:path';
 import { rmSync, existsSync } from 'node:fs';
-import { homedir } from 'node:os';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
+import { matchesAny } from '../glob.mjs';
 import { resolveInput } from '../paths.mjs';
-import { gitSparseList, gitSparseSet, isGitRepo } from '../git.mjs';
-import { REGISTRY_DIR } from '../constants.mjs';
+import { load as loadManifest, save as saveManifest } from '../manifest.mjs';
 
 export function dropCommand(args) {
   const input = args._positional?.[0];
   const cwd = process.cwd();
-  const GLOBAL_AW_DIR = join(homedir(), '.aw_registry');
-  const localDir = join(cwd, '.aw_registry');
-  const workspaceDir = existsSync(join(localDir, '.sync-config.json')) ? localDir : GLOBAL_AW_DIR;
+  const workspaceDir = join(cwd, '.aw_registry');
 
   fmt.intro('aw drop');
 
@@ -26,10 +23,7 @@ export function dropCommand(args) {
   const cfg = config.load(workspaceDir);
   if (!cfg) fmt.cancel('No .sync-config.json found. Run: aw init');
 
-  if (!isGitRepo(workspaceDir)) {
-    fmt.cancel('Registry not initialized as git repo. Run: aw init');
-  }
-
+  // Resolve to registry path (accepts both local and registry paths)
   const resolved = resolveInput(input, workspaceDir);
   const regPath = resolved.registryPath;
 
@@ -37,37 +31,58 @@ export function dropCommand(args) {
     fmt.cancel(`Could not resolve "${input}" to a registry path`);
   }
 
-  // Check if this is a top-level synced path → remove from sparse-checkout
+  // Check if this path (or a parent) is in config → remove from config + delete files
   const isConfigPath = cfg.include.some(p => p === regPath || p.startsWith(regPath + '/'));
 
   if (isConfigPath) {
     config.removePattern(workspaceDir, regPath);
     fmt.logSuccess(`Removed ${chalk.cyan(regPath)} from sync config`);
+  }
 
-    // Remove from sparse checkout
-    const sparsePath = `${REGISTRY_DIR}/${regPath}`;
-    const currentPaths = gitSparseList(workspaceDir);
-    const newPaths = currentPaths.filter(p => p !== sparsePath && !p.startsWith(sparsePath + '/'));
+  // Delete matching local files
+  const removed = deleteMatchingFiles(workspaceDir, regPath);
 
-    if (newPaths.length !== currentPaths.length) {
-      gitSparseSet(workspaceDir, newPaths);
-      fmt.logSuccess(`Removed ${chalk.cyan(regPath)} from sparse checkout`);
-    }
-  } else {
-    // Sub-path: delete local files (restored on next pull since still in sparse checkout)
-    const targetPath = join(workspaceDir, regPath);
-    if (existsSync(targetPath)) {
-      rmSync(targetPath, { recursive: true, force: true });
-      fmt.logInfo(`Removed ${chalk.cyan(regPath)} from workspace`);
-      fmt.logWarn(`Path still in sync config — next ${chalk.dim('aw pull')} will restore it`);
-    } else if (existsSync(targetPath + '.md')) {
-      rmSync(targetPath + '.md', { force: true });
-      fmt.logInfo(`Removed ${chalk.cyan(regPath)}.md from workspace`);
-      fmt.logWarn(`Path still in sync config — next ${chalk.dim('aw pull')} will restore it`);
-    } else {
-      fmt.cancel(`Nothing found for ${chalk.cyan(regPath)}.\n\n  Use ${chalk.dim('aw status')} to see synced paths.`);
-    }
+  if (removed > 0) {
+    fmt.logInfo(`${chalk.bold(removed)} file${removed > 1 ? 's' : ''} removed from workspace`);
+  } else if (!isConfigPath) {
+    fmt.cancel(`Nothing found for ${chalk.cyan(regPath)}.\n\n  Use ${chalk.dim('aw status')} to see synced paths.`);
+  }
+
+  if (!isConfigPath && removed > 0) {
+    fmt.logWarn(`Path still in sync config — next ${chalk.dim('aw pull')} will restore it`);
   }
 
   fmt.outro('Done');
 }
+
+/**
+ * Find and delete local files whose registry path matches the given path.
+ */
+function deleteMatchingFiles(workspaceDir, path) {
+  const manifest = loadManifest(workspaceDir);
+  let removed = 0;
+
+  for (const [manifestKey] of Object.entries(manifest.files)) {
+    const registryPath = manifestKeyToRegistryPath(manifestKey);
+
+    if (matchesAny(registryPath, [path])) {
+      const filePath = join(workspaceDir, manifestKey);
+      if (existsSync(filePath)) {
+        rmSync(filePath, { recursive: true, force: true });
+        removed++;
+      }
+      delete manifest.files[manifestKey];
+    }
+  }
+
+  saveManifest(workspaceDir, manifest);
+  return removed;
+}
+
+/**
+ * Convert manifest key to registry path.
+ * Manifest key now mirrors registry: "platform/agents/architecture-reviewer.md" → "platform/agents/architecture-reviewer"
+ */
+function manifestKeyToRegistryPath(manifestKey) {
+  return manifestKey.replace(/\.md$/, '');
+}

package/commands/init.mjs

@@ -1,25 +1,19 @@
-// commands/init.mjs — Persistent sparse git checkout, link IDEs, global git hooks.
+// commands/init.mjs — Clean init: clone registry, link IDEs, global git hooks.
 //
-// Layout:
-//   ~/.aw_registry/.git-source/   — hidden git clone
-//   ~/.aw_registry/platform       — symlink into clone
-//   ~/.aw_registry/platform/docs  — symlink to content/ (full docs)
+// No shell profile modifications. No daemons. No background processes.
+// Uses core.hooksPath (git-lfs pattern) for system-wide hook interception.
+// Uses IDE tasks for auto-pull on workspace open.
 
-import { mkdirSync, existsSync, writeFileSync, symlinkSync, cpSync, readFileSync, readdirSync, renameSync, lstatSync, rmSync } from 'node:fs';
+import { mkdirSync, existsSync, writeFileSync, symlinkSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { join, dirname } from 'node:path';
 import { homedir } from 'node:os';
 import { fileURLToPath } from 'node:url';
+import { readFileSync } from 'node:fs';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import {
-  gitInit, gitPull, gitSparseAdd, gitSparseList, gitSparseSet, gitLsRemote,
-  isGitRepo, withLock, includeToSparsePaths, addGitExcludes,
-  ensureNamespaceLinks, ensureDocsSymlink,
-  GLOBAL_GIT_DIR,
-} from '../git.mjs';
-import { REGISTRY_BASE_BRANCH, REGISTRY_DIR, REGISTRY_REPO } from '../constants.mjs';
+import { pullCommand, pullAsync } from './pull.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions, initAwDocs } from '../integrate.mjs';
 import { setupMcp } from '../mcp.mjs';
@@ -33,29 +27,36 @@ const HOME = homedir();
 const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 const MANIFEST_PATH = join(GLOBAL_AW_DIR, '.aw-manifest.json');
 
-// ── IDE tasks ────────────────────────────────────────────────────────
+// ── IDE tasks for auto-pull ─────────────────────────────────────────────
 
 function installIdeTasks() {
+  // VS Code / Cursor task — runs aw pull on folder open
   const vscodeTask = {
     version: '2.0.0',
-    tasks: [{
-      label: 'aw: sync registry',
-      type: 'shell',
-      command: 'aw init --silent',
-      presentation: { reveal: 'silent', panel: 'shared', close: true },
-      runOptions: { runOn: 'folderOpen' },
-      problemMatcher: [],
-    }],
+    tasks: [
+      {
+        label: 'aw: sync registry',
+        type: 'shell',
+        command: 'aw init --silent',
+        presentation: { reveal: 'silent', panel: 'shared', close: true },
+        runOptions: { runOn: 'folderOpen' },
+        problemMatcher: [],
+      },
+    ],
   };
 
+  // Install globally for VS Code and Cursor
   for (const ide of ['Code', 'Cursor']) {
     const userDir = join(HOME, 'Library', 'Application Support', ide, 'User');
     if (!existsSync(userDir)) continue;
+
     const tasksPath = join(userDir, 'tasks.json');
     if (existsSync(tasksPath)) {
+      // Don't override existing tasks — check if aw task already there
       try {
         const existing = JSON.parse(readFileSync(tasksPath, 'utf8'));
         if (existing.tasks?.some(t => t.label === 'aw: sync registry' || t.label === 'aw: pull registry')) continue;
+        // Add our task to existing
         existing.tasks = existing.tasks || [];
         existing.tasks.push(vscodeTask.tasks[0]);
         writeFileSync(tasksPath, JSON.stringify(existing, null, 2) + '\n');
@@ -72,48 +73,26 @@ function saveManifest(data) {
   writeFileSync(MANIFEST_PATH, JSON.stringify(data, null, 2) + '\n');
 }
 
-const ALLOWED_NAMESPACES = ['platform', 'revex', 'mobile', 'commerce', 'leadgen', 'crm', 'marketplace', 'ai'];
 
-/**
- * Bootstrap a new namespace from [template].
- */
-function bootstrapFromTemplate(folderName, teamNS) {
-  const gitDir = GLOBAL_GIT_DIR;
-  const templateDir = join(gitDir, REGISTRY_DIR, '[template]');
-  const targetDir = join(gitDir, REGISTRY_DIR, ...folderName.split('/'));
+function printPullSummary(pattern, actions) {
+  for (const type of ['agents', 'skills', 'commands', 'evals']) {
+    const typeActions = actions.filter(a => a.type === type);
+    if (typeActions.length === 0) continue;
 
-  if (!existsSync(templateDir)) {
-    throw new Error('Template directory not found. Ensure [template] is in sparse checkout.');
-  }
+    const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0 };
+    for (const a of typeActions) counts[a.action] = (counts[a.action] || 0) + 1;
 
-  cpSync(templateDir, targetDir, { recursive: true });
-  walkAndReplace(targetDir, '$TEAM_NS', teamNS);
-}
+    const parts = [];
+    if (counts.ADD > 0) parts.push(chalk.green(`${counts.ADD} new`));
+    if (counts.UPDATE > 0) parts.push(chalk.cyan(`${counts.UPDATE} updated`));
+    if (counts.CONFLICT > 0) parts.push(chalk.red(`${counts.CONFLICT} conflict`));
+    const detail = parts.length > 0 ? ` (${parts.join(', ')})` : '';
 
-function walkAndReplace(dir, search, replace) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
-    const fullPath = join(dir, entry.name);
-    if (entry.isDirectory()) {
-      walkAndReplace(fullPath, search, replace);
-    } else if (entry.name.endsWith('.md')) {
-      const content = readFileSync(fullPath, 'utf8');
-      if (content.includes(search)) {
-        writeFileSync(fullPath, content.replaceAll(search, replace));
-      }
-    }
+    fmt.logSuccess(`${chalk.cyan(pattern)}: ${typeActions.length} ${type}${detail}`);
   }
 }
 
-/**
- * Remove [template] from sparse checkout after bootstrapping.
- */
-function removeTemplateFromSparse() {
-  const currentPaths = gitSparseList(GLOBAL_AW_DIR);
-  const cleanPaths = currentPaths.filter(p => !p.includes('[template]'));
-  if (cleanPaths.length !== currentPaths.length) {
-    gitSparseSet(GLOBAL_AW_DIR, cleanPaths);
-  }
-}
+const ALLOWED_NAMESPACES = ['platform', 'revex', 'mobile', 'commerce', 'leadgen', 'crm', 'marketplace', 'ai'];
 
 export async function initCommand(args) {
   const namespace = args['--namespace'] || null;
@@ -122,7 +101,7 @@ export async function initCommand(args) {
 
   fmt.intro(`aw init ${chalk.dim('v' + VERSION)}`);
 
-  // ── Validate ──────────────────────────────────────────────────────
+  // ── Validate ──────────────────────────────────────────────────────────
 
   if (!namespace && !silent) {
     const list = ALLOWED_NAMESPACES.map(n => chalk.cyan(n)).join(', ');
@@ -136,11 +115,12 @@ export async function initCommand(args) {
     ].join('\n'));
   }
 
+  // Parse team/sub-team
   const nsParts = namespace ? namespace.split('/') : [];
   const team = nsParts[0] || null;
   const subTeam = nsParts[1] || null;
-  const teamNS = subTeam ? `${team}-${subTeam}` : team;
-  const folderName = subTeam ? `${team}/${subTeam}` : team;
+  const teamNS = subTeam ? `${team}-${subTeam}` : team;          // for $TEAM_NS replacement
+  const folderName = subTeam ? `${team}/${subTeam}` : team;       // for .aw_registry/ path
 
   if (team && !ALLOWED_NAMESPACES.includes(team)) {
     const list = ALLOWED_NAMESPACES.map(n => chalk.cyan(n)).join(', ');
@@ -171,55 +151,63 @@ export async function initCommand(args) {
     fmt.cancel(`Invalid sub-team '${subTeam}' — must match: ${SLUG_RE}`);
   }
 
-  const cwd = process.cwd();
-  const hasGitRepo = isGitRepo(GLOBAL_AW_DIR);
   const hasConfig = config.exists(GLOBAL_AW_DIR);
+  const hasPlatform = existsSync(join(GLOBAL_AW_DIR, 'platform'));
+  const isExisting = hasConfig && hasPlatform;
+  const cwd = process.cwd();
 
-  // ── Fast path: already initialized ─────────────────────────────────
+  // ── Fast path: already initialized → just pull + link ─────────────────
 
-  if (hasGitRepo && hasConfig) {
+  if (isExisting) {
     const cfg = config.load(GLOBAL_AW_DIR);
-    const isNewSubTeam = folderName && cfg && !cfg.include.includes(folderName);
 
-    await withLock(GLOBAL_AW_DIR, async () => {
-      if (!silent) fmt.logStep('Syncing registry...');
-      try {
-        const { conflicts } = gitPull(GLOBAL_AW_DIR);
-        if (conflicts && !silent) {
-          fmt.logWarn('Merge conflicts — resolve in ~/.aw_registry/.git-source/');
-        }
-      } catch (e) {
-        if (!silent) fmt.logWarn(`Pull failed: ${e.message}`);
-      }
-
-      if (isNewSubTeam) {
-        if (!silent) fmt.logStep(`Adding sub-team ${chalk.cyan(folderName)}...`);
-        const nsExists = gitLsRemote(GLOBAL_AW_DIR, folderName);
-        if (nsExists) {
-          gitSparseAdd(GLOBAL_AW_DIR, [`${REGISTRY_DIR}/${folderName}`]);
-        } else {
-          gitSparseAdd(GLOBAL_AW_DIR, [`${REGISTRY_DIR}/[template]`]);
-          try { gitPull(GLOBAL_AW_DIR); } catch { /* */ }
-          bootstrapFromTemplate(folderName, teamNS);
-          removeTemplateFromSparse();
-        }
-        config.addPattern(GLOBAL_AW_DIR, folderName);
-      }
-    }, { skipIfLocked: silent });
-
-    // Refresh symlinks + docs
-    ensureDocsSymlink(GLOBAL_AW_DIR);
-    ensureNamespaceLinks(GLOBAL_AW_DIR);
+    // Add new sub-team if not already tracked
+    const isNewSubTeam = folderName && cfg && !cfg.include.includes(folderName);
+    if (isNewSubTeam) {
+      if (!silent) fmt.logStep(`Adding sub-team ${chalk.cyan(folderName)}...`);
+      await pullAsync({
+        ...args,
+        _positional: ['[template]'],
+        _renameNamespace: folderName,
+        _teamNS: teamNS,
+        _workspaceDir: GLOBAL_AW_DIR,
+        _skipIntegrate: true,
+      });
+      config.addPattern(GLOBAL_AW_DIR, folderName);
+    } else {
+      if (!silent) fmt.logStep('Already initialized — syncing...');
+    }
 
+    // Pull latest (parallel)
+    // cfg.include has the renamed namespace (e.g. 'revex/courses'), but the repo
+    // only has '.aw_registry/[template]/' — remap non-platform entries back.
     const freshCfg = config.load(GLOBAL_AW_DIR);
+    if (freshCfg && freshCfg.include.length > 0) {
+      const pullJobs = freshCfg.include.map(p => {
+        const isTeamNs = p !== 'platform';
+        const derivedTeamNS = isTeamNs ? p.replace(/\//g, '-') : undefined;
+        return pullAsync({
+          ...args,
+          _positional: [isTeamNs ? '[template]' : p],
+          _workspaceDir: GLOBAL_AW_DIR,
+          _skipIntegrate: true,
+          _renameNamespace: isTeamNs ? p : undefined,
+          _teamNS: derivedTeamNS,
+        });
+      });
+      await Promise.all(pullJobs);
+    }
+
+    // Re-link IDE dirs + hooks (idempotent)
     linkWorkspace(HOME);
     generateCommands(HOME);
-    copyInstructions(HOME, null, freshCfg?.namespace || team);
+    copyInstructions(HOME, null, freshCfg?.namespace || team) || [];
     initAwDocs(HOME);
-    setupMcp(HOME, freshCfg?.namespace || team);
+    setupMcp(HOME, freshCfg?.namespace || team) || [];
     if (cwd !== HOME) setupMcp(cwd, freshCfg?.namespace || team);
     installGlobalHooks();
 
+    // Link current project if needed
     if (cwd !== HOME && !existsSync(join(cwd, '.aw_registry'))) {
       try {
         symlinkSync(GLOBAL_AW_DIR, join(cwd, '.aw_registry'));
@@ -241,86 +229,55 @@ export async function initCommand(args) {
     return;
   }
 
-  // ── Full init ──────────────────────────────────────────────────────
-
-  // Backup old ~/.aw_registry/ if it's a real dir without our git clone
-  if (existsSync(GLOBAL_AW_DIR) && !isGitRepo(GLOBAL_AW_DIR)) {
-    const backupDir = `${GLOBAL_AW_DIR}.bak-${new Date().toISOString().slice(0, 10)}`;
-    fmt.logWarn(`Existing ~/.aw_registry/ found — backing up to ${backupDir}`);
-    renameSync(GLOBAL_AW_DIR, backupDir);
-  }
-
-  // Ensure ~/.aw_registry/ exists as a real directory
-  mkdirSync(GLOBAL_AW_DIR, { recursive: true });
+  // ── Full init: first time setup ───────────────────────────────────────
 
+  // Auto-detect user
   if (!user) {
     try {
       user = execSync('git config user.name', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-    } catch { /* */ }
+    } catch { /* git not configured */ }
   }
 
+  // Step 1: Create global source of truth
+  mkdirSync(GLOBAL_AW_DIR, { recursive: true });
+
+  const cfg = config.create(GLOBAL_AW_DIR, { namespace: team, user });
+
   fmt.note([
     `${chalk.dim('source:')}     ~/.aw_registry/`,
     folderName ? `${chalk.dim('namespace:')}  ${folderName}` : `${chalk.dim('namespace:')}  ${chalk.dim('none')}`,
-    user ? `${chalk.dim('user:')}       ${user}` : null,
+    user ? `${chalk.dim('user:')}       ${cfg.user}` : null,
     `${chalk.dim('version:')}    v${VERSION}`,
   ].filter(Boolean).join('\n'), 'Config created');
 
-  // Step 1: Clone to hidden .git-source/ inside .aw_registry
+  // Step 2: Pull registry content (parallel)
   const s = fmt.spinner();
   const pullTargets = folderName ? `platform + ${folderName}` : 'platform';
-  s.start(`Cloning registry (${pullTargets})...`);
+  s.start(`Pulling ${pullTargets}...`);
 
-  const initialPaths = includeToSparsePaths(['platform']);
+  const pullJobs = [
+    pullAsync({ ...args, _positional: ['platform'], _workspaceDir: GLOBAL_AW_DIR, _skipIntegrate: true }),
+  ];
+  if (folderName) {
+    pullJobs.push(
+      pullAsync({ ...args, _positional: ['[template]'], _renameNamespace: folderName, _teamNS: teamNS, _workspaceDir: GLOBAL_AW_DIR, _skipIntegrate: true }),
+    );
+  }
 
+  let pullResults;
   try {
-    gitInit(REGISTRY_REPO, REGISTRY_BASE_BRANCH, GLOBAL_GIT_DIR, initialPaths);
-    s.stop('Repository cloned');
+    pullResults = await Promise.all(pullJobs);
+    s.stop(`Pulled ${pullTargets}`);
   } catch (e) {
-    s.stop(chalk.red('Clone failed'));
+    s.stop(chalk.red('Pull failed'));
     fmt.cancel(e.message);
   }
 
-  // Step 2: Git excludes for local config files
-  addGitExcludes(GLOBAL_GIT_DIR, [
-    `${REGISTRY_DIR}/.sync-config.json`,
-    `${REGISTRY_DIR}/.aw-manifest.json`,
-    `${REGISTRY_DIR}/platform/docs`,
-    '.aw-lock/',
-  ]);
-
-  // Step 3: Write config
-  const newCfg = config.create(GLOBAL_AW_DIR, { namespace: team, user });
-
-  // Step 4: Add namespace
-  if (folderName) {
-    const s2 = fmt.spinner();
-    s2.start(`Setting up namespace ${chalk.cyan(folderName)}...`);
-
-    const nsExists = gitLsRemote(GLOBAL_AW_DIR, folderName);
-    if (nsExists) {
-      gitSparseAdd(GLOBAL_AW_DIR, [`${REGISTRY_DIR}/${folderName}`]);
-      s2.stop(`Namespace ${chalk.cyan(folderName)} checked out`);
-    } else {
-      gitSparseAdd(GLOBAL_AW_DIR, [`${REGISTRY_DIR}/[template]`]);
-      bootstrapFromTemplate(folderName, teamNS);
-      removeTemplateFromSparse();
-      s2.stop(`Namespace ${chalk.cyan(folderName)} bootstrapped from template`);
-    }
-    config.addPattern(GLOBAL_AW_DIR, folderName);
+  for (const { pattern, actions } of pullResults) {
+    printPullSummary(pattern, actions);
   }
 
-  if (!newCfg.include.includes('platform')) {
-    config.addPattern(GLOBAL_AW_DIR, 'platform');
-  }
-
-  // Step 5: Docs symlink (content/ → platform/docs)
-  ensureDocsSymlink(GLOBAL_AW_DIR);
-
-  // Step 6: Namespace symlinks (platform → .git-source/.aw_registry/platform)
-  ensureNamespaceLinks(GLOBAL_AW_DIR);
-
-  // Step 7: Link IDE dirs
+  // Step 3: Link IDE dirs + setup tasks
   fmt.logStep('Linking IDE symlinks...');
   linkWorkspace(HOME);
   generateCommands(HOME);
@@ -331,7 +288,7 @@ export async function initCommand(args) {
   const hooksInstalled = installGlobalHooks();
   installIdeTasks();
 
-  // Step 8: Project symlink
+  // Step 4: Symlink in current directory if it's a git repo
   if (cwd !== HOME && !existsSync(join(cwd, '.aw_registry'))) {
     try {
       symlinkSync(GLOBAL_AW_DIR, join(cwd, '.aw_registry'));
@@ -339,9 +296,9 @@ export async function initCommand(args) {
     } catch { /* best effort */ }
   }
 
-  // Step 9: Install manifest for nuke
-  saveManifest({
-    version: 2,
+  // Step 5: Write manifest for nuke cleanup
+  const manifest = {
+    version: 1,
     installedAt: new Date().toISOString(),
     globalDir: GLOBAL_AW_DIR,
     createdFiles: [
@@ -349,14 +306,17 @@ export async function initCommand(args) {
       ...mcpFiles.map(p => p.startsWith(HOME) ? p.slice(HOME.length + 1) : p),
     ],
     globalHooksDir: hooksInstalled ? join(HOME, '.aw', 'hooks') : null,
-  });
+  };
+  saveManifest(manifest);
 
+  // Offer to update if a newer version is available
   await promptUpdate(await args._updateCheck);
 
+  // Done
   fmt.outro([
     'Install complete',
     '',
-    `  ${chalk.green('✓')} Source of truth: ~/.aw_registry/ (git)`,
+    `  ${chalk.green('✓')} Source of truth: ~/.aw_registry/`,
     `  ${chalk.green('✓')} IDE integration: ~/.claude/, ~/.cursor/, ~/.codex/`,
     hooksInstalled ? `  ${chalk.green('✓')} Git hooks: auto-sync on pull/clone (core.hooksPath)` : null,
     `  ${chalk.green('✓')} IDE task: auto-sync on workspace open`,

package/commands/nuke.mjs

@@ -286,24 +286,10 @@ export function nukeCommand(args) {
     } catch { /* not installed via npm or no permissions */ }
   }
 
-  // 9. Remove ~/.aw_registry/ (contains .git-source/ clone + namespace symlinks)
-  //    May be a real dir (current) or symlink (legacy layouts)
-  try {
-    if (lstatSync(GLOBAL_AW_DIR).isSymbolicLink()) {
-      unlinkSync(GLOBAL_AW_DIR);
-    } else {
-      rmSync(GLOBAL_AW_DIR, { recursive: true, force: true });
-    }
-  } catch { rmSync(GLOBAL_AW_DIR, { recursive: true, force: true }); }
+  // 9. Remove ~/.aw_registry/ itself (source of truth — last!)
+  rmSync(GLOBAL_AW_DIR, { recursive: true, force: true });
   fmt.logStep('Removed ~/.aw_registry/');
 
-  // Legacy cleanup: remove ~/.aw_repo/ if it exists from older versions
-  const legacyRepo = join(HOME, '.aw_repo');
-  if (existsSync(legacyRepo)) {
-    rmSync(legacyRepo, { recursive: true, force: true });
-    fmt.logStep('Removed legacy ~/.aw_repo/');
-  }
-
   fmt.outro([
     'Fully removed',
     '',