@kaddo/cli 3.8.0 → 3.9.1

package/dist/index.js

@@ -725,6 +725,17 @@ async function runScan() {
 }
 
 // src/core/knowledge-levels.ts
+var WORK_ITEM_TYPES = ["feature", "bugfix", "hotfix", "spike", "chore"];
+var TYPE_ALIASES = {
+  setup: "chore",
+  maintenance: "chore",
+  tooling: "chore",
+  infrastructure: "chore",
+  infra: "chore",
+  config: "chore",
+  configuration: "chore",
+  refactor: "chore"
+};
 var LEVELS = {
   K0: {
     level: "K0",
@@ -879,7 +890,9 @@ var TYPE_TO_LEVEL = {
   hotfix: "K1",
   bugfix: "K2",
   feature: "K2",
-  spike: "K3"
+  spike: "K3",
+  // Chores are maintenance/config/tooling work — low ceremony (problem + expected result).
+  chore: "K1"
 };
 function getLevel(level) {
   return LEVELS[level];
@@ -888,7 +901,13 @@ function getLevelForType(type) {
   return TYPE_TO_LEVEL[type];
 }
 function isValidType(type) {
-  return ["feature", "bugfix", "hotfix", "spike"].includes(type);
+  return WORK_ITEM_TYPES.includes(type);
+}
+function normalizeType(raw) {
+  if (!raw) return null;
+  const t = raw.trim().toLowerCase();
+  if (isValidType(t)) return t;
+  return TYPE_ALIASES[t] ?? null;
 }
 
 // src/modules/adr.ts
@@ -1832,6 +1851,9 @@ Produce a roadmap where each initiative includes:
 7. Dependencies.
 8. Why this comes now.
 9. Candidate work items (each with type, suggested knowledge level, expected value, notes).
+   Use only the official Work Item types: \`feature\`, \`bugfix\`, \`hotfix\`, \`spike\`, \`chore\`.
+   Use \`chore\` for technical/maintenance/tooling/config/infra work (e.g. "Initialize
+   TypeScript project", "Configure Vitest", "Setup CI") \u2014 do not label such work \`feature\`.
 10. Open questions.
 
 Then add a suggested execution order, risks and constraints, a "Not Now" list, and the
@@ -2133,12 +2155,14 @@ A refined Work Item intended to be saved under the lifecycle workspace:
 
 1. Restate the problem in one clear sentence.
 2. Split the candidate if it is too large for a single Work Item.
-3. Validate the Knowledge Level (K0\u2013K4) and propose a different one if needed.
-4. Propose acceptance criteria.
-5. Propose Out of scope and Validation sections.
-6. Propose a Definition of Done.
-7. Identify open questions and assumptions.
-8. Suggest ownership candidates (code globs) if evident.
+3. Preserve the candidate's type (\`feature\`, \`bugfix\`, \`hotfix\`, \`spike\`, \`chore\`).
+   Keep \`chore\` for maintenance/tooling/config/infra work \u2014 never upgrade a chore to a feature.
+4. Validate the Knowledge Level (K0\u2013K4) and propose a different one if needed.
+5. Propose acceptance criteria.
+6. Propose Out of scope and Validation sections.
+7. Propose a Definition of Done.
+8. Identify open questions and assumptions.
+9. Suggest ownership candidates (code globs) if evident.
 
 ## Constraints
 
@@ -3675,20 +3699,21 @@ async function runCreate(type, opts = {}) {
   }
   if (!type) {
     console.error("Missing work item type.");
-    console.error("Usage: kaddo create <feature|bugfix|hotfix|spike> [--from roadmap]");
+    console.error("Usage: kaddo create <feature|bugfix|hotfix|spike|chore> [--from roadmap]");
     process.exit(1);
   }
   const modWorkItemType = findWorkItemType(type);
   if (modWorkItemType) {
     return runCreateModule(dir, modWorkItemType);
   }
-  if (!isValidType(type)) {
+  const workItemType = normalizeType(type);
+  if (!workItemType) {
     console.error(`Unknown work item type: "${type}"`);
-    console.error("Valid types: feature, bugfix, hotfix, spike");
+    console.error("Valid types: feature, bugfix, hotfix, spike, chore");
+    console.error("Aliases: setup, maintenance, tooling, infrastructure, refactor \u2192 chore");
     console.error("Module types: adr, incident, rfc, migration, legacy (run `kaddo add <module>` first)");
     process.exit(1);
   }
-  const workItemType = type;
   const level = getLevelForType(workItemType);
   const levelDef = getLevel(level);
   intro2(`kaddo create ${workItemType}`);
@@ -3696,7 +3721,7 @@ async function runCreate(type, opts = {}) {
   printStateGuidance(dir);
   const title = await text2({
     message: "Title for this work item",
-    placeholder: `e.g. ${workItemType === "feature" ? "Add email verification to checkout" : workItemType === "hotfix" ? "Fix null pointer in payment handler" : workItemType === "bugfix" ? "Fix broken pagination on orders list" : "Explore caching strategies for API responses"}`,
+    placeholder: `e.g. ${workItemType === "feature" ? "Add email verification to checkout" : workItemType === "hotfix" ? "Fix null pointer in payment handler" : workItemType === "bugfix" ? "Fix broken pagination on orders list" : workItemType === "chore" ? "Configure Vitest and CI pipeline" : "Explore caching strategies for API responses"}`,
     validate: (v) => v.trim().length === 0 ? "Title is required." : void 0
   });
   const answers = {};
@@ -3765,9 +3790,7 @@ ${body}`;
 }
 var K_LEVEL_RE = /^K[0-4]$/;
 function resolveCandidateType(candidate, cliType) {
-  if (candidate.type && isValidType(candidate.type)) return candidate.type;
-  if (cliType && isValidType(cliType)) return cliType;
-  return null;
+  return normalizeType(candidate.type) ?? normalizeType(cliType);
 }
 function resolveCandidateLevel(candidate, type) {
   const suggested = candidate.suggestedKnowledgeLevel?.trim().toUpperCase();
@@ -3929,7 +3952,8 @@ async function runCreateFromRoadmap(dir, cliType) {
         { value: "feature", label: "feature" },
         { value: "bugfix", label: "bugfix" },
         { value: "hotfix", label: "hotfix" },
-        { value: "spike", label: "spike" }
+        { value: "spike", label: "spike" },
+        { value: "chore", label: "chore" }
       ]
     });
   }
