haac-aikit 0.5.0 → 0.7.2

package/dist/cli.mjs

@@ -972,6 +972,10 @@ var init_kleur = __esm({
 });
 
 // src/wizard.ts
+function defaultSpecialtyAgents(scope) {
+  if (scope === "everything") return SPECIALTY_TIER2_AGENTS.map((a2) => a2.value);
+  return [];
+}
 async function runWizard(projectName) {
   we(kleur_default.bgCyan().black(" haac-aikit ") + "  The batteries-included AI-agentic-coding kit");
   const answers = await be(
@@ -1029,6 +1033,15 @@ async function runWizard(projectName) {
           initialValues: ["web"],
           required: false
         });
+      },
+      specialtyAgents: ({ results }) => {
+        if (results.scope === "minimal") return Promise.resolve(void 0);
+        return pe({
+          message: "Include specialty agents? (debugger and pr-describer always installed)",
+          options: SPECIALTY_TIER2_AGENTS.map((a2) => ({ value: a2.value, label: a2.label })),
+          required: false,
+          initialValues: defaultSpecialtyAgents(results.scope ?? "standard")
+        });
       }
     },
     {
@@ -1044,15 +1057,24 @@ async function runWizard(projectName) {
     tools: answers.tools ?? ALL_TOOLS.map((t) => t.value),
     scope: answers.scope ?? "standard",
     integrations: answers.integrations ?? [],
-    shape: answers.shape ?? []
+    shape: answers.shape ?? [],
+    specialtyAgents: answers.specialtyAgents ?? []
   };
 }
