aether-colony 3.1.17 → 5.1.0

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,14 +42,22 @@ 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_COMMANDS_CLAUDE = path.join(HUB_DIR, 'commands', 'claude');
-const HUB_COMMANDS_OPENCODE = path.join(HUB_DIR, 'commands', 'opencode');
-const HUB_AGENTS = path.join(HUB_DIR, 'agents');
+const HUB_SYSTEM_DIR = path.join(HUB_DIR, 'system');
+const HUB_COMMANDS_CLAUDE = path.join(HUB_SYSTEM_DIR, 'commands', 'claude');
+const HUB_COMMANDS_OPENCODE = path.join(HUB_SYSTEM_DIR, 'commands', 'opencode');
+const HUB_AGENTS = path.join(HUB_SYSTEM_DIR, 'agents');
+const HUB_AGENTS_CLAUDE = path.join(HUB_SYSTEM_DIR, 'agents-claude');
+const HUB_RULES = path.join(HUB_SYSTEM_DIR, 'rules');
 const HUB_REGISTRY = path.join(HUB_DIR, 'registry.json');
 const HUB_VERSION = path.join(HUB_DIR, 'version.json');
 
@@ -374,41 +359,15 @@ function removeDirSync(dir) {
   return count;
 }
 
-// System files allowlist — only these are copied during updates (never colony data)
-const SYSTEM_FILES = [
-  'aether-utils.sh',
-  'coding-standards.md',
-  'debugging.md',
-  'DISCIPLINES.md',
-  'learning.md',
-  'planning.md',
-  'QUEEN_ANT_ARCHITECTURE.md',
-  'tdd.md',
-  'verification-loop.md',
-  'verification.md',
-  'workers.md',
-  'docs/constraints.md',
-  'docs/pathogen-schema-example.json',
-  'docs/pathogen-schema.md',
-  'docs/pheromones.md',
-  'docs/progressive-disclosure.md',
-  'utils/atomic-write.sh',
-  'utils/colorize-log.sh',
-  'utils/file-lock.sh',
-  'utils/watch-spawn-tree.sh',
-];
-
-function copySystemFiles(srcDir, destDir) {
+// 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;
-  for (const file of SYSTEM_FILES) {
-    const srcPath = path.join(srcDir, file);
+  const sourceFiles = fs.readdirSync(sourceDir).filter(f => f.endsWith('.md'));
+  for (const file of sourceFiles) {
     const destPath = path.join(destDir, file);
-    if (fs.existsSync(srcPath)) {
-      fs.mkdirSync(path.dirname(destPath), { recursive: true });
-      fs.copyFileSync(srcPath, destPath);
-      if (file.endsWith('.sh')) {
-        fs.chmodSync(destPath, 0o755);
-      }
+    if (fs.existsSync(destPath)) {
+      fs.unlinkSync(destPath);
       count++;
     }
   }
@@ -585,65 +544,15 @@ function computeFileHash(filePath) {
   }
 }
 
-function syncSystemFilesWithCleanup(srcDir, destDir, opts) {
-  opts = opts || {};
-  const dryRun = opts.dryRun || false;
-
-  let copied = 0;
-  let skipped = 0;
-  for (const file of SYSTEM_FILES) {
-    const srcPath = path.join(srcDir, file);
-    const destPath = path.join(destDir, file);
-    if (fs.existsSync(srcPath)) {
-      if (!dryRun) {
-        // Compute hashes to determine if copy is needed
-        const srcHash = computeFileHash(srcPath);
-        const destHash = fs.existsSync(destPath) ? computeFileHash(destPath) : null;
-
-        if (srcHash === destHash) {
-          // Files are identical, skip copying
-          skipped++;
-          continue;
-        }
-
-        fs.mkdirSync(path.dirname(destPath), { recursive: true });
-        fs.copyFileSync(srcPath, destPath);
-        if (file.endsWith('.sh')) {
-          fs.chmodSync(destPath, 0o755);
-        }
-      }
-      copied++;
-    }
-  }
-
-  // Remove allowlisted files that no longer exist in src
-  const removed = [];
-  for (const file of SYSTEM_FILES) {
-    const srcPath = path.join(srcDir, file);
-    const destPath = path.join(destDir, file);
-    if (!fs.existsSync(srcPath) && fs.existsSync(destPath)) {
-      removed.push(file);
-      if (!dryRun) {
-        fs.unlinkSync(destPath);
-      }
-    }
-  }
-
-  if (!dryRun && removed.length > 0) {
-    cleanEmptyDirs(destDir);
-  }
-
-  return { copied, removed, skipped };
-}
-
 // Checkpoint allowlist - only these files are captured in checkpoints
 // NEVER include: data/, dreams/, oracle/, TO-DOs.md (user data)
+// Note: runtime/ was removed in v4.0 — .aether/ is published directly
 const CHECKPOINT_ALLOWLIST = [
   '.aether/*.md',                    // All .md files directly in .aether/
   '.claude/commands/ant/**',         // All files in .claude/commands/ant/ recursively
+  '.claude/agents/ant/**',           // All files in .claude/agents/ant/ recursively
   '.opencode/commands/ant/**',       // All files in .opencode/commands/ant/ recursively
   '.opencode/agents/**',             // All files in .opencode/agents/ recursively
-  'runtime/**',                      // All files in runtime/ recursively
   'bin/cli.js',                      // Specific file: bin/cli.js
 ];
 
@@ -805,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)));
@@ -814,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 [];
   }
