@ghl-ai/aw 0.1.35 → 0.1.36-beta.2

package/commands/pull.mjs

@@ -1,4 +1,4 @@
-// commands/pull.mjs — Pull content from registry
+// commands/pull.mjs — Pull content from registry using persistent git clone
 
 import { mkdirSync, existsSync, readdirSync, copyFileSync, unlinkSync, rmdirSync } from 'node:fs';
 import { join, relative } from 'node:path';
@@ -7,37 +7,20 @@ import { execSync } from 'node:child_process';
 import * as config from '../config.mjs';
 import * as fmt from '../fmt.mjs';
 import { chalk } from '../fmt.mjs';
-import { sparseCheckout, sparseCheckoutAsync, cleanup, includeToSparsePaths } from '../git.mjs';
-import { REGISTRY_DIR, DOCS_SOURCE_DIR } from '../constants.mjs';
-import { walkRegistryTree } from '../registry.mjs';
-import { matchesAny } from '../glob.mjs';
-import { computePlan } from '../plan.mjs';
-import { applyActions } from '../apply.mjs';
-import { update as updateManifest } from '../manifest.mjs';
-import { resolveInput } from '../paths.mjs';
+import { fetchAndMerge, addToSparseCheckout, isValidClone } from '../git.mjs';
+import { REGISTRY_DIR, REGISTRY_REPO, DOCS_SOURCE_DIR } from '../constants.mjs';
 import { linkWorkspace } from '../link.mjs';
 import { generateCommands, copyInstructions } from '../integrate.mjs';
 
