aether-colony 5.0.0 → 5.2.1

package/bin/cli.js

@@ -22,31 +22,8 @@ const { logError, logActivity } = require('./lib/logger');
 const { UpdateTransaction, UpdateError, UpdateErrorCodes } = require('./lib/update-transaction');
 const { initializeRepo, isInitialized } = require('./lib/init');
 const { syncStateFromPlanning, reconcileStates } = require('./lib/state-sync');
-const { createVerificationReport } = require('./lib/model-verify');
-const {
-  loadModelProfiles,
-  getAllAssignments,
-  getProviderForModel,
-  validateCaste,
-  validateModel,
-  setModelOverride,
-  resetModelOverride,
-  getEffectiveModel,
-  getUserOverrides,
-  getModelMetadata,
-  getProxyConfig,
-} = require('./lib/model-profiles');
-const {
-  checkProxyHealth,
-  verifyModelRouting,
-  formatProxyStatusColored,
-} = require('./lib/proxy-health');
 const { findNestmates, formatNestmates, loadNestmateTodos } = require('./lib/nestmate-loader');
 const { logSpawn, formatSpawnTree } = require('./lib/spawn-logger');
-const {
-  getTelemetrySummary,
-  getModelPerformance,
-} = require('./lib/telemetry');
 
 // Color palette
 const c = require('./lib/colors');
@@ -65,10 +42,14 @@ if (!HOME) {
 }
 
 // Claude Code paths (global)
-const COMMANDS_SRC = path.join(PACKAGE_DIR, 'commands', 'ant');
+const COMMANDS_SRC = path.join(PACKAGE_DIR, '.claude', 'commands', 'ant');
 const COMMANDS_DEST = path.join(HOME, '.claude', 'commands', 'ant');
 const AGENTS_DEST = path.join(HOME, '.claude', 'agents', 'ant');
 
+// OpenCode paths (global)
+const OPENCODE_COMMANDS_DEST = path.join(HOME, '.opencode', 'command');
+const OPENCODE_AGENTS_DEST = path.join(HOME, '.opencode', 'agent');
+
 // Hub paths
 const HUB_DIR = path.join(HOME, '.aether');
 const HUB_SYSTEM_DIR = path.join(HUB_DIR, 'system');
@@ -378,6 +359,21 @@ function removeDirSync(dir) {
   return count;
 }
 