@@ -835,7 +809,13 @@ function gitStashFiles(repoPath, files) {
 }
 
 // Directories to exclude from hub sync (user data, local state)
-const HUB_EXCLUDE_DIRS = ['data', 'dreams', 'checkpoints', 'locks', 'temp'];
+// '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
@@ -844,8 +824,13 @@ const HUB_EXCLUDE_DIRS = ['data', 'dreams', 'checkpoints', 'locks', 'temp'];
  */
 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;
 }
 
 /**
@@ -870,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()) {
@@ -920,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);
@@ -950,11 +939,116 @@ 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 {
     fs.mkdirSync(HUB_DIR, { recursive: true });
 
+    // MIGRATION: Check for old structure and migrate to system/
+    const oldStructureFiles = [
+      path.join(HUB_DIR, 'aether-utils.sh'),
+      path.join(HUB_DIR, 'workers.md'),
+    ];
+    const hasOldStructure = oldStructureFiles.some(f => fs.existsSync(f));
+    const hasNewStructure = fs.existsSync(HUB_SYSTEM_DIR);
+
+    if (hasOldStructure && !hasNewStructure) {
+      log('  Migrating hub to new structure...');
+      fs.mkdirSync(HUB_SYSTEM_DIR, { recursive: true });
+
+      // Move system files to system/
+      const systemFiles = ['aether-utils.sh', 'workers.md'];
+      const systemDirs = ['docs', 'utils', 'commands', 'agents', 'schemas', 'exchange', 'templates', 'lib'];
+
+      for (const file of systemFiles) {
+        const oldPath = path.join(HUB_DIR, file);
+        if (fs.existsSync(oldPath)) {
+          fs.renameSync(oldPath, path.join(HUB_SYSTEM_DIR, file));
+        }
+      }
+
+      for (const dir of systemDirs) {
+        const oldPath = path.join(HUB_DIR, dir);
+        if (fs.existsSync(oldPath)) {
+          fs.renameSync(oldPath, path.join(HUB_SYSTEM_DIR, dir));
+        }
+      }
+
+      log('  Migration complete: system files moved to ~/.aether/system/');
+    }
+
+    // Create system/ directory structure
+    fs.mkdirSync(HUB_SYSTEM_DIR, { recursive: true });
+    fs.mkdirSync(path.join(HUB_SYSTEM_DIR, 'commands', 'claude'), { recursive: true });
+    fs.mkdirSync(path.join(HUB_SYSTEM_DIR, 'commands', 'opencode'), { recursive: true });
+    fs.mkdirSync(path.join(HUB_SYSTEM_DIR, 'agents'), { recursive: true });
+    fs.mkdirSync(path.join(HUB_SYSTEM_DIR, 'agents-claude'), { recursive: true });
+    fs.mkdirSync(path.join(HUB_SYSTEM_DIR, 'rules'), { recursive: true });
+
     // Read previous manifest for delta reporting
     const prevManifestRaw = readJsonSafe(path.join(HUB_DIR, 'manifest.json'));
     const prevManifest = prevManifestRaw && validateManifest(prevManifestRaw).valid ? prevManifestRaw : null;
@@ -962,21 +1056,32 @@ function setupHub() {
       log(`  Warning: previous manifest is invalid, regenerating`);
     }
 
-    // Sync runtime/ -> ~/.aether/ (clean production files)
-    // runtime/ is the staging area - explicit allowlist via sync-to-runtime.sh
-    const runtimeSrc = path.join(PACKAGE_DIR, 'runtime');
-    if (fs.existsSync(runtimeSrc)) {
-      const result = syncAetherToHub(runtimeSrc, HUB_DIR);
-      log(`  Hub system: ${result.copied} files, ${result.skipped} unchanged -> ${HUB_DIR}`);
+    // Sync .aether/ -> ~/.aether/system/ (direct packaging, no staging)
+    // v4.0: .aether/ is published directly — runtime/ staging removed
+    const aetherSrc = path.join(PACKAGE_DIR, '.aether');
+    if (fs.existsSync(aetherSrc)) {
+      const result = syncAetherToHub(aetherSrc, HUB_SYSTEM_DIR);
+      log(`  Hub system: ${result.copied} files, ${result.skipped} unchanged -> ${HUB_SYSTEM_DIR}`);
       if (result.removed.length > 0) {
         log(`  Hub system: removed ${result.removed.length} stale files`);
         for (const f of result.removed) log(`    - ${f}`);
       }
     }
 
-    // Clean up legacy directories from old hub structure
+    // Migration message for users upgrading from pre-4.0 (runtime/ era)
+    const prevManifestForMigration = readJsonSafe(path.join(HUB_DIR, 'manifest.json'));
+    if (prevManifestForMigration && prevManifestForMigration.version && prevManifestForMigration.version.startsWith('3.')) {
+      log('');
+      log('  Distribution pipeline simplified (v4.0 change):');
+      log('  - runtime/ staging directory has been removed');
+      log('  - .aether/ is now published directly (private dirs excluded)');
+      log('  - Your colony state and data are unaffected');
+      log('  - See CHANGELOG.md for details');
+      log('');
+    }
+
+    // Clean up legacy directories from very old hub structure (pre-system/)
     const legacyDirs = [
-      path.join(HUB_DIR, 'system'),
       path.join(HUB_DIR, '.aether'),
       path.join(HUB_DIR, 'visualizations'),
     ];
@@ -991,7 +1096,7 @@ function setupHub() {
       }
     }
 
-    // Sync .claude/commands/ant/ -> ~/.aether/commands/claude/
+    // Sync .claude/commands/ant/ -> ~/.aether/system/commands/claude/
     const claudeCmdSrc = fs.existsSync(COMMANDS_SRC)
       ? COMMANDS_SRC
       : path.join(PACKAGE_DIR, '.claude', 'commands', 'ant');
@@ -1004,7 +1109,7 @@ function setupHub() {
       }
     }
 
-    // Sync .opencode/commands/ant/ -> ~/.aether/commands/opencode/
+    // Sync .opencode/commands/ant/ -> ~/.aether/system/commands/opencode/
     const opencodeCmdSrc = path.join(PACKAGE_DIR, '.opencode', 'commands', 'ant');
     if (fs.existsSync(opencodeCmdSrc)) {
       const result = syncDirWithCleanup(opencodeCmdSrc, HUB_COMMANDS_OPENCODE);
@@ -1015,7 +1120,7 @@ function setupHub() {
       }
     }
 
-    // Sync .opencode/agents/ -> ~/.aether/agents/
+    // Sync .opencode/agents/ -> ~/.aether/system/agents/
     const agentsSrc = path.join(PACKAGE_DIR, '.opencode', 'agents');
     if (fs.existsSync(agentsSrc)) {
       const result = syncDirWithCleanup(agentsSrc, HUB_AGENTS);
@@ -1026,7 +1131,44 @@ function setupHub() {
       }
     }
 
-    // Create/preserve registry.json
+    // Sync .claude/agents/ant/ -> ~/.aether/system/agents-claude/
+    const claudeAgentsSrc = path.join(PACKAGE_DIR, '.claude', 'agents', 'ant');
+    if (fs.existsSync(claudeAgentsSrc)) {
+      const result = syncDirWithCleanup(claudeAgentsSrc, HUB_AGENTS_CLAUDE);
+      log(`  Hub agents (claude): ${result.copied} files, ${result.skipped} unchanged -> ${HUB_AGENTS_CLAUDE}`);
+      if (result.removed.length > 0) {
+        log(`  Hub agents (claude): removed ${result.removed.length} stale files`);
+        for (const f of result.removed) log(`    - ${f}`);
+      }
+    }
+
+    // Sync rules/ from .aether/ -> ~/.aether/system/rules/
+    // v4.0: source is .aether/rules/ directly (no runtime/ staging)
+    const rulesSrc = path.join(PACKAGE_DIR, '.aether', 'rules');
+    if (fs.existsSync(rulesSrc)) {
+      const result = syncDirWithCleanup(rulesSrc, HUB_RULES);
+      log(`  Hub rules: ${result.copied} files -> ${HUB_RULES}`);
+      if (result.removed.length > 0) {
+        log(`  Hub rules: removed ${result.removed.length} stale files`);
+        for (const f of result.removed) log(`    - ${f}`);
+      }
+    }
+
+    // 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: [] });
       log(`  Registry: initialized ${HUB_REGISTRY}`);
@@ -1034,7 +1176,7 @@ function setupHub() {
       log(`  Registry: preserved existing ${HUB_REGISTRY}`);
     }
 
-    // Generate and write manifest
+    // Generate and write manifest (at root, tracks everything)
     const manifest = generateManifest(HUB_DIR);
     const manifestPath = path.join(HUB_DIR, 'manifest.json');
     writeJsonSync(manifestPath, manifest);
@@ -1053,7 +1195,7 @@ function setupHub() {
       }
     }
 
-    // Write version.json
+    // Write version.json (at root)
     writeJsonSync(HUB_VERSION, { version: VERSION, updated_at: new Date().toISOString() });
     log(`  Hub version: ${VERSION}`);
   } catch (err) {
@@ -1079,21 +1221,23 @@ async function updateRepo(repoPath, sourceVersion, opts) {
   const currentVer = currentVersion ? currentVersion.version : 'unknown';
 
   // Target directories for git safety checks
-  const targetDirs = ['.aether', '.claude/commands/ant', '.opencode/commands/ant', '.opencode/agents'];
+  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 });
 
@@ -1101,17 +1245,25 @@ async function updateRepo(repoPath, sourceVersion, opts) {
     const systemCopied = result.sync_result?.system?.copied || 0;
     const commandsCopied = (result.sync_result?.commands?.copied || 0);
     const agentsCopied = result.sync_result?.agents?.copied || 0;
+    const rulesCopied = result.sync_result?.rules?.copied || 0;
+    const agentsClaudeCopied = result.sync_result?.agents_claude?.copied || 0;
 
     const systemRemoved = result.sync_result?.system?.removed?.length || 0;
     const commandsRemoved = result.sync_result?.commands?.removed?.length || 0;
     const agentsRemoved = result.sync_result?.agents?.removed?.length || 0;
+    const rulesRemoved = result.sync_result?.rules?.removed?.length || 0;
+    const agentsClaudeRemoved = result.sync_result?.agents_claude?.removed?.length || 0;
 
     const allRemovedFiles = [
       ...(result.sync_result?.system?.removed || []),
       ...(result.sync_result?.commands?.removed || []).map(f => `.claude/commands/ant/${f}`),
       ...(result.sync_result?.agents?.removed || []).map(f => `.opencode/agents/${f}`),
+      ...(result.sync_result?.rules?.removed || []).map(f => `.claude/rules/${f}`),
+      ...(result.sync_result?.agents_claude?.removed || []).map(f => `.claude/agents/ant/${f}`),
     ];
 
+    const cleanupResult = result.cleanup_result || { cleaned: [], failed: [] };
+
     return {
       status: result.status,
       from: currentVer,
@@ -1119,10 +1271,13 @@ async function updateRepo(repoPath, sourceVersion, opts) {
       system: systemCopied,
       commands: commandsCopied,
       agents: agentsCopied,
-      removed: systemRemoved + commandsRemoved + agentsRemoved,
+      rules: rulesCopied,
+      agentsClaude: agentsClaudeCopied,
+      removed: systemRemoved + commandsRemoved + agentsRemoved + rulesRemoved + agentsClaudeRemoved,
       removedFiles: allRemovedFiles,
       stashCreated: !!transaction.checkpoint?.stashRef,
       checkpoint_id: result.checkpoint_id,
+      cleanup: cleanupResult,
     };
   } catch (error) {
     // Handle UpdateError with recovery commands
@@ -1161,7 +1316,7 @@ program.on('option:quiet', () => {
 // Install command
 program
   .command('install')
-  .description('Install slash-commands to ~/.claude/commands/ant/ and set up distribution hub')
+  .description('Install commands and agents to ~/.claude/ and set up distribution hub')
   .action(wrapCommand(async () => {
     log(c.header(`aether-colony v${VERSION} — installing...`));
 
@@ -1188,6 +1343,39 @@ program
       }
     }
 
+    // Sync agents to ~/.claude/agents/ant/ (with orphan cleanup)
+    const repoAgents = path.join(PACKAGE_DIR, '.claude', 'agents', 'ant');
+    if (fs.existsSync(repoAgents)) {
+      const result = syncDirWithCleanup(repoAgents, AGENTS_DEST);
+      log(`  Agents (claude): ${result.copied} files -> ${AGENTS_DEST}`);
+      if (result.removed.length > 0) {
+        log(`  Agents (claude): removed ${result.removed.length} stale files`);
+        for (const f of result.removed) log(`    - ${f}`);
+      }
+    }
+
+    // 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...'));
@@ -1196,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)`);
   }));
 
@@ -1288,19 +1477,31 @@ program
             console.error(`  Skipping. Use --force to stash and update.`);
             dirty++;
           } else if (result.status === 'dry-run') {
-            log(`  Would update: ${repo.path} (${result.from} -> ${result.to}) [${result.system} system, ${result.commands} commands, ${result.agents} agents]`);
+            log(`  Would update: ${repo.path} (${result.from} -> ${result.to}) [${result.system} system, ${result.commands} commands, ${result.agents} agents, ${result.agentsClaude} claude agents]`);
             if (result.removed > 0) {
               log(`  Would remove ${result.removed} stale files:`);
               for (const f of result.removedFiles) log(`    - ${f}`);
             }
             updated++;
           } else if (result.status === 'updated') {
-            log(`  ${c.success('Updated:')} ${repo.path} (${result.from} -> ${result.to}) [${result.system} system, ${result.commands} commands, ${result.agents} agents]`);
+            log(`  ${c.success('Updated:')} ${repo.path} (${result.from} -> ${result.to}) [${result.system} system, ${result.commands} commands, ${result.agents} agents, ${result.agentsClaude} claude agents]`);
             if (result.removed > 0) {
               log(`  Removed ${result.removed} stale files:`);
               for (const f of result.removedFiles) log(`    - ${f}`);
               totalRemoved += result.removed;
             }
+            // Distribution chain cleanup reporting
+            if (result.cleanup && result.cleanup.cleaned.length > 0) {
+              for (const label of result.cleanup.cleaned) {
+                log(`    ${c.success('\u2713')} Removed ${label}`);
+              }
+            }
+            for (const failure of (result.cleanup?.failed || [])) {
+              log(`    ${c.error('\u2717')} Failed to remove ${failure.label}: ${failure.error}`);
+            }
+            if (result.cleanup && result.cleanup.cleaned.length === 0 && result.cleanup.failed.length === 0) {
+              log(`    Distribution chain: ${c.success('\u2713')} clean`);
+            }
             if (result.stashCreated) {
               log(`  Stash created. Recover with: cd ${repo.path} && git stash pop`);
             }
@@ -1324,7 +1525,7 @@ program
       }
 
       const label = dryRun ? 'would update' : 'updated';
-      let summary = `\nSummary: ${updated} ${label}, ${upToDate} up-to-date, ${pruned} pruned`;
+      let summary = `\nSummary: ${updated} ${label}, ${upToDate} up to date, ${pruned} pruned`;
       if (dirty > 0) summary += `, ${dirty} dirty (skipped)`;
       if (totalRemoved > 0) summary += `, ${totalRemoved} stale files removed`;
       console.log(summary);
@@ -1343,11 +1544,19 @@ program
         process.exit(getExitCode(error.code));
       }
 
+      const pendingPath = path.join(repoAether, '.update-pending');
+      const hasPending = fs.existsSync(pendingPath);
+
+      if (hasPending) {
+        console.log('Detected incomplete update, re-syncing...');
+        try { fs.unlinkSync(pendingPath); } catch { /* ignore */ }
+      }
+
       const currentVersion = readJsonSafe(path.join(repoAether, 'version.json'));
       const currentVer = currentVersion ? currentVersion.version : 'unknown';
 
