safeword 0.63.0 → 0.67.0

package/dist/{architecture-T4RR7Q5J.js → architecture-K67T4PSI.js}

@@ -1,14 +1,19 @@
+import {
+  listArchitectureRecords
+} from "./chunk-M4FTAAXQ.js";
 import {
   GENERATED_ARCHITECTURE_FILENAME,
   isArchitectureDocumentEnforcementEnabled,
+  resolveArchitectureNarrative,
   resolveGeneratedArchitecturePath
-} from "./chunk-FTMQT2V3.js";
+} from "./chunk-CYICTM6W.js";
 import {
   exists,
+  findAllInTree,
   isDirectory,
   readFileSafe,
   readJson
-} from "./chunk-2KELQTLE.js";
+} from "./chunk-X26EJNPZ.js";
 import {
   error,
   success,
@@ -32,6 +37,107 @@ import nodePath3 from "path";
 // src/utils/architecture-skeleton.ts
 import { readdirSync } from "fs";
 import nodePath from "path";
+
+// src/utils/toml.ts
+function readTomlTableArray(content, table, key) {
+  const found = tableArrayBody(content.split(/\r?\n/), table, key);
+  if (found === void 0) return void 0;
+  const values = found.body.matchAll(/"([^"]*)"|'([^']*)'/g).map((match) => match[1] ?? match[2] ?? "").filter((value) => value.length > 0).toArray();
+  return values.length > 0 ? values : void 0;
+}
+function isTomlTableEmptyArray(content, table, key) {
+  const found = tableArrayBody(content.split(/\r?\n/), table, key);
+  return found !== void 0 && found.closed && found.body.replaceAll(/[\s,]/g, "") === "";
+}
+function hasTomlTable(content, table) {
+  return content.split(/\r?\n/).some((line) => tableHeader(stripTomlComment(line).trim()) === table);
+}
+function* linesInTable(content, table) {
+  let inTable = false;
+  for (const rawLine of content.split(/\r?\n/)) {
+    const line = stripTomlComment(rawLine).trim();
+    if (line === "") continue;
+    const header = tableHeader(line);
+    if (header !== void 0) {
+      inTable = header === table;
+      continue;
+    }
+    if (inTable) yield line;
+  }
+}
+function hasTomlTableKey(content, table, key) {
+  for (const line of linesInTable(content, table)) {
+    if (tableValue(line, key) !== void 0) return true;
+  }
+  return false;
+}
+function readTomlTableString(content, table, key) {
+  for (const line of linesInTable(content, table)) {
+    const value = tableValue(line, key);
+    if (value?.startsWith('"')) {
+      const end = value.indexOf('"', 1);
+      if (end !== -1) return value.slice(1, end);
+    }
+  }
+  return void 0;
+}
+function tableArrayBody(lines, table, key) {
+  const opened = findTableArrayOpen(lines, table, key);
+  if (opened === void 0) return void 0;
+  let body = opened.initial;
+  for (let index = opened.line; index < lines.length; index += 1) {
+    if (index > opened.line) body += `
+${stripTomlComment(lines[index] ?? "")}`;
+    const close = indexOfOutsideQuotes(body, "]");
+    if (close !== -1) return { body: body.slice(0, close), closed: true };
+  }
+  return { body, closed: false };
+}
+function findTableArrayOpen(lines, table, key) {
+  let inTable = false;
+  for (const [index, rawLine] of lines.entries()) {
+    const trimmed = stripTomlComment(rawLine).trim();
+    const header = tableHeader(trimmed);
+    if (header !== void 0) {
+      inTable = header === table;
+      continue;
+    }
+    if (!inTable) continue;
+    const value = tableValue(trimmed, key);
+    if (value?.startsWith("[") === true) return { line: index, initial: value.slice(1) };
+  }
+  return void 0;
+}
+function indexOfOutsideQuotes(text, target) {
+  let quote = "";
+  let index = 0;
+  while (index < text.length) {
+    const character = text[index];
+    if (quote === "") {
+      if (character === '"' || character === "'") quote = character;
+      else if (character === target) return index;
+    } else if (character === quote) {
+      quote = "";
+    }
+    index += 1;
+  }
+  return -1;
+}
+function tableValue(line, key) {
+  const equals = line.indexOf("=");
+  if (equals === -1 || line.slice(0, equals).trim() !== key) return void 0;
+  return line.slice(equals + 1).trim();
+}
+function tableHeader(line) {
+  const match = /^\[\[?([^[\]]+)\]\]?\s*$/.exec(line);
+  return match?.[1] === void 0 ? void 0 : match[1].trim();
+}
+function stripTomlComment(line) {
+  const hash = indexOfOutsideQuotes(line, "#");
+  return hash === -1 ? line : line.slice(0, hash);
+}
+
+// src/utils/architecture-skeleton.ts
 var PURPOSE_PLACEHOLDER = "No description yet \u2014 awaiting prose.";
 var GO_LAYOUT_DIRECTORIES = ["cmd", "internal", "pkg"];
 var RUST_ROOT_FILES = /* @__PURE__ */ new Set(["lib.rs", "main.rs"]);