-// Filter out top-level platform CLI meta-commands (drop, pull, push, etc.)
-// but keep domain-specific commands (platform/design/commands/, platform/infra/commands/).
-function filterActions(actions, pattern) {
-  if (pattern !== 'platform') return actions;
-  return actions.filter(a => !(a.type === 'commands' && a.namespacePath === 'platform'));
-}
+const HOME = homedir();
+const AW_HOME = join(HOME, '.aw');
+const GLOBAL_AW_DIR = join(HOME, '.aw_registry');
 
 export async function pullCommand(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 = args._workspaceDir || (existsSync(join(localDir, '.sync-config.json')) ? localDir : GLOBAL_AW_DIR);
-  const dryRun = args['--dry-run'] === true;
-  const verbose = args['-v'] === true || args['--verbose'] === true;
   const silent = args['--silent'] === true || args._silent === true;
-  let renameNamespace = args._renameNamespace || null;
-  const teamNSOverride = args._teamNS || null;
 
-  // 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,
@@ -50,304 +33,82 @@ export async function pullCommand(args) {
     spinner: silent ? () => ({ start: () => {}, stop: () => {} }) : fmt.spinner,
   };
 
-  // No args = re-pull everything in sync config (parallel)
-  if (!input) {
-    const cfg = config.load(workspaceDir);
-    if (!cfg) log.cancel('No .sync-config.json found. Run: aw init');
-    if (cfg.include.length === 0) {
-      log.cancel('Nothing to pull. Add paths first:\n\n  aw pull <path>');
-    }
-    log.logInfo(`Pulling ${chalk.cyan(cfg.include.length)} synced path${cfg.include.length > 1 ? 's' : ''}...`);
-    const pullJobs = cfg.include.map(p => {
-      const isTeamNs = p !== 'platform';
-      const derivedTeamNS = isTeamNs ? p.replace(/\//g, '-') : undefined;
-      return pullAsync({
-        ...args,
-        _positional: [isTeamNs ? '[template]' : p],
-        _workspaceDir: workspaceDir,
-        _skipIntegrate: true,
-        _renameNamespace: isTeamNs ? p : undefined,
-        _teamNS: derivedTeamNS,
-      });
-    });
-    await Promise.all(pullJobs);
-    // Post-pull IDE integration (once after all paths pulled)
-    linkWorkspace(cwd);
-    generateCommands(cwd);
-    copyInstructions(cwd, null, cfg.namespace);
-    return;
-  }
-
-  // Resolve input — accepts both local and registry paths
-  const resolved = resolveInput(input, workspaceDir);
-  let pattern = resolved.registryPath;
-
-  if (!pattern) {
-    log.cancel(`Could not resolve "${input}" to a registry path`);
-  }
+  const repoUrl = `https://github.com/${REGISTRY_REPO}.git`;
+  const hasClone = isValidClone(AW_HOME, repoUrl);
 
-  // Ensure workspace exists
-  if (!existsSync(workspaceDir)) {
-    mkdirSync(workspaceDir, { recursive: true });
+  if (!hasClone) {
+    log.cancel('Registry not initialized. Run: aw init');
+    return;
   }
 
-  // Load config
-  const cfg = config.load(workspaceDir);
+  const cfg = config.load(GLOBAL_AW_DIR);
   if (!cfg) {
     log.cancel('No .sync-config.json found. Run: aw init');
+    return;
   }
 
-  // Fetch from registry
-  const s = log.spinner();
-  s.start('Fetching from registry...');
-
-  // When pulling from template with rename, also fetch the actual namespace —
-  // if it exists in the registry, use it directly instead of the template.
-  const pathsToFetch = [pattern];
-  if (renameNamespace && pattern === '[template]') {
-    pathsToFetch.push(renameNamespace);
+  // If input is a new namespace to add
+  if (input && input !== 'platform') {
+    const sparsePath = `.aw_registry/${input}`;
+    if (!cfg.include.includes(input)) {
+      log.logStep(`Adding namespace ${chalk.cyan(input)} to sparse checkout...`);
+      addToSparseCheckout(AW_HOME, [sparsePath, 'content']);
+      config.addPattern(GLOBAL_AW_DIR, input);
+    }
   }
-  const sparsePaths = includeToSparsePaths(pathsToFetch);
-  let tempDir;
+
+  // Fetch + merge latest
+  const s = log.spinner();
+  s.start('Fetching latest from registry...');
+  let fetchResult = { updated: false, conflicts: [] };
   try {
-    tempDir = sparseCheckout(cfg.repo, sparsePaths);
+    fetchResult = fetchAndMerge(AW_HOME);
+    s.stop(fetchResult.updated ? 'Registry updated' : 'Already up to date');
   } catch (e) {
-    s.stop(chalk.red('Fetch failed'));
-    log.cancel(e.message);
+    s.stop(chalk.yellow('Fetch failed'));
+    if (!silent) log.logWarn(`Fetch error: ${e.message}`);
   }
 
-  try {
-    const regBase = join(tempDir, REGISTRY_DIR);
-
-    // Check if actual namespace exists in the registry
-    if (renameNamespace && pattern === '[template]') {
-      const actualNsTopDir = renameNamespace.split('/')[0];
-      const actualNsPath = join(regBase, actualNsTopDir);
-      if (existsSync(actualNsPath)) {
-        const fullNsPath = join(regBase, ...renameNamespace.split('/'));
-        if (existsSync(fullNsPath) && listDirs(fullNsPath).length > 0) {
-          pattern = renameNamespace;
-          renameNamespace = null;  // No rename needed — using actual content
-        }
-      }
-    }
-
-    const registryDirs = [];
-    if (existsSync(regBase)) {
-      for (const name of listDirs(regBase)) {
-        registryDirs.push({ name, path: join(regBase, name) });
-      }
-    }
-
-    if (registryDirs.length === 0) {
-      s.stop(chalk.red('Not found'));
-      if (silent) return;
-      log.cancel(`Nothing found in registry for ${chalk.cyan(pattern)}`);
-    }
-
-    // Rename namespace if requested (e.g., [template] → dev)
-    if (renameNamespace) {
-      for (const rd of registryDirs) {
-        if (rd.name === pattern) {
-          rd.name = renameNamespace;
-        }
-      }
-      // Also remap pattern for include filter matching
-      pattern = renameNamespace;
-    }
-
-    // Validate pattern matches actual content
-    let hasMatch = false;
-    for (const { name, path } of registryDirs) {
-      const entries = walkRegistryTree(path, name);
-      if (entries.some(e => matchesAny(e.registryPath, [pattern]))) {
-        hasMatch = true;
-        break;
-      }
-    }
-
-    if (!hasMatch) {
-      s.stop(chalk.red('Not found'));
-      cleanup(tempDir);
-      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(', ');
-    s.stop(`Fetched ${fetched}`);
-
-    // Add to config if not already there
-    if (!cfg.include.includes(pattern)) {
-      config.addPattern(workspaceDir, pattern);
-      log.logSuccess(`Added ${chalk.cyan(pattern)} to config`);
-    }
-
-    // Compute plan
-    const { actions: rawActions } = computePlan(registryDirs, workspaceDir, [pattern], {
-      skipOrphans: false,
-    });
-    const actions = filterActions(rawActions, pattern);
-
-    if (dryRun) {
-      printDryRun(actions, verbose);
-      return;
-    }
-
-    // Apply
-    const s2 = log.spinner();
-    s2.start('Applying changes...');
-    const conflictCount = applyActions(actions, { teamNS: teamNSOverride || renameNamespace || undefined });
-    updateManifest(workspaceDir, actions, cfg.namespace, { fromTemplate: !!renameNamespace });
-    s2.stop('Changes applied');
-
-    // Copy root-level registry files (e.g. AW-PROTOCOL.md) that are fetched via
-    // sparse checkout but never processed by walkRegistryTree (dirs-only pipeline).
-    const ROOT_REGISTRY_FILES = ['AW-PROTOCOL.md'];
-    for (const fname of ROOT_REGISTRY_FILES) {
-      const src = join(regBase, fname);
-      if (existsSync(src)) {
-        copyFileSync(src, join(workspaceDir, fname));
-      }
-    }
-
-    // Sync docs from repo content/ into platform/docs/ (markdown only, skip images)
-    const contentSrc = join(tempDir, DOCS_SOURCE_DIR);
-    if (existsSync(contentSrc)) {
-      const docsDest = join(workspaceDir, 'platform', 'docs');
-      syncMarkdownTree(contentSrc, docsDest);
-    }
-
-    // MCP registration (second-class — skip if not available)
-    if (cfg.namespace) {
-      registerMcp(cfg.namespace);
-    }
+  if (fetchResult.conflicts.length > 0) {
+    log.logWarn(`Conflicts in: ${fetchResult.conflicts.join(', ')}`);
+  }
 
-    // Summary
-    printSummary(actions, verbose, conflictCount);
+  // Sync content/ → platform/docs/
+  syncDocs(AW_HOME, GLOBAL_AW_DIR);
 
-    // Post-pull IDE integration (skip if called from batch re-pull)
-    if (!args._skipIntegrate) {
+  // Re-link IDE dirs
+  if (!args._skipIntegrate) {
+    linkWorkspace(HOME);
+    generateCommands(HOME);
+    copyInstructions(HOME, null, cfg.namespace);
+    if (cwd !== HOME) {
       linkWorkspace(cwd);
       generateCommands(cwd);
-      copyInstructions(cwd, null, cfg.namespace);
     }
+  }
 
-  } finally {
-    cleanup(tempDir);
+  if (!silent) {
+    registerMcp(cfg.namespace);
+    log.outro('Pull complete');
   }
 }
 
 /**
- * Async pull for parallel use by init. Runs git fetch asynchronously,
- * then applies changes synchronously. Returns a summary object instead
- * of printing directly — the caller controls output.
+ * Sync ~/.aw/content/ markdown files → ~/.aw_registry/platform/docs/
  */
-export async function pullAsync(args) {
-  const input = args._positional?.[0] || '';
-  const workspaceDir = args._workspaceDir;
-  let renameNamespace = args._renameNamespace || null;
-  const teamNSOverride = args._teamNS || null;
-
-  const resolved = resolveInput(input, workspaceDir);
-  let pattern = resolved.registryPath;
-  if (!pattern) throw new Error(`Could not resolve "${input}" to a registry path`);
-
-  if (!existsSync(workspaceDir)) mkdirSync(workspaceDir, { recursive: true });
-
-  const cfg = config.load(workspaceDir);
-  if (!cfg) throw new Error('No .sync-config.json found');
-
-  // When pulling from template with rename, also fetch the actual namespace —
-  // if it exists in the registry, use it directly instead of the template.
-  const pathsToFetch = [pattern];
-  if (renameNamespace && pattern === '[template]') {
-    pathsToFetch.push(renameNamespace);
-  }
-  const sparsePaths = includeToSparsePaths(pathsToFetch);
-  const tempDir = await sparseCheckoutAsync(cfg.repo, sparsePaths);
-
-  try {
-    const regBase = join(tempDir, REGISTRY_DIR);
-
-    // Check if actual namespace exists in the registry
-    let useActualNamespace = false;
-    if (renameNamespace && pattern === '[template]') {
-      const actualNsTopDir = renameNamespace.split('/')[0];
-      const actualNsPath = join(regBase, actualNsTopDir);
-      if (existsSync(actualNsPath)) {
-        // Verify the full namespace path has content (not just the top-level team dir)
-        const fullNsPath = join(regBase, ...renameNamespace.split('/'));
-        if (existsSync(fullNsPath) && listDirs(fullNsPath).length > 0) {
-          useActualNamespace = true;
-          pattern = renameNamespace;
-          renameNamespace = null;  // No rename needed — using actual content
-        }
-      }
-    }
-
-    const registryDirs = [];
-    if (existsSync(regBase)) {
-      for (const name of listDirs(regBase)) {
-        registryDirs.push({ name, path: join(regBase, name) });
-      }
-    }
-
-    if (registryDirs.length === 0) {
-      throw new Error(`Nothing found in registry for ${pattern}`);
-    }
-
-    if (renameNamespace) {
-      for (const rd of registryDirs) {
-        if (rd.name === pattern) rd.name = renameNamespace;
-      }
-      pattern = renameNamespace;
-    }
-
-    let hasMatch = false;
-    for (const { name, path } of registryDirs) {
-      const entries = walkRegistryTree(path, name);
-      if (entries.some(e => matchesAny(e.registryPath, [pattern]))) {
-        hasMatch = true;
-        break;
-      }
-    }
-
-    if (!hasMatch) {
-      throw new Error(`Nothing found in registry for ${pattern}`);
-    }
-
-    if (!cfg.include.includes(pattern)) {
-      config.addPattern(workspaceDir, pattern);
-    }
-
-    const { actions: rawActions } = computePlan(registryDirs, workspaceDir, [pattern], { skipOrphans: false });
-    const actions = filterActions(rawActions, pattern);
-    const conflictCount = applyActions(actions, { teamNS: teamNSOverride || renameNamespace || undefined });
-    updateManifest(workspaceDir, actions, cfg.namespace, { fromTemplate: !!renameNamespace });
-
-    const ROOT_REGISTRY_FILES = ['AW-PROTOCOL.md'];
-    for (const fname of ROOT_REGISTRY_FILES) {
-      const src = join(regBase, fname);
-      if (existsSync(src)) copyFileSync(src, join(workspaceDir, fname));
-    }
-
-    // Sync docs from repo content/ into platform/docs/ (markdown only, skip images)
-    const contentSrc = join(tempDir, DOCS_SOURCE_DIR);
-    if (existsSync(contentSrc)) {
-      const docsDest = join(workspaceDir, 'platform', 'docs');
-      syncMarkdownTree(contentSrc, docsDest);
-    }
-
-    return { pattern, actions, conflictCount };
-  } finally {
-    cleanup(tempDir);
-  }
+function syncDocs(awHome, globalAwDir) {
+  const contentSrc = join(awHome, DOCS_SOURCE_DIR);
+  if (!existsSync(contentSrc)) return;
+  const docsDest = join(globalAwDir, 'platform', 'docs');
+  syncMarkdownTree(contentSrc, docsDest);
 }
 
-function listDirs(dir) {
-  return readdirSync(dir, { withFileTypes: true })
-    .filter(d => d.isDirectory() && !d.name.startsWith('.'))
-    .map(d => d.name);
+/**
+ * pullAsync — kept for backward compat; now delegates to pullCommand.
+ */
+export async function pullAsync(args) {
+  await pullCommand({ ...args, _skipIntegrate: true });
+  return { pattern: args._positional?.[0] || '', actions: [], conflictCount: 0 };
 }
 
 /**
@@ -377,7 +138,6 @@ function syncMarkdownTree(src, dest) {
   const remotePaths = collectMarkdownPaths(src, src);
   const localPaths = collectMarkdownPaths(dest, dest);
 
-  // Copy new and updated files
   for (const rel of remotePaths) {
     const srcPath = join(src, rel);
     const destPath = join(dest, rel);
@@ -385,7 +145,6 @@ function syncMarkdownTree(src, dest) {
     copyFileSync(srcPath, destPath);
   }
 
-  // Delete local files not on remote
   for (const rel of localPaths) {
     if (!remotePaths.has(rel)) {
       const destPath = join(dest, rel);
@@ -393,7 +152,6 @@ function syncMarkdownTree(src, dest) {
     }
   }
 
-  // Prune empty directories (bottom-up)
   function pruneEmpty(dir) {
     if (!existsSync(dir)) return;
     for (const entry of readdirSync(dir, { withFileTypes: true })) {
@@ -416,74 +174,3 @@ function registerMcp(namespace) {
     fmt.logWarn('MCP registration failed (pull still successful)');
   }
 }
-
-function printDryRun(actions, verbose) {
-  const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0, ORPHAN: 0, UNCHANGED: 0 };
-  const lines = [];
-
-  for (const type of ['agents', 'skills', 'commands', 'evals']) {
-    const items = actions.filter(a => a.type === type);
-    if (items.length === 0) continue;
-
-    lines.push(chalk.bold(`${type}/`));
-    for (const act of items.sort((a, b) => a.targetFilename.localeCompare(b.targetFilename))) {
-      counts[act.action] = (counts[act.action] || 0) + 1;
-      if (!verbose && act.action === 'UNCHANGED') continue;
-      const ns = act.namespacePath ? chalk.dim(` [${act.namespacePath}]`) : '';
-      lines.push(`  ${fmt.actionLabel(act.action)} ${act.targetFilename}${ns}`);
-    }
-  }
-
-  if (lines.length > 0) {
-    fmt.note(lines.join('\n'), 'Dry Run');
-  }
-
-  fmt.logInfo(`Summary: ${fmt.countSummary(counts)}`);
-  fmt.logWarn('No files modified (--dry-run)');
-}
-
-function printSummary(actions, verbose, conflictCount) {
-  const conflicts = actions.filter(a => a.action === 'CONFLICT');
-
-  for (const type of ['agents', 'skills', 'commands', 'evals']) {
-    const typeActions = actions.filter(a => a.type === type);
-    if (typeActions.length === 0) continue;
-
-    const counts = { ADD: 0, UPDATE: 0, CONFLICT: 0, ORPHAN: 0, UNCHANGED: 0 };
-    for (const a of typeActions) counts[a.action]++;
-
-    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`));
-    if (counts.ORPHAN > 0) parts.push(chalk.yellow(`${counts.ORPHAN} removed`));
-    const detail = parts.length > 0 ? ` (${parts.join(', ')})` : '';
-
-    fmt.logSuccess(`${typeActions.length} ${type} pulled${detail}`);
-
-    if (verbose) {
-      for (const a of typeActions.filter(a => a.action !== 'UNCHANGED')) {
-        const ns = a.namespacePath ? chalk.dim(` [${a.namespacePath}]`) : '';
-        fmt.logMessage(`  ${fmt.actionLabel(a.action)} ${a.targetFilename}${ns}`);
-      }
-    }
-  }
-
-  if (conflicts.length > 0) {
-    const conflictLines = conflicts.map(c => {
-      return `${chalk.red('both modified:')}  ${c.type}/${c.targetFilename}`;
-    }).join('\n');
-
-    fmt.note(
-      conflictLines + '\n\n' +
-      chalk.dim('Fix conflicts, then re-run pull to verify.\n') +
-      chalk.dim('grep -r "<<<<<<< " .aw_registry/'),
-      chalk.red('Merge Conflicts')
-    );
-
-    fmt.outro(chalk.red('Pull completed with conflicts — resolve and re-run'));
-    process.exit(1);
-  }
-
-  fmt.outro('Pull complete');
-}