-      if (!forceFlag && !dryRun && currentVer === sourceVersion) {
-        console.log(c.info(`Already up-to-date (v${sourceVersion}).`));
+      if (!hasPending && !forceFlag && !dryRun && currentVer === sourceVersion) {
+        console.log(c.info(`Already up to date (v${sourceVersion}).`));
         return;
       }
 
@@ -1371,7 +1580,7 @@ program
 
         if (result.status === 'dry-run') {
           console.log(`Would update: ${result.from} -> ${result.to}`);
-          console.log(`  ${result.system} system files, ${result.commands} command files, ${result.agents} agent files`);
+          console.log(`  ${result.system} system files, ${result.commands} command files, ${result.agents} agent files, ${result.agentsClaude} claude agent files`);
           if (result.removed > 0) {
             console.log(`  Would remove ${result.removed} stale files:`);
             for (const f of result.removedFiles) console.log(`    - ${f}`);
@@ -1381,11 +1590,23 @@ program
         }
 
         console.log(c.success(`Updated: ${result.from} -> ${result.to}`));
-        console.log(`  ${result.system} system files, ${result.commands} command files, ${result.agents} agent files, ${result.visualizations} visualization files`);
+        console.log(`  ${result.system} system files, ${result.commands} command files, ${result.agents} agent files, ${result.agentsClaude} claude agent files`);
         if (result.removed > 0) {
           console.log(`  Removed ${result.removed} stale files:`);
           for (const f of result.removedFiles) console.log(`    - ${f}`);
         }
+        // Distribution chain cleanup reporting
+        if (result.cleanup && result.cleanup.cleaned.length > 0) {
+          for (const label of result.cleanup.cleaned) {
+            console.log(`  ${c.success('\u2713')} Removed ${label}`);
+          }
+        }
+        for (const failure of (result.cleanup?.failed || [])) {
+          console.log(`  ${c.error('\u2717')} Failed to remove ${failure.label}: ${failure.error}`);
+        }
+        if (result.cleanup && result.cleanup.cleaned.length === 0 && result.cleanup.failed.length === 0) {
+          console.log(`  Distribution chain: ${c.success('\u2713')} clean`);
+        }
         if (result.stashCreated) {
           console.log('  Git stash created. Recover with: git stash pop');
         }
@@ -1432,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...`));
 
@@ -1444,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).`);
@@ -1681,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')
@@ -1969,156 +1955,100 @@ program
     console.log(tree);
   }));
 
