@kaddo/cli 2.8.0 → 3.1.0

package/dist/index.js

@@ -79,7 +79,7 @@ async function multiselect2(opts) {
 
 // src/commands/init.ts
 var KADDO_DIR = ".kaddo";
-var ARCH_DIR = "architecture";
+var ARCH_DIR = "knowledge";
 function inferProjectName(dir) {
   const pkgPath = join(dir, "package.json");
   if (exists(pkgPath)) {
@@ -217,13 +217,13 @@ async function runInit() {
   };
   const kaddoConfigPath = join(dir, KADDO_DIR, "config.yml");
   writeFile(kaddoConfigPath, buildConfig(meta));
-  ensureDir(join(dir, ARCH_DIR, "work-items"));
+  ensureDir(join(dir, ARCH_DIR, "delivery", "work-items"));
   writeFile(join(dir, ARCH_DIR, "knowledge.md"), buildKnowledge(projectName.trim()));
-  writeFile(join(dir, ARCH_DIR, "roadmap.md"), buildRoadmap(projectName.trim()));
+  writeFile(join(dir, ARCH_DIR, "delivery", "roadmap.md"), buildRoadmap(projectName.trim()));
   log2.success("Created .kaddo/config.yml");
-  log2.success("Created architecture/knowledge.md");
-  log2.success("Created architecture/roadmap.md");
-  log2.success("Created architecture/work-items/");
+  log2.success("Created knowledge/knowledge.md");
+  log2.success("Created knowledge/delivery/roadmap.md");
+  log2.success("Created knowledge/delivery/work-items/");
   log2.info("Next: run `kaddo scan` to detect your stack.");
   outro2("Kaddo initialized.");
 }
@@ -566,8 +566,8 @@ function loadConfig(dir) {
   const parsed = configSchema.safeParse(raw ?? {});
   if (!parsed.success) {
     const issues = parsed.error.issues.map((i) => {
-      const path6 = i.path.join(".");
-      return path6 ? `  - ${path6}: ${i.message}` : `  - ${i.message}`;
+      const path5 = i.path.join(".");
+      return path5 ? `  - ${path5}: ${i.message}` : `  - ${i.message}`;
     }).join("\n");
     throw new ConfigError(`Invalid .kaddo/config.yml:
 ${issues}`);
@@ -669,20 +669,20 @@ async function writeBaselineArtifacts(dir, result) {
   const scanJsonPath = join(dir, ".kaddo", "scan.json");
   writeFile(scanJsonPath, serializeBaseline(baseline));
   log2.success("Wrote .kaddo/scan.json");
-  const inventoryPath = join(dir, "architecture", "inventory.md");
+  const inventoryPath = join(dir, "knowledge", "inventory.md");
   const inventoryExists = exists(inventoryPath);
   let writeInventory = true;
   if (inventoryExists) {
     writeInventory = await confirm2({
-      message: "architecture/inventory.md already exists. Overwrite it?",
+      message: "knowledge/inventory.md already exists. Overwrite it?",
       initialValue: true
     });
   }
   if (writeInventory) {
     writeFile(inventoryPath, renderInventory(baseline));
-    log2.success(`${inventoryExists ? "Updated" : "Wrote"} architecture/inventory.md`);
+    log2.success(`${inventoryExists ? "Updated" : "Wrote"} knowledge/inventory.md`);
   } else {
-    log2.info("Kept existing architecture/inventory.md.");
+    log2.info("Kept existing knowledge/inventory.md.");
   }
 }
 function printStateAwareNextStep(dir) {
@@ -895,10 +895,10 @@ var adrModule = {
   name: "adr",
   description: "Architectural Decision Records \u2014 document decisions when risk justifies it",
   configKey: "module_adr",
-  dirs: ["architecture/decisions"],
+  dirs: ["knowledge/tech/decisions"],
   files: [
     {
-      path: "architecture/decisions/.gitkeep",
+      path: "knowledge/tech/decisions/.gitkeep",
       content: ""
     }
   ],
@@ -956,10 +956,10 @@ var incidentModule = {
   name: "incident",
   description: "Incident records \u2014 document incidents, learnings, and preventive actions",
   configKey: "module_incident",
-  dirs: ["architecture/incidents"],
+  dirs: ["knowledge/incidents"],
   files: [
     {
-      path: "architecture/incidents/.gitkeep",
+      path: "knowledge/incidents/.gitkeep",
       content: ""
     }
   ],
@@ -1018,10 +1018,10 @@ var rfcModule = {
   name: "rfc",
   description: "Request for Comments \u2014 explore relevant changes before building them",
   configKey: "module_rfc",
-  dirs: ["architecture/rfcs"],
+  dirs: ["knowledge/rfcs"],
   files: [
     {
-      path: "architecture/rfcs/.gitkeep",
+      path: "knowledge/rfcs/.gitkeep",
       content: ""
     }
   ],
@@ -1071,10 +1071,10 @@ var migrationModule = {
   name: "migration",
   description: "Migration records \u2014 data, infra, or technology changes with more rigor",
   configKey: "module_migration",
-  dirs: ["architecture/migrations"],
+  dirs: ["knowledge/migrations"],
   files: [
     {
-      path: "architecture/migrations/.gitkeep",
+      path: "knowledge/migrations/.gitkeep",
       content: ""
     }
   ],
@@ -1132,10 +1132,10 @@ var legacyModule = {
   name: "legacy",
   description: "Legacy records \u2014 document systems with technical debt before modifying them",
   configKey: "module_legacy",
-  dirs: ["architecture/legacy"],
+  dirs: ["knowledge/legacy"],
   files: [
     {
-      path: "architecture/legacy/.gitkeep",
+      path: "knowledge/legacy/.gitkeep",
       content: ""
     }
   ],
@@ -1185,10 +1185,10 @@ var contractsModule = {
   name: "contracts",
   description: "API, event, and integration contracts \u2014 document shared interfaces before changing them",
   configKey: "module_contracts",
-  dirs: ["architecture/contracts"],
+  dirs: ["knowledge/contracts"],
   files: [
     {
-      path: "architecture/contracts/.gitkeep",
+      path: "knowledge/contracts/.gitkeep",
       content: ""
     }
   ],
@@ -1247,10 +1247,10 @@ var capabilitiesModule = {
   name: "capabilities",
   description: "Product capabilities \u2014 map what the product can do and link it to domains and decisions",
   configKey: "module_capabilities",
-  dirs: ["architecture/capabilities"],
+  dirs: ["knowledge/product/capabilities"],
   files: [
     {
-      path: "architecture/capabilities/.gitkeep",
+      path: "knowledge/product/capabilities/.gitkeep",
       content: ""
     }
   ],
@@ -1301,10 +1301,10 @@ var guardAdvancedModule = {
   name: "guard-advanced",
   description: "Advanced guard rules \u2014 CI blocking, critical artifact protection, domain-level thresholds",
   configKey: "module_guard_advanced",
-  dirs: ["architecture/guard-rules"],
+  dirs: ["knowledge/guard-rules"],
   files: [
     {
-      path: "architecture/guard-rules/rules.yml",
+      path: "knowledge/guard-rules/rules.yml",
       content: [
         "# Kaddo Guard Advanced \u2014 rules configuration",
         "# Uncomment and configure the rules you want to enforce.",
@@ -1405,7 +1405,7 @@ Optionally provide: README, existing docs, product notes, screenshots, API docum
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/capabilities.md\`.
+A Markdown artifact intended to be saved as \`knowledge/product/capabilities.md\`.
 
 ## Instructions
 
@@ -1472,7 +1472,7 @@ Generated from Kaddo Context Pack.
 
 ## Where to Save the Result
 
-Save the output as \`architecture/capabilities.md\`.
+Save the output as \`knowledge/product/capabilities.md\`.
 
 ## Quality Checklist
 
@@ -1507,9 +1507,9 @@ Optionally provide: existing diagrams, infra config, README, dependency manifest
 
 Markdown artifacts intended to be saved as:
 
-- \`architecture/current-state.md\`
-- \`architecture/architecture-notes.md\`
-- \`architecture/decision-candidates.md\`
+- \`knowledge/tech/current-state.md\`
+- \`knowledge/tech/architecture-notes.md\`
+- \`knowledge/tech/decision-candidates.md\`
 
 ## Instructions
 
@@ -1555,9 +1555,9 @@ Generated from Kaddo Context Pack.
 
 ## Where to Save the Result
 
-Save the architecture overview as \`architecture/current-state.md\`, supporting notes as
-\`architecture/architecture-notes.md\`, and decision candidates as
-\`architecture/decision-candidates.md\`.
+Save the architecture overview as \`knowledge/tech/current-state.md\`, supporting notes as
+\`knowledge/tech/architecture-notes.md\`, and decision candidates as
+\`knowledge/tech/decision-candidates.md\`.
 
 ## Quality Checklist
 
@@ -1589,17 +1589,17 @@ Provide \`.kaddo/context-pack.md\` as the primary input.
 Optionally provide (use whatever is available; mark anything missing as an assumption or
 open question):
 
-- \`architecture/capabilities.md\`
-- \`architecture/current-state.md\`
-- \`architecture/legacy/risks.md\`
-- \`architecture/legacy/unknowns.md\`
-- \`architecture/decision-candidates.md\`
-- \`architecture/knowledge.md\`
+- \`knowledge/product/capabilities.md\`
+- \`knowledge/tech/current-state.md\`
+- \`knowledge/legacy/risks.md\`
+- \`knowledge/legacy/unknowns.md\`
+- \`knowledge/tech/decision-candidates.md\`
+- \`knowledge/knowledge.md\`
 - business priorities
 
 ## Expected Output
 
-A single Markdown artifact intended to be saved as \`architecture/roadmap.md\`.
+A single Markdown artifact intended to be saved as \`knowledge/delivery/roadmap.md\`.
 
 This roadmap is the bridge between understanding and execution. It must be structured enough
 that a future \`kaddo create --from roadmap\` command can read its candidate work items.
@@ -1706,7 +1706,7 @@ human review \u2014 not final commitments.
 
 ## Where to Save the Result
 
-Save the output as \`architecture/roadmap.md\`.
+Save the output as \`knowledge/delivery/roadmap.md\`.
 
 ## Quality Checklist
 
@@ -1744,9 +1744,9 @@ Optionally provide: incident history, known pain points, dependency manifests.
 
 Markdown artifacts intended to be saved as:
 
-- \`architecture/legacy/risks.md\`
-- \`architecture/legacy/unknowns.md\`
-- \`architecture/legacy/modernization-candidates.md\`
+- \`knowledge/legacy/risks.md\`
+- \`knowledge/legacy/unknowns.md\`
+- \`knowledge/legacy/modernization-candidates.md\`
 
 ## Instructions
 
@@ -1796,9 +1796,9 @@ Generated from Kaddo Context Pack.
 
 ## Where to Save the Result
 
-Save risks as \`architecture/legacy/risks.md\`, unknowns as
-\`architecture/legacy/unknowns.md\`, and modernization candidates as
-\`architecture/legacy/modernization-candidates.md\`.
+Save risks as \`knowledge/legacy/risks.md\`, unknowns as
+\`knowledge/legacy/unknowns.md\`, and modernization candidates as
+\`knowledge/legacy/modernization-candidates.md\`.
 
 ## Quality Checklist
 
@@ -1826,11 +1826,11 @@ to capture decisions that are implicit in the system.
 
 Provide \`.kaddo/context-pack.md\` as the primary input.
 
-Optionally provide: \`architecture/current-state.md\`, \`architecture/architecture-notes.md\`.
+Optionally provide: \`knowledge/tech/current-state.md\`, \`knowledge/tech/architecture-notes.md\`.
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/decision-candidates.md\`.
+A Markdown artifact intended to be saved as \`knowledge/tech/decision-candidates.md\`.
 
 ## Instructions
 
@@ -1876,7 +1876,7 @@ Generated from Kaddo Context Pack.
 
 ## Where to Save the Result
 
-Save the output as \`architecture/decision-candidates.md\`.
+Save the output as \`knowledge/tech/decision-candidates.md\`.
 
 ## Quality Checklist
 
@@ -1897,7 +1897,7 @@ Work Item actionable for a human.
 
 ## When to Use
 
-Use this agent after a roadmap exists (\`architecture/roadmap.md\`) or when an existing Work
+Use this agent after a roadmap exists (\`knowledge/delivery/roadmap.md\`) or when an existing Work
 Item is vague, too large, or missing acceptance criteria.
 
 ## Input Required
@@ -1907,7 +1907,7 @@ existing Work Item file to refine.
 
 ## Expected Output
 
-A refined Work Item intended to be saved as \`architecture/work-items/*.md\`.
+A refined Work Item intended to be saved as \`knowledge/delivery/work-items/*.md\`.
 
 ## Instructions
 
@@ -1948,7 +1948,7 @@ A refined Work Item intended to be saved as \`architecture/work-items/*.md\`.
 
 ## Where to Save the Result
 
-Save the output as a file under \`architecture/work-items/\`.
+Save the output as a file under \`knowledge/delivery/work-items/\`.
 
 ## Quality Checklist
 
@@ -1979,7 +1979,7 @@ structure (from \`.kaddo/config.yml\`) are especially relevant.
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/git-strategy.md\`.
+A Markdown artifact intended to be saved as \`knowledge/tech/git-strategy.md\`.
 
 ## Instructions
 
@@ -2019,7 +2019,7 @@ GitHub Flow + Conventional Commits + SemVer
 
 ## Where to Save the Result
 
-Save the output as \`architecture/git-strategy.md\`. Optionally record machine config in
+Save the output as \`knowledge/tech/git-strategy.md\`. Optionally record machine config in
 \`.kaddo/git.yml\`.
 
 ## Quality Checklist
@@ -2051,8 +2051,8 @@ module's \`module-design.md\` if it exists.
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/security.md\` or
-\`architecture/modules/<module-name>/security.md\`.
+A Markdown artifact intended to be saved as \`knowledge/tech/security.md\` or
+\`knowledge/tech/modules/<module-name>/security.md\`.
 
 ## Instructions
 
@@ -2090,8 +2090,8 @@ A Markdown artifact intended to be saved as \`architecture/security.md\` or
 
 ## Where to Save the Result
 
-Save as \`architecture/security.md\` (global) or
-\`architecture/modules/<module-name>/security.md\` (per module).
+Save as \`knowledge/tech/security.md\` (global) or
+\`knowledge/tech/modules/<module-name>/security.md\` (per module).
 
 ## Quality Checklist
 
@@ -2119,8 +2119,8 @@ Provide \`.kaddo/context-pack.md\` as the primary input.
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/standards.md\` or
-\`architecture/modules/<module-name>/standards.md\`.
+A Markdown artifact intended to be saved as \`knowledge/tech/standards.md\` or
+\`knowledge/tech/modules/<module-name>/standards.md\`.
 
 ## Instructions
 
@@ -2152,8 +2152,8 @@ A Markdown artifact intended to be saved as \`architecture/standards.md\` or
 
 ## Where to Save the Result
 
-Save as \`architecture/standards.md\` (global) or
-\`architecture/modules/<module-name>/standards.md\` (per module).
+Save as \`knowledge/tech/standards.md\` (global) or
+\`knowledge/tech/modules/<module-name>/standards.md\` (per module).
 
 ## Quality Checklist
 
@@ -2183,8 +2183,8 @@ especially relevant.
 
 ## Expected Output
 
-A Markdown artifact intended to be saved as \`architecture/stack.md\` or
-\`architecture/modules/<module-name>/stack.md\`.
+A Markdown artifact intended to be saved as \`knowledge/tech/stack.md\` or
+\`knowledge/tech/modules/<module-name>/stack.md\`.
 
 ## Instructions
 
@@ -2220,8 +2220,8 @@ A Markdown artifact intended to be saved as \`architecture/stack.md\` or
 
 ## Where to Save the Result
 
-Save as \`architecture/stack.md\` (global) or
-\`architecture/modules/<module-name>/stack.md\` (per module).
+Save as \`knowledge/tech/stack.md\` (global) or
+\`knowledge/tech/modules/<module-name>/stack.md\` (per module).
 
 ## Quality Checklist
 
@@ -2242,7 +2242,7 @@ mark assumptions.
 ## When to Use
 
 Use this agent after \`kaddo modules map\`, to fill in the generated
-\`architecture/modules/<module-name>/module-design.md\`.
+\`knowledge/tech/modules/<module-name>/module-design.md\`.
 
 ## Input Required
 
@@ -2252,7 +2252,7 @@ Provide \`.kaddo/context-pack.md\` as the primary input, plus the module entry i
 ## Expected Output
 
 A Markdown artifact intended to be saved as
-\`architecture/modules/<module-name>/module-design.md\`.
+\`knowledge/tech/modules/<module-name>/module-design.md\`.
 
 ## Instructions
 
@@ -2295,7 +2295,7 @@ A Markdown artifact intended to be saved as
 
 ## Where to Save the Result
 
-Save as \`architecture/modules/<module-name>/module-design.md\`.
+Save as \`knowledge/tech/modules/<module-name>/module-design.md\`.
 
 ## Quality Checklist
 
@@ -2315,7 +2315,7 @@ for missing information and mark unknowns.
 ## When to Use
 
 Use this agent after \`kaddo bootstrap\`, when refining the artifacts under
-\`architecture/business/\`.
+\`knowledge/business/\`.
 
 ## Input Required
 
@@ -2324,7 +2324,7 @@ idea: problem, intended users, value, constraints.
 
 ## Expected Output
 
-Refined Markdown for \`architecture/business/*.md\`: product brief, problem statement,
+Refined Markdown for \`knowledge/business/*.md\`: product brief, problem statement,
 users/personas, value proposition, business rules, constraints and glossary.
 
 ## Instructions
@@ -2346,12 +2346,12 @@ users/personas, value proposition, business rules, constraints and glossary.
 
 ## Output Format
 
-One Markdown section per \`architecture/business/*.md\` artifact, keeping the template
+One Markdown section per \`knowledge/business/*.md\` artifact, keeping the template
 headings.
 
 ## Where to Save the Result
 
-Save into \`architecture/business/\` (product-brief.md, problem.md, users.md,
+Save into \`knowledge/business/\` (product-brief.md, problem.md, users.md,
 value-proposition.md, business-rules.md, constraints.md, glossary.md).
 
 ## Quality Checklist
@@ -2375,12 +2375,12 @@ Use this agent after \`kaddo bootstrap\` and after the business artifacts are dr
 
 ## Input Required
 
-Provide \`.kaddo/context-pack.md\` and the \`architecture/business/*.md\` artifacts.
+Provide \`.kaddo/context-pack.md\` and the \`knowledge/business/*.md\` artifacts.
 
 ## Expected Output
 
-Refined Markdown for \`architecture/bootstrap-summary.md\`, \`architecture/capabilities.md\`,
-\`architecture/quality-attributes.md\` and \`architecture/roadmap.md\`, plus candidate Work
+Refined Markdown for \`knowledge/bootstrap-summary.md\`, \`knowledge/product/capabilities.md\`,
+\`knowledge/tech/quality-attributes.md\` and \`knowledge/delivery/roadmap.md\`, plus candidate Work
 Items.
 
 ## Instructions
@@ -2405,8 +2405,8 @@ templates.
 
 ## Where to Save the Result
 
-Save to \`architecture/bootstrap-summary.md\`, \`architecture/capabilities.md\`,
-\`architecture/quality-attributes.md\` and \`architecture/roadmap.md\`.
+Save to \`knowledge/bootstrap-summary.md\`, \`knowledge/product/capabilities.md\`,
+\`knowledge/tech/quality-attributes.md\` and \`knowledge/delivery/roadmap.md\`.
 
 ## Quality Checklist
 
@@ -2426,17 +2426,17 @@ architecture and the candidate stack. You do **not** write production code.
 ## When to Use
 
 Use this agent after the business and initial architecture artifacts exist, when refining
-\`architecture/codebase-foundation.md\`.
+\`knowledge/tech/codebase.md\`.
 
 ## Input Required
 
-Provide \`.kaddo/context-pack.md\`, \`architecture/business/*.md\`,
-\`architecture/capabilities.md\`, \`architecture/quality-attributes.md\` and
-\`architecture/stack.md\`.
+Provide \`.kaddo/context-pack.md\`, \`knowledge/business/*.md\`,
+\`knowledge/product/capabilities.md\`, \`knowledge/tech/quality-attributes.md\` and
+\`knowledge/tech/stack.md\`.
 
 ## Expected Output
 
-Refined Markdown for \`architecture/codebase-foundation.md\`.
+Refined Markdown for \`knowledge/tech/codebase.md\`.
 
 ## Instructions
 
@@ -2460,7 +2460,7 @@ Markdown matching the codebase-foundation template headings.
 
 ## Where to Save the Result
 
-Save as \`architecture/codebase-foundation.md\`.
+Save as \`knowledge/tech/codebase.md\`.
 
 ## Quality Checklist
 
@@ -2484,12 +2484,12 @@ var AGENT_PROMPTS = [
   // Bootstrap agents (new projects)
   { fileName: "business-agent.md", content: BUSINESS_AGENT },
   { fileName: "bootstrap-agent.md", content: BOOTSTRAP_AGENT },
-  { fileName: "codebase-foundation-agent.md", content: CODEBASE_FOUNDATION_AGENT }
+  { fileName: "codebase-agent.md", content: CODEBASE_FOUNDATION_AGENT }
 ];
 
 // src/modules/agents.ts
 var agentReadme = {
-  path: "architecture/agents/README.md",
+  path: "knowledge/agents/README.md",
   content: [
     "# Agents",
     "",
@@ -2507,7 +2507,7 @@ var agentReadme = {
     "",
     "## Recommended order by project state",
     "",
-    "- **new** \u2192 business-agent \u2192 bootstrap-agent \u2192 codebase-foundation-agent \u2192 roadmap-agent",
+    "- **new** \u2192 business-agent \u2192 bootstrap-agent \u2192 codebase-agent \u2192 roadmap-agent",
     "- **pre-ai** \u2192 capability-agent \u2192 architecture-agent \u2192 roadmap-agent",
     "- **legacy** \u2192 legacy-agent \u2192 architecture-agent \u2192 capability-agent \u2192 roadmap-agent",
     "",
@@ -2517,7 +2517,7 @@ var agentReadme = {
     "",
     "- `business-agent.md` \u2014 turn an idea into a business definition.",
     "- `bootstrap-agent.md` \u2014 go from business to capabilities, quality attributes and roadmap.",
-    "- `codebase-foundation-agent.md` \u2014 propose a codebase foundation (no code).",
+    "- `codebase-agent.md` \u2014 propose a codebase foundation (no code).",
     "",
     "### Understanding agents",
     "",
@@ -2538,14 +2538,14 @@ var agentReadme = {
   ].join("\n")
 };
 var agentFiles = AGENT_PROMPTS.map((a) => ({
-  path: `architecture/agents/${a.fileName}`,
+  path: `knowledge/agents/${a.fileName}`,
   content: a.content
 }));
 var agentsModule = {
   name: "agents",
   description: "Agent prompt packs \u2014 Markdown prompts to turn context packs into knowledge in your LLM",
   configKey: "module_agents",
-  dirs: ["architecture/agents"],
+  dirs: ["knowledge/agents"],
   files: [agentReadme, ...agentFiles],
   workItemTypes: [
     {
@@ -2594,14 +2594,14 @@ var skillsModule = {
   name: "skills",
   description: "Reusable skills \u2014 capabilities shared across agents, teams, or projects",
   configKey: "module_skills",
-  dirs: ["architecture/skills"],
+  dirs: ["knowledge/skills"],
   files: [
     {
-      path: "architecture/skills/.gitkeep",
+      path: "knowledge/skills/.gitkeep",
       content: ""
     },
     {
-      path: "architecture/skills/README.md",
+      path: "knowledge/skills/README.md",
       content: [
         "# Skills",
         "",
@@ -2814,33 +2814,33 @@ var standardsModule = {
   name: "standards",
   description: "Global standards starter \u2014 lightweight coding, docs and testing conventions",
   configKey: "module_standards",
-  dirs: ["architecture"],
-  files: [{ path: "architecture/standards.md", content: standardsTemplate }],
+  dirs: ["knowledge"],
+  files: [{ path: "knowledge/tech/standards.md", content: standardsTemplate }],
   workItemTypes: []
 };
 var securityModule = {
   name: "security",
   description: "Global security starter \u2014 document security considerations (no scanning)",
   configKey: "module_security",
-  dirs: ["architecture"],
-  files: [{ path: "architecture/security.md", content: securityTemplate }],
+  dirs: ["knowledge"],
+  files: [{ path: "knowledge/tech/security.md", content: securityTemplate }],
   workItemTypes: []
 };
 var stackModule = {
   name: "stack",
   description: "Global stack starter \u2014 document technologies and stack decisions",
   configKey: "module_stack",
-  dirs: ["architecture"],
-  files: [{ path: "architecture/stack.md", content: stackTemplate }],
+  dirs: ["knowledge"],
+  files: [{ path: "knowledge/tech/stack.md", content: stackTemplate }],
   workItemTypes: []
 };
 var gitStrategyModule = {
   name: "git-strategy",
   description: "Git strategy starter \u2014 default GitHub Flow + Conventional Commits + SemVer",
   configKey: "module_git_strategy",
-  dirs: ["architecture"],
+  dirs: ["knowledge"],
   files: [
-    { path: "architecture/git-strategy.md", content: gitStrategyTemplate },
+    { path: "knowledge/tech/git-strategy.md", content: gitStrategyTemplate },
     { path: ".kaddo/git.yml", content: gitYml }
   ],
   workItemTypes: []
@@ -2996,8 +2996,8 @@ function parseRoadmapCandidates(markdown) {
 }
 
 // src/commands/create.ts
-var WORK_ITEMS_DIR = "architecture/work-items";
-var ROADMAP_PATH = "architecture/roadmap.md";
+var WORK_ITEMS_DIR = "knowledge/delivery/work-items";
+var ROADMAP_PATH = "knowledge/delivery/roadmap.md";
 function printStateGuidance(dir) {
   let config;
   try {
@@ -3518,9 +3518,8 @@ function readArtifacts(archDir) {
 
 // src/core/diff-analysis.ts
 import { minimatch } from "minimatch";
-import path3 from "path";
 function normalizePath(p2) {
-  return p2.split(path3.sep).join("/");
+  return p2.replace(/\\/g, "/");
 }
 function fileMatchesGlob(file, glob) {
   return minimatch(normalizePath(file), glob, { matchBase: false, dot: true });
@@ -3578,10 +3577,10 @@ function analyzeGuard(touchedFiles, artifacts, silentWithoutOwnership) {
 import { parse as parseYaml4, stringify as stringifyYaml2 } from "yaml";
 var IGNORE_FILE = ".kaddo/ignores.yml";
 function loadIgnores(dir) {
-  const path6 = join(dir, IGNORE_FILE);
-  if (!exists(path6)) return [];
+  const path5 = join(dir, IGNORE_FILE);
+  if (!exists(path5)) return [];
   try {
-    const raw = readFile(path6);
+    const raw = readFile(path5);
     const parsed = parseYaml4(raw);
     return Array.isArray(parsed) ? parsed : [];
   } catch {
@@ -3589,7 +3588,7 @@ function loadIgnores(dir) {
   }
 }
 function saveIgnore(dir, entry) {
-  const path6 = join(dir, IGNORE_FILE);
+  const path5 = join(dir, IGNORE_FILE);
   const existing = loadIgnores(dir);
   const idx = existing.findIndex((e) => e.artifact_id === entry.artifact_id);
   if (idx >= 0) {
@@ -3597,17 +3596,17 @@ function saveIgnore(dir, entry) {
   } else {
     existing.push(entry);
   }
-  writeFile(path6, stringifyYaml2(existing));
+  writeFile(path5, stringifyYaml2(existing));
 }
 function isIgnored(ignores, artifactId) {
   return ignores.find((e) => e.artifact_id === artifactId);
 }
 function removeIgnore(dir, artifactId) {
-  const path6 = join(dir, IGNORE_FILE);
+  const path5 = join(dir, IGNORE_FILE);
   const existing = loadIgnores(dir);
   const filtered = existing.filter((e) => e.artifact_id !== artifactId);
   if (filtered.length === existing.length) return false;
-  writeFile(path6, stringifyYaml2(filtered));
+  writeFile(path5, stringifyYaml2(filtered));
   return true;
 }
 
@@ -3618,7 +3617,7 @@ function toStringArray(value) {
   return Array.isArray(value) ? value.map((v) => String(v)).filter(Boolean) : [];
 }
 function moduleArtifactCoverage(dir, id) {
-  const base = join(dir, "architecture", "modules", id);
+  const base = join(dir, "knowledge", "tech", "modules", id);
   return {
     moduleDesign: exists(join(base, "module-design.md")),
     stack: exists(join(base, "stack.md")),
@@ -3629,11 +3628,11 @@ function moduleArtifactCoverage(dir, id) {
   };
 }
 function loadMappedModules(dir) {
-  const path6 = join(dir, DESCRIPTOR_PATH);
-  if (!exists(path6)) return [];
+  const path5 = join(dir, DESCRIPTOR_PATH);
+  if (!exists(path5)) return [];
   let parsed;
   try {
-    parsed = parseYaml5(readFile(path6));
+    parsed = parseYaml5(readFile(path5));
   } catch {
     return [];
   }
@@ -3725,7 +3724,7 @@ async function collectWorkspaceChanges(dir, mode = "head", deps = defaultDeps) {
 }
 
 // src/commands/guard.ts
-import path4 from "path";
+import path3 from "path";
 import { parse as parseYaml7 } from "yaml";
 
 // src/plugins/prisma.ts
@@ -3909,7 +3908,7 @@ function collectMatchedDomains(matchedArtifactDomains) {
 }
 
 // src/commands/guard.ts
-var ARCH_DIR2 = "architecture";
+var ARCH_DIR2 = "knowledge";
 var CONFIG_PATH2 = ".kaddo/config.yml";
 function loadConfig2(dir) {
   const configPath = join(dir, CONFIG_PATH2);
@@ -3929,7 +3928,7 @@ function printHeader(touchedFiles) {
 function artifactLabel(artifact, dir) {
   if (artifact.id) return artifact.id;
   if (artifact.title) return artifact.title;
-  const rel = path4.relative(dir, artifact.filePath).split(path4.sep).join("/");
+  const rel = path3.relative(dir, artifact.filePath).split(path3.sep).join("/");
   return rel || artifact.filePath;
 }
 function printWorkspaceHeader(scan2) {
@@ -4055,7 +4054,7 @@ async function runGuard(opts = {}) {
   }
   const archDir = join(dir, ARCH_DIR2);
   if (!exists(archDir)) {
-    console.log("kaddo guard: no architecture/ directory found. Run `kaddo init` first.");
+    console.log("kaddo guard: no knowledge/ directory found. Run `kaddo init` first.");
     return;
   }
   const artifacts = readArtifacts(archDir);
@@ -4170,8 +4169,66 @@ function runIgnoreRemove(artifactId) {
 import matter2 from "gray-matter";
 import { parse as parseYaml8 } from "yaml";
 
+// src/core/layers.ts
+var KNOWLEDGE = "knowledge";
+var LAYER_SPEC = [
+  {
+    layer: "Business",
+    items: [
+      { name: "problem", path: `${KNOWLEDGE}/business/problem.md` },
+      { name: "users", path: `${KNOWLEDGE}/business/users.md` },
+      { name: "value-proposition", path: `${KNOWLEDGE}/business/value-proposition.md` },
+      { name: "constraints", path: `${KNOWLEDGE}/business/constraints.md` },
+      { name: "business-rules", path: `${KNOWLEDGE}/business/business-rules.md` }
+    ]
+  },
+  {
+    layer: "Product",
+    items: [
+      { name: "product brief", path: `${KNOWLEDGE}/product/product-brief.md` },
+      { name: "capabilities", path: `${KNOWLEDGE}/product/capabilities.md` }
+    ]
+  },
+  {
+    layer: "Tech",
+    items: [
+      { name: "codebase", path: `${KNOWLEDGE}/tech/codebase.md` },
+      { name: "current-state", path: `${KNOWLEDGE}/tech/current-state.md` },
+      { name: "decisions", path: `${KNOWLEDGE}/tech/decisions` }
+    ]
+  },
+  {
+    layer: "Delivery",
+    items: [
+      { name: "roadmap", path: `${KNOWLEDGE}/delivery/roadmap.md` },
+      { name: "work items", path: `${KNOWLEDGE}/delivery/work-items` }
+    ]
+  }
+];
+function knowledgeLayers(dir) {
+  return LAYER_SPEC.map(({ layer, items }) => ({
+    layer,
+    items: items.map((it) => ({ name: it.name, present: exists(join(dir, it.path)) }))
+  }));
+}
+function currentPhase(layers) {
+  for (const { layer, items } of layers) {
+    if (items.some((i) => !i.present)) return layer;
+  }
+  return "Delivery";
+}
+function renderLayersMarkdown(layers) {
+  const lines = [];
+  for (const { layer, items } of layers) {
+    lines.push(`### ${layer}`);
+    for (const it of items) lines.push(`- ${it.present ? "\u2713" : "\u2717"} ${it.name}`);
+    lines.push("");
+  }
+  return lines.join("\n").trimEnd();
+}
+
 // src/core/project-explain.ts
-var ARCH_DIR3 = "architecture";
+var ARCH_DIR3 = "knowledge";
 function first(values) {
   if (Array.isArray(values)) {
     const v = values.find((x) => typeof x === "string" && x);
@@ -4229,9 +4286,9 @@ function buildProjectExplanation(dir) {
     hasInventory: exists(join(dir, ARCH_DIR3, "inventory.md")),
     hasContextPack: exists(join(dir, ".kaddo", "context-pack.md")),
     hasUnderstand: exists(join(dir, ".kaddo", "understand.md")),
-    hasCapabilities: exists(join(dir, ARCH_DIR3, "capabilities.md")),
-    hasArchitecture: exists(join(dir, ARCH_DIR3, "current-state.md")),
-    hasRoadmap: exists(join(dir, ARCH_DIR3, "roadmap.md")),
+    hasCapabilities: exists(join(dir, ARCH_DIR3, "product", "capabilities.md")),
+    hasArchitecture: exists(join(dir, ARCH_DIR3, "tech", "current-state.md")),
+    hasRoadmap: exists(join(dir, ARCH_DIR3, "delivery", "roadmap.md")),
     hasAgents: hasAgents(dir)
   };
   const archDir = join(dir, ARCH_DIR3);
@@ -4265,14 +4322,14 @@ function buildProjectExplanation(dir) {
   const missingKnowledge = [];
   if (!knowledge.hasScan) missingKnowledge.push("Scan baseline (.kaddo/scan.json)");
   if (!knowledge.hasContextPack) missingKnowledge.push("Context pack (.kaddo/context-pack.md)");
-  if (!knowledge.hasInventory) missingKnowledge.push("Inventory (architecture/inventory.md)");
+  if (!knowledge.hasInventory) missingKnowledge.push("Inventory (knowledge/inventory.md)");
   if (!knowledge.hasCapabilities)
-    missingKnowledge.push("Capabilities (architecture/capabilities.md)");
+    missingKnowledge.push("Capabilities (knowledge/product/capabilities.md)");
   if (!knowledge.hasArchitecture)
-    missingKnowledge.push("Architecture baseline (architecture/current-state.md)");
-  if (!knowledge.hasRoadmap) missingKnowledge.push("Roadmap (architecture/roadmap.md)");
-  if (!knowledge.hasAgents) missingKnowledge.push("Agents (architecture/agents/)");
-  if (items.length === 0) missingKnowledge.push("Work items (architecture/work-items/)");
+    missingKnowledge.push("Architecture baseline (knowledge/tech/current-state.md)");
+  if (!knowledge.hasRoadmap) missingKnowledge.push("Roadmap (knowledge/delivery/roadmap.md)");
+  if (!knowledge.hasAgents) missingKnowledge.push("Agents (knowledge/agents/)");
+  if (items.length === 0) missingKnowledge.push("Work items (knowledge/delivery/work-items/)");
   const suggestedNextSteps = [];
   if (!knowledge.hasScan) {
     suggestedNextSteps.push("Run `kaddo scan` to detect the technical stack.");
@@ -4283,13 +4340,13 @@ function buildProjectExplanation(dir) {
     suggestedNextSteps.push("Run `kaddo add agents` to install knowledge agents.");
   }
   if (!knowledge.hasCapabilities) {
-    suggestedNextSteps.push("Use capability-agent to generate architecture/capabilities.md.");
+    suggestedNextSteps.push("Use capability-agent to generate knowledge/product/capabilities.md.");
   }
   if (!knowledge.hasArchitecture) {
-    suggestedNextSteps.push("Use architecture-agent to generate architecture/current-state.md.");
+    suggestedNextSteps.push("Use architecture-agent to generate knowledge/tech/current-state.md.");
   }
   if (!knowledge.hasRoadmap) {
-    suggestedNextSteps.push("Use roadmap-agent to generate architecture/roadmap.md.");
+    suggestedNextSteps.push("Use roadmap-agent to generate knowledge/delivery/roadmap.md.");
   }
   if (items.length === 0) {
     suggestedNextSteps.push("Create your first Work Item with `kaddo create`.");
@@ -4305,6 +4362,7 @@ function buildProjectExplanation(dir) {
     workItems,
     ownership,
     domains,
+    layers: knowledgeLayers(dir),
     mappedModules,
     missingKnowledge,
     suggestedNextSteps
@@ -4323,6 +4381,9 @@ function renderExplanationHuman(exp) {
   lines.push(`- Team: ${exp.project.teamSize}`);
   lines.push(`- Structure: ${exp.project.structure}`);
   lines.push("");
+  lines.push("## Knowledge Layers");
+  lines.push(renderLayersMarkdown(exp.layers));
+  lines.push("");
   if (exp.stack) {
     lines.push("## Detected Stack");
     if (exp.stack.language) lines.push(`- Language: ${exp.stack.language}`);
@@ -4400,7 +4461,7 @@ function renderExplanationAgent(exp) {
 }
 
 // src/commands/explain.ts
-var ARCH_DIR4 = "architecture";
+var ARCH_DIR4 = "knowledge";
 var CONFIG_PATH3 = ".kaddo/config.yml";
 function readKnowledge(dir) {
   const knowledgePath = join(dir, ARCH_DIR4, "knowledge.md");
@@ -4565,7 +4626,7 @@ function runExplain(opts) {
   }
   const archDir = join(dir, ARCH_DIR4);
   if (!exists(archDir)) {
-    console.error("No architecture/ directory found. Run `kaddo init` first.");
+    console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   let artifacts = readArtifacts(archDir);
@@ -4588,7 +4649,7 @@ function runExplain(opts) {
 // src/core/context-pack.ts
 import matter3 from "gray-matter";
 var CONTEXT_PACK_VERSION = "1";
-var ARCH_DIR5 = "architecture";
+var ARCH_DIR5 = "knowledge";
 function readScanJson(dir) {
   const scanPath = join(dir, ".kaddo", "scan.json");
   if (!exists(scanPath)) return null;
@@ -4679,7 +4740,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
   if (!knowledgeSummary) {
     missing.push("No project knowledge summary found yet.");
   }
-  const roadmapSummary = readMarkdownSummary(dir, "roadmap.md") ?? "";
+  const roadmapSummary = readMarkdownSummary(dir, "delivery/roadmap.md") ?? "";
   if (!roadmapSummary) {
     missing.push("No roadmap baseline found.");
   }
@@ -4693,6 +4754,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
   }
   const state = config.project.state;
   const mappedModules = loadMappedModules(dir);
+  const layers = knowledgeLayers(dir);
   return {
     version: CONTEXT_PACK_VERSION,
     generatedAt: now.toISOString(),
@@ -4719,6 +4781,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
       workItems: workItems.map(toContextWorkItem),
       artifacts: workItems.filter((a) => a.codeGlobs.length > 0).map(toContextArtifact)
     },
+    layers,
     mappedModules,
     missing,
     handoff: {
@@ -4752,6 +4815,11 @@ function renderContextPack(pack) {
       `- Structure: ${project.structure}`
     ].join("\n") + "\n"
   );
+  parts.push("## Knowledge Layers\n");
+  parts.push(
+    "Project knowledge is organized in four layers: **Business \u2192 Product \u2192 Tech \u2192 Delivery**.\n"
+  );
+  parts.push(renderLayersMarkdown(pack.layers) + "\n");
   parts.push("## Technical Inventory\n");
   if (scan2.available) {
     const lines = [
@@ -4881,22 +4949,22 @@ function flowForState(state) {
   switch (state) {
     case "new":
       return [
-        { agent: "roadmap-agent.md", output: "architecture/roadmap.md" },
-        { agent: "architecture-agent.md", output: "architecture/current-state.md" }
+        { agent: "roadmap-agent.md", output: "knowledge/delivery/roadmap.md" },
+        { agent: "architecture-agent.md", output: "knowledge/tech/current-state.md" }
       ];
     case "legacy":
       return [
-        { agent: "legacy-agent.md", output: "architecture/legacy/risks.md" },
-        { agent: "architecture-agent.md", output: "architecture/current-state.md" },
-        { agent: "capability-agent.md", output: "architecture/capabilities.md" },
-        { agent: "roadmap-agent.md", output: "architecture/roadmap.md" }
+        { agent: "legacy-agent.md", output: "knowledge/legacy/risks.md" },
+        { agent: "architecture-agent.md", output: "knowledge/tech/current-state.md" },
+        { agent: "capability-agent.md", output: "knowledge/product/capabilities.md" },
+        { agent: "roadmap-agent.md", output: "knowledge/delivery/roadmap.md" }
       ];
     case "pre-ai":
     default:
       return [
-        { agent: "capability-agent.md", output: "architecture/capabilities.md" },
-        { agent: "architecture-agent.md", output: "architecture/current-state.md" },
-        { agent: "roadmap-agent.md", output: "architecture/roadmap.md" }
+        { agent: "capability-agent.md", output: "knowledge/product/capabilities.md" },
+        { agent: "architecture-agent.md", output: "knowledge/tech/current-state.md" },
+        { agent: "roadmap-agent.md", output: "knowledge/delivery/roadmap.md" }
       ];
   }
 }
@@ -4904,11 +4972,11 @@ function buildUnderstandPlan(dir, config) {
   const state = config.project.state;
   const flow = flowForState(state);
   const steps = flow.map((s) => {
-    const installed = exists(join(dir, "architecture", "agents", s.agent));
+    const installed = exists(join(dir, "knowledge", "agents", s.agent));
     return { agent: s.agent, output: s.output, installed };
   });
   const missingAgents = steps.filter((s) => !s.installed).map((s) => s.agent);
-  const agentsInstalled = exists(join(dir, "architecture", "agents")) && missingAgents.length === 0;
+  const agentsInstalled = exists(join(dir, "knowledge", "agents")) && missingAgents.length === 0;
   return {
     project: {
       name: config.project.name,
@@ -4962,7 +5030,7 @@ function renderUnderstand(plan) {
 `);
   parts.push("## Agent Prompts\n");
   parts.push(
-    steps.map((s) => `- \`architecture/agents/${s.agent}\``).join("\n") + "\n"
+    steps.map((s) => `- \`knowledge/agents/${s.agent}\``).join("\n") + "\n"
   );
   parts.push("## Expected Outputs\n");
   parts.push(steps.map((s) => `- \`${s.output}\``).join("\n") + "\n");
@@ -4975,7 +5043,7 @@ function renderUnderstand(plan) {
         "",
         "1. Open your preferred LLM chat (Claude, ChatGPT, Cursor, Copilot, Windsurf\u2026).",
         `2. Paste the context pack: \`${plan.contextPackPath}\``,
-        `3. Paste the agent prompt: \`architecture/agents/${first2.agent}\``,
+        `3. Paste the agent prompt: \`knowledge/agents/${first2.agent}\``,
         `4. Ask the LLM to produce: \`${first2.output}\``,
         `5. Save the result in: \`${first2.output}\``
       ].join("\n") + "\n"
@@ -5014,7 +5082,7 @@ function renderUnderstandTerminal(plan) {
     lines.push(`First step: use ${agentName(first2.agent)}.`);
     lines.push("");
     lines.push(`  Context:         ${plan.contextPackPath}`);
-    lines.push(`  Agent prompt:    architecture/agents/${first2.agent}`);
+    lines.push(`  Agent prompt:    knowledge/agents/${first2.agent}`);
     lines.push(`  Expected output: ${first2.output}`);
     lines.push("");
   }
@@ -5027,6 +5095,69 @@ function renderUnderstandTerminal(plan) {
   return lines.join("\n");
 }
 
+// src/agents/groups.ts
+var AGENT_GROUPS = {
+  business: ["business-agent.md"],
+  product: ["bootstrap-agent.md", "capability-agent.md"],
+  tech: [
+    "architecture-agent.md",
+    "codebase-agent.md",
+    "stack-agent.md",
+    "security-agent.md",
+    "standards-agent.md",
+    "module-design-agent.md",
+    "adr-agent.md"
+  ],
+  delivery: ["roadmap-agent.md", "work-item-agent.md", "git-strategy-agent.md"],
+  utilities: ["legacy-agent.md"]
+};
+var AGENT_GROUP_NAMES = Object.keys(AGENT_GROUPS);
+var RECOMMENDED_BY_STATE = {
+  new: [
+    "business-agent.md",
+    "bootstrap-agent.md",
+    "codebase-agent.md",
+    "roadmap-agent.md",
+    "work-item-agent.md"
+  ],
+  "pre-ai": [
+    "capability-agent.md",
+    "architecture-agent.md",
+    "roadmap-agent.md",
+    "work-item-agent.md"
+  ],
+  legacy: [
+    "legacy-agent.md",
+    "architecture-agent.md",
+    "capability-agent.md",
+    "roadmap-agent.md",
+    "work-item-agent.md"
+  ]
+};
+function recommendedAgents(state) {
+  return RECOMMENDED_BY_STATE[state ?? "pre-ai"] ?? RECOMMENDED_BY_STATE["pre-ai"];
+}
+function selectAgentFiles(opts) {
+  if (opts.all) {
+    const all = AGENT_GROUP_NAMES.flatMap((g) => AGENT_GROUPS[g]);
+    return { files: all, label: "all agents" };
+  }
+  if (opts.group) {
+    const group = opts.group;
+    const files = AGENT_GROUPS[group];
+    if (!files) {
+      throw new Error(
+        `Unknown agent group "${opts.group}". Valid groups: ${AGENT_GROUP_NAMES.join(", ")}.`
+      );
+    }
+    return { files, label: `group: ${group}` };
+  }
+  return {
+    files: recommendedAgents(opts.state),
+    label: `recommended for state: ${opts.state ?? "pre-ai"}`
+  };
+}
+
 // src/commands/understand.ts
 function runUnderstand() {
   const dir = cwd();
@@ -5059,13 +5190,22 @@ function runUnderstand() {
     );
   }
   console.log(renderUnderstandTerminal(plan));
+  const phase = currentPhase(knowledgeLayers(dir));
+  const group = phase.toLowerCase();
+  const groupAgents = (AGENT_GROUPS[group] ?? []).map((a) => a.replace(/\.md$/, ""));
+  if (groupAgents.length > 0) {
+    console.log("");
+    console.log(`Current phase: ${phase}`);
+    console.log("Recommended agents for this phase:");
+    for (const a of groupAgents) console.log(`  - ${a}`);
+  }
   writeFile(join(dir, ".kaddo", "understand.md"), renderUnderstand(plan));
   log2.success("Wrote .kaddo/understand.md");
   outro2("Handoff ready. CLI prepares context \u2014 your LLM creates the understanding.");
 }
 
 // src/core/classifier.ts
-import path5 from "path";
+import path4 from "path";
 var MIGRATION_PATTERNS = [
   /supabase\/migrations\//,
   /prisma\/migrations\//,
@@ -5104,7 +5244,7 @@ var DEP_PATTERNS = [
   /^pom\.xml$/
 ];
 function normalizePath2(p2) {
-  return p2.split(path5.sep).join("/");
+  return p2.split(path4.sep).join("/");
 }
 function matchesAny(file, patterns) {
   const normalized = normalizePath2(file);
@@ -5215,7 +5355,7 @@ function classify(declaredType, declaredLevel, touchedFiles) {
 }
 
 // src/commands/classify.ts
-var ARCH_DIR6 = "architecture";
+var ARCH_DIR6 = "knowledge";
 function findActiveWorkItem(dir) {
   const archDir = join(dir, ARCH_DIR6);
   if (!exists(archDir)) return null;
@@ -5283,7 +5423,7 @@ async function runClassify(opts = {}) {
 
 // src/commands/status.ts
 import { parse as parseYaml9 } from "yaml";
-var ARCH_DIR7 = "architecture";
+var ARCH_DIR7 = "knowledge";
 var CONFIG_PATH4 = ".kaddo/config.yml";
 function loadConfig3(dir) {
   const p2 = join(dir, CONFIG_PATH4);
@@ -5297,7 +5437,7 @@ function loadConfig3(dir) {
 function runStatus() {
   const dir = cwd();
   if (!exists(join(dir, ARCH_DIR7))) {
-    console.error("No architecture/ directory found. Run `kaddo init` first.");
+    console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   const config = loadConfig3(dir);
@@ -5347,8 +5487,8 @@ function runStatus() {
 
 // src/commands/learn.ts
 import matter4 from "gray-matter";
-var ARCH_DIR8 = "architecture";
-var WORK_ITEMS_DIR2 = "architecture/work-items";
+var ARCH_DIR8 = "knowledge";
+var WORK_ITEMS_DIR2 = "knowledge/delivery/work-items";
 function findWorkItemFile(dir, id) {
   const wiDir = join(dir, WORK_ITEMS_DIR2);
   if (!exists(wiDir)) return null;
@@ -5389,7 +5529,7 @@ ${learning.trim()}
 async function runLearn(artifactId) {
   const dir = cwd();
   if (!exists(join(dir, ARCH_DIR8))) {
-    console.error("No architecture/ directory found. Run `kaddo init` first.");
+    console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   intro2("kaddo learn");
@@ -5431,12 +5571,12 @@ async function runLearn(artifactId) {
   updateWorkItemFile(filePath, learning.trim());
   log2.success(`${targetId} marked as done`);
   log2.success(`Learning recorded in ${filePath.replace(dir + "/", "")}`);
-  log2.info("Consider updating architecture/knowledge.md if this changes the current state.");
+  log2.info("Consider updating knowledge/knowledge.md if this changes the current state.");
   outro2("Work item closed.");
 }
 
 // src/commands/history.ts
-var ARCH_DIR9 = "architecture";
+var ARCH_DIR9 = "knowledge";
 function formatRow(a) {
   const id = (a.id || "").padEnd(8);
   const type = a.type.padEnd(18);
@@ -5448,7 +5588,7 @@ function formatRow(a) {
 function runHistory(opts = {}) {
   const dir = cwd();
   if (!exists(join(dir, ARCH_DIR9))) {
-    console.error("No architecture/ directory found. Run `kaddo init` first.");
+    console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   let artifacts = readArtifacts(join(dir, ARCH_DIR9)).filter(
@@ -5493,6 +5633,24 @@ function runHistory(opts = {}) {
 // src/commands/add.ts
 import { parse as parseYaml10, stringify as stringifyYaml3 } from "yaml";
 var CONFIG_PATH5 = ".kaddo/config.yml";
+function readProjectState(dir) {
+  const configPath = join(dir, CONFIG_PATH5);
+  if (!exists(configPath)) return void 0;
+  try {
+    const config = parseYaml10(readFile(configPath));
+    return config.project?.state;
+  } catch {
+    return void 0;
+  }
+}
+function selectAgentModuleFiles(files, opts, state) {
+  const { files: names, label } = selectAgentFiles({ all: opts.all, group: opts.group, state });
+  const wanted = new Set(names);
+  const selected = files.filter(
+    (f) => f.path.endsWith("README.md") || names.some((n) => f.path.endsWith(n)) || wanted.has(f.path)
+  );
+  return { files: selected, label };
+}
 function markModuleInstalled(dir, configKey, moduleName) {
   const configPath = join(dir, CONFIG_PATH5);
   if (!exists(configPath)) return;
@@ -5517,7 +5675,7 @@ function isModuleInstalled(dir, configKey) {
     return false;
   }
 }
-function runAdd(moduleName, dir = cwd()) {
+function runAdd(moduleName, opts = {}, dir = cwd()) {
   if (!moduleName) {
     console.log("");
     console.log("Available modules:");
@@ -5543,9 +5701,20 @@ function runAdd(moduleName, dir = cwd()) {
   for (const d of mod.dirs) {
     ensureDir(join(dir, d));
   }
+  let filesToInstall = mod.files;
+  if (mod.name === "agents") {
+    try {
+      const sel = selectAgentModuleFiles(mod.files, opts, readProjectState(dir));
+      filesToInstall = sel.files;
+      log2.info(`Installing agents (${sel.label}).`);
+    } catch (err) {
+      console.error(err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
+  }
   const written = [];
   const skipped = [];
-  for (const file of mod.files) {
+  for (const file of filesToInstall) {
     const fullPath = join(dir, file.path);
     if (exists(fullPath)) {
       skipped.push(file.path);
@@ -5568,6 +5737,7 @@ function runAdd(moduleName, dir = cwd()) {
     console.log("    2. Open your preferred LLM chat");
     console.log("    3. Paste `.kaddo/context-pack.md`");
     console.log("    4. Use the recommended agent for your project state");
+    log2.info("More agents: `kaddo add agents --all` or `--group <business|product|tech|delivery|utilities>`.");
     outro2("Agents installed. Kaddo prepares context \u2014 your LLM does the interpretation.");
     return;
   }
@@ -5582,7 +5752,7 @@ function runAdd(moduleName, dir = cwd()) {
 
 // src/core/ownership-suggest.ts
 import matter5 from "gray-matter";
-var WORK_ITEMS_DIR3 = "architecture/work-items";
+var WORK_ITEMS_DIR3 = "knowledge/delivery/work-items";
 var SCAN_PATH = ".kaddo/scan.json";
 function toStringArray3(value) {
   return Array.isArray(value) ? value.map((v) => String(v)).filter(Boolean) : [];
@@ -5823,12 +5993,12 @@ ${globs.map((g) => `  - ${g}`).join("\n")}`);
 
 // src/commands/module-descriptor.ts
 import { parse as parseYaml11, stringify as stringifyYaml4 } from "yaml";
-var DESCRIPTOR_PATH2 = "architecture/module.yml";
+var DESCRIPTOR_PATH2 = "knowledge/module.yml";
 function readDescriptor(dir) {
-  const path6 = join(dir, DESCRIPTOR_PATH2);
-  if (!exists(path6)) return null;
+  const path5 = join(dir, DESCRIPTOR_PATH2);
+  if (!exists(path5)) return null;
   try {
-    return parseYaml11(readFile(path6));
+    return parseYaml11(readFile(path5));
   } catch {
     return null;
   }
@@ -5848,7 +6018,7 @@ async function runModuleDescriptor(opts) {
     return;
   }
   intro2("kaddo module --init");
-  log2.info("Creates architecture/module.yml \u2014 declares this repository's identity for multirepo contexts.");
+  log2.info("Creates knowledge/module.yml \u2014 declares this repository's identity for multirepo contexts.");
   const name = await text2({
     message: "Module name (this repository)",
     placeholder: "e.g. payments-service",
@@ -5897,7 +6067,7 @@ async function runModuleDescriptor(opts) {
   };
   writeDescriptor(dir, descriptor);
   log2.success(`Created ${DESCRIPTOR_PATH2}`);
-  outro2(`Module descriptor ready. Share architecture/module.yml with dependent repositories.`);
+  outro2(`Module descriptor ready. Share knowledge/module.yml with dependent repositories.`);
 }
 function printDescriptor(d) {
   console.log("");
@@ -6063,7 +6233,7 @@ ${QUALITY}
 - [ ] Capabilities describe outcomes, not implementation.
 - [ ] Each capability cites evidence or is flagged as an assumption.
 `;
-var KNOWLEDGE = `---
+var KNOWLEDGE2 = `---
 type: current-state
 updated_at: YYYY-MM-DD
 ---
@@ -6857,47 +7027,138 @@ ${QUALITY}
 - [ ] Attributes are prioritized, not all "high".
 - [ ] Trade-offs are explicit.
 `;
+var BUSINESS_CONSOLIDATED = `---
+type: business
+status: draft
+---
+
+# Business
+
+> Created by \`kaddo bootstrap\`. The minimal **why** of the project. Refine with the
+> business-agent. As this matures it can split into problem.md, users.md, \u2026
+
+## Problem
+
+TBD
+
+## Users
+
+TBD
+
+## Value Proposition
+
+TBD
+
+## Business Rules
+
+- TBD
+
+## Constraints
+
+- TBD
+
+## Assumptions
+
+- ...
+
+## Open Questions
+
+- ...
+
+${QUALITY}
+
+- [ ] The problem is stated without assuming the solution.
+- [ ] Users have goals, not just labels.
+`;
+var PRODUCT_CONSOLIDATED = `---
+type: product
+status: draft
+---
+
+# Product
+
+> Created by \`kaddo bootstrap\`. The minimal **what** of the project. Refine with the
+> bootstrap-agent / capability-agent. As this matures it can split into product-brief.md
+> and capabilities.md.
+
+## Product Brief
+
+TBD
+
+## Capabilities
+
+- TBD
+
+## Scope
+
+- TBD
+
+## Out of Scope
+
+- TBD
+
+## Success Criteria
+
+- TBD
+
+## Assumptions
+
+- ...
+
+## Open Questions
+
+- ...
+
+${QUALITY}
+
+- [ ] The product fits in one page.
+- [ ] Scope and out-of-scope are explicit.
+`;
 var CODEBASE_FOUNDATION = `---
-type: codebase-foundation
+type: codebase
 status: draft
 ---
 
-# Codebase Foundation
+# Codebase
 
-> Created by \`kaddo bootstrap\`. Refine with the codebase-foundation-agent.
-> This describes the intended base \u2014 it does **not** generate code.
+> Created by \`kaddo bootstrap\`. The minimal **how** of the project. Refine with the
+> codebase-agent. It describes the intended base \u2014 it does **not** generate code.
 
-## Suggested structure
+## Repository Structure
 
 TBD
 
-## Initial modules / boundaries
+## Candidate Stack
+
+- TBD
+
+## Quality Attributes
 
 - TBD
 
-## Conventions
+## Development Standards
 
 - TBD
 
-## Git strategy
+## Git Strategy
 
-See \`architecture/git-strategy.md\`.
+GitHub Flow + Conventional Commits + SemVer (default). See \`kaddo add git-strategy\`.
 
-## Minimum criteria to start development
+## Initial Modules
 
-- [ ] TBD
+- TBD
 
 ## Assumptions
 
 - ...
 
-## Open questions
+## Open Questions
 
 - ...
 
 ${QUALITY}
 
-- [ ] Structure follows the business and architecture, not a framework default.
+- [ ] Structure follows business and product, not a framework default.
 - [ ] No production code is described here \u2014 only the foundation.
 `;
 var BOOTSTRAP_SUMMARY = `---
@@ -6911,7 +7172,7 @@ status: draft
 
 ## Layers
 
-- **Business** \u2014 \`architecture/business/\`
+- **Business** \u2014 \`knowledge/business/\`
 - **Architecture** \u2014 capabilities, quality-attributes, stack, current-state, decisions
 - **Codebase** \u2014 codebase-foundation, standards, git-strategy
 - **Development** \u2014 roadmap, work-items
@@ -6927,7 +7188,7 @@ status: draft
 
 1. Run \`kaddo context\` and \`kaddo add agents\`.
 2. Refine the artifacts with the business-agent, bootstrap-agent and
-   codebase-foundation-agent in your LLM.
+   codebase-agent in your LLM.
 3. Run \`kaddo create --from roadmap\` to create the first Work Items.
 
 ## Open questions
@@ -6944,8 +7205,8 @@ var KADDO_TEMPLATES = [
   {
     id: "work-item",
     name: "Work Item",
-    category: "core",
-    outputPath: "architecture/work-items/",
+    category: "delivery",
+    outputPath: "knowledge/delivery/work-items/",
     description: "Smallest traceable unit of product evolution.",
     whenToUse: "When you start any change (feature, bugfix, hotfix, spike).",
     relatedCommand: "kaddo create",
@@ -6955,8 +7216,8 @@ var KADDO_TEMPLATES = [
   {
     id: "roadmap",
     name: "Roadmap",
-    category: "core",
-    outputPath: "architecture/roadmap.md",
+    category: "delivery",
+    outputPath: "knowledge/delivery/roadmap.md",
     description: "Initiatives and candidate work items for human review.",
     whenToUse: "When planning what to build next and why.",
     relatedCommand: "kaddo create --from roadmap",
@@ -6966,107 +7227,138 @@ var KADDO_TEMPLATES = [
   {
     id: "capabilities",
     name: "Capabilities",
-    category: "core",
-    outputPath: "architecture/capabilities.md",
+    category: "product",
+    outputPath: "knowledge/product/capabilities.md",
     description: "What the system can do from the product point of view.",
     whenToUse: "When mapping product capabilities to the system.",
     relatedAgent: "capability-agent",
+    advanced: true,
     content: CAPABILITIES
   },
   {
     id: "knowledge",
     name: "Knowledge (Current State)",
-    category: "core",
-    outputPath: "architecture/knowledge.md",
+    category: "tech",
+    outputPath: "knowledge/knowledge.md",
     description: "What is true about the product right now.",
     whenToUse: "Created by `kaddo init`; keep it current as the product evolves.",
     relatedCommand: "kaddo init",
-    content: KNOWLEDGE
+    content: KNOWLEDGE2
   },
-  // business (bootstrap)
+  // business / product (bootstrap — consolidated, minimal)
+  {
+    id: "business",
+    name: "Business",
+    category: "business",
+    outputPath: "knowledge/business/business.md",
+    description: "The minimal why: problem, users, value, rules, constraints (one file).",
+    whenToUse: "Generated by kaddo bootstrap for new projects.",
+    relatedCommand: "kaddo bootstrap",
+    relatedAgent: "business-agent",
+    content: BUSINESS_CONSOLIDATED
+  },
+  {
+    id: "product",
+    name: "Product",
+    category: "product",
+    outputPath: "knowledge/product/product.md",
+    description: "The minimal what: product brief, capabilities, scope (one file).",
+    whenToUse: "Generated by kaddo bootstrap for new projects.",
+    relatedCommand: "kaddo bootstrap",
+    relatedAgent: "bootstrap-agent",
+    content: PRODUCT_CONSOLIDATED
+  },
+  // business (advanced — split out as knowledge matures, not generated by bootstrap)
   {
     id: "business-product-brief",
     name: "Product Brief",
-    category: "business",
-    outputPath: "architecture/business/product-brief.md",
+    category: "product",
+    outputPath: "knowledge/product/product-brief.md",
     description: "The product in one page: problem, users, value, MVP boundary.",
     whenToUse: "At the start of a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_PRODUCT_BRIEF
   },
   {
     id: "business-problem",
     name: "Problem Statement",
     category: "business",
-    outputPath: "architecture/business/problem.md",
+    outputPath: "knowledge/business/problem.md",
     description: "The problem the product solves, without assuming the solution.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_PROBLEM
   },
   {
     id: "business-users",
     name: "Users & Personas",
     category: "business",
-    outputPath: "architecture/business/users.md",
+    outputPath: "knowledge/business/users.md",
     description: "Primary and secondary users with goals.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_USERS
   },
   {
     id: "business-value-proposition",
     name: "Value Proposition",
     category: "business",
-    outputPath: "architecture/business/value-proposition.md",
+    outputPath: "knowledge/business/value-proposition.md",
     description: "For whom, what we offer and why it is better.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_VALUE_PROPOSITION
   },
   {
     id: "business-rules",
     name: "Business Rules",
     category: "business",
-    outputPath: "architecture/business/business-rules.md",
+    outputPath: "knowledge/business/business-rules.md",
     description: "Product rules as testable statements.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_RULES
   },
   {
     id: "business-constraints",
     name: "Business Constraints",
     category: "business",
-    outputPath: "architecture/business/constraints.md",
+    outputPath: "knowledge/business/constraints.md",
     description: "Business, regulatory and resource constraints.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_CONSTRAINTS
   },
   {
     id: "business-glossary",
     name: "Glossary",
     category: "business",
-    outputPath: "architecture/business/glossary.md",
+    outputPath: "knowledge/business/glossary.md",
     description: "Shared vocabulary for the project.",
     whenToUse: "When defining a new project (kaddo bootstrap).",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "business-agent",
+    advanced: true,
     content: BUSINESS_GLOSSARY
   },
   // architecture
   {
     id: "current-state",
     name: "Current State",
-    category: "architecture",
-    outputPath: "architecture/current-state.md",
+    category: "tech",
+    outputPath: "knowledge/tech/current-state.md",
     description: "Reconstructed architecture baseline.",
     whenToUse: "When establishing the architecture baseline of an existing system.",
     relatedAgent: "architecture-agent",
@@ -7075,8 +7367,8 @@ var KADDO_TEMPLATES = [
   {
     id: "architecture-notes",
     name: "Architecture Notes",
-    category: "architecture",
-    outputPath: "architecture/architecture-notes.md",
+    category: "tech",
+    outputPath: "knowledge/tech/architecture-notes.md",
     description: "Working notes on architecture topics not yet decided.",
     whenToUse: "When exploring an architecture topic before it becomes an ADR.",
     content: ARCHITECTURE_NOTES
@@ -7084,8 +7376,8 @@ var KADDO_TEMPLATES = [
   {
     id: "decision-candidates",
     name: "Decision Candidates",
-    category: "architecture",
-    outputPath: "architecture/decision-candidates.md",
+    category: "tech",
+    outputPath: "knowledge/tech/decision-candidates.md",
     description: "Candidate architecture decisions for human review.",
     whenToUse: "When surfacing decisions that may become ADRs.",
     relatedAgent: "adr-agent",
@@ -7094,30 +7386,31 @@ var KADDO_TEMPLATES = [
   {
     id: "quality-attributes",
     name: "Quality Attributes",
-    category: "architecture",
-    outputPath: "architecture/quality-attributes.md",
+    category: "tech",
+    outputPath: "knowledge/tech/quality-attributes.md",
     description: "Prioritized quality attributes and accepted trade-offs.",
     whenToUse: "During bootstrap, to record what matters most technically.",
     relatedCommand: "kaddo bootstrap",
     relatedAgent: "bootstrap-agent",
+    advanced: true,
     content: QUALITY_ATTRIBUTES
   },
   {
-    id: "codebase-foundation",
+    id: "codebase",
     name: "Codebase Foundation",
-    category: "architecture",
-    outputPath: "architecture/codebase-foundation.md",
+    category: "tech",
+    outputPath: "knowledge/tech/codebase.md",
     description: "Intended codebase structure and conventions (no source code).",
     whenToUse: "During bootstrap, before writing code.",
     relatedCommand: "kaddo bootstrap",
-    relatedAgent: "codebase-foundation-agent",
+    relatedAgent: "codebase-agent",
     content: CODEBASE_FOUNDATION
   },
   {
     id: "bootstrap-summary",
     name: "Bootstrap Summary",
-    category: "architecture",
-    outputPath: "architecture/bootstrap-summary.md",
+    category: "tech",
+    outputPath: "knowledge/bootstrap-summary.md",
     description: "Index of the initial knowledge base and next steps.",
     whenToUse: "Generated by kaddo bootstrap.",
     relatedCommand: "kaddo bootstrap",
@@ -7127,8 +7420,8 @@ var KADDO_TEMPLATES = [
   {
     id: "adr",
     name: "ADR",
-    category: "architecture",
-    outputPath: "architecture/decisions/",
+    category: "tech",
+    outputPath: "knowledge/tech/decisions/",
     description: "A single architecture decision record.",
     whenToUse: "When recording a significant, accepted architecture decision.",
     relatedCommand: "kaddo create adr",
@@ -7139,7 +7432,7 @@ var KADDO_TEMPLATES = [
     id: "module-design",
     name: "Module Design",
     category: "module",
-    outputPath: "architecture/modules/<id>/module-design.md",
+    outputPath: "knowledge/tech/modules/<id>/module-design.md",
     description: "A module's purpose, boundaries and dependencies.",
     whenToUse: "After mapping a secondary repo as a module.",
     relatedCommand: "kaddo modules map",
@@ -7150,7 +7443,7 @@ var KADDO_TEMPLATES = [
     id: "module-stack",
     name: "Module Stack",
     category: "module",
-    outputPath: "architecture/modules/<id>/stack.md",
+    outputPath: "knowledge/tech/modules/<id>/stack.md",
     description: "A module's technology stack.",
     whenToUse: "To document the stack of a specific module.",
     relatedAgent: "stack-agent",
@@ -7160,7 +7453,7 @@ var KADDO_TEMPLATES = [
     id: "module-security",
     name: "Module Security",
     category: "module",
-    outputPath: "architecture/modules/<id>/security.md",
+    outputPath: "knowledge/tech/modules/<id>/security.md",
     description: "A module's security considerations.",
     whenToUse: "To document security concerns specific to a module.",
     relatedAgent: "security-agent",
@@ -7170,7 +7463,7 @@ var KADDO_TEMPLATES = [
     id: "module-standards",
     name: "Module Standards",
     category: "module",
-    outputPath: "architecture/modules/<id>/standards.md",
+    outputPath: "knowledge/tech/modules/<id>/standards.md",
     description: "A module's coding and testing standards.",
     whenToUse: "When a module needs standards beyond the system defaults.",
     relatedAgent: "standards-agent",
@@ -7180,7 +7473,7 @@ var KADDO_TEMPLATES = [
     id: "module-adr",
     name: "Module ADR",
     category: "module",
-    outputPath: "architecture/modules/<id>/adrs/",
+    outputPath: "knowledge/tech/modules/<id>/adrs/",
     description: "A module-scoped architecture decision record.",
     whenToUse: "When a decision affects only one module.",
     content: MODULE_ADR
@@ -7190,7 +7483,7 @@ var KADDO_TEMPLATES = [
     id: "security",
     name: "Security",
     category: "operations",
-    outputPath: "architecture/security.md",
+    outputPath: "knowledge/tech/security.md",
     description: "Global security considerations (no scanning).",
     whenToUse: "To document system-wide security concerns.",
     relatedCommand: "kaddo add security",
@@ -7201,7 +7494,7 @@ var KADDO_TEMPLATES = [
     id: "standards",
     name: "Standards",
     category: "operations",
-    outputPath: "architecture/standards.md",
+    outputPath: "knowledge/tech/standards.md",
     description: "Global lightweight coding/docs/testing standards.",
     whenToUse: "To document system-wide standards.",
     relatedCommand: "kaddo add standards",
@@ -7212,7 +7505,7 @@ var KADDO_TEMPLATES = [
     id: "stack",
     name: "Stack",
     category: "operations",
-    outputPath: "architecture/stack.md",
+    outputPath: "knowledge/tech/stack.md",
     description: "Global technology stack documentation.",
     whenToUse: "To document the system-wide stack.",
     relatedCommand: "kaddo add stack",
@@ -7223,7 +7516,7 @@ var KADDO_TEMPLATES = [
     id: "git-strategy",
     name: "Git Strategy",
     category: "operations",
-    outputPath: "architecture/git-strategy.md",
+    outputPath: "knowledge/tech/git-strategy.md",
     description: "Recommended, customizable Git workflow.",
     whenToUse: "To agree on branching, commits and tagging.",
     relatedCommand: "kaddo add git-strategy",
@@ -7234,7 +7527,7 @@ var KADDO_TEMPLATES = [
     id: "incident",
     name: "Incident",
     category: "operations",
-    outputPath: "architecture/incidents/",
+    outputPath: "knowledge/incidents/",
     description: "A post-incident record.",
     whenToUse: "After a production incident.",
     relatedCommand: "kaddo create incident",
@@ -7244,7 +7537,7 @@ var KADDO_TEMPLATES = [
     id: "runbook",
     name: "Runbook",
     category: "operations",
-    outputPath: "architecture/runbooks/",
+    outputPath: "knowledge/runbooks/",
     description: "How to perform a recurring operational task safely.",
     whenToUse: "For repeatable operational procedures.",
     content: RUNBOOK
@@ -7254,7 +7547,7 @@ var KADDO_TEMPLATES = [
     id: "legacy-risks",
     name: "Legacy Risks",
     category: "legacy",
-    outputPath: "architecture/legacy/risks.md",
+    outputPath: "knowledge/legacy/risks.md",
     description: "High-risk areas before changing legacy code.",
     whenToUse: "Before modifying legacy code.",
     relatedAgent: "legacy-agent",
@@ -7264,7 +7557,7 @@ var KADDO_TEMPLATES = [
     id: "legacy-unknowns",
     name: "Legacy Unknowns",
     category: "legacy",
-    outputPath: "architecture/legacy/unknowns.md",
+    outputPath: "knowledge/legacy/unknowns.md",
     description: "What is not yet understood about the legacy system.",
     whenToUse: "When surfacing gaps in legacy knowledge.",
     relatedAgent: "legacy-agent",
@@ -7274,7 +7567,7 @@ var KADDO_TEMPLATES = [
     id: "modernization-candidates",
     name: "Modernization Candidates",
     category: "legacy",
-    outputPath: "architecture/legacy/modernization-candidates.md",
+    outputPath: "knowledge/legacy/modernization-candidates.md",
     description: "Candidate modernization efforts for human review.",
     whenToUse: "When planning legacy modernization.",
     content: MODERNIZATION_CANDIDATES
@@ -7301,10 +7594,10 @@ function slugify2(name) {
   return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function readModulesDescriptor(dir) {
-  const path6 = join(dir, DESCRIPTOR_PATH3);
-  if (!exists(path6)) return { version: 1, modules: [] };
+  const path5 = join(dir, DESCRIPTOR_PATH3);
+  if (!exists(path5)) return { version: 1, modules: [] };
   try {
-    const parsed = parseYaml12(readFile(path6));
+    const parsed = parseYaml12(readFile(path5));
     return { version: parsed.version ?? 1, modules: parsed.modules ?? [] };
   } catch {
     return { version: 1, modules: [] };
@@ -7314,7 +7607,7 @@ function writeModulesDescriptor(dir, descriptor) {
   writeFile(join(dir, DESCRIPTOR_PATH3), stringifyYaml5(descriptor));
 }
 function moduleDir(id) {
-  return `architecture/modules/${id}`;
+  return `knowledge/tech/modules/${id}`;
 }
 function buildModule(input) {
   const id = slugify2(input.name);
@@ -7511,30 +7804,14 @@ function runModulesList(dir = cwd()) {
 // src/commands/bootstrap.ts
 var CONFIG_PATH8 = ".kaddo/config.yml";
 var TARGETS = [
-  // Business
-  { layer: "Business", path: "architecture/business/product-brief.md", templateId: "business-product-brief" },
-  { layer: "Business", path: "architecture/business/problem.md", templateId: "business-problem" },
-  { layer: "Business", path: "architecture/business/users.md", templateId: "business-users" },
-  { layer: "Business", path: "architecture/business/value-proposition.md", templateId: "business-value-proposition" },
-  { layer: "Business", path: "architecture/business/business-rules.md", templateId: "business-rules" },
-  { layer: "Business", path: "architecture/business/constraints.md", templateId: "business-constraints" },
-  { layer: "Business", path: "architecture/business/glossary.md", templateId: "business-glossary" },
-  // Architecture
-  { layer: "Architecture", path: "architecture/capabilities.md", templateId: "capabilities" },
-  { layer: "Architecture", path: "architecture/quality-attributes.md", templateId: "quality-attributes" },
-  { layer: "Architecture", path: "architecture/stack.md", templateId: "stack" },
-  { layer: "Architecture", path: "architecture/current-state.md", templateId: "current-state" },
-  { layer: "Architecture", path: "architecture/decision-candidates.md", templateId: "decision-candidates" },
-  { layer: "Architecture", path: "architecture/adrs/ADR-0001-initial-architecture.md", templateId: "adr" },
-  // Codebase
-  { layer: "Codebase", path: "architecture/codebase-foundation.md", templateId: "codebase-foundation" },
-  { layer: "Codebase", path: "architecture/standards.md", templateId: "standards" },
-  { layer: "Codebase", path: "architecture/git-strategy.md", templateId: "git-strategy" },
-  // Development
-  { layer: "Development", path: "architecture/roadmap.md", templateId: "roadmap" },
-  { layer: "Development", path: "architecture/bootstrap-summary.md", templateId: "bootstrap-summary" }
+  // Minimum sufficient knowledge: one consolidated file per layer. Specialized
+  // artifacts (problem.md, users.md, capabilities.md, …) appear later, as the project
+  // matures, via agents and refinement — not at bootstrap.
+  { layer: "Business", path: "knowledge/business/business.md", templateId: "business" },
+  { layer: "Product", path: "knowledge/product/product.md", templateId: "product" },
+  { layer: "Tech", path: "knowledge/tech/codebase.md", templateId: "codebase" }
 ];
-var BOOTSTRAP_LAYERS = ["Business", "Architecture", "Codebase", "Development"];
+var BOOTSTRAP_LAYERS = ["Business", "Product", "Tech"];
 function bootstrap(dir) {
   const written = [];
   const skipped = [];
@@ -7550,15 +7827,6 @@ function bootstrap(dir) {
 `);
     written.push(target.path);
   }
-  const workItems = join(dir, "architecture/work-items");
-  if (!exists(workItems)) {
-    ensureDir(workItems);
-    const keep = join(workItems, ".gitkeep");
-    if (!exists(keep)) {
-      writeFile(keep, "");
-      written.push("architecture/work-items/.gitkeep");
-    }
-  }
   return { written, skipped, layers: BOOTSTRAP_LAYERS };
 }
 async function runBootstrap(dir = cwd()) {
@@ -7578,7 +7846,7 @@ async function runBootstrap(dir = cwd()) {
     process.exit(1);
   }
   log2.info(`Project state: ${state}`);
-  log2.info("Base layers: Business \u2192 Architecture \u2192 Codebase \u2192 Development");
+  log2.info("Base layers: Business \u2192 Product \u2192 Tech \u2192 Delivery");
   if (state !== "new") {
     log2.warn("This project is not marked as new. Bootstrap is designed for new projects.");
     const ok = await confirm2({ message: "Continue anyway?", initialValue: false });
@@ -7603,20 +7871,20 @@ async function runBootstrap(dir = cwd()) {
   }
   console.log("");
   outro2(
-    "Knowledge base ready. Run `kaddo context` and `kaddo add agents`, then refine these artifacts with the business-agent, bootstrap-agent and codebase-foundation-agent in your LLM."
+    "Minimal knowledge base ready (Business \u2192 Product \u2192 Tech). Run `kaddo context` and `kaddo add agents`, then refine with the business-agent, bootstrap-agent and codebase-agent. Roadmap and work items come next under knowledge/delivery/."
   );
 }
 
 // src/index.ts
 var program = new Command();
-program.name("kaddo").description("Knowledge Driven Development toolkit").version("2.8.0");
+program.name("kaddo").description("Knowledge Driven Development toolkit").version("3.1.0");
 program.command("init").description("Initialize Kaddo in the current project").action(async () => {
   await runInit();
 });
 program.command("scan").description("Detect project stack and suggest domains").action(async () => {
   await runScan();
 });
-program.command("bootstrap").description("Build the initial knowledge base for a new project (Business \u2192 Architecture \u2192 Codebase \u2192 Development)").action(async () => {
+program.command("bootstrap").description("Build the initial knowledge base for a new project (Business \u2192 Product \u2192 Tech \u2192 Delivery)").action(async () => {
   await runBootstrap();
 });
 program.command("create [type]").description("Create a work item (feature, bugfix, hotfix, spike). Use --from roadmap to create from a roadmap candidate.").option("--from <source>", "Create from a source artifact (currently: roadmap)").action(async (type, opts) => {
@@ -7663,7 +7931,7 @@ program.command("owners [action]").description("List domain owners, or run `owne
     runOwners(opts);
   }
 });
-program.command("module").description("Show or initialize the multirepo module descriptor (architecture/module.yml)").option("--init", "Create the module descriptor interactively").option("--show", "Print the current module descriptor").action(async (opts) => {
+program.command("module").description("Show or initialize the multirepo module descriptor (knowledge/module.yml)").option("--init", "Create the module descriptor interactively").option("--show", "Print the current module descriptor").action(async (opts) => {
   await runModuleDescriptor(opts);
 });
 var modulesCmd = program.command("modules").description("Map and list secondary repositories as modules of the system (multirepo)");
@@ -7673,8 +7941,8 @@ modulesCmd.command("map").description("Register a secondary repository as a modu
 modulesCmd.command("list").description("List mapped modules").action(() => {
   runModulesList();
 });
-program.command("add [module]").description("Install an optional Kaddo module (adr, incident, rfc, migration, legacy, agents, standards, security, stack, git-strategy)").action((moduleName) => {
-  runAdd(moduleName ?? "");
+program.command("add [module]").description("Install an optional Kaddo module (adr, incident, rfc, migration, legacy, agents, standards, security, stack, git-strategy)").option("--all", "For `add agents`: install every agent (not just the recommended set)").option("--group <name>", "For `add agents`: install one layer group (business, product, tech, delivery, utilities)").action((moduleName, opts) => {
+  runAdd(moduleName ?? "", { all: opts.all, group: opts.group });
 });
 program.parseAsync(process.argv).catch((err) => {
   console.error(err);