@@ -42,6 +148,7 @@ var PYTHON_EXCLUDED_FILES = /* @__PURE__ */ new Set([
   "__init__.py",
   "__main__.py"
 ]);
+var JS_SOURCE_EXTENSIONS = [".ts", ".tsx", ".mts", ".cts", ".js", ".jsx", ".mjs", ".cjs"];
 var byNodeName = (a, b) => a.name.localeCompare(b.name);
 function extractSkeleton(projectDirectory) {
   if (exists(nodePath.join(projectDirectory, "pyproject.toml"))) {
@@ -51,7 +158,7 @@ function extractSkeleton(projectDirectory) {
   if (exists(nodePath.join(projectDirectory, "Cargo.toml"))) {
     return { nodes: rustModuleNodes(projectDirectory) };
   }
-  const sourceNodes = enumerateModuleDirectories(
+  const sourceNodes = enumerateJsSourceRoot(
     nodePath.join(projectDirectory, "src"),
     (name) => `src/${name}`
   );
@@ -59,16 +166,70 @@ function extractSkeleton(projectDirectory) {
   if (exists(nodePath.join(projectDirectory, "go.mod"))) {
     return { nodes: goLayoutNodes(projectDirectory) };
   }
-  return { nodes: sourceNodes };
+  const libraryNodes = enumerateJsSourceRoot(
+    nodePath.join(projectDirectory, "lib"),
+    (name) => `lib/${name}`
+  );
+  if (libraryNodes.length > 0) return { nodes: libraryNodes };
+  if (declaresWorkspaces(projectDirectory)) return { nodes: [] };
+  return { nodes: topLevelJsModuleNodes(projectDirectory) };
+}
+function declaresWorkspaces(projectDirectory) {
+  if (exists(nodePath.join(projectDirectory, "pnpm-workspace.yaml"))) return true;
+  if (exists(nodePath.join(projectDirectory, "go.work"))) return true;
+  const manifest = readJson(nodePath.join(projectDirectory, "package.json"));
+  if (manifest !== null && typeof manifest === "object" && manifest.workspaces !== void 0) {
+    return true;
+  }
+  const pyproject = readFileSafe(nodePath.join(projectDirectory, "pyproject.toml"));
+  return pyproject !== void 0 && hasTomlTable(pyproject, "tool.uv.workspace");
 }
-function enumerateModuleDirectories(directory, pathFor) {
+function enumerateJsSourceRoot(directory, pathFor) {
   let entries;
   try {
     entries = readdirSync(directory, { withFileTypes: true });
   } catch {
     return [];
   }
-  return entries.filter((entry) => entry.isDirectory()).map((entry) => ({ name: entry.name, path: pathFor(entry.name), purpose: PURPOSE_PLACEHOLDER })).toSorted(byNodeName);
+  const directories = entries.filter((entry) => entry.isDirectory());
+  if (directories.length > 0) {
+    return directories.map((entry) => ({ name: entry.name, path: pathFor(entry.name), purpose: PURPOSE_PLACEHOLDER })).toSorted(byNodeName);
+  }
+  return jsFileNodes(entries, pathFor);
+}
+function topLevelJsModuleNodes(projectDirectory) {
+  let entries;
+  try {
+    entries = readdirSync(projectDirectory, { withFileTypes: true });
+  } catch {
+    return [];
+  }
+  return jsFileNodes(entries, (name) => name);
+}
+function jsFileNodes(entries, pathFor) {
+  const files = entries.filter((entry) => entry.isFile() && isJsSourceModuleFile(entry.name)).toSorted(
+    (a, b) => extensionPriority(a.name) - extensionPriority(b.name) || a.name.localeCompare(b.name)
+  );
+  const byName = /* @__PURE__ */ new Map();
+  for (const entry of files) {
+    const name = jsModuleName(entry.name);
+    if (!byName.has(name)) {
+      byName.set(name, { name, path: pathFor(entry.name), purpose: PURPOSE_PLACEHOLDER });
+    }
+  }
+  return byName.values().toArray().toSorted(byNodeName);
+}
+function extensionPriority(filename) {
+  return JS_SOURCE_EXTENSIONS.findIndex((extension) => filename.endsWith(extension));
+}
+function isJsSourceModuleFile(name) {
+  if (name.startsWith(".")) return false;
+  if (/\.d\.[mc]?ts$/.test(name)) return false;
+  if (/\.config\.[mc]?[jt]sx?$/.test(name)) return false;
+  return JS_SOURCE_EXTENSIONS.some((extension) => name.endsWith(extension));
+}
+function jsModuleName(filename) {
+  return filename.slice(0, filename.lastIndexOf("."));
 }
 function goLayoutNodes(projectDirectory) {
   return GO_LAYOUT_DIRECTORIES.filter((name) => isDirectory(nodePath.join(projectDirectory, name))).map((name) => ({ name, path: name, purpose: PURPOSE_PLACEHOLDER })).toSorted(byNodeName);
@@ -161,105 +322,6 @@ function readBoundaryConfig(projectDirectory) {
   return "";
 }
 
-// src/utils/toml.ts
-function readTomlTableArray(content, table, key) {
-  const found = tableArrayBody(content.split(/\r?\n/), table, key);
-  if (found === void 0) return void 0;
-  const values = found.body.matchAll(/"([^"]*)"|'([^']*)'/g).map((match) => match[1] ?? match[2] ?? "").filter((value) => value.length > 0).toArray();
-  return values.length > 0 ? values : void 0;
-}
-function isTomlTableEmptyArray(content, table, key) {
-  const found = tableArrayBody(content.split(/\r?\n/), table, key);
-  return found !== void 0 && found.closed && found.body.replaceAll(/[\s,]/g, "") === "";
-}
-function hasTomlTable(content, table) {
-  return content.split(/\r?\n/).some((line) => tableHeader(stripTomlComment(line).trim()) === table);
-}
-function* linesInTable(content, table) {
-  let inTable = false;
-  for (const rawLine of content.split(/\r?\n/)) {
-    const line = stripTomlComment(rawLine).trim();
-    if (line === "") continue;
-    const header = tableHeader(line);
-    if (header !== void 0) {
-      inTable = header === table;
-      continue;
-    }
-    if (inTable) yield line;
-  }
-}
-function hasTomlTableKey(content, table, key) {
-  for (const line of linesInTable(content, table)) {
-    if (tableValue(line, key) !== void 0) return true;
-  }
-  return false;
-}
-function readTomlTableString(content, table, key) {
-  for (const line of linesInTable(content, table)) {
-    const value = tableValue(line, key);
-    if (value?.startsWith('"')) {
-      const end = value.indexOf('"', 1);
-      if (end !== -1) return value.slice(1, end);
-    }
-  }
-  return void 0;
-}
-function tableArrayBody(lines, table, key) {
-  const opened = findTableArrayOpen(lines, table, key);
-  if (opened === void 0) return void 0;
-  let body = opened.initial;
-  for (let index = opened.line; index < lines.length; index += 1) {
-    if (index > opened.line) body += `
-${stripTomlComment(lines[index] ?? "")}`;
-    const close = indexOfOutsideQuotes(body, "]");
-    if (close !== -1) return { body: body.slice(0, close), closed: true };
-  }
-  return { body, closed: false };
-}
-function findTableArrayOpen(lines, table, key) {
-  let inTable = false;
-  for (const [index, rawLine] of lines.entries()) {
-    const trimmed = stripTomlComment(rawLine).trim();
-    const header = tableHeader(trimmed);
-    if (header !== void 0) {
-      inTable = header === table;
-      continue;
-    }
-    if (!inTable) continue;
-    const value = tableValue(trimmed, key);
-    if (value?.startsWith("[") === true) return { line: index, initial: value.slice(1) };
-  }
-  return void 0;
-}
-function indexOfOutsideQuotes(text, target) {
-  let quote = "";
-  let index = 0;
-  while (index < text.length) {
-    const character = text[index];
-    if (quote === "") {
-      if (character === '"' || character === "'") quote = character;
-      else if (character === target) return index;
-    } else if (character === quote) {
-      quote = "";
-    }
-    index += 1;
-  }
-  return -1;
-}
-function tableValue(line, key) {
-  const equals = line.indexOf("=");
-  if (equals === -1 || line.slice(0, equals).trim() !== key) return void 0;
-  return line.slice(equals + 1).trim();
-}
-function tableHeader(line) {
-  const match = /^\[\[?([^[\]]+)\]\]?\s*$/.exec(line);
-  return match?.[1] === void 0 ? void 0 : match[1].trim();
-}
-function stripTomlComment(line) {
-  const hash = indexOfOutsideQuotes(line, "#");
-  return hash === -1 ? line : line.slice(0, hash);
-}
-
 // src/utils/cargo-manifest.ts
 var DEPENDENCY_TABLES = ["dependencies", "dev-dependencies", "build-dependencies"];
 function readCargoWorkspaceMembers(content) {
@@ -484,13 +546,58 @@ function discoverWorkspaces(projectDirectory) {
     patterns: detections.flatMap(
       (detection) => detection.status === "parsed" ? detection.patterns : []
     ),
-    unreadable: detections.flatMap(
-      (detection) => detection.status === "unreadable" ? [{ manager: detection.manager, config: detection.config }] : []
-    )
+    unreadable: detections.filter((detection) => detection.status === "unreadable").map((detection) => ({ manager: detection.manager, config: detection.config }))
   };
 }
 function discoverLeafDirectories(projectDirectory) {
-  return resolveLeafDirectories(projectDirectory, discoverWorkspaces(projectDirectory).patterns);
+  return leafDirectoriesFrom(projectDirectory, discoverWorkspaces(projectDirectory).patterns);
+}
+function leafDirectoriesFrom(projectDirectory, patterns) {
+  const workspaceLeaves = resolveLeafDirectories(projectDirectory, patterns);
+  const orphanLeaves = discoverOrphanManifestDirectories(projectDirectory);
+  return [.../* @__PURE__ */ new Set([...workspaceLeaves, ...orphanLeaves])].toSorted(byString2);
+}
+var ORPHAN_MANIFESTS = [
+  { packs: ["golang", "go"], filename: "go.mod", declaresPackage: (content) => hasGoModule(content) },
+  {
+    packs: ["python"],
+    filename: "pyproject.toml",
+    // A real package declares [project] (PEP 621) or [tool.poetry]; a pyproject that
+    // only carries [tool.ruff]/[tool.black] tooling config is not a package leaf.
+    declaresPackage: (content) => hasTomlTable(content, "project") || hasTomlTable(content, "tool.poetry")
+  },
+  {
+    packs: ["rust"],
+    filename: "Cargo.toml",
+    // A member crate declares [package]; a bare [workspace] root is not a leaf.
+    declaresPackage: (content) => hasTomlTable(content, "package")
+  }
+];
+function discoverOrphanManifestDirectories(projectDirectory) {
+  const installed = installedPacks(projectDirectory);
+  const directories = /* @__PURE__ */ new Set();
+  for (const manifest of ORPHAN_MANIFESTS) {
+    if (manifest.packs.every((pack) => !installed.has(pack))) continue;
+    for (const dir of orphanDirectoriesFor(projectDirectory, manifest)) directories.add(dir);
+  }
+  return [...directories];
+}
+function orphanDirectoriesFor(projectDirectory, manifest) {
+  return findAllInTree(projectDirectory, manifest.filename).filter((dir) => {
+    if (dir === projectDirectory) return false;
+    const content = readFileSafe(nodePath4.join(dir, manifest.filename));
+    return content !== void 0 && manifest.declaresPackage(content);
+  });
+}
+function hasGoModule(content) {
+  return /^module\s+\S+/m.test(content);
+}
+function installedPacks(projectDirectory) {
+  const config = readJson(nodePath4.join(projectDirectory, ".safeword", "config.json"));
+  if (config === null || typeof config !== "object") return /* @__PURE__ */ new Set();
+  const packs = config.installedPacks;
+  if (!Array.isArray(packs)) return /* @__PURE__ */ new Set();
+  return new Set(packs.filter((pack) => typeof pack === "string"));
 }
 function discoverUnreadableWorkspaces(projectDirectory) {
   return discoverWorkspaces(projectDirectory).unreadable;
@@ -534,7 +641,7 @@ function hasRecognizedManifest(directory) {
 }
 function extractMonorepoModel(projectDirectory) {
   const { patterns, unreadable: unreadableWorkspaces } = discoverWorkspaces(projectDirectory);
-  const packages = resolveLeafDirectories(projectDirectory, patterns).map((dir) => ({
+  const packages = leafDirectoriesFrom(projectDirectory, patterns).map((dir) => ({
     name: packageName(dir),
     dir,
     purpose: PURPOSE_PLACEHOLDER,
@@ -552,8 +659,7 @@ function extractMonorepoModel(projectDirectory) {
   edges.sort((a, b) => byString2(a.from, b.from) || byString2(a.to, b.to));
   return { packages, edges, unreadableWorkspaces };
 }
-function monorepoFingerprint(projectDirectory) {
-  const model = extractMonorepoModel(projectDirectory);
+function monorepoFingerprintOf(projectDirectory, model) {
   const inputs = {
     // Introspection status is part of the root shape: a package gaining or losing
     // a `src/` tree flips its root-index line (marker ↔ described), so the root
@@ -753,8 +859,8 @@ function leafTarget(packageDirectory) {
   );
 }
 function rootIndexTarget(projectDirectory) {
-  const fingerprint = monorepoFingerprint(projectDirectory);
   const model = extractMonorepoModel(projectDirectory);
+  const fingerprint = monorepoFingerprintOf(projectDirectory, model);
   return {
     path: resolveGeneratedArchitecturePath(projectDirectory),
     fingerprint,
@@ -902,7 +1008,7 @@ ${items}
 `;
 }
 function renderPackageSection(node, stamp) {
-  const body = node.introspected ? node.purpose : "> \u26A0 not introspected \u2014 no recognized source layout";
+  const body = node.introspected ? node.purpose : "> \u26A0 not introspected \u2014 no source modules to map";
   return `### ${node.name}
 
 ${RECONCILED_PREFIX} ${stamp} -->
@@ -911,6 +1017,54 @@ ${body}
 `;
 }
 
+// src/utils/architecture-narrative-drift.ts
+var ADVISORY_PACKAGE_CAP = 6;
+function architectureNarrativeDriftAdvisoryForProject(projectDirectory) {
+  const narrative = resolveArchitectureNarrative(projectDirectory);
+  const records = listArchitectureRecords(narrative.absolutePath).records;
+  if (records.length === 0) return void 0;
+  const generatedDocument = readFileSafe(resolveGeneratedArchitecturePath(projectDirectory));
+  if (generatedDocument === void 0) return void 0;
+  const narrativeText = records.map((record) => readFileSafe(record) ?? "").join("\n");
+  return narrativeDriftAdvisory(
+    extractRootIndexPackages(generatedDocument),
+    narrativeText,
+    narrative.displayPath
+  );
+}
+function extractRootIndexPackages(generatedDocument) {
+  const packages = [];
+  let isInPackagesSection = false;
+  for (const line of generatedDocument.split(/\r?\n/)) {
+    if (line.startsWith("## ")) {
+      isInPackagesSection = line.slice(3).trim() === "Packages";
+      continue;
+    }
+    if (isInPackagesSection && line.startsWith("### ")) {
+      const name = line.slice(4).trim();
+      if (name.length > 0) packages.push(name);
+    }
+  }
+  return packages;
+}
+function isMentioned(packageName2, narrativeText) {
+  const tail = packageName2.includes("/") ? packageName2.split("/").at(-1) : void 0;
+  const candidates = tail !== void 0 && tail !== "" ? [packageName2, tail] : [packageName2];
+  return candidates.some((candidate) => nameBoundaryPattern(candidate).test(narrativeText));
+}
+function nameBoundaryPattern(name) {
+  const escaped = name.replaceAll(/[.*+?^${}()|[\]\\]/g, String.raw`\$&`);
+  return new RegExp(String.raw`(?<![\w@/.-])${escaped}(?!\w|[.-]\w)`, "i");
+}
+function narrativeDriftAdvisory(packageNames, narrativeText, narrativeDisplayPath) {
+  const missing = packageNames.filter((name) => !isMentioned(name, narrativeText));
+  if (missing.length === 0) return void 0;
+  const named = missing.slice(0, ADVISORY_PACKAGE_CAP);
+  const remainder = missing.length - named.length;
+  const listing = remainder > 0 ? `${named.join(", ")} and ${remainder} more` : named.join(", ");
+  return `Architecture narrative (${narrativeDisplayPath}) does not mention ${missing.length} generated package(s): ${listing} \u2014 run /audit to reconcile against architecture.generated.md. (Advisory; nothing is blocked.)`;
+}
+
 // src/commands/architecture.ts
 function architecture(cwd = process.cwd(), options = {}) {
   if (options.check) {
@@ -924,8 +1078,13 @@ function architecture(cwd = process.cwd(), options = {}) {
     success(`Architecture state document ${result.action}: ${result.path}`);
   }
   warnUnreadableWorkspaces(cwd);
+  warnNarrativeDrift(cwd);
   return Promise.resolve();
 }
+function warnNarrativeDrift(cwd) {
+  const advisory = architectureNarrativeDriftAdvisoryForProject(cwd);
+  if (advisory !== void 0) warn(advisory);
+}
 function warnUnreadableWorkspaces(cwd) {
   for (const workspace of discoverUnreadableWorkspaces(cwd)) {
     warn(
@@ -937,17 +1096,19 @@ function architectureStage(cwd) {
   warnUnreadableWorkspaces(cwd);
   if (!isArchitectureDocumentEnforcementEnabled(cwd)) {
     success("Architecture doc enforcement is opted out (architectureDocEnforcement: false).");
+    warnNarrativeDrift(cwd);
     return Promise.resolve();
   }
   const changed = selfHealProject(cwd).filter((result) => isWouldChangeAction(result.action));
   if (changed.length === 0) {
     success("Architecture docs need no change.");
-    return Promise.resolve();
-  }
-  for (const result of changed) {
-    stageDocument(cwd, result);
-    success(`Architecture doc ${result.action} and staged: ${result.path}`);
+  } else {
+    for (const result of changed) {
+      stageDocument(cwd, result);
+      success(`Architecture doc ${result.action} and staged: ${result.path}`);
+    }
   }
+  warnNarrativeDrift(cwd);
   return Promise.resolve();
 }
 function stageDocument(cwd, result) {
@@ -959,6 +1120,7 @@ function stageDocument(cwd, result) {
 }
 function architectureCheck(cwd) {
   warnUnreadableWorkspaces(cwd);
+  warnNarrativeDrift(cwd);
   if (!isArchitectureDocumentEnforcementEnabled(cwd)) {
     success("Architecture doc enforcement is opted out (architectureDocEnforcement: false).");
     return Promise.resolve();
@@ -976,4 +1138,4 @@ function architectureCheck(cwd) {
 export {
   architecture
 };
-//# sourceMappingURL=architecture-T4RR7Q5J.js.map
+//# sourceMappingURL=architecture-K67T4PSI.js.map