-// Nestmates command - List sibling colonies
+// Status command - Show colony status
 program
-  .command('nestmates')
-  .description('List sibling colonies (nestmates)')
-  .action(wrapCommand(async () => {
+  .command('status')
+  .description('Show colony status')
+  .option('-j, --json', 'Output as JSON')
+  .action(wrapCommand(async (options) => {
     const repoPath = process.cwd();
-    const nestmates = findNestmates(repoPath);
+    const colonyStatePath = path.join(repoPath, '.aether', 'data', 'COLONY_STATE.json');
 
-    if (nestmates.length === 0) {
-      console.log('No nestmates found (sibling directories with .aether/).');
+    // Check if colony exists
+    if (!fs.existsSync(colonyStatePath)) {
+      console.log(c.warning('No colony found in current directory.'));
+      console.log(c.dim('Run /ant:init to create a new colony, or cd to a project with an existing colony.'));
       return;
     }
 
-    console.log(`Found ${nestmates.length} nestmate(s):\n`);
-    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.'));
+    // Load colony state
+    let state;
+    try {
+      state = JSON.parse(fs.readFileSync(colonyStatePath, 'utf8'));
+    } catch (err) {
+      console.log(c.error('Could not read colony state.'));
+      console.log(c.dim(`Error: ${err.message}`));
+      console.log(c.dim('The colony state file may be corrupted. Consider running /ant:init to reinitialize.'));
       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})`);
-      }
+    // JSON output
+    if (options.json) {
+      console.log(JSON.stringify(state, null, 2));
+      return;
     }
-  }));
 
-// summary subcommand (explicit)
-telemetryCmd
-  .command('summary')
-  .description('Show overall telemetry summary')
-  .action(wrapCommand(async () => {
-    const repoPath = process.cwd();
-    const summary = getTelemetrySummary(repoPath);
+    // Dashboard output
+    console.log(c.header('Colony Status\n'));
 
-    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;
+    // Goal
+    if (state.goal) {
+      console.log(`${c.queen('Goal:')} ${state.goal}`);
     }
 
-    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`);
+    // State
+    if (state.state) {
+      const stateDisplay = state.state === 'BUILDING' ? c.success(state.state) :
+                          state.state === 'PLANNING' ? c.warning(state.state) :
+                          state.state === 'COMPLETED' ? c.success(state.state) :
+                          state.state;
+      console.log(`${c.colony('State:')} ${stateDisplay}`);
     }
 
-    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})`);
-      }
+    // Phase
+    if (state.current_phase !== undefined) {
+      console.log(`${c.info('Phase:')} ${state.current_phase}`);
     }
-  }));
 
-// 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;
+    // Version
+    if (state.version) {
+      console.log(`${c.dim('Version:')} ${state.version}`);
     }
 
-    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}`);
+    // Last updated
+    if (state.last_updated) {
+      const lastUpdated = new Date(state.last_updated);
+      const now = new Date();
+      const hoursAgo = Math.round((now - lastUpdated) / (1000 * 60 * 60));
+      const timeDisplay = hoursAgo < 1 ? 'just now' :
+                         hoursAgo < 24 ? `${hoursAgo} hours ago` :
+                         `${Math.round(hoursAgo / 24)} days ago`;
+      console.log(`${c.dim('Last updated:')} ${timeDisplay}`);
+    }
 
-    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`);
-      }
+    // Event count
+    if (state.events && state.events.length > 0) {
+      console.log(`${c.dim('Events:')} ${state.events.length}`);
     }
+
+    console.log('');
   }));
 
-// performance subcommand
-telemetryCmd
-  .command('performance')
-  .description('Show models ranked by performance')
+// Nestmates command - List sibling colonies
+program
+  .command('nestmates')
+  .description('List sibling colonies (nestmates)')
   .action(wrapCommand(async () => {
     const repoPath = process.cwd();
-    const summary = getTelemetrySummary(repoPath);
-
-    console.log(c.header('Model Performance Ranking\n'));
+    const nestmates = findNestmates(repoPath);
 
-    if (summary.total_spawns === 0) {
-      console.log(c.info('No telemetry data yet. Run some builds to collect data.'));
+    if (nestmates.length === 0) {
+      console.log('No nestmates found (sibling directories with .aether/).');
       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'));
+    console.log(`Found ${nestmates.length} nestmate(s):\n`);
+    console.log(formatNestmates(nestmates));
   }));
 
 // Context command - Show auto-loaded context
@@ -2191,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');
     }
   }));
 
@@ -2204,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('');
@@ -2242,7 +2170,7 @@ module.exports = {
   saveCheckpointMetadata,
   isUserData,
   syncDirWithCleanup,
-  syncSystemFilesWithCleanup,
+  syncSkillsToHub,
   listFilesRecursive,
   cleanEmptyDirs
 };