-var ALL_TOOLS, ALL_SHAPES, ALL_INTEGRATIONS;
+var SPECIALTY_TIER2_AGENTS, ALL_TOOLS, ALL_SHAPES, ALL_INTEGRATIONS;
 var init_wizard = __esm({
   "src/wizard.ts"() {
     "use strict";
     init_dist2();
     init_kleur();
+    SPECIALTY_TIER2_AGENTS = [
+      { value: "flake-hunter", label: "flake-hunter \u2014 diagnose intermittent test failures" },
+      { value: "simplifier", label: "simplifier \u2014 DRY, dead code, complexity reduction" },
+      { value: "prompt-engineer", label: "prompt-engineer \u2014 author/optimize prompts" },
+      { value: "evals-author", label: "evals-author \u2014 eval datasets & benchmarks" },
+      { value: "changelog-curator", label: "changelog-curator \u2014 generate CHANGELOG from commits" },
+      { value: "dependency-upgrader", label: "dependency-upgrader \u2014 npm major bumps + codemods" }
+    ];
     ALL_TOOLS = [
       { value: "claude", label: "Claude Code", hint: "CLAUDE.md + .claude/" },
       { value: "cursor", label: "Cursor", hint: ".cursor/rules/" },
@@ -1270,6 +1292,30 @@ var init_catalog = __esm({
   }
 });
 
+// src/catalog/shape-agents.ts
+function resolveShapeAgents(shapes) {
+  const set = /* @__PURE__ */ new Set();
+  for (const shape of shapes) {
+    for (const agent of SHAPE_AGENTS[shape] ?? []) {
+      set.add(agent);
+    }
+  }
+  return Array.from(set);
+}
+var SHAPE_AGENTS;
+var init_shape_agents = __esm({
+  "src/catalog/shape-agents.ts"() {
+    "use strict";
+    SHAPE_AGENTS = {
+      web: ["frontend"],
+      fullstack: ["frontend", "backend"],
+      backend: ["backend"],
+      mobile: ["mobile"],
+      library: ["backend"]
+    };
+  }
+});
+
 // src/render/dialects/parser.ts
 function parseRuleSet(content, projectName, description) {
   const rules = [];
@@ -1386,13 +1432,87 @@ var init_dialects = __esm({
   }
 });
 
+// src/fs/diff.ts
+import { createPatch } from "diff";
+function formatUnifiedDiff(local, incoming) {
+  if (local === incoming) return "";
+  const raw = createPatch("local", local, incoming, "", "", { context: 3 });
+  const lines = [];
+  let inHunk = false;
+  for (const line of raw.split("\n")) {
+    if (line.startsWith("@@")) {
+      inHunk = true;
+      continue;
+    }
+    if (!inHunk) continue;
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      lines.push(kleur_default.green(`+ ${line.slice(1)}`));
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      lines.push(kleur_default.red(`- ${line.slice(1)}`));
+    } else if (line.startsWith(" ")) {
+      lines.push(kleur_default.dim(`  ${line.slice(1)}`));
+    }
+  }
+  return lines.join("\n");
+}
+var init_diff = __esm({
+  "src/fs/diff.ts"() {
+    "use strict";
+    init_kleur();
+  }
+});
+
+// src/fs/conflict.ts
+import { basename } from "path";
+function inferTier3Slot(filePath) {
+  if ((filePath.includes("/.claude/agents/") || filePath.startsWith(".claude/agents/")) && filePath.endsWith(".md")) return "agents";
+  if ((filePath.includes("/.claude/skills/") || filePath.startsWith(".claude/skills/")) && filePath.endsWith(".md")) return "skills";
+  return null;
+}
+var interactivePrompt;
+var init_conflict = __esm({
+  "src/fs/conflict.ts"() {
+    "use strict";
+    init_dist2();
+    init_diff();
+    interactivePrompt = {
+      async ask(filePath, local, incoming) {
+        while (true) {
+          const choice = await de({
+            message: `Modified locally: ${filePath}`,
+            options: [
+              { value: "replace", label: "Replace with catalog version (recommended)" },
+              { value: "keep", label: "Keep local version (mark as tier3 to silence future prompts)" },
+              { value: "diff", label: "Show diff first" },
+              { value: "replace_all", label: "Replace all remaining conflicts" },
+              { value: "skip_all", label: "Skip all remaining conflicts" }
+            ],
+            initialValue: "replace"
+          });
+          if (BD(choice)) {
+            ve("Sync cancelled");
+            process.exit(0);
+          }
+          if (choice === "diff") {
+            const out = formatUnifiedDiff(local, incoming);
+            ye(out, basename(filePath));
+            continue;
+          }
+          return choice;
+        }
+      }
+    };
+  }
+});
+
 // src/commands/sync.ts
 var sync_exports = {};
 __export(sync_exports, {
+  copyAction: () => copyAction,
   runSync: () => runSync
 });
-import { existsSync as existsSync5, mkdirSync as mkdirSync2, copyFileSync, readdirSync, readFileSync as readFileSync5 } from "fs";
-import { join as join2 } from "path";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, copyFileSync, readdirSync, readFileSync as readFileSync5, chmodSync } from "fs";
+import { basename as basename2, dirname as dirname3, join as join2 } from "path";
 async function runSync(argv) {
   const dryRun = argv["dry-run"];
   const force = argv.force;
@@ -1417,7 +1537,7 @@ async function runSync(argv) {
     if (config.scope !== "minimal") {
       results.push(safeWrite("docs/claude-md-reference.md", catalog.claudeMdReference(), { ...opts, useMarkers: false }));
       results.push(safeWrite(".claude/aikit-rules.json", catalog.aikitRulesJson(), { ...opts, useMarkers: false }));
-      results.push(...syncDir("rules/claude-rules", ".claude/rules", dryRun, [".md"]));
+      results.push(...syncDir("rules/claude-rules", ".claude/rules", opts, [".md"]));
     }
   }
   if (config.tools.includes("copilot")) {
@@ -1442,32 +1562,98 @@ async function runSync(argv) {
     results.push(safeWrite(".mcp.json", catalog.mcpJson(), { ...opts, useMarkers: false }));
   }
   if (config.scope !== "minimal") {
-    results.push(...syncSkills("tier1", dryRun));
-    results.push(...syncSkills("tier2", dryRun));
+    results.push(...syncSkills("tier1", opts));
+    results.push(...syncSkills("tier2", opts));
   }
   if (config.integrations.hooks) {
-    results.push(...syncHooks(dryRun));
+    results.push(...syncHooks(opts));
   }
   if (config.integrations.subagents) {
-    results.push(...syncAgents(config.shape, dryRun));
+    results.push(...syncAgents(config, opts));
   }
   if (config.integrations.commands) {
-    results.push(...syncCommands(dryRun));
+    results.push(...syncCommands(opts));
   }
   if (config.integrations.ci) {
-    results.push(...syncCI(dryRun));
+    results.push(...syncCI(opts));
   }
   if (config.integrations.devcontainer) {
-    results.push(...syncDir("devcontainer", ".devcontainer", dryRun, [".json"]));
+    results.push(...syncDir("devcontainer", ".devcontainer", opts, [".json"]));
   }
   if (config.integrations.otel) {
     results.push(safeWrite(".env.example", readCatalogFile("settings/env.example"), { dryRun, useMarkers: false }));
   }
+  if (config.integrations.husky) {
+    results.push(...syncDir("husky", ".husky", opts, []));
+  }
+  if (config.integrations.plugin) {
+    const tmpl = readCatalogFile("plugin/plugin.json");
+    const content = interpolate(tmpl, { projectName: config.projectName });
+    results.push(safeWrite(".claude/plugin/plugin.json", content, { ...opts, useMarkers: false }));
+  }
   ensureGitignoreEntries(dryRun);
+  const conflicts = results.filter((r2) => r2.action === "conflict");
+  if (conflicts.length > 0 && !force) {
+    const isInteractive2 = (Boolean(process.stdin.isTTY) || argv._conflictPrompt != null) && !argv.yes;
+    if (isInteractive2) {
+      const prompt = argv._conflictPrompt ?? interactivePrompt;
+      let bulkAction = null;
+      let configMutated = false;
+      let workingConfig = config;
+      v2.info(`Found ${conflicts.length} file(s) modified locally. Reviewing each\u2026`);
+      for (const conflict of conflicts) {
+        const incomingSrc = conflict.src;
+        if (!incomingSrc) continue;
+        if (bulkAction === "skip_all") {
+          conflict.action = "skipped";
+          continue;
+        }
+        let resolution;
+        if (bulkAction === "replace_all") {
+          resolution = "replace";
+        } else {
+          const local = readFileSync5(conflict.path, "utf8");
+          const incoming = readFileSync5(incomingSrc, "utf8");
+          resolution = await prompt.ask(conflict.path, local, incoming);
+          if (resolution === "replace_all") bulkAction = "replace_all";
+          if (resolution === "skip_all") {
+            bulkAction = "skip_all";
+            conflict.action = "skipped";
+            continue;
+          }
+        }
+        if (resolution === "replace" || resolution === "replace_all") {
+          if (!opts.dryRun) copyFileSync(incomingSrc, conflict.path);
+          conflict.action = "updated";
+        } else if (resolution === "keep") {
+          const slot = inferTier3Slot(conflict.path);
+          if (slot) {
+            const name = basename2(conflict.path).replace(/\.md$/, "");
+            const current = workingConfig[slot] ?? { tier1: "all", tier2: "all", tier3: [] };
+            if (!current.tier3.includes(name)) {
+              workingConfig = {
+                ...workingConfig,
+                [slot]: { ...current, tier3: [...current.tier3, name] }
+              };
+              configMutated = true;
+            }
+          } else {
+            v2.warn(
+              `Kept ${conflict.path} \u2014 no tier3 protection available; this file will be flagged again on next sync.`
+            );
+          }
+          conflict.action = "skipped";
+        }
+      }
+      if (configMutated && !opts.dryRun) {
+        writeConfig(workingConfig);
+      }
+    }
+  }
   const created = results.filter((r2) => r2.action === "created").length;
   const updated = results.filter((r2) => r2.action === "updated").length;
   const skipped = results.filter((r2) => r2.action === "skipped").length;
-  const conflicts = results.filter((r2) => r2.action === "conflict");
+  const remainingConflicts = results.filter((r2) => r2.action === "conflict");
   const visible = dryRun ? results : results.filter((r2) => r2.action !== "skipped");
   if (dryRun) {
     ye(visible.map((r2) => `${r2.action.padEnd(9)} ${r2.path}`).join("\n"), "Dry run");
@@ -1481,109 +1667,121 @@ async function runSync(argv) {
   } else {
     v2.info(`Already up to date \u2014 ${skipped} files match the catalog.`);
   }
-  if (conflicts.length > 0) {
-    v2.warn(`${conflicts.length} conflict(s) skipped (use --force to overwrite)`);
+  if (remainingConflicts.length > 0) {
+    v2.warn(`${remainingConflicts.length} conflict(s) skipped (use --force to overwrite)`);
   }
   fe("Sync complete.");
 }
-function copyAction(srcPath, destPath, dryRun) {
+function copyAction(srcPath, destPath, opts) {
   const existed = existsSync5(destPath);
   const incoming = readFileSync5(srcPath, "utf8");
   if (existed) {
     const current = readFileSync5(destPath, "utf8");
     if (current === incoming) {
-      return { path: destPath, action: "skipped" };
+      return { path: destPath, action: "skipped", src: srcPath };
+    }
+    if (!opts.force) {
+      return { path: destPath, action: "conflict", src: srcPath };
+    }
+  }
+  if (!opts.dryRun) {
+    mkdirSync2(dirname3(destPath), { recursive: true });
+    copyFileSync(srcPath, destPath);
+    if (destPath.endsWith(".sh") || destPath.includes("/.husky/") || destPath.includes("/.claude/hooks/")) {
+      chmodSync(destPath, 493);
     }
   }
-  if (!dryRun) copyFileSync(srcPath, destPath);
-  return { path: destPath, action: existed ? "updated" : "created" };
+  return { path: destPath, action: existed ? "updated" : "created", src: srcPath };
 }
-function syncSkills(tier, dryRun) {
+function syncSkills(tier, opts) {
   const srcDir = join2(CATALOG_ROOT, "skills", tier);
   const destDir = `.claude/skills`;
   const results = [];
   if (!existsSync5(srcDir)) return results;
   const files = readdirSync(srcDir).filter((f2) => f2.endsWith(".md"));
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const file of files) {
-    results.push(copyAction(join2(srcDir, file), join2(destDir, file), dryRun));
+    results.push(copyAction(join2(srcDir, file), join2(destDir, file), opts));
   }
   return results;
 }
-function syncHooks(dryRun) {
+function syncHooks(opts) {
   const srcDir = join2(CATALOG_ROOT, "hooks");
   const destDir = `.claude/hooks`;
   const results = [];
   if (!existsSync5(srcDir)) return results;
   const files = readdirSync(srcDir).filter((f2) => f2.endsWith(".sh") || f2 === "hooks.json");
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const file of files) {
-    results.push(copyAction(join2(srcDir, file), join2(destDir, file), dryRun));
+    results.push(copyAction(join2(srcDir, file), join2(destDir, file), opts));
   }
   return results;
 }
-function syncAgents(shapes, dryRun) {
-  const srcDir = join2(CATALOG_ROOT, "agents");
-  const destDir = `.claude/agents`;
+function syncAgents(config, opts) {
   const results = [];
-  if (!existsSync5(srcDir)) return results;
-  const CORE_AGENTS2 = ["orchestrator", "planner", "researcher", "implementer", "reviewer", "tester", "security-auditor", "devops"];
-  const SHAPE_AGENTS2 = {
-    web: ["frontend"],
-    fullstack: ["frontend", "backend"],
-    backend: ["backend"],
-    mobile: ["mobile"],
-    library: ["backend"]
-  };
-  const agentsToInstall = new Set(CORE_AGENTS2);
-  for (const shape of shapes) {
-    for (const agent of SHAPE_AGENTS2[shape] ?? []) {
-      agentsToInstall.add(agent);
-    }
+  results.push(...syncAgentTier("tier1", config.agents?.tier1 ?? "all", opts));
+  results.push(...syncAgentTier("tier2", resolveTier2Set(config), opts));
+  return results;
+}
+function resolveTier2Set(config) {
+  if (config.agents?.tier2 === "all") return "all";
+  const set = new Set(
+    Array.isArray(config.agents?.tier2) ? config.agents.tier2 : []
+  );
+  for (const agent of resolveShapeAgents(config.shape)) {
+    set.add(agent);
   }
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  return Array.from(set);
+}
+function syncAgentTier(tier, selection, opts) {
+  const srcDir = join2(CATALOG_ROOT, "agents", tier);
+  const destDir = ".claude/agents";
+  const results = [];
+  if (!existsSync5(srcDir)) return results;
+  const allAgents = readdirSync(srcDir).filter((f2) => f2.endsWith(".md")).map((f2) => f2.replace(/\.md$/, ""));
+  const agentsToInstall = selection === "all" ? allAgents : allAgents.filter((a2) => selection.includes(a2));
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const agent of agentsToInstall) {
     const src = join2(srcDir, `${agent}.md`);
     const dest = join2(destDir, `${agent}.md`);
-    if (!existsSync5(src)) continue;
-    results.push(copyAction(src, dest, dryRun));
+    results.push(copyAction(src, dest, opts));
   }
   return results;
 }
-function syncCommands(dryRun) {
+function syncCommands(opts) {
   const srcDir = join2(CATALOG_ROOT, "commands");
   const destDir = `.claude/commands`;
   const results = [];
   if (!existsSync5(srcDir)) return results;
   const files = readdirSync(srcDir).filter((f2) => f2.endsWith(".md"));
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const file of files) {
-    results.push(copyAction(join2(srcDir, file), join2(destDir, file), dryRun));
+    results.push(copyAction(join2(srcDir, file), join2(destDir, file), opts));
   }
   return results;
 }
-function syncCI(dryRun) {
+function syncCI(opts) {
   const srcDir = join2(CATALOG_ROOT, "ci");
   const destDir = `.github/workflows`;
   const results = [];
   if (!existsSync5(srcDir)) return results;
   const files = readdirSync(srcDir).filter((f2) => f2.endsWith(".yml"));
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const file of files) {
-    results.push(copyAction(join2(srcDir, file), join2(destDir, file), dryRun));
+    results.push(copyAction(join2(srcDir, file), join2(destDir, file), opts));
   }
   return results;
 }
-function syncDir(catalogSubdir, destDir, dryRun, extensions = [".md", ".json", ".yml", ".yaml"]) {
+function syncDir(catalogSubdir, destDir, opts, extensions = [".md", ".json", ".yml", ".yaml"]) {
   const srcDir = join2(CATALOG_ROOT, catalogSubdir);
   const results = [];
   if (!existsSync5(srcDir)) return results;
   const files = readdirSync(srcDir).filter(
-    (f2) => extensions.some((ext) => f2.endsWith(ext))
+    (f2) => extensions.length === 0 || extensions.some((ext) => f2.endsWith(ext))
   );
-  if (!dryRun) mkdirSync2(destDir, { recursive: true });
+  if (!opts.dryRun) mkdirSync2(destDir, { recursive: true });
   for (const file of files) {
-    results.push(copyAction(join2(srcDir, file), join2(destDir, file), dryRun));
+    results.push(copyAction(join2(srcDir, file), join2(destDir, file), opts));
   }
   return results;
 }
@@ -1598,8 +1796,11 @@ var init_sync = __esm({
     init_safeWrite();
     init_gitignore();
     init_catalog();
+    init_shape_agents();
     init_dialects();
+    init_template();
     init_markers();
+    init_conflict();
   }
 });
 
@@ -1608,7 +1809,7 @@ var init_exports = {};
 __export(init_exports, {
   runInit: () => runInit
 });
-import { basename } from "path";
+import { basename as basename3 } from "path";
 async function runInit(argv, headless) {
   const dryRun = argv["dry-run"];
   if (!argv["skip-git-check"] && !headless && isGitRepo() && isDirtyTree()) {
@@ -1629,13 +1830,13 @@ async function runInit(argv, headless) {
   }
   let config;
   if (headless || argv.yes) {
-    const projectName = basename(process.cwd());
+    const projectName = basename3(process.cwd());
     const tools = parseTools(argv.tools);
     const scope = argv.preset ?? "standard";
     const integrations = defaultIntegrationsForScope(scope);
-    config = buildDefaultConfig(projectName, "", tools, scope, integrations, []);
+    config = buildDefaultConfig(projectName, "", tools, scope, integrations, [], defaultSpecialtyAgents(scope));
   } else {
-    const answers = await runWizard(basename(process.cwd()));
+    const answers = await runWizard(basename3(process.cwd()));
     const defaultIntegrations = defaultIntegrationsForScope(answers.scope);
     const integrations = answers.integrations.length > 0 ? answers.integrations : defaultIntegrations;
     config = buildDefaultConfig(
@@ -1644,7 +1845,8 @@ async function runInit(argv, headless) {
       answers.tools,
       answers.scope,
       integrations,
-      answers.shape
+      answers.shape,
+      answers.specialtyAgents
     );
   }
   writeConfig(config, argv.config ?? ".aikitrc.json", dryRun);
@@ -1662,7 +1864,9 @@ function defaultIntegrationsForScope(scope) {
   if (scope === "standard") return ["mcp", "hooks", "commands", "subagents", "ci", "husky"];
   return ["mcp", "hooks", "commands", "subagents", "ci", "husky", "devcontainer", "plugin", "otel"];
 }
-function buildDefaultConfig(projectName, projectDescription, tools, scope, integrations, shape) {
+function buildDefaultConfig(projectName, projectDescription, tools, scope, integrations, shape, specialtyAgents) {
+  const allSpecialtyValues = new Set(SPECIALTY_TIER2_AGENTS.map((a2) => a2.value));
+  const agentTier2 = specialtyAgents.length === allSpecialtyValues.size && specialtyAgents.every((a2) => allSpecialtyValues.has(a2)) ? "all" : specialtyAgents;
   return {
     version: 1,
     projectName,
@@ -1682,6 +1886,7 @@ function buildDefaultConfig(projectName, projectDescription, tools, scope, integ
       otel: integrations.includes("otel")
     },
     skills: { tier1: "all", tier2: "all", tier3: [] },
+    agents: { tier1: "all", tier2: agentTier2, tier3: [] },
     canonical: "AGENTS.md"
   };
 }
@@ -1729,7 +1934,8 @@ async function runDiff(argv) {
   }
   checkCatalogDir("skills/tier1", ".claude/skills", missing, drifted);
   checkCatalogDir("skills/tier2", ".claude/skills", missing, drifted);
-  checkCatalogAgents(config.shape, missing, drifted);
+  checkCatalogDir("agents/tier1", ".claude/agents", missing, drifted);
+  checkCatalogAgentsTier2(config, missing, drifted);
   checkCatalogDir("hooks", ".claude/hooks", missing, drifted, [".sh"]);
   if (config.tools.includes("claude") && config.scope !== "minimal") {
     checkCatalogDir("rules/claude-rules", ".claude/rules", missing, drifted);
@@ -1772,32 +1978,40 @@ async function runDiff(argv) {
 Run ${kleur_default.cyan("aikit sync")} to update all, or ${kleur_default.cyan("aikit update")} to review changes first.
 `);
 }
-function checkCatalogAgents(shapes, missing, drifted) {
-  const required = new Set(CORE_AGENTS);
-  for (const shape of shapes) {
-    for (const agent of SHAPE_AGENTS[shape] ?? []) required.add(agent);
+function extractRegion(content, begin, end) {
+  const bi = content.indexOf(begin);
+  const ei = content.indexOf(end);
+  if (bi === -1 || ei === -1) return "";
+  return content.slice(bi + begin.length, ei).trim();
+}
+function checkCatalogAgentsTier2(config, missing, drifted) {
+  const tier2Selection = config.agents?.tier2;
+  if (tier2Selection === "all") {
+    checkCatalogDir("agents/tier2", ".claude/agents", missing, drifted);
+    return;
   }
-  const catalogDir = join3(CATALOG_ROOT, "agents");
-  if (!existsSync6(catalogDir)) return;
-  for (const agent of required) {
-    const installed = join3(".claude/agents", `${agent}.md`);
-    const catalogPath = join3(catalogDir, `${agent}.md`);
+  const expected = new Set(
+    Array.isArray(tier2Selection) ? tier2Selection : []
+  );
+  for (const agent of resolveShapeAgents(config.shape)) {
+    expected.add(agent);
+  }
+  if (expected.size === 0) return;
+  const tier2Dir = join3(CATALOG_ROOT, "agents", "tier2");
+  if (!existsSync6(tier2Dir)) return;
+  for (const name of expected) {
+    const catalogPath = join3(tier2Dir, `${name}.md`);
+    const installedPath = join3(".claude/agents", `${name}.md`);
     if (!existsSync6(catalogPath)) continue;
-    if (!existsSync6(installed)) {
-      missing.push(installed);
+    if (!existsSync6(installedPath)) {
+      missing.push(`agents/${name}.md`);
       continue;
     }
-    if (readFileSync6(catalogPath, "utf8") !== readFileSync6(installed, "utf8")) {
-      drifted.push(installed);
+    if (readFileSync6(catalogPath, "utf8") !== readFileSync6(installedPath, "utf8")) {
+      drifted.push(`agents/${name}.md`);
     }
   }
 }
-function extractRegion(content, begin, end) {
-  const bi = content.indexOf(begin);
-  const ei = content.indexOf(end);
-  if (bi === -1 || ei === -1) return "";
-  return content.slice(bi + begin.length, ei).trim();
-}
 function checkCatalogDir(catalogSubdir, installedDir, missing, drifted, extensions = [".md"]) {
   const catalogDir = join3(CATALOG_ROOT, catalogSubdir);
   if (!existsSync6(catalogDir)) return;
@@ -1817,30 +2031,13 @@ function checkCatalogDir(catalogSubdir, installedDir, missing, drifted, extensio
     }
   }
 }
-var CORE_AGENTS, SHAPE_AGENTS;
-var init_diff = __esm({
+var init_diff2 = __esm({
   "src/commands/diff.ts"() {
     "use strict";
     init_kleur();
     init_readConfig();
     init_catalog();
-    CORE_AGENTS = [
-      "orchestrator",
-      "planner",
-      "researcher",
-      "implementer",
-      "reviewer",
-      "tester",
-      "security-auditor",
-      "devops"
-    ];
-    SHAPE_AGENTS = {
-      web: ["frontend"],
-      fullstack: ["frontend", "backend"],
-      backend: ["backend"],
-      mobile: ["mobile"],
-      library: ["backend"]
-    };
+    init_shape_agents();
   }
 });
 
@@ -1855,7 +2052,7 @@ async function runUpdate(argv) {
     v2.error(".aikitrc.json not found. Run `aikit` to initialise.");
     process.exit(1);
   }
-  const { runDiff: runDiff2 } = await Promise.resolve().then(() => (init_diff(), diff_exports));
+  const { runDiff: runDiff2 } = await Promise.resolve().then(() => (init_diff2(), diff_exports));
   await runDiff2({ ...argv, "dry-run": true });
   if (argv.yes) {
     const { runSync: runSync3 } = await Promise.resolve().then(() => (init_sync(), sync_exports));
@@ -1951,7 +2148,22 @@ function findCatalogItem(name) {
       }
     }
   }
-  for (const type of ["agent", "hook"]) {
+  for (const tier of ["tier1", "tier2"]) {
+    const dir = join4(CATALOG_ROOT, "agents", tier);
+    if (existsSync7(dir)) {
+      const candidate = join4(dir, `${name}.md`);
+      if (existsSync7(candidate)) {
+        return {
+          type: "agent",
+          name,
+          srcFile: candidate,
+          destFile: join4(".claude/agents", `${name}.md`),
+          destDir: ".claude/agents"
+        };
+      }
+    }
+  }
+  for (const type of ["hook"]) {
     const spec = ITEM_DIRS[type];
     const catalogDir = join4(CATALOG_ROOT, spec.catalog);
     if (!existsSync7(catalogDir)) continue;
@@ -1981,6 +2193,26 @@ function updateConfigForAddition(configPath, item) {
       updated = { ...config, shape: [...config.shape, shape] };
       message = `Added "${shape}" to .aikitrc.json shape (so sync re-installs ${item.name})`;
     }
+    const agentTier = detectAgentTier(item.name);
+    if (agentTier === "tier2" && !shape) {
+      const currentAgents = config.agents ?? { tier1: "all", tier2: "all", tier3: [] };
+      const tier2 = currentAgents.tier2;
+      if (tier2 !== "all" && !tier2.includes(item.name)) {
+        updated = {
+          ...updated ?? config,
+          agents: { ...currentAgents, tier2: [...tier2, item.name] }
+        };
+        message = `Added "${item.name}" to .aikitrc.json agents.tier2`;
+      }
+    }
+    if (agentTier === "tier3" && !(config.agents?.tier3 ?? []).includes(item.name)) {
+      const currentAgents = config.agents ?? { tier1: "all", tier2: "all", tier3: [] };
+      updated = {
+        ...updated ?? config,
+        agents: { ...currentAgents, tier3: [...currentAgents.tier3, item.name] }
+      };
+      message = `Added "${item.name}" to .aikitrc.json agents.tier3`;
+    }
   } else if (item.type === "skill") {
     const skillTier = detectSkillTier(item.name);
     if (skillTier === "tier3" && !config.skills.tier3.includes(item.name)) {
@@ -2013,9 +2245,17 @@ function detectSkillTier(name) {
   }
   return "tier3";
 }
+function detectAgentTier(name) {
+  for (const tier of ["tier1", "tier2"]) {
+    if (existsSync7(join4(CATALOG_ROOT, "agents", tier, `${name}.md`))) {
+      return tier;
+    }
+  }
+  return "tier3";
+}
 function listAllCatalogItems() {
   const items = [];
-  for (const subdir of ["skills/tier1", "skills/tier2", "agents", "hooks"]) {
+  for (const subdir of ["skills/tier1", "skills/tier2", "agents/tier1", "agents/tier2", "hooks"]) {
     const dir = join4(CATALOG_ROOT, subdir);
     if (existsSync7(dir)) {
       readdirSync3(dir).filter((f2) => f2.endsWith(".md") || f2.endsWith(".sh")).forEach((f2) => items.push(f2.replace(/\.(md|sh)$/, "")));
@@ -2033,7 +2273,7 @@ var init_add = __esm({
     init_readConfig();
     ITEM_DIRS = {
       skill: { catalog: "skills/tier1", dest: ".claude/skills", ext: [".md"] },
-      agent: { catalog: "agents", dest: ".claude/agents", ext: [".md"] },
+      agent: { catalog: "agents/tier1", dest: ".claude/agents", ext: [".md"] },
       hook: { catalog: "hooks", dest: ".claude/hooks", ext: [".sh"] }
     };
     AGENT_TO_SHAPE = {
@@ -2055,8 +2295,9 @@ async function runList(_argv) {
   const sections = [
     { label: "Skills \u2014 Tier 1", items: listCategory("skills/tier1", ".claude/skills") },
     { label: "Skills \u2014 Tier 2", items: listCategory("skills/tier2", ".claude/skills") },
+    { label: "Agents \u2014 Tier 1", items: listCategory("agents/tier1", ".claude/agents") },
+    { label: "Agents \u2014 Tier 2", items: listCategory("agents/tier2", ".claude/agents") },
     { label: "Slash commands", items: listCategory("commands", ".claude/commands") },
-    { label: "Agents", items: listCategory("agents", ".claude/agents") },
     { label: "Hooks", items: listCategory("hooks", ".claude/hooks", [".sh"]) },
     { label: "Path-scoped rules", items: listClaudeRules() }
   ];
@@ -3136,7 +3377,7 @@ function isInteractive() {
 }
 
 // src/cli.ts
-var VERSION = "0.5.0";
+var VERSION = "0.7.1";
 var HELP = `
 haac-aikit \u2014 the batteries-included AI-agentic-coding kit
 
@@ -3217,7 +3458,7 @@ async function main() {
       break;
     }
     case "diff": {
-      const { runDiff: runDiff2 } = await Promise.resolve().then(() => (init_diff(), diff_exports));
+      const { runDiff: runDiff2 } = await Promise.resolve().then(() => (init_diff2(), diff_exports));
       await runDiff2(argv);
       break;
     }