+// Remove only files from dest that exist in source (safe for shared directories)
+function removeFilesFromSource(sourceDir, destDir) {
+  if (!fs.existsSync(sourceDir) || !fs.existsSync(destDir)) return 0;
+  let count = 0;
+  const sourceFiles = fs.readdirSync(sourceDir).filter(f => f.endsWith('.md'));
+  for (const file of sourceFiles) {
+    const destPath = path.join(destDir, file);
+    if (fs.existsSync(destPath)) {
+      fs.unlinkSync(destPath);
+      count++;
+    }
+  }
+  return count;
+}
+
 function readJsonSafe(filePath) {
   try {
     return JSON.parse(fs.readFileSync(filePath, 'utf8'));
@@ -718,6 +714,64 @@ function isGitRepo(repoPath) {
   }
 }
 
+// Paths that updates should preserve (never overwrite/stash as "managed")
+const UPDATE_PROTECTED_AETHER_DIRS = new Set([
+  'data',
+  'dreams',
+  'oracle',
+  'midden',
+  'checkpoints',
+  'locks',
+  'temp',
+  'archive',
+  'chambers',
+  'exchange',
+]);
+
+const UPDATE_MANAGED_PREFIXES = [
+  '.claude/commands/ant',
+  '.claude/agents/ant',
+  '.claude/rules',
+  '.opencode/commands/ant',
+  '.opencode/agents',
+];
+
+function normalizePorcelainPath(filePath) {
+  let normalized = filePath;
+
+  // For rename entries, keep only destination path: "old -> new"
+  if (normalized.includes(' -> ')) {
+    normalized = normalized.split(' -> ').pop();
+  }
+
+  // Handle quoted porcelain paths (spaces, escaped chars)
+  if (normalized.startsWith('"') && normalized.endsWith('"')) {
+    normalized = normalized
+      .slice(1, -1)
+      .replace(/\\"/g, '"')
+      .replace(/\\\\/g, '\\');
+  }
+
+  return normalized;
+}
+
+function isManagedUpdatePath(filePath) {
+  const normalized = normalizePorcelainPath(filePath);
+
+  if (normalized === '.aether' || normalized.startsWith('.aether/')) {
+    const rel = normalized === '.aether' ? '' : normalized.slice('.aether/'.length);
+    if (!rel) return true;
+
+    const first = rel.split('/')[0];
+    if (!first || first.startsWith('.')) return false;
+    if (UPDATE_PROTECTED_AETHER_DIRS.has(first)) return false;
+    if (rel === 'QUEEN.md') return false;
+    return true;
+  }
+
+  return UPDATE_MANAGED_PREFIXES.some(prefix => normalized === prefix || normalized.startsWith(`${prefix}/`));
+}
+
 function getGitDirtyFiles(repoPath, targetDirs) {
   try {
     const args = targetDirs.filter(d => fs.existsSync(path.join(repoPath, d)));
@@ -727,7 +781,14 @@ function getGitDirtyFiles(repoPath, targetDirs) {
       stdio: 'pipe',
       encoding: 'utf8',
     });
-    return result.trim().split('\n').filter(Boolean).map(line => line.slice(3));
+    const files = [];
+    for (const line of result.split('\n')) {
+      if (!line || line.length < 4) continue;
+      const filePath = line.slice(3);
+      if (!isManagedUpdatePath(filePath)) continue;
+      files.push(normalizePorcelainPath(filePath));
+    }
+    return [...new Set(files)];
   } catch {
     return [];
   }
@@ -750,6 +811,11 @@ function gitStashFiles(repoPath, files) {
 // Directories to exclude from hub sync (user data, local state)
 // 'rules' is excluded here because it is synced via a dedicated step (rulesSrc below)
 const HUB_EXCLUDE_DIRS = ['data', 'dreams', 'checkpoints', 'locks', 'temp', 'rules'];
+// Directories excluded only when they are the FIRST path segment under .aether/
+// (e.g., .aether/oracle/ is excluded but .aether/utils/oracle/ is NOT)
+const HUB_EXCLUDE_FIRST_SEGMENT = ['oracle'];
+// Files to exclude from hub sync (repo-local state, not distributable)
+const HUB_EXCLUDE_FILES = ['CONTEXT.md', 'HANDOFF.md'];
 
 /**
  * Check if a path should be excluded from hub sync
@@ -758,8 +824,13 @@ const HUB_EXCLUDE_DIRS = ['data', 'dreams', 'checkpoints', 'locks', 'temp', 'rul
  */
 function shouldExcludeFromHub(relPath) {
   const parts = relPath.split(path.sep);
+  const basename = path.basename(relPath);
   // Exclude if any part of the path is in the exclude list
-  return parts.some(part => HUB_EXCLUDE_DIRS.includes(part));
+  if (parts.some(part => HUB_EXCLUDE_DIRS.includes(part))) return true;
+  // Exclude if first segment matches first-segment-only list (position-aware)
+  if (parts.length > 0 && HUB_EXCLUDE_FIRST_SEGMENT.includes(parts[0])) return true;
+  if (HUB_EXCLUDE_FILES.includes(basename)) return true;
+  return false;
 }
 
 /**
@@ -784,6 +855,7 @@ function syncAetherToHub(srcDir, destDir) {
       const fullPath = path.join(dir, entry.name);
       const relPath = path.relative(base, fullPath);
 
+      // Exclude non-distributable paths from source collection.
       if (shouldExcludeFromHub(relPath)) continue;
 
       if (entry.isDirectory()) {
@@ -834,7 +906,10 @@ function syncAetherToHub(srcDir, destDir) {
       const fullPath = path.join(dir, entry.name);
       const relPath = path.relative(base, fullPath);
 
-      if (shouldExcludeFromHub(relPath)) continue;
+      // Skip protected directories during cleanup, but allow excluded files
+      // (e.g. CONTEXT.md/HANDOFF.md) to be removed from the hub if stale.
+      const parts = relPath.split(path.sep);
+      if (parts.some(part => HUB_EXCLUDE_DIRS.includes(part))) continue;
 
       if (entry.isDirectory()) {
         collectDestFiles(fullPath, base);
@@ -864,6 +939,70 @@ function syncAetherToHub(srcDir, destDir) {
   return { copied, removed, skipped };
 }
 
+/**
+ * Sync skills from source to hub using manifest-aware strategy.
+ * Only syncs skills listed in .manifest.json (Aether-managed).
+ * User-created skills (not in manifest) are never modified or deleted.
+ *
+ * @param {string} skillsSrc - Source skills directory (e.g., .aether/skills)
+ * @param {string} hubSkillsDir - Hub skills directory (e.g., ~/.aether/skills)
+ * @returns {{ synced: string[], skipped: string[], notices: string[] }}
+ */
+function syncSkillsToHub(skillsSrc, hubSkillsDir) {
+  const result = { synced: [], skipped: [], notices: [] };
+
+  if (!fs.existsSync(skillsSrc)) {
+    return result;
+  }
+
+  for (const category of ['colony', 'domain']) {
+    const srcCat = path.join(skillsSrc, category);
+    const hubCat = path.join(hubSkillsDir, category);
+
+    if (!fs.existsSync(srcCat)) continue;
+    fs.mkdirSync(hubCat, { recursive: true });
+
+    // Copy manifest
+    const manifestSrc = path.join(srcCat, '.manifest.json');
+    if (fs.existsSync(manifestSrc)) {
+      fs.copyFileSync(manifestSrc, path.join(hubCat, '.manifest.json'));
+    }
+
+    // Read manifest for owned skills list
+    let manifest = { skills: [] };
+    try {
+      manifest = JSON.parse(fs.readFileSync(manifestSrc, 'utf8'));
+    } catch (e) { /* no manifest = no managed skills */ }
+
+    // Sync only managed skills (skip user-created)
+    const srcDirs = fs.readdirSync(srcCat, { withFileTypes: true })
+      .filter(d => d.isDirectory());
+
+    for (const dir of srcDirs) {
+      if (manifest.skills.includes(dir.name)) {
+        // Managed skill — overwrite via syncDirWithCleanup
+        const srcSkill = path.join(srcCat, dir.name);
+        const hubSkill = path.join(hubCat, dir.name);
+        syncDirWithCleanup(srcSkill, hubSkill);
+        result.synced.push(`${category}/${dir.name}`);
+      } else if (fs.existsSync(path.join(hubCat, dir.name))) {
+        // User-created skill exists with same name — skip and log notice
+        const notice = `Skipped skill '${dir.name}' — user version exists. Run 'aether skill-diff ${dir.name}' to compare.`;
+        result.notices.push(notice);
+        result.skipped.push(`${category}/${dir.name}`);
+      }
+    }
+
+    // Copy README if present
+    const readmeSrc = path.join(srcCat, 'README.md');
+    if (fs.existsSync(readmeSrc)) {
+      fs.copyFileSync(readmeSrc, path.join(hubCat, 'README.md'));
+    }
+  }
+
+  return result;
+}
+
 function setupHub() {
   // Create ~/.aether/ directory structure and populate from package
   try {
@@ -882,7 +1021,7 @@ function setupHub() {
       fs.mkdirSync(HUB_SYSTEM_DIR, { recursive: true });
 
       // Move system files to system/
-      const systemFiles = ['aether-utils.sh', 'workers.md', 'CONTEXT.md', 'model-profiles.yaml'];
+      const systemFiles = ['aether-utils.sh', 'workers.md'];
       const systemDirs = ['docs', 'utils', 'commands', 'agents', 'schemas', 'exchange', 'templates', 'lib'];
 
       for (const file of systemFiles) {
@@ -1015,6 +1154,20 @@ function setupHub() {
       }
     }
 
+    // Sync skills to hub (~/.aether/skills/)
+    // Skills install at hub root (NOT in system/) so users can find and create their own
+    const skillsSrc = path.join(aetherSrc, 'skills');
+    const HUB_SKILLS_DIR = path.join(HUB_DIR, 'skills');
+    if (fs.existsSync(skillsSrc)) {
+      const skillsResult = syncSkillsToHub(skillsSrc, HUB_SKILLS_DIR);
+      if (skillsResult.synced.length > 0) {
+        log(`  Hub skills: ${skillsResult.synced.length} managed skills synced -> ${HUB_SKILLS_DIR}`);
+      }
+      for (const notice of skillsResult.notices) {
+        log(`  ${notice}`);
+      }
+    }
+
     // Create/preserve registry.json (at root, not in system/)
     if (!fs.existsSync(HUB_REGISTRY)) {
       writeJsonSync(HUB_REGISTRY, { schema_version: 1, repos: [] });
@@ -1070,19 +1223,21 @@ async function updateRepo(repoPath, sourceVersion, opts) {
   // Target directories for git safety checks
   const targetDirs = ['.aether', '.claude/commands/ant', '.claude/agents/ant', '.claude/rules', '.opencode/commands/ant', '.opencode/agents'];
 
-  // Git safety: check for dirty files in target directories (skip in dry-run mode)
+  // Use UpdateTransaction for two-phase commit with automatic rollback
+  const transaction = new UpdateTransaction(repoPath, { sourceVersion, quiet, force });
+
+  // Git safety: only warn about dirty files the update would actually overwrite
   let dirtyFiles = [];
-  if (isGitRepo(repoPath)) {
-    dirtyFiles = getGitDirtyFiles(repoPath, targetDirs);
-    if (dirtyFiles.length > 0 && !force) {
+  if (isGitRepo(repoPath) && !force) {
+    const wouldOverwrite = new Set(transaction.getConflictingFiles());
+    const allDirty = getGitDirtyFiles(repoPath, targetDirs);
+    dirtyFiles = allDirty.filter(f => wouldOverwrite.has(f));
+    if (dirtyFiles.length > 0) {
       return { status: 'dirty', files: dirtyFiles };
     }
     // Note: --force handling is now done via checkpoint stash in UpdateTransaction
   }
 
-  // Use UpdateTransaction for two-phase commit with automatic rollback
-  const transaction = new UpdateTransaction(repoPath, { sourceVersion, quiet, force });
-
   try {
     const result = await transaction.execute(sourceVersion, { dryRun });
 
@@ -1199,6 +1354,28 @@ program
       }
     }
 
+    // Sync OpenCode commands to ~/.opencode/command/ (with orphan cleanup)
+    const opencodeCmdsSrc = path.join(PACKAGE_DIR, '.opencode', 'commands', 'ant');
+    if (fs.existsSync(opencodeCmdsSrc)) {
+      const result = syncDirWithCleanup(opencodeCmdsSrc, OPENCODE_COMMANDS_DEST);
+      log(`  Commands (opencode): ${result.copied} files -> ${OPENCODE_COMMANDS_DEST}`);
+      if (result.removed.length > 0) {
+        log(`  Commands (opencode): removed ${result.removed.length} stale files`);
+        for (const f of result.removed) log(`    - ${f}`);
+      }
+    }
+
+    // Sync OpenCode agents to ~/.opencode/agent/ (with orphan cleanup)
+    const opencodeAgentsSrc = path.join(PACKAGE_DIR, '.opencode', 'agents');
+    if (fs.existsSync(opencodeAgentsSrc)) {
+      const result = syncDirWithCleanup(opencodeAgentsSrc, OPENCODE_AGENTS_DEST);
+      log(`  Agents (opencode): ${result.copied} files -> ${OPENCODE_AGENTS_DEST}`);
+      if (result.removed.length > 0) {
+        log(`  Agents (opencode): removed ${result.removed.length} stale files`);
+        for (const f of result.removed) log(`    - ${f}`);
+      }
+    }
+
     // Set up distribution hub at ~/.aether/
     log('');
     log(c.colony('Setting up distribution hub...'));
@@ -1207,6 +1384,7 @@ program
     log('');
     log(c.success('Install complete.'));
     log(`  ${c.queen('Claude Code:')} run /ant to get started`);
+    log(`  ${c.colony('OpenCode:')} run /ant to get started`);
     log(`  ${c.colony('Hub:')} ${c.dim('~/.aether/')} (for coordinated updates across repos)`);
   }));
 
@@ -1475,7 +1653,7 @@ program
 // Uninstall command
 program
   .command('uninstall')
-  .description('Remove slash-commands from ~/.claude/commands/ant/ (preserves project state and hub)')
+  .description('Remove slash-commands from ~/.claude/commands/ant/ and ~/.opencode/ (preserves project state and hub)')
   .action(wrapCommand(async () => {
     log(c.header(`aether-colony v${VERSION} — uninstalling...`));
 
@@ -1487,6 +1665,26 @@ program
       log('  Claude Code commands already removed.');
     }
 
+    // Remove Claude Code agents
+    if (fs.existsSync(AGENTS_DEST)) {
+      const n = removeDirSync(AGENTS_DEST);
+      log(`  Removed: ${n} agent files from ${AGENTS_DEST}`);
+    }
+
+    // Remove OpenCode commands (only our files, preserve others)
+    const opencodeCmdsSrc = path.join(PACKAGE_DIR, '.opencode', 'commands', 'ant');
+    if (fs.existsSync(OPENCODE_COMMANDS_DEST) && fs.existsSync(opencodeCmdsSrc)) {
+      const n = removeFilesFromSource(opencodeCmdsSrc, OPENCODE_COMMANDS_DEST);
+      log(`  Removed: ${n} command files from ${OPENCODE_COMMANDS_DEST}`);
+    }
+
+    // Remove OpenCode agents (only our files, preserve others)
+    const opencodeAgentsSrc = path.join(PACKAGE_DIR, '.opencode', 'agents');
+    if (fs.existsSync(OPENCODE_AGENTS_DEST) && fs.existsSync(opencodeAgentsSrc)) {
+      const n = removeFilesFromSource(opencodeAgentsSrc, OPENCODE_AGENTS_DEST);
+      log(`  Removed: ${n} agent files from ${OPENCODE_AGENTS_DEST}`);
+    }
+
     log('');
     log(c.success('Uninstall complete. Per-project .aether/data/ directories are untouched.'));
     log(`  ${c.colony('Hub:')} ${c.dim('~/.aether/')} preserved (remove manually if desired).`);
@@ -1724,261 +1922,6 @@ program
     }
   }));
 
-// Caste emoji mapping for display
-const CASTE_EMOJIS = {
-  builder: '🔨',
-  watcher: '👁️',
-  scout: '🔍',
-  chaos: '🎲',
-  oracle: '🔮',
-  architect: '🏗️',
-  prime: '🏛️',
-  colonizer: '🌱',
-  route_setter: '🧭',
-  archaeologist: '📜',
-};
-
-/**
- * Format context window for display
- * @param {number} contextWindow - Context window size
- * @returns {string} Formatted string (e.g., "256K")
- */
-function formatContextWindow(contextWindow) {
-  if (!contextWindow) return '-';
-  if (contextWindow >= 1000) {
-    return `${Math.round(contextWindow / 1000)}K`;
-  }
-  return String(contextWindow);
-}
-
-// Caste-models command - Manage caste-to-model assignments
-const casteModelsCmd = program
-  .command('caste-models')
-  .description('Manage caste-to-model assignments');
-
-// list subcommand
-casteModelsCmd
-  .command('list')
-  .description('List current model assignments per caste')
-  .option('--verify', 'Verify model availability on proxy')
-  .action(wrapCommand(async (options) => {
-    const repoPath = process.cwd();
-    const profiles = loadModelProfiles(repoPath);
-    const overrides = getUserOverrides(profiles);
-    const proxyConfig = getProxyConfig(profiles);
-
-    // Check proxy health
-    let proxyHealth = null;
-    let proxyModels = null;
-    if (proxyConfig?.endpoint) {
-      proxyHealth = await checkProxyHealth(proxyConfig.endpoint);
-      if (proxyHealth.healthy && proxyHealth.models) {
-        proxyModels = proxyHealth.models;
-      }
-    }
-
-    console.log(c.header('Caste Model Assignments\n'));
-
-    // Display proxy status
-    if (proxyConfig?.endpoint) {
-      const proxyStatus = formatProxyStatusColored(proxyHealth, c) + c.dim(` @ ${proxyConfig.endpoint}`);
-      console.log(`Proxy: ${proxyStatus}`);
-      if (!proxyHealth?.healthy) {
-        console.log(c.warning('Warning: Using default model (kimi-k2.5) for all castes'));
-      }
-      console.log('');
-    }
-
-    // Table header - add Verify column if --verify flag
-    const verifyFlag = options.verify;
-    const header = verifyFlag
-      ? `${'Caste'.padEnd(14)} ${'Model'.padEnd(14)} ${'Provider'.padEnd(10)} ${'Context'.padEnd(8)} Verify Status`
-      : `${'Caste'.padEnd(14)} ${'Model'.padEnd(14)} ${'Provider'.padEnd(10)} ${'Context'.padEnd(8)} Status`;
-    console.log(header);
-    console.log(verifyFlag ? '─'.repeat(70) : '─'.repeat(60));
-
-    // Get all assignments
-    const assignments = getAllAssignments(profiles);
-
-    for (const assignment of assignments) {
-      const emoji = CASTE_EMOJIS[assignment.caste] || '•';
-      const casteName = assignment.caste.charAt(0).toUpperCase() + assignment.caste.slice(1);
-      const casteDisplay = `${emoji} ${casteName}`;
-
-      // Check for override
-      const hasOverride = overrides[assignment.caste] !== undefined;
-      const effectiveModel = getEffectiveModel(profiles, assignment.caste);
-      const modelDisplay = effectiveModel.model + (hasOverride ? ' (override)' : '');
-
-      // Get model metadata
-      const metadata = getModelMetadata(profiles, effectiveModel.model);
-      const provider = metadata?.provider || assignment.provider || '-';
-      const contextWindow = formatContextWindow(metadata?.context_window);
-
-      // Status indicator based on proxy health
-      const status = proxyHealth?.healthy ? '✓' : '⚠';
-
-      // Verify flag - check if model is available on proxy
-      let verifyStatus = '';
-      if (verifyFlag) {
-        if (proxyModels) {
-          const isAvailable = proxyModels.includes(effectiveModel.model);
-          verifyStatus = isAvailable ? '✓' : '✗';
-        } else {
-          verifyStatus = '?';
-        }
-        console.log(
-          `${casteDisplay.padEnd(14)} ${modelDisplay.padEnd(14)} ${provider.padEnd(10)} ${contextWindow.padEnd(8)} ${verifyStatus.padEnd(7)} ${status}`
-        );
-      } else {
-        console.log(
-          `${casteDisplay.padEnd(14)} ${modelDisplay.padEnd(14)} ${provider.padEnd(10)} ${contextWindow.padEnd(8)} ${status}`
-        );
-      }
-    }
-
-    // Show overrides summary if any exist
-    const overrideCount = Object.keys(overrides).length;
-    if (overrideCount > 0) {
-      console.log('');
-      console.log(c.info(`Active overrides: ${overrideCount}`));
-      for (const [caste, model] of Object.entries(overrides)) {
-        console.log(`  ${caste}: ${model}`);
-      }
-    }
-  }));
-
-// set subcommand
-casteModelsCmd
-  .command('set')
-  .description('Set model override for a caste')
-  .argument('<assignment>', 'caste=model (e.g., builder=glm-5)')
-  .action(wrapCommand(async (assignment) => {
-    // Parse caste=model format
-    const match = assignment.match(/^([^=]+)=(.+)$/);
-    if (!match) {
-      const error = new ValidationError(
-        `Invalid assignment format: '${assignment}'`,
-        { received: assignment },
-        'Use format: caste=model (e.g., builder=glm-5)'
-      );
-      throw error;
-    }
-
-    const [, caste, model] = match;
-
-    const repoPath = process.cwd();
-
-    // Validate and set
-    try {
-      const result = setModelOverride(repoPath, caste, model);
-
-      if (result.previous) {
-        console.log(c.success(`Updated ${caste}: ${result.previous} → ${model}`));
-      } else {
-        console.log(c.success(`Set ${caste} to ${model}`));
-      }
-    } catch (error) {
-      if (error.name === 'ValidationError') {
-        // Add helpful suggestions
-        if (error.details?.validCastes) {
-          console.error(c.error(`Error: ${error.message}`));
-          console.error('\nValid castes:');
-          for (const casteName of error.details.validCastes) {
-            const emoji = CASTE_EMOJIS[casteName] || '•';
-            console.error(`  ${emoji} ${casteName}`);
-          }
-        } else if (error.details?.validModels) {
-          console.error(c.error(`Error: ${error.message}`));
-          console.error('\nValid models:');
-          for (const modelName of error.details.validModels) {
-            console.error(`  • ${modelName}`);
-          }
-        }
-        process.exit(1);
-      }
-      throw error;
-    }
-  }));
-
-// reset subcommand
-casteModelsCmd
-  .command('reset')
-  .description('Reset caste to default model (remove override)')
-  .argument('<caste>', 'caste name (e.g., builder)')
-  .action(wrapCommand(async (caste) => {
-    const repoPath = process.cwd();
-
-    try {
-      const result = resetModelOverride(repoPath, caste);
-
-      if (result.hadOverride) {
-        console.log(c.success(`Reset ${caste} to default model`));
-      } else {
-        console.log(c.info(`${caste} was already using default model`));
-      }
-    } catch (error) {
-      if (error.name === 'ValidationError' && error.details?.validCastes) {
-        console.error(c.error(`Error: ${error.message}`));
-        console.error('\nValid castes:');
-        for (const casteName of error.details.validCastes) {
-          const emoji = CASTE_EMOJIS[casteName] || '•';
-          console.error(`  ${emoji} ${casteName}`);
-        }
-        process.exit(1);
-      }
-      throw error;
-    }
-  }));
-
-// Verify-models command - Verify model routing configuration
-program
-  .command('verify-models')
-  .description('Verify model routing configuration is active')
-  .action(wrapCommand(async () => {
-    const repoPath = process.cwd();
-    const report = await createVerificationReport(repoPath);
-
-    console.log('=== Model Routing Verification ===\n');
-
-    // Proxy status
-    console.log(`LiteLLM Proxy: ${report.proxy.running ? '✓ Running' : '✗ Not running'}`);
-    if (report.proxy.running) {
-      console.log(`  Latency: ${report.proxy.latency}ms`);
-    }
-
-    // Environment
-    console.log(`\nEnvironment:`);
-    console.log(`  ANTHROPIC_MODEL: ${report.env.model || '(not set)'}`);
-    console.log(`  ANTHROPIC_BASE_URL: ${report.env.baseUrl || '(not set)'}`);
-
-    // Caste assignments
-    console.log(`\nCaste Model Assignments:`);
-    for (const [caste, info] of Object.entries(report.castes)) {
-      const status = info.assigned ? '✓' : '✗';
-      console.log(`  ${status} ${caste}: ${info.model || 'default'}`);
-    }
-
-    // Model profiles file
-    console.log(`\nModel Profiles File:`);
-    if (report.profilesFile.exists) {
-      console.log(`  ✓ Found: ${report.profilesFile.path}`);
-      const profileCount = Object.keys(report.profilesFile.profiles).length;
-      console.log(`  Profiles: ${profileCount} castes configured`);
-    } else {
-      console.log(`  ✗ Not found: ${report.profilesFile.path}`);
-    }
-
-    // Issues
-    if (report.issues.length > 0) {
-      console.log(`\nIssues Found:`);
-      report.issues.forEach(issue => console.log(`  ⚠ ${issue}`));
-    }
-
-    // Recommendation
-    console.log(`\n${report.recommendation}`);
-  }));
-
 // Spawn-log command - Log a worker spawn event
 program
   .command('spawn-log')
@@ -2108,141 +2051,6 @@ program
     console.log(formatNestmates(nestmates));
   }));
 
-// Telemetry command - View model performance telemetry
-const telemetryCmd = program
-  .command('telemetry')
-  .description('View model performance telemetry')
-  .action(wrapCommand(async () => {
-    // Default action: show summary
-    const repoPath = process.cwd();
-    const summary = getTelemetrySummary(repoPath);
-
-    console.log(c.header('Model Performance Telemetry\n'));
-    console.log(`Total Spawns: ${summary.total_spawns}`);
-    console.log(`Models Used: ${summary.total_models}\n`);
-
-    if (summary.total_spawns === 0) {
-      console.log(c.info('No telemetry data yet. Run some builds to collect data.'));
-      return;
-    }
-
-    console.log('Model Performance:');
-    console.log('─'.repeat(60));
-    for (const [model, stats] of Object.entries(summary.models)) {
-      const rate = (stats.success_rate * 100).toFixed(1);
-      const rateColor = stats.success_rate >= 0.9 ? c.success :
-                       stats.success_rate >= 0.7 ? c.warning : c.error;
-      console.log(`  ${model.padEnd(15)} ${String(stats.total_spawns).padStart(4)} spawns  ${rateColor(rate + '%')} success`);
-    }
-
-    if (summary.recent_decisions.length > 0) {
-      console.log('\nRecent Routing Decisions:');
-      console.log('─'.repeat(60));
-      for (const decision of summary.recent_decisions.slice(-5)) {
-        console.log(`  ${decision.caste.padEnd(10)} → ${decision.selected_model.padEnd(12)} (${decision.source})`);
-      }
-    }
-  }));
-
-// summary subcommand (explicit)
-telemetryCmd
-  .command('summary')
-  .description('Show overall telemetry summary')
-  .action(wrapCommand(async () => {
-    const repoPath = process.cwd();
-    const summary = getTelemetrySummary(repoPath);
-
-    console.log(c.header('Model Performance Telemetry\n'));
-    console.log(`Total Spawns: ${summary.total_spawns}`);
-    console.log(`Models Used: ${summary.total_models}\n`);
-
-    if (summary.total_spawns === 0) {
-      console.log(c.info('No telemetry data yet. Run some builds to collect data.'));
-      return;
-    }
-
-    console.log('Model Performance:');
-    console.log('─'.repeat(60));
-    for (const [model, stats] of Object.entries(summary.models)) {
-      const rate = (stats.success_rate * 100).toFixed(1);
-      const rateColor = stats.success_rate >= 0.9 ? c.success :
-                       stats.success_rate >= 0.7 ? c.warning : c.error;
-      console.log(`  ${model.padEnd(15)} ${String(stats.total_spawns).padStart(4)} spawns  ${rateColor(rate + '%')} success`);
-    }
-
-    if (summary.recent_decisions.length > 0) {
-      console.log('\nRecent Routing Decisions:');
-      console.log('─'.repeat(60));
-      for (const decision of summary.recent_decisions.slice(-5)) {
-        console.log(`  ${decision.caste.padEnd(10)} → ${decision.selected_model.padEnd(12)} (${decision.source})`);
-      }
-    }
-  }));
-
-// model subcommand
-telemetryCmd
-  .command('model <model-name>')
-  .description('Show detailed performance for a specific model')
-  .action(wrapCommand(async (modelName) => {
-    const repoPath = process.cwd();
-    const performance = getModelPerformance(repoPath, modelName);
-
-    if (!performance) {
-      console.log(c.warning(`No data for model: ${modelName}`));
-      return;
-    }
-
-    console.log(c.header(`Model Performance: ${modelName}\n`));
-    console.log(`Total Spawns: ${performance.total_spawns}`);
-    console.log(`Success Rate: ${(performance.success_rate * 100).toFixed(1)}%`);
-    console.log(`  ✓ Completed: ${performance.successful_completions}`);
-    console.log(`  ✗ Failed: ${performance.failed_completions}`);
-    console.log(`  🚫 Blocked: ${performance.blocked}`);
-
-    if (Object.keys(performance.by_caste).length > 0) {
-      console.log('\nPerformance by Caste:');
-      console.log('─'.repeat(50));
-      for (const [caste, stats] of Object.entries(performance.by_caste)) {
-        const casteRate = stats.spawns > 0 ? (stats.success / stats.spawns * 100).toFixed(1) : '0.0';
-        console.log(`  ${caste.padEnd(12)} ${String(stats.spawns).padStart(4)} spawns  ${casteRate}% success`);
-      }
-    }
-  }));
-
-// performance subcommand
-telemetryCmd
-  .command('performance')
-  .description('Show models ranked by performance')
-  .action(wrapCommand(async () => {
-    const repoPath = process.cwd();
-    const summary = getTelemetrySummary(repoPath);
-
-    console.log(c.header('Model Performance Ranking\n'));
-
-    if (summary.total_spawns === 0) {
-      console.log(c.info('No telemetry data yet. Run some builds to collect data.'));
-      return;
-    }
-
-    // Sort models by success rate
-    const ranked = Object.entries(summary.models)
-      .map(([model, stats]) => ({ model, ...stats }))
-      .sort((a, b) => b.success_rate - a.success_rate);
-
-    console.log(`${'Rank'.padEnd(6)} ${'Model'.padEnd(15)} ${'Spawns'.padStart(6)} ${'Success'.padStart(8)} ${'Rate'.padStart(6)}`);
-    console.log('─'.repeat(60));
-
-    ranked.forEach((m, i) => {
-      const rank = `${i + 1}.`.padEnd(6);
-      const rate = (m.success_rate * 100).toFixed(1);
-      const rateColor = m.success_rate >= 0.9 ? c.success :
-                       m.success_rate >= 0.7 ? c.warning : c.error;
-      console.log(`${rank} ${m.model.padEnd(15)} ${String(m.total_spawns).padStart(6)} ${String(m.successful_completions || 0).padStart(8)} ${rateColor(rate.padStart(5) + '%')}`);
-    });
-
-    console.log('\n' + c.dim('Tip: Use "aether telemetry model <name>" for detailed stats'));
-  }));
-
 // Context command - Show auto-loaded context
 program
   .command('context')
@@ -2313,8 +2121,7 @@ program
       console.log('Next steps:');
       console.log('  1. Define your colony goal in .aether/data/COLONY_STATE.json');
       console.log('  2. Run: aether sync-state');
-      console.log('  3. Run: aether verify-models');
-      console.log('  4. Start building: /ant:init');
+      console.log('  3. Start building: /ant:init');
     }
   }));
 
@@ -2326,7 +2133,6 @@ program.on('--help', () => {
   console.log('  install              Install slash-commands and set up distribution hub');
   console.log('  update               Update current repo from hub');
   console.log('  sync-state           Synchronize COLONY_STATE.json with .planning/STATE.md');
-  console.log('  verify-models        Verify model routing configuration');
   console.log('  version              Show installed version');
   console.log('  uninstall            Remove slash-commands (preserves project state and hub)');
   console.log('');
@@ -2364,6 +2170,7 @@ module.exports = {
   saveCheckpointMetadata,
   isUserData,
   syncDirWithCleanup,
+  syncSkillsToHub,
   listFilesRecursive,
   cleanEmptyDirs
 };