@kaddo/cli 3.22.0 → 3.22.1

package/README.md

@@ -509,6 +509,7 @@ create --from roadmap → owners → guard → explain`.
 | v3.20 | MCP derived tools: safe regeneration of context/explain/understand/graph/capsule-draft under `.kaddo/` |
 | v3.21 | Reusable Skills layer (`kaddo add skills`); skills in context/explain/understand, agent prompts and MCP |
 | v3.22 | Guard & graph scope semantics: graph scope metadata, contextual-empty messaging, Guard ownership scope (active + completed; `--include-archived`) |
+| v3.22.1 | Guard project-root path normalization: matches `code:` globs when the project is a subfolder of the Git root |
 
 **Optional modules (installed with `kaddo add`):**
 

package/dist/index.js

@@ -592,8 +592,8 @@ function loadConfig(dir) {
   const parsed = configSchema.safeParse(raw ?? {});
   if (!parsed.success) {
     const issues = parsed.error.issues.map((i) => {
-      const path5 = i.path.join(".");
-      return path5 ? `  - ${path5}: ${i.message}` : `  - ${i.message}`;
+      const path6 = i.path.join(".");
+      return path6 ? `  - ${path6}: ${i.message}` : `  - ${i.message}`;
     }).join("\n");
     throw new ConfigError(`Invalid .kaddo/config.yml:
 ${issues}`);
@@ -4902,6 +4902,14 @@ async function isGitRepo(dir) {
     return false;
   }
 }
+async function getGitRoot(dir) {
+  try {
+    const result = await execa("git", ["rev-parse", "--show-toplevel"], { cwd: dir });
+    return result.stdout.trim() || null;
+  } catch {
+    return null;
+  }
+}
 async function getUntrackedFiles() {
   try {
     const result = await execa("git", ["ls-files", "--others", "--exclude-standard"]);
@@ -5048,6 +5056,20 @@ function discoverWorkItems(dir) {
 
 // src/core/diff-analysis.ts
 import { minimatch } from "minimatch";
+import path3 from "path";
+function toPosix2(p2) {
+  return p2.replace(/\\/g, "/");
+}
+function normalizeTouchedPathForProject(touchedPath, gitRoot, projectRoot) {
+  const t = toPosix2(touchedPath).replace(/^\.\//, "").replace(/^\/+/, "");
+  if (!gitRoot) return t;
+  const prefix = toPosix2(path3.relative(gitRoot, projectRoot)).replace(/^\.\//, "").replace(/\/+$/, "");
+  if (prefix === "" || prefix === ".") return t;
+  if (prefix.startsWith("..")) return t;
+  if (t === prefix) return null;
+  if (t.startsWith(prefix + "/")) return t.slice(prefix.length + 1);
+  return null;
+}
 function normalizePath(p2) {
   return p2.replace(/\\/g, "/");
 }
@@ -5107,10 +5129,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 path5 = join(dir, IGNORE_FILE);
-  if (!exists(path5)) return [];
+  const path6 = join(dir, IGNORE_FILE);
+  if (!exists(path6)) return [];
   try {
-    const raw = readFile(path5);
+    const raw = readFile(path6);
     const parsed = parseYaml4(raw);
     return Array.isArray(parsed) ? parsed : [];
   } catch {
@@ -5118,7 +5140,7 @@ function loadIgnores(dir) {
   }
 }
 function saveIgnore(dir, entry) {
-  const path5 = join(dir, IGNORE_FILE);
+  const path6 = join(dir, IGNORE_FILE);
   const existing = loadIgnores(dir);
   const idx = existing.findIndex((e) => e.artifact_id === entry.artifact_id);
   if (idx >= 0) {
@@ -5126,17 +5148,17 @@ function saveIgnore(dir, entry) {
   } else {
     existing.push(entry);
   }
-  writeFile(path5, stringifyYaml2(existing));
+  writeFile(path6, stringifyYaml2(existing));
 }
 function isIgnored(ignores, artifactId) {
   return ignores.find((e) => e.artifact_id === artifactId);
 }
 function removeIgnore(dir, artifactId) {
-  const path5 = join(dir, IGNORE_FILE);
+  const path6 = 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(path5, stringifyYaml2(filtered));
+  writeFile(path6, stringifyYaml2(filtered));
   return true;
 }
 
@@ -5158,11 +5180,11 @@ function moduleArtifactCoverage(dir, id) {
   };
 }
 function loadMappedModules(dir) {
-  const path5 = join(dir, DESCRIPTOR_PATH);
-  if (!exists(path5)) return [];
+  const path6 = join(dir, DESCRIPTOR_PATH);
+  if (!exists(path6)) return [];
   let parsed;
   try {
-    parsed = parseYaml5(readFile(path5));
+    parsed = parseYaml5(readFile(path6));
   } catch {
     return [];
   }
@@ -5254,7 +5276,7 @@ async function collectWorkspaceChanges(dir, mode = "head", deps = defaultDeps) {
 }
 
 // src/commands/guard.ts
-import path3 from "path";
+import path4 from "path";
 import { parse as parseYaml7 } from "yaml";
 
 // src/plugins/prisma.ts
@@ -5458,7 +5480,7 @@ function printHeader(touchedFiles) {
 function artifactLabel(artifact, dir) {
   if (artifact.id) return artifact.id;
   if (artifact.title) return artifact.title;
-  const rel = path3.relative(dir, artifact.filePath).split(path3.sep).join("/");
+  const rel = path4.relative(dir, artifact.filePath).split(path4.sep).join("/");
   return rel || artifact.filePath;
 }
 function printWorkspaceHeader(scan2) {
@@ -5524,7 +5546,7 @@ async function offerIgnore(dir, match) {
   log2.success(`${id} added to .kaddo/ignores.yml`);
   return true;
 }
-function printCIJson(dir, touchedFiles, activeMatches, ignoredCount, pluginSignals, affectedOwners, workspace, includeArchived) {
+function printCIJson(dir, touchedFiles, activeMatches, ignoredCount, pluginSignals, affectedOwners, workspace, includeArchived, normalizedFiles, outsideProjectFiles) {
   const output = {
     kaddo_guard: true,
     ci: true,
@@ -5532,6 +5554,9 @@ function printCIJson(dir, touchedFiles, activeMatches, ignoredCount, pluginSigna
       included: includeArchived ? ["draft", "ready", "in-progress", "blocked", "completed", "archived"] : ["draft", "ready", "in-progress", "blocked", "completed"],
       excluded: includeArchived ? [] : ["archived"]
     },
+    // Git-root-relative → project-root-relative mapping used for matching (VS-060.1).
+    normalized_files: normalizedFiles,
+    files_outside_project: outsideProjectFiles,
     touched_files: touchedFiles.length,
     fyi_count: activeMatches.length,
     ignored_count: ignoredCount,
@@ -5580,8 +5605,16 @@ async function runGuard(opts = {}) {
   const ignores = loadIgnores(dir);
   const plugins = resolvePlugins(config.plugins ?? []);
   const mode = opts.staged ? "staged" : "head";
-  const currentFiles = await getModifiedFiles(mode);
-  const untrackedFiles = opts.staged ? [] : await getUntrackedFiles();
+  const currentFilesRaw = await getModifiedFiles(mode);
+  const gitRoot = await getGitRoot(dir);
+  const currentPairs = currentFilesRaw.map((raw) => ({
+    raw,
+    project: normalizeTouchedPathForProject(raw, gitRoot, dir)
+  }));
+  const inProjectPairs = currentPairs.filter((p2) => p2.project !== null);
+  const currentFiles = inProjectPairs.map((p2) => p2.project);
+  const outsideProjectFiles = currentPairs.filter((p2) => p2.project === null).map((p2) => p2.raw);
+  const untrackedFiles = opts.staged ? [] : (await getUntrackedFiles()).map((f) => normalizeTouchedPathForProject(f, gitRoot, dir)).filter((f) => f !== null);
   const printUntracked = () => {
     if (untrackedFiles.length === 0 || jsonMode) return;
     console.log("");
@@ -5596,6 +5629,7 @@ async function runGuard(opts = {}) {
   }
   const workspaceFiles = workspaceScan ? workspaceScan.changedFiles.map((c) => c.normalizedPath) : [];
   const touchedFiles = [.../* @__PURE__ */ new Set([...currentFiles, ...workspaceFiles])];
+  const displayTouched = [.../* @__PURE__ */ new Set([...inProjectPairs.map((p2) => p2.raw), ...workspaceFiles])];
   if (touchedFiles.length === 0) {
     if (workspaceScan) printWorkspaceHeader(workspaceScan);
     console.log("kaddo guard: no modified files detected.");
@@ -5631,7 +5665,7 @@ async function runGuard(opts = {}) {
     const ownerMapCI = loadOwners(dir);
     const matchedDomainsCI = collectMatchedDomains(activeMatches.map((m) => m.artifact.domains));
     const affectedOwnersCI = resolveAffectedOwners(matchedDomainsCI, ownerMapCI);
-    printCIJson(dir, touchedFiles, activeMatches, alreadyIgnoredMatches.length, pluginSignals, affectedOwnersCI, workspaceScan, includeArchived);
+    printCIJson(dir, touchedFiles, activeMatches, alreadyIgnoredMatches.length, pluginSignals, affectedOwnersCI, workspaceScan, includeArchived, inProjectPairs.map((p2) => ({ raw_path: p2.raw, project_path: p2.project })), outsideProjectFiles);
     return;
   }
   if (result.silenced && pluginSignals.length === 0) {
@@ -5640,7 +5674,7 @@ async function runGuard(opts = {}) {
   }
   if (result.matches.length === 0 && pluginSignals.length === 0) {
     if (workspaceScan) printWorkspaceHeader(workspaceScan);
-    printHeader(touchedFiles);
+    printHeader(displayTouched);
     printOwnershipScope(includeArchived);
     console.log("  No artifact ownership matches found.");
     console.log("");
@@ -5651,7 +5685,7 @@ async function runGuard(opts = {}) {
     return;
   }
   if (workspaceScan) printWorkspaceHeader(workspaceScan);
-  printHeader(touchedFiles);
+  printHeader(displayTouched);
   printOwnershipScope(includeArchived);
   printUntracked();
   for (const match of activeMatches) {
@@ -5999,7 +6033,7 @@ function sectionParagraph(md, title) {
   }
   return "";
 }
-function parseCapsule(id, path5, md) {
+function parseCapsule(id, path6, md) {
   const { data } = matter2(md);
   const updatedAt = data.updated_at ? String(data.updated_at) : void 0;
   let ageDays = null;
@@ -6009,7 +6043,7 @@ function parseCapsule(id, path5, md) {
   }
   return {
     id,
-    path: path5,
+    path: path6,
     system: data.system ? String(data.system) : id,
     owner: data.owner ? String(data.owner) : void 0,
     updatedAt,
@@ -6064,14 +6098,14 @@ var ALL_STATUSES = ["draft", "ready", "in-progress", "blocked", "completed"];
 function scopeStatuses(scope) {
   return scope === "all" ? { included: ALL_STATUSES, excluded: ["archived"] } : { included: ACTIVE_STATUSES, excluded: ["completed", "archived"] };
 }
-function toPosix2(p2) {
+function toPosix3(p2) {
   return p2.replace(/\\/g, "/");
 }
 function slug(s) {
   return s.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function isAdr(a) {
-  return toPosix2(a.filePath).includes("/tech/decisions/") && Boolean(a.type);
+  return toPosix3(a.filePath).includes("/tech/decisions/") && Boolean(a.type);
 }
 function buildGraph(dir, config, opts = {}, now = /* @__PURE__ */ new Date()) {
   const scope = opts.scope ?? "active";
@@ -6095,9 +6129,9 @@ function buildGraph(dir, config, opts = {}, now = /* @__PURE__ */ new Date()) {
   ];
   const presentLayers = [];
   for (const layer2 of layerDocs) {
-    const path5 = layer2.files.map((f) => `${KNOWLEDGE2}/${f}`).find((rel) => exists(join(dir, rel)));
-    if (path5) {
-      addNode({ id: layer2.id, type: layer2.type, label: layer2.label, path: path5 });
+    const path6 = layer2.files.map((f) => `${KNOWLEDGE2}/${f}`).find((rel) => exists(join(dir, rel)));
+    if (path6) {
+      addNode({ id: layer2.id, type: layer2.type, label: layer2.label, path: path6 });
       presentLayers.push(layer2.id);
     }
   }
@@ -6256,14 +6290,14 @@ function loadGraphSummary(dir) {
 
 // src/core/graph-hints.ts
 var KNOWLEDGE3 = "knowledge";
-function toPosix3(p2) {
+function toPosix4(p2) {
   return p2.replace(/\\/g, "/");
 }
 function slug2(s) {
   return s.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function isAdr2(a) {
-  return toPosix3(a.filePath).includes("/tech/decisions/") && Boolean(a.type);
+  return toPosix4(a.filePath).includes("/tech/decisions/") && Boolean(a.type);
 }
 function capabilityHeadings(dir) {
   const p2 = join(dir, KNOWLEDGE3, "product", "capabilities.md");
@@ -8007,7 +8041,7 @@ function runUnderstand() {
 }
 
 // src/core/classifier.ts
-import path4 from "path";
+import path5 from "path";
 var MIGRATION_PATTERNS = [
   /supabase\/migrations\//,
   /prisma\/migrations\//,
@@ -8046,7 +8080,7 @@ var DEP_PATTERNS = [
   /^pom\.xml$/
 ];
 function normalizePath2(p2) {
-  return p2.split(path4.sep).join("/");
+  return p2.split(path5.sep).join("/");
 }
 function matchesAny(file, patterns) {
   const normalized = normalizePath2(file);
@@ -8878,10 +8912,10 @@ ${globs.map((g) => `  - ${g}`).join("\n")}`);
 import { parse as parseYaml13, stringify as stringifyYaml5 } from "yaml";
 var DESCRIPTOR_PATH2 = "knowledge/module.yml";
 function readDescriptor(dir) {
-  const path5 = join(dir, DESCRIPTOR_PATH2);
-  if (!exists(path5)) return null;
+  const path6 = join(dir, DESCRIPTOR_PATH2);
+  if (!exists(path6)) return null;
   try {
-    return parseYaml13(readFile(path5));
+    return parseYaml13(readFile(path6));
   } catch {
     return null;
   }
@@ -10486,10 +10520,10 @@ function slugify3(name) {
   return name.trim().toLowerCase().replace(/[^a-z0-9]+/g, "-").replace(/^-+|-+$/g, "");
 }
 function readModulesDescriptor(dir) {
-  const path5 = join(dir, DESCRIPTOR_PATH3);
-  if (!exists(path5)) return { version: 1, modules: [] };
+  const path6 = join(dir, DESCRIPTOR_PATH3);
+  if (!exists(path6)) return { version: 1, modules: [] };
   try {
-    const parsed = parseYaml14(readFile(path5));
+    const parsed = parseYaml14(readFile(path6));
     return { version: parsed.version ?? 1, modules: parsed.modules ?? [] };
   } catch {
     return { version: 1, modules: [] };
@@ -10899,8 +10933,8 @@ var capsuleCmd = program.command("capsule").description("Export this project as
 capsuleCmd.command("export").description("Write a Knowledge Capsule about this project to .kaddo/exports/").action(() => {
   runCapsuleExport();
 });
-capsuleCmd.command("add <path>").description("Register an external Knowledge Capsule as project context (.kaddo/external.yml)").action((path5) => {
-  runCapsuleAdd(path5);
+capsuleCmd.command("add <path>").description("Register an external Knowledge Capsule as project context (.kaddo/external.yml)").action((path6) => {
+  runCapsuleAdd(path6);
 });
 var graphCmd = program.command("graph").description("Export the lightweight, file-based knowledge graph of the project");
 graphCmd.command("export").description("Write the knowledge graph to .kaddo/graph.json and .kaddo/graph.mmd").option("--scope <scope>", "Graph scope: active (default) or all").option("--format <format>", "Output format: json, mermaid (default: both)").action((opts) => {

package/package.json

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