@@ -4020,9 +4044,11 @@ function parseArtifact(filePath, raw) {
       knowledgeLevel: String(data.knowledge_level ?? ""),
       codeGlobs: globs,
       domains: Array.isArray(data.domains) ? data.domains : [],
+      capabilities: Array.isArray(data.capabilities) ? data.capabilities.map(String).filter(Boolean) : [],
       status: String(data.status ?? ""),
       phase: String(data.phase ?? ""),
-      initiative: String(data.initiative ?? data.source_initiative ?? "")
+      initiative: String(data.initiative ?? data.source_initiative ?? ""),
+      source: data.source ? String(data.source) : ""
     };
   } catch {
     return null;
@@ -4047,6 +4073,94 @@ function readArtifacts(archDir) {
   return artifacts;
 }
 
+// src/core/lifecycle.ts
+var LIFECYCLE_STATES = [
+  "draft",
+  "ready",
+  "in-progress",
+  "blocked",
+  "completed",
+  "archived"
+];
+var ACTIVE_STATES = ["draft", "ready", "in-progress", "blocked"];
+var LEGACY_STATUS_MAP = {
+  done: "completed",
+  cancelled: "archived",
+  canceled: "archived",
+  "in-progress": "in-progress"
+};
+var STATE_SET = new Set(LIFECYCLE_STATES);
+function isLifecycleState(s) {
+  return STATE_SET.has(s);
+}
+function isActiveState(s) {
+  return ACTIVE_STATES.includes(s);
+}
+function lifecycleFolderOf(filePath) {
+  const p2 = filePath.replace(/\\/g, "/");
+  const m = p2.match(/\/delivery\/work-items\/([^/]+)\//);
+  if (m && isLifecycleState(m[1])) return m[1];
+  return null;
+}
+function lifecycleStateOf(item) {
+  const status = (item.status ?? "").trim().toLowerCase();
+  if (isLifecycleState(status)) return status;
+  if (status && LEGACY_STATUS_MAP[status]) return LEGACY_STATUS_MAP[status];
+  const folder = lifecycleFolderOf(item.filePath ?? "");
+  if (folder) return folder;
+  return "ready";
+}
+function emptyLifecycleCounts() {
+  return Object.fromEntries(LIFECYCLE_STATES.map((s) => [s, 0]));
+}
+function lifecycleCounts(states) {
+  const counts = emptyLifecycleCounts();
+  for (const s of states) counts[s]++;
+  return counts;
+}
+
+// src/services/knowledge-artifacts.ts
+var ARCH_DIR2 = "knowledge";
+function toPosix(p2) {
+  return p2.replace(/\\/g, "/");
+}
+function relativeTo(dir, filePath) {
+  const base = toPosix(dir).replace(/\/+$/, "");
+  const full = toPosix(filePath);
+  return full.startsWith(base + "/") ? full.slice(base.length + 1) : full;
+}
+function isWorkItemArtifact(a) {
+  return toPosix(a.filePath).includes("/delivery/work-items/") && Boolean(a.type);
+}
+function classifyLayer(posixPath) {
+  if (posixPath.includes("/knowledge/business/")) return "business";
+  if (posixPath.includes("/knowledge/product/")) return "product";
+  if (posixPath.includes("/knowledge/tech/modules/") || posixPath.includes("/knowledge/modules/"))
+    return "module";
+  if (posixPath.includes("/knowledge/tech/")) return "tech";
+  if (posixPath.includes("/knowledge/delivery/")) return "delivery";
+  return "unknown";
+}
+function enrich(dir, a) {
+  const posix = toPosix(a.filePath);
+  const isWi = isWorkItemArtifact(a);
+  return {
+    ...a,
+    relPath: relativeTo(dir, a.filePath),
+    layer: classifyLayer(posix),
+    isWorkItem: isWi,
+    lifecycle: isWi ? lifecycleStateOf({ status: a.status, filePath: a.filePath }) : void 0
+  };
+}
+function discoverKnowledge(dir) {
+  const archDir = join(dir, ARCH_DIR2);
+  if (!exists(archDir)) return [];
+  return readArtifacts(archDir).map((a) => enrich(dir, a));
+}
+function discoverWorkItems(dir) {
+  return discoverKnowledge(dir).filter((a) => a.isWorkItem);
+}
+
 // src/core/diff-analysis.ts
 import { minimatch } from "minimatch";
 function normalizePath(p2) {
@@ -4439,7 +4553,7 @@ function collectMatchedDomains(matchedArtifactDomains) {
 }
 
 // src/commands/guard.ts
-var ARCH_DIR2 = "knowledge";
+var ARCH_DIR3 = "knowledge";
 var CONFIG_PATH2 = ".kaddo/config.yml";
 function loadConfig2(dir) {
   const configPath = join(dir, CONFIG_PATH2);
@@ -4583,12 +4697,12 @@ async function runGuard(opts = {}) {
     console.log("kaddo guard: no modified files detected.");
     return;
   }
-  const archDir = join(dir, ARCH_DIR2);
+  const archDir = join(dir, ARCH_DIR3);
   if (!exists(archDir)) {
     console.log("kaddo guard: no knowledge/ directory found. Run `kaddo init` first.");
     return;
   }
-  const artifacts = readArtifacts(archDir);
+  const artifacts = discoverKnowledge(dir);
   const result = analyzeGuard(touchedFiles, artifacts, silentWithoutOwnership);
   const pluginSignals = runPlugins(plugins, currentFiles, (filePath) => {
     const abs = join(dir, filePath);
@@ -4725,7 +4839,7 @@ var STRUCTURED_TYPES = {
   ]),
   Delivery: /* @__PURE__ */ new Set([])
 };
-var WORK_ITEM_TYPES = /* @__PURE__ */ new Set([
+var WORK_ITEM_TYPES2 = /* @__PURE__ */ new Set([
   "work-item",
   "feature",
   "bugfix",
@@ -4738,7 +4852,7 @@ function layerForType(type) {
   if (type === CONSOLIDATED_TYPE.Product || STRUCTURED_TYPES.Product.has(type)) return "Product";
   if (type === CONSOLIDATED_TYPE.Tech || STRUCTURED_TYPES.Tech.has(type) || type === "knowledge")
     return "Tech";
-  if (type === "roadmap" || WORK_ITEM_TYPES.has(type)) return "Delivery";
+  if (type === "roadmap" || WORK_ITEM_TYPES2.has(type)) return "Delivery";
   return null;
 }
 function layerFromPath(filePath) {
@@ -4769,7 +4883,7 @@ function discoverLayers(dir) {
     slot.detected.add(basename(a.filePath));
     if (layer === "Delivery") {
       if (type === "roadmap" || basename(a.filePath) === "roadmap.md") slot.hasRoadmap = true;
-      if (WORK_ITEM_TYPES.has(type) || a.filePath.replace(/\\/g, "/").includes("/delivery/work-items/")) {
+      if (WORK_ITEM_TYPES2.has(type) || a.filePath.replace(/\\/g, "/").includes("/delivery/work-items/")) {
         if (a.filePath.replace(/\\/g, "/").includes("/delivery/work-items/")) slot.hasWorkItem = true;
       }
       continue;
@@ -4857,54 +4971,8 @@ function renderLayersMarkdown(layers) {
   return lines.join("\n").trimEnd();
 }
 
-// src/core/lifecycle.ts
-var LIFECYCLE_STATES = [
-  "draft",
-  "ready",
-  "in-progress",
-  "blocked",
-  "completed",
-  "archived"
-];
-var ACTIVE_STATES = ["draft", "ready", "in-progress", "blocked"];
-var LEGACY_STATUS_MAP = {
-  done: "completed",
-  cancelled: "archived",
-  canceled: "archived",
-  "in-progress": "in-progress"
-};
-var STATE_SET = new Set(LIFECYCLE_STATES);
-function isLifecycleState(s) {
-  return STATE_SET.has(s);
-}
-function isActiveState(s) {
-  return ACTIVE_STATES.includes(s);
-}
-function lifecycleFolderOf(filePath) {
-  const p2 = filePath.replace(/\\/g, "/");
-  const m = p2.match(/\/delivery\/work-items\/([^/]+)\//);
-  if (m && isLifecycleState(m[1])) return m[1];
-  return null;
-}
-function lifecycleStateOf(item) {
-  const status = (item.status ?? "").trim().toLowerCase();
-  if (isLifecycleState(status)) return status;
-  if (status && LEGACY_STATUS_MAP[status]) return LEGACY_STATUS_MAP[status];
-  const folder = lifecycleFolderOf(item.filePath ?? "");
-  if (folder) return folder;
-  return "ready";
-}
-function emptyLifecycleCounts() {
-  return Object.fromEntries(LIFECYCLE_STATES.map((s) => [s, 0]));
-}
-function lifecycleCounts(states) {
-  const counts = emptyLifecycleCounts();
-  for (const s of states) counts[s]++;
-  return counts;
-}
-
 // src/core/project-explain.ts
-var ARCH_DIR3 = "knowledge";
+var ARCH_DIR4 = "knowledge";
 function first(values) {
   if (Array.isArray(values)) {
     const v = values.find((x) => typeof x === "string" && x);
@@ -4935,7 +5003,7 @@ function loadScan(dir) {
   }
 }
 function hasAgents(dir) {
-  const agentsDir = join(dir, ARCH_DIR3, "agents");
+  const agentsDir = join(dir, ARCH_DIR4, "agents");
   if (!exists(agentsDir)) return false;
   function hasAgentMd(d) {
     for (const e of readDir(d)) {
@@ -4972,7 +5040,7 @@ function buildProjectExplanation(dir) {
   const layerStatus = (name) => layers.find((l) => l.layer === name)?.status ?? "Missing";
   const knowledge = {
     hasScan: scan2 !== null,
-    hasInventory: exists(join(dir, ARCH_DIR3, "inventory.md")),
+    hasInventory: exists(join(dir, ARCH_DIR4, "inventory.md")),
     hasContextPack: exists(join(dir, ".kaddo", "context-pack.md")),
     hasUnderstand: exists(join(dir, ".kaddo", "understand.md")),
     hasCapabilities: layerStatus("Product") !== "Missing",
@@ -4980,15 +5048,11 @@ function buildProjectExplanation(dir) {
     hasRoadmap: layerStatus("Delivery") !== "Missing",
     hasAgents: hasAgents(dir)
   };
-  const archDir = join(dir, ARCH_DIR3);
-  const allArtifacts = exists(archDir) ? readArtifacts(archDir) : [];
-  const workItemArtifacts = allArtifacts.filter((a) => {
-    const p2 = a.filePath.replace(/\\/g, "/");
-    return p2.includes("/delivery/work-items/") && Boolean(a.type);
-  });
+  const workItemArtifacts = discoverWorkItems(dir);
   const items = workItemArtifacts.map((a) => ({
     id: a.id || a.title,
     title: a.title,
+    type: a.type,
     status: a.status,
     lifecycle: lifecycleStateOf({ status: a.status, filePath: a.filePath }),
     initiative: a.initiative,
@@ -4997,6 +5061,11 @@ function buildProjectExplanation(dir) {
     domains: a.domains
   }));
   const byState = lifecycleCounts(items.map((i) => i.lifecycle));
+  const byType = {};
+  for (const i of items) {
+    const t = i.type || "unknown";
+    byType[t] = (byType[t] ?? 0) + 1;
+  }
   const initiativeMap = /* @__PURE__ */ new Map();
   for (const i of items) {
     const name = i.initiative || "Unassigned";
@@ -5010,6 +5079,7 @@ function buildProjectExplanation(dir) {
     done: items.filter((i) => i.status === "done").length,
     cancelled: items.filter((i) => i.status === "cancelled").length,
     byState,
+    byType,
     initiatives,
     items
   };
@@ -5020,7 +5090,7 @@ function buildProjectExplanation(dir) {
     workItemsMissingOwnership: items.length - withOwnership
   };
   const domains = [...new Set(workItemArtifacts.flatMap((a) => a.domains))].filter(Boolean);
-  const roadmapPath = join(dir, ARCH_DIR3, "delivery", "roadmap.md");
+  const roadmapPath = join(dir, ARCH_DIR4, "delivery", "roadmap.md");
   const roadmapMd = exists(roadmapPath) ? readFile(roadmapPath) : null;
   const roadmap = roadmapStats(roadmapMd, items.length);
   const mappedModules = loadMappedModules(dir);
@@ -5079,6 +5149,10 @@ function buildProjectExplanation(dir) {
 function stateLabel(state) {
   return state === "pre-ai" ? "pre-ai" : state;
 }
+function typeLabel(type) {
+  const cap = type.charAt(0).toUpperCase() + type.slice(1);
+  return cap.endsWith("s") ? cap : `${cap}s`;
+}
 var LIFECYCLE_LABEL = {
   draft: "Draft",
   ready: "Ready",
@@ -5140,6 +5214,12 @@ function renderExplanationHuman(exp) {
       lines.push(`- ${LIFECYCLE_LABEL[s]}: ${exp.workItems.byState[s]}`);
     }
     lines.push("");
+    const typeEntries = Object.entries(exp.workItems.byType).sort((a, b) => b[1] - a[1]);
+    if (typeEntries.length > 0) {
+      lines.push("## Work Items by Type");
+      for (const [t, n] of typeEntries) lines.push(`- ${typeLabel(t)}: ${n}`);
+      lines.push("");
+    }
     const grouped = exp.workItems.initiatives.filter(
       (g) => LIFECYCLE_STATES.some((s) => g.states[s] > 0)
     );
@@ -5204,10 +5284,10 @@ function renderExplanationAgent(exp) {
 }
 
 // src/commands/explain.ts
-var ARCH_DIR4 = "knowledge";
+var ARCH_DIR5 = "knowledge";
 var CONFIG_PATH3 = ".kaddo/config.yml";
 function readKnowledge(dir) {
-  const knowledgePath = join(dir, ARCH_DIR4, "knowledge.md");
+  const knowledgePath = join(dir, ARCH_DIR5, "knowledge.md");
   if (!exists(knowledgePath)) return null;
   try {
     const raw = readFile(knowledgePath);
@@ -5218,7 +5298,7 @@ function readKnowledge(dir) {
   }
 }
 function readRoadmap(dir) {
-  const roadmapPath = join(dir, ARCH_DIR4, "roadmap.md");
+  const roadmapPath = join(dir, ARCH_DIR5, "roadmap.md");
   if (!exists(roadmapPath)) return null;
   try {
     const raw = readFile(roadmapPath);
@@ -5367,7 +5447,7 @@ function runExplain(opts) {
     explainProject(dir, mode);
     return;
   }
-  const archDir = join(dir, ARCH_DIR4);
+  const archDir = join(dir, ARCH_DIR5);
   if (!exists(archDir)) {
     console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
@@ -5392,7 +5472,7 @@ function runExplain(opts) {
 // src/core/context-pack.ts
 import matter3 from "gray-matter";
 var CONTEXT_PACK_VERSION = "1";
-var ARCH_DIR5 = "knowledge";
+var ARCH_DIR6 = "knowledge";
 function readScanJson(dir) {
   const scanPath = join(dir, ".kaddo", "scan.json");
   if (!exists(scanPath)) return null;
@@ -5408,7 +5488,7 @@ function firstParagraph(markdown) {
   return para ?? "";
 }
 function readMarkdownSummary(dir, file) {
-  const p2 = join(dir, ARCH_DIR5, file);
+  const p2 = join(dir, ARCH_DIR6, file);
   if (!exists(p2)) return null;
   try {
     return firstParagraph(readFile(p2));
@@ -5486,7 +5566,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
     missing.push("Scan baseline missing. Run `kaddo scan` for better context.");
   }
   const detected = scanJson?.detected ?? {};
-  const inventoryAvailable = exists(join(dir, ARCH_DIR5, "inventory.md"));
+  const inventoryAvailable = exists(join(dir, ARCH_DIR6, "inventory.md"));
   if (!inventoryAvailable) {
     missing.push("No technical inventory found. Run `kaddo scan` to generate it.");
   }
@@ -5498,8 +5578,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
   if (!roadmapSummary) {
     missing.push("No roadmap baseline found.");
   }
-  const archPath = join(dir, ARCH_DIR5);
-  const allArtifacts = exists(archPath) ? readArtifacts(archPath) : [];
+  const allArtifacts = discoverKnowledge(dir);
   const workItems = allArtifacts.filter(
     (a) => isDeliveryWorkItem(a) && isActiveState(lifecycleStateOf({ status: a.status, filePath: a.filePath }))
   );
@@ -5507,11 +5586,18 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
     missing.push("No work items found.");
   }
   const state = config.project.state;
-  const roadmapPath = join(dir, ARCH_DIR5, "delivery", "roadmap.md");
+  const roadmapPath = join(dir, ARCH_DIR6, "delivery", "roadmap.md");
   const materialized = allArtifacts.filter(
     (a) => a.filePath.replace(/\\/g, "/").includes("/delivery/work-items/") && Boolean(a.type)
   ).length;
   const roadmap = roadmapStats(exists(roadmapPath) ? readFile(roadmapPath) : null, materialized);
+  const deliveryMix = {};
+  for (const a of allArtifacts) {
+    const p2 = a.filePath.replace(/\\/g, "/");
+    if (!a.type || !p2.includes("/delivery/work-items/")) continue;
+    if (!isActiveState(lifecycleStateOf({ status: a.status, filePath: a.filePath }))) continue;
+    deliveryMix[a.type] = (deliveryMix[a.type] ?? 0) + 1;
+  }
   const mappedModules = loadMappedModules(dir);
   const layers = knowledgeLayers(dir);
   return {
@@ -5542,6 +5628,7 @@ function buildContextPack(dir, config, now = /* @__PURE__ */ new Date()) {
     },
     layers,
     roadmap,
+    deliveryMix,
     mappedModules,
     missing,
     handoff: {
@@ -5643,6 +5730,16 @@ function renderContextPack(pack) {
   } else {
     parts.push("No active work items found.\n");
   }
+  const mixEntries = Object.entries(pack.deliveryMix).sort((a, b) => b[1] - a[1]);
+  if (mixEntries.length > 0) {
+    parts.push("## Delivery Mix\n");
+    parts.push("Active Work Items by type:\n");
+    const label = (t) => {
+      const c = t.charAt(0).toUpperCase() + t.slice(1);
+      return c.endsWith("s") ? c : `${c}s`;
+    };
+    parts.push(mixEntries.map(([t, n]) => `- ${label(t)}: ${n}`).join("\n") + "\n");
+  }
   parts.push("## Artifacts and Ownership\n");
   if (knowledge.artifacts.length > 0) {
     const lines = knowledge.artifacts.map(
@@ -5883,19 +5980,12 @@ import { parse as parseYaml9 } from "yaml";
 function slugify2(s) {
   return s.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
-function isWorkItem(a) {
-  return a.filePath.replace(/\\/g, "/").includes("/delivery/work-items/") && Boolean(a.type);
-}
 function toActive(a) {
   const id = a.id || a.title || "WI";
   return { id, title: a.title || id, type: a.type, slug: slugify2(a.title || id) };
 }
 function activeWorkItems(dir) {
-  const archDir = join(dir, "knowledge");
-  if (!exists(archDir)) return [];
-  return readArtifacts(archDir).filter(
-    (a) => isWorkItem(a) && lifecycleStateOf({ status: a.status, filePath: a.filePath }) === "in-progress"
-  ).map(toActive);
+  return discoverWorkItems(dir).filter((a) => a.lifecycle === "in-progress").map(toActive);
 }
 function branchPrefix(type) {
   switch (type) {
@@ -6198,9 +6288,9 @@ function classify(declaredType, declaredLevel, touchedFiles) {
 }
 
 // src/commands/classify.ts
-var ARCH_DIR6 = "knowledge";
+var ARCH_DIR7 = "knowledge";
 function findActiveWorkItem(dir) {
-  const archDir = join(dir, ARCH_DIR6);
+  const archDir = join(dir, ARCH_DIR7);
   if (!exists(archDir)) return null;
   const artifacts = readArtifacts(archDir);
   return artifacts.filter((a) => a.status === "in-progress" && a.type !== "current-state" && a.type !== "roadmap").sort((a, b) => {
@@ -6266,7 +6356,7 @@ async function runClassify(opts = {}) {
 
 // src/commands/status.ts
 import { parse as parseYaml10 } from "yaml";
-var ARCH_DIR7 = "knowledge";
+var ARCH_DIR8 = "knowledge";
 var CONFIG_PATH4 = ".kaddo/config.yml";
 function loadConfig3(dir) {
   const p2 = join(dir, CONFIG_PATH4);
@@ -6279,12 +6369,12 @@ function loadConfig3(dir) {
 }
 function runStatus() {
   const dir = cwd();
-  if (!exists(join(dir, ARCH_DIR7))) {
+  if (!exists(join(dir, ARCH_DIR8))) {
     console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   const config = loadConfig3(dir);
-  const artifacts = readArtifacts(join(dir, ARCH_DIR7));
+  const artifacts = readArtifacts(join(dir, ARCH_DIR8));
   const ignores = loadIgnores(dir);
   const workItems = artifacts.filter(
     (a) => a.type !== "current-state" && a.type !== "roadmap"
@@ -6330,7 +6420,7 @@ function runStatus() {
 
 // src/commands/learn.ts
 import matter4 from "gray-matter";
-var ARCH_DIR8 = "knowledge";
+var ARCH_DIR9 = "knowledge";
 var WORK_ITEMS_DIR2 = "knowledge/delivery/work-items";
 function findWorkItemFile(dir, id) {
   const wiDir = join(dir, WORK_ITEMS_DIR2);
@@ -6371,12 +6461,12 @@ ${learning.trim()}
 }
 async function runLearn(artifactId) {
   const dir = cwd();
-  if (!exists(join(dir, ARCH_DIR8))) {
+  if (!exists(join(dir, ARCH_DIR9))) {
     console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
   intro2("kaddo learn");
-  const artifacts = readArtifacts(join(dir, ARCH_DIR8));
+  const artifacts = readArtifacts(join(dir, ARCH_DIR9));
   const inProgress = artifacts.filter(
     (a) => a.status === "in-progress" && a.type !== "current-state" && a.type !== "roadmap"
   );
@@ -6419,7 +6509,7 @@ async function runLearn(artifactId) {
 }
 
 // src/commands/history.ts
-var ARCH_DIR9 = "knowledge";
+var ARCH_DIR10 = "knowledge";
 function formatRow(a) {
   const id = (a.id || "").padEnd(8);
   const type = a.type.padEnd(18);
@@ -6430,11 +6520,11 @@ function formatRow(a) {
 }
 function runHistory(opts = {}) {
   const dir = cwd();
-  if (!exists(join(dir, ARCH_DIR9))) {
+  if (!exists(join(dir, ARCH_DIR10))) {
     console.error("No knowledge/ directory found. Run `kaddo init` first.");
     process.exit(1);
   }
-  let artifacts = readArtifacts(join(dir, ARCH_DIR9)).filter(
+  let artifacts = readArtifacts(join(dir, ARCH_DIR10)).filter(
     (a) => a.type !== "current-state" && a.type !== "roadmap"
   );
   if (opts.domain) {
@@ -6595,42 +6685,23 @@ function runAdd(moduleName, opts = {}, dir = cwd()) {
 
 // src/core/ownership-suggest.ts
 import matter5 from "gray-matter";
-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) : [];
 }
-function parseOwnershipArtifact(filePath, relPath, raw) {
-  try {
-    const { data } = matter5(raw);
-    const codeGlobs = toStringArray3(data.code);
-    return {
-      filePath,
-      relPath: relPath.split("\\").join("/"),
-      id: String(data.id ?? ""),
-      title: String(data.title ?? ""),
-      type: String(data.type ?? ""),
-      domains: toStringArray3(data.domains),
-      capabilities: toStringArray3(data.capabilities),
-      codeGlobs,
-      source: data.source ? String(data.source) : void 0,
-      hasOwnership: codeGlobs.length > 0
-    };
-  } catch {
-    return null;
-  }
-}
 function findWorkItemArtifacts(dir) {
-  const wiDir = join(dir, WORK_ITEMS_DIR3);
-  if (!exists(wiDir)) return [];
-  const artifacts = [];
-  for (const entry of readDir(wiDir)) {
-    const full = join(wiDir, entry);
-    if (!isFile(full) || !entry.endsWith(".md")) continue;
-    const parsed = parseOwnershipArtifact(full, `${WORK_ITEMS_DIR3}/${entry}`, readFile(full));
-    if (parsed) artifacts.push(parsed);
-  }
-  return artifacts;
+  return discoverWorkItems(dir).map((a) => ({
+    filePath: a.filePath,
+    relPath: a.relPath,
+    id: a.id,
+    title: a.title,
+    type: a.type,
+    domains: a.domains,
+    capabilities: a.capabilities,
+    codeGlobs: a.codeGlobs,
+    source: a.source || void 0,
+    hasOwnership: a.codeGlobs.length > 0
+  }));
 }
 function artifactsMissingOwnership(artifacts) {
   return artifacts.filter((a) => !a.hasOwnership);
@@ -6774,16 +6845,24 @@ async function runOwnersSuggest() {
   intro2("kaddo owners suggest");
   const artifacts = findWorkItemArtifacts(dir);
   if (artifacts.length === 0) {
-    log2.warn("No knowledge artifacts found. Create a Work Item first.");
+    log2.warn(
+      "No Work Items found under knowledge/delivery/work-items/ (searched recursively, including draft/ ready/ in-progress/ \u2026)."
+    );
+    log2.info("Create one with `kaddo create` or `kaddo create --from roadmap`.");
     outro2("Nothing to do.");
     return;
   }
   const missing = artifactsMissingOwnership(artifacts);
   if (missing.length === 0) {
-    log2.info("All detected artifacts already declare code ownership.");
+    log2.success(
+      `Found ${artifacts.length} Work Item${artifacts.length === 1 ? "" : "s"}; all already declare code ownership.`
+    );
     outro2("Nothing to do.");
     return;
   }
+  log2.info(
+    `Found ${artifacts.length} Work Item${artifacts.length === 1 ? "" : "s"}; ${missing.length} missing code ownership.`
+  );
   const relPath = missing.length === 1 ? missing[0].relPath : await select2({
     message: "Which artifact needs ownership?",
     options: missing.map((a) => ({
@@ -8745,7 +8824,7 @@ program.command("scan").description("Detect project stack and suggest domains").
 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) => {
+program.command("create [type]").description("Create a work item (feature, bugfix, hotfix, spike, chore). Use --from roadmap to create from a roadmap candidate.").option("--from <source>", "Create from a source artifact (currently: roadmap)").action(async (type, opts) => {
   await runCreate(type ?? "", opts);
 });
 program.command("guard").description("Check if modified code has related artifacts that were not updated").option("--staged", "Check only staged files").option("--no-interactive", "Disable interactive ignore prompts").option("--ci", "CI mode: output JSON, no prompts, non-blocking").option("--json", "Output JSON (alias for --ci)").option("--workspace", "Also check local mapped module repos from .kaddo/modules.yml (opt-in)").action(async (opts) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaddo/cli",
-  "version": "3.8.0",
+  "version": "3.9.1",
   "description": "Knowledge Driven Development toolkit",
   "license": "MIT",
   "repository": {