@catspec/core 0.1.0 → 0.2.0

package/dist/index.d.ts

@@ -48,7 +48,7 @@ declare const CODES: {
     };
     readonly CS0107: {
         readonly severity: "error";
-        readonly title: "architecture spec missing or ambiguous";
+        readonly title: "architecture spec ambiguous or not staged";
         readonly docs: string;
     };
     readonly CS0108: {
@@ -2063,9 +2063,10 @@ interface SpecModel {
     config: CatspecConfig;
     specs: SpecSet;
     graph: DependencyGraph;
-    /** The architecture spec (`type: architecture` at `specs.architecture`), if exactly one exists. */
+    /** The architecture spec (`type: architecture` at `specs.architecture`), if exactly one exists:
+     * it is optional (ADR-028). */
     architecture?: Spec;
-    /** ADR ids of the architecture spec's log. */
+    /** ADR ids of the architecture spec's log and of the plain ADR files at `specs.architecture`. */
     adrIds: string[];
     /** Every diagnostic of `catspec check --specs-only`, sorted. */
     diagnostics: Diagnostic[];
@@ -2081,6 +2082,22 @@ interface SpecModel {
  * `catspec check --specs-only`). Spec errors of `deprecated` specs are lowered to warnings (§D8).
  */
 declare function loadSpecModel(root: string, config: CatspecConfig, source?: SourceProvider): Promise<SpecModel>;
+/**
+ * Matches the files of `specs.architecture` (ADR-028): a glob or a file path as written, or a
+ * folder (no glob characters and no `.md` ending) for every Markdown file in it.
+ */
+declare function architectureMatcher(pattern: string): (path: string) => boolean;
+/**
+ * True when a file at `specs.architecture` is meant as CatSpec's architecture spec: its
+ * frontmatter has a `catspec:` key or `type: architecture`. Other files (no frontmatter, or the
+ * frontmatter of an ADR tool) are plain ADRs. A line match, so broken YAML is still reported.
+ */
+declare function isArchitectureSpecText(text: string): boolean;
+/** The ADR ids of a plain ADR file: its file name (`ADR-007-….md`, `0007-….md`) and its
+ * `ADR-NNN` headings. */
+declare function plainAdrIds(file: string, text: string): string[];
+/** ADR ids compare by number: `ADR-7`, `ADR-007` and `ADR-0007` are the same decision. */
+declare const sameAdrId: (a: string, b: string) => boolean;
 
 /**
  * `status`: enforcement by spec status (§D8): draft, ready and deprecated specs aren't checked,
@@ -2706,4 +2723,4 @@ declare function formatStageRun(run: StageRun): string;
 /** Package name. */
 declare const packageName = "@catspec/core";
 
-export { type Ambiguity, type AttributeFact, BINDING_KINDS, type BaselineSymbol, type Binding, type BindingKind, type BindingResolution, BindingSchema, type BodyReference, type BuiltinGate, CODES, CONFIG_FILE, type CallFact, type CatspecConfig, type CheckMode, type CheckOptions, type CheckResult, type CodeInfo, type Codebase, type CommandRunner, ConfigError, type ConfigIssue, ConfigSchema, type ContractBullet, type CoverageReport, DependencyGraph, type Diagnostic, type DiagnosticCode, type DiagnosticCounts, type DiagnosticInit, type Driver, type DropUndefined, type EditClass, type Evidence, FRONTMATTER_KEYS, type Feature, type FeatureFolder, type FeaturePosition, type FileFacts, GATES, type Gate, type GateResult, Git, GitError, GitUnavailableError, type ImportFact, type ImportKind, type ImportedName, IndexProvider, type ItemPosition, type ItemResult, type LanguageAdapter, LineIndex, type Links, type LoadedConfig, type Location, type LockCheckOptions, type LockFile, type LockedSymbol, type Lost, MAX_SOURCE_BYTES, MEMBER_KINDS, MODIFIERS, ManualRuleSchema, type Mapping, type Member, MemberEntrySchema, type MemberKind, MemberSchema, type Modifier, type NextLockOptions, type NextStep, PLACEHOLDERS, PRESETS, PRESET_PROFILES, type ParamFact, type PatchOp, type PatchPath, type Phase, type Position, type PresetName, QueryRuleSchema, RULE_CLASSES, RULE_SCHEMAS, type Range, type Ratio, type ReadSpecOptions, type RenameInput, type RenameMap, type RenameReport, type ResolvedBinding, RevisionProvider, type Rule, type RuleClass, type RuleInput, RuleSchema, SDD_SKILLS, SKILL_DIRS, SPEC_ID_PATTERN, SPEC_STATUSES, SPEC_TYPES, SPEC_WRITING_STEP, STRUCTURAL_KINDS, SYMBOL_KINDS, type ScoredCandidate, type Severity, type Shape, type SourceEntry, type SourceFile, type SourceProvider, type Spec, type SpecBody, type SpecCoverage, type SpecEdit, SpecEditError, SpecFrontmatterSchema, type SpecModel, type SpecPatch, SpecSet, type SpecSource, type SpecStatus, type SpecType, type SplitSource, type Stage, type StageInfo, type StageRun, type StagedChange, type StagedScope, type StatusChange, type StatusGate, type StructuralRule, StructuralRuleSchema, type Suggestion, type SymbolEntry, type SymbolFact, type SymbolKind, SymbolTable, type SyncOptions, type SyncPlan, type Target, type TaskItem, TestRuleSchema, type TestRun, type Transition, type TreeEntry, type TypeRef, type Waiver, WaiverSchema, Workflow, WorkflowError, type WorkflowInput, type WorkflowOptions, type WorkflowProfile, WorkflowSchema, WorkingTreeProvider, agentSteps, applyLock, applyPatch, attributeMatches, baselineFromLock, baselineFromSymbol, bindingItems, bodyTokens, calleeNames, checkCode, classifyOp, classifyPatch, codeLocation, compareStrings, configJsonSchema, countDiagnostics, coverage, createDiagnostic, customWorkflowYaml, defaultBindingId, defaultConfig, describeStage, detectPreset, detectRenames, didYouMean, driverText, editPatch, editYaml, evaluateContract, evaluateRule, featureDirYaml, featureDirsText, featureFolderOf, finalGates, findConfig, findGitCommonDir, findGitRoot, findProgram, findSddSkills, fingerprintOf, formatLocation, formatNextStep, formatPath, formatStageRun, frontmatterLocation, gateName, gitBlobSha, globMatcher, hasLockFile, hookWorkflowDiagnostics, importTargets, inModule, isBatchScript, isEnforced, isListedPath, isRegisteredCode, isSegmentSuffix, itemHashes, jaccard, kebabCase, listFiles, loadConfig, loadSpecModel, lockPathOf, lockedFiles, memberNames, nameFreeFingerprint, nameMatches, nextLock, normalizeBinding, onPath, openCheckboxes, packageName, parseBody, parseConfig, parseErrorDiagnostics, parseLock, parseSpecSource, planSync, qualifiedNameMatches, queryDiagnostics, reached, readSpec, readYaml, relativePosix, renameScore, resolveBinding, resolveWorkflow, rewriteSymbol, runCommand, runTestCommand, serializeLock, shapeOf, signatureText, skillFile, sortDiagnostics, specHash, specJsonSchema, specLocation, splitFrontmatter, splitResolved, splitSymbol, stageLines, stageSnippet, stageStatus, stagedDiagnostics, stagedScope, statusGate, stripUndefined, testCommandArgs, toPosix, tokenSimilarity, typeMatches, typePatternMatches, unknownPlaceholders, wildcard, withFrontmatter, workflowDoctor, workflowProfile, writeStage, writesSpecs };
+export { type Ambiguity, type AttributeFact, BINDING_KINDS, type BaselineSymbol, type Binding, type BindingKind, type BindingResolution, BindingSchema, type BodyReference, type BuiltinGate, CODES, CONFIG_FILE, type CallFact, type CatspecConfig, type CheckMode, type CheckOptions, type CheckResult, type CodeInfo, type Codebase, type CommandRunner, ConfigError, type ConfigIssue, ConfigSchema, type ContractBullet, type CoverageReport, DependencyGraph, type Diagnostic, type DiagnosticCode, type DiagnosticCounts, type DiagnosticInit, type Driver, type DropUndefined, type EditClass, type Evidence, FRONTMATTER_KEYS, type Feature, type FeatureFolder, type FeaturePosition, type FileFacts, GATES, type Gate, type GateResult, Git, GitError, GitUnavailableError, type ImportFact, type ImportKind, type ImportedName, IndexProvider, type ItemPosition, type ItemResult, type LanguageAdapter, LineIndex, type Links, type LoadedConfig, type Location, type LockCheckOptions, type LockFile, type LockedSymbol, type Lost, MAX_SOURCE_BYTES, MEMBER_KINDS, MODIFIERS, ManualRuleSchema, type Mapping, type Member, MemberEntrySchema, type MemberKind, MemberSchema, type Modifier, type NextLockOptions, type NextStep, PLACEHOLDERS, PRESETS, PRESET_PROFILES, type ParamFact, type PatchOp, type PatchPath, type Phase, type Position, type PresetName, QueryRuleSchema, RULE_CLASSES, RULE_SCHEMAS, type Range, type Ratio, type ReadSpecOptions, type RenameInput, type RenameMap, type RenameReport, type ResolvedBinding, RevisionProvider, type Rule, type RuleClass, type RuleInput, RuleSchema, SDD_SKILLS, SKILL_DIRS, SPEC_ID_PATTERN, SPEC_STATUSES, SPEC_TYPES, SPEC_WRITING_STEP, STRUCTURAL_KINDS, SYMBOL_KINDS, type ScoredCandidate, type Severity, type Shape, type SourceEntry, type SourceFile, type SourceProvider, type Spec, type SpecBody, type SpecCoverage, type SpecEdit, SpecEditError, SpecFrontmatterSchema, type SpecModel, type SpecPatch, SpecSet, type SpecSource, type SpecStatus, type SpecType, type SplitSource, type Stage, type StageInfo, type StageRun, type StagedChange, type StagedScope, type StatusChange, type StatusGate, type StructuralRule, StructuralRuleSchema, type Suggestion, type SymbolEntry, type SymbolFact, type SymbolKind, SymbolTable, type SyncOptions, type SyncPlan, type Target, type TaskItem, TestRuleSchema, type TestRun, type Transition, type TreeEntry, type TypeRef, type Waiver, WaiverSchema, Workflow, WorkflowError, type WorkflowInput, type WorkflowOptions, type WorkflowProfile, WorkflowSchema, WorkingTreeProvider, agentSteps, applyLock, applyPatch, architectureMatcher, attributeMatches, baselineFromLock, baselineFromSymbol, bindingItems, bodyTokens, calleeNames, checkCode, classifyOp, classifyPatch, codeLocation, compareStrings, configJsonSchema, countDiagnostics, coverage, createDiagnostic, customWorkflowYaml, defaultBindingId, defaultConfig, describeStage, detectPreset, detectRenames, didYouMean, driverText, editPatch, editYaml, evaluateContract, evaluateRule, featureDirYaml, featureDirsText, featureFolderOf, finalGates, findConfig, findGitCommonDir, findGitRoot, findProgram, findSddSkills, fingerprintOf, formatLocation, formatNextStep, formatPath, formatStageRun, frontmatterLocation, gateName, gitBlobSha, globMatcher, hasLockFile, hookWorkflowDiagnostics, importTargets, inModule, isArchitectureSpecText, isBatchScript, isEnforced, isListedPath, isRegisteredCode, isSegmentSuffix, itemHashes, jaccard, kebabCase, listFiles, loadConfig, loadSpecModel, lockPathOf, lockedFiles, memberNames, nameFreeFingerprint, nameMatches, nextLock, normalizeBinding, onPath, openCheckboxes, packageName, parseBody, parseConfig, parseErrorDiagnostics, parseLock, parseSpecSource, plainAdrIds, planSync, qualifiedNameMatches, queryDiagnostics, reached, readSpec, readYaml, relativePosix, renameScore, resolveBinding, resolveWorkflow, rewriteSymbol, runCommand, runTestCommand, sameAdrId, serializeLock, shapeOf, signatureText, skillFile, sortDiagnostics, specHash, specJsonSchema, specLocation, splitFrontmatter, splitResolved, splitSymbol, stageLines, stageSnippet, stageStatus, stagedDiagnostics, stagedScope, statusGate, stripUndefined, testCommandArgs, toPosix, tokenSimilarity, typeMatches, typePatternMatches, unknownPlaceholders, wildcard, withFrontmatter, workflowDoctor, workflowProfile, writeStage, writesSpecs };

package/dist/index.js

@@ -32,8 +32,8 @@ var CODES = {
   },
   CS0107: {
     severity: "error",
-    title: "architecture spec missing or ambiguous",
-    docs: "Exactly one file must match `specs.architecture` (default `docs/architecture/adr/*-adr.md`). Create it with `catspec init`, remove the extra matches, or change `specs.architecture` in `catspec.yaml`. In `check --staged`, an ADR log that exists on disk but isn't staged yet is a warning that names the file to stage, so the first commit after `catspec init` isn't blocked."
+    title: "architecture spec ambiguous or not staged",
+    docs: "The architecture spec is optional. If you have one, it is the one file at `specs.architecture` (default `docs/architecture/adr/*-adr.md`; a file, a glob or a folder) whose frontmatter has `catspec:` or `type: architecture`. More than one such file is an error: keep the repository-wide rules in one file, or narrow `specs.architecture` in `catspec.yaml`. Plain ADR files without CatSpec frontmatter are fine. In `check --staged`, an architecture spec that exists on disk but isn't staged yet is a warning that names the file to stage, so the commit isn't blocked."
   },
   CS0108: {
     severity: "warning",
@@ -53,7 +53,7 @@ var CODES = {
   CS0112: {
     severity: "error",
     title: "unknown ADR id",
-    docs: "A rule's `adr` field names a decision that isn't in the architecture spec's ADR log (a `## ADR-NNN: <title>` heading). Fix the id or add the decision to the log."
+    docs: "A rule's `adr` field names a decision that isn't among your ADRs: a `## ADR-NNN: <title>` heading of the architecture spec, or a plain ADR file at `specs.architecture` (its file name, such as `0007-use-postgres.md`, or an `ADR-NNN` heading). Ids compare by number, so ADR-7 and ADR-0007 are the same. Fix the id or add the decision. Without any ADRs, `adr` isn't checked."
   },
   CS0130: {
     severity: "error",
@@ -1098,7 +1098,9 @@ var ConfigSchema = z3.strictObject({
   workflow: WorkflowSchema.prefault({}),
   specs: z3.strictObject({
     include: globList.default(["docs/spec/*/*.spec.md"]).describe("Machine spec files."),
-    architecture: z3.string().min(1).default("docs/architecture/adr/*-adr.md").describe("The architecture spec (ADR log); exactly one file must match (CS0107).")
+    architecture: z3.string().min(1).default("docs/architecture/adr/*-adr.md").describe(
+      "Optional. Your ADRs: a file, a glob or a folder. At most one of these files is the architecture spec (CatSpec frontmatter, repository-wide rules); the others are plain ADRs that rules can refer to (CS0107, CS0112)."
+    )
   }).prefault({}),
   languages: z3.strictObject({
     typescript: language(["src/**/*.{ts,tsx}"], ["**/*.d.ts", "**/node_modules/**"]),
@@ -1167,6 +1169,9 @@ function parseConfig(text2, file = CONFIG_FILE) {
       { file, line: 1, column: 1, key: "", message: `the config can't be read: ${reason}` }
     ]);
   }
+  if (value !== null && typeof value === "object" && value.specs === null) {
+    delete value.specs;
+  }
   const result = ConfigSchema.safeParse(value);
   if (result.success) return withWorkflowDefaults(result.data, value);
   throw new ConfigError(
@@ -3793,7 +3798,8 @@ var DependencyGraph = class {
 };
 
 // src/load.ts
-import { posix as posix3 } from "path";
+import { readFile as readFile3 } from "fs/promises";
+import { join as join4, posix as posix3 } from "path";
 var SpecSet = class {
   byId = /* @__PURE__ */ new Map();
   byFile = /* @__PURE__ */ new Map();
@@ -3822,7 +3828,7 @@ async function loadSpecModel(root, config, source = new WorkingTreeProvider(root
   const specs = new SpecSet();
   const options = { unenforcedProse: config.enforcement.unenforced_prose };
   const isIncluded = globMatcher(config.specs.include);
-  const isArchitecture = globMatcher(config.specs.architecture);
+  const isArchitecture = architectureMatcher(config.specs.architecture);
   const architectureFiles = files.filter((f) => isArchitecture(f));
   const specFiles2 = files.filter((f) => isIncluded(f) && !architectureFiles.includes(f));
   const involved = /* @__PURE__ */ new Map();
@@ -3833,39 +3839,37 @@ async function loadSpecModel(root, config, source = new WorkingTreeProvider(root
     return result.spec;
   };
   let architecture;
-  const unstagedLog = architectureFiles.length === 0 && source.kind === "index" ? (await listFiles(root)).find((f) => isArchitecture(f)) : void 0;
+  const architectureTexts = /* @__PURE__ */ new Map();
+  for (const file of architectureFiles) {
+    architectureTexts.set(file, (await source.read(file))?.toString("utf8") ?? "");
+  }
+  const rulesFiles = architectureFiles.filter(
+    (f) => isArchitectureSpecText(architectureTexts.get(f))
+  );
+  const unstagedLog = rulesFiles.length === 0 && source.kind === "index" ? await findUnstagedArchitectureSpec(root, isArchitecture) : void 0;
   if (unstagedLog) {
     diagnostics.push(
       createDiagnostic("CS0107", {
         severity: "warning",
-        message: `the ADR log ${unstagedLog} isn't staged, so this commit is checked without it`,
+        message: `the architecture spec ${unstagedLog} isn't staged, so this commit is checked without its rules`,
         suggestions: [{ message: `stage it: git add ${unstagedLog}` }]
       })
     );
-  } else if (architectureFiles.length === 0) {
+  } else if (rulesFiles.length > 1) {
     diagnostics.push(
       createDiagnostic("CS0107", {
-        message: `no architecture spec: no file matches specs.architecture "${config.specs.architecture}"`,
+        specLocation: { file: rulesFiles[0], line: 1, column: 1 },
+        message: `more than one architecture spec matches specs.architecture "${config.specs.architecture}": ` + listOf(rulesFiles),
+        actual: rulesFiles,
         suggestions: [
           {
-            message: "run `catspec init` to create one, or set specs.architecture in catspec.yaml"
+            message: "keep the repository-wide rules in one file, or narrow specs.architecture in catspec.yaml"
           }
         ]
       })
     );
-  } else if (architectureFiles.length > 1) {
-    diagnostics.push(
-      createDiagnostic("CS0107", {
-        specLocation: { file: architectureFiles[0], line: 1, column: 1 },
-        message: `more than one architecture spec matches specs.architecture "${config.specs.architecture}": ` + listOf(architectureFiles),
-        actual: architectureFiles,
-        suggestions: [
-          { message: "keep one ADR log, or narrow specs.architecture in catspec.yaml" }
-        ]
-      })
-    );
-  } else {
-    const spec = await read(architectureFiles[0]);
+  } else if (rulesFiles.length === 1) {
+    const spec = await read(rulesFiles[0]);
     if (spec) {
       if (spec.type === "architecture") {
         architecture = spec;
@@ -3937,20 +3941,28 @@ async function loadSpecModel(root, config, source = new WorkingTreeProvider(root
       );
     }
   }
-  const adrIds = architecture?.body.adrIds ?? [];
-  if (architecture) {
+  const adrIds = [...architecture?.body.adrIds ?? []];
+  for (const file of architectureFiles) {
+    if (rulesFiles.includes(file)) continue;
+    for (const id of plainAdrIds(file, architectureTexts.get(file))) {
+      if (!adrIds.some((known) => sameAdrId(known, id))) adrIds.push(id);
+    }
+  }
+  const adrLog = architecture?.file ?? `specs.architecture "${config.specs.architecture}"`;
+  if (adrIds.length > 0) {
     for (const spec of specs.byFile.values()) {
       for (const rule of spec.rules) {
-        if (rule.adr === void 0 || adrIds.includes(rule.adr)) continue;
-        const close = didYouMean(rule.adr, adrIds);
+        const ruleAdr = rule.adr;
+        if (ruleAdr === void 0 || adrIds.some((id) => sameAdrId(id, ruleAdr))) continue;
+        const close = didYouMean(ruleAdr, adrIds);
         diagnostics.push(
           createDiagnostic("CS0112", {
             spec: spec.id,
             ruleId: rule.id,
             specLocation: specLocation(spec.source, ["rules", rule.index, "adr"]),
-            message: `rule "${rule.id}" enforces ${rule.adr}, which is not in the ADR log ${architecture.file}`,
+            message: `rule "${rule.id}" enforces ${ruleAdr}, which is not in the ADR log ${adrLog}`,
             expected: adrIds,
-            actual: rule.adr,
+            actual: ruleAdr,
             ...close.length > 0 ? { suggestions: close.map((c) => ({ message: `did you mean ${c}?` })) } : {}
           })
         );
@@ -4021,6 +4033,33 @@ async function loadSpecModel(root, config, source = new WorkingTreeProvider(root
     source
   };
 }
+function architectureMatcher(pattern) {
+  const clean = pattern.replace(/\\/g, "/").replace(/^\.\//, "").replace(/\/+$/, "");
+  if (/[*?[\]{}()!]/.test(clean) || /\.md$/i.test(clean)) return globMatcher(clean);
+  return globMatcher(`${clean}/**/*.md`);
+}
+function isArchitectureSpecText(text2) {
+  const split = splitFrontmatter(text2);
+  if ("error" in split) return false;
+  return /^(catspec\s*:|type\s*:\s*["']?architecture["']?\s*(#.*)?$)/m.test(split.frontmatter.text);
+}
+function plainAdrIds(file, text2) {
+  const ids = [];
+  const name = /^(?:adr-?)?(\d+)(?=[-_. ])/i.exec(posix3.basename(file));
+  if (name) ids.push(`ADR-${name[1]}`);
+  for (const match of text2.matchAll(/^#{1,6}[ \t]+\[?(ADR-\d+)\b/gm)) {
+    if (!ids.some((id) => sameAdrId(id, match[1]))) ids.push(match[1]);
+  }
+  return ids;
+}
+var sameAdrId = (a, b) => Number(a.slice(4)) === Number(b.slice(4)) && /^ADR-\d+$/.test(a) && /^ADR-\d+$/.test(b);
+async function findUnstagedArchitectureSpec(root, isArchitecture) {
+  for (const file of (await listFiles(root)).filter((f) => isArchitecture(f))) {
+    const text2 = await readFile3(join4(root, file), "utf8").catch(() => "");
+    if (isArchitectureSpecText(text2)) return file;
+  }
+  return void 0;
+}
 
 // src/spec-editor.ts
 import { isDeepStrictEqual } from "util";
@@ -5164,11 +5203,11 @@ var editPatch = (edit) => ({ file: edit.spec.file, ops: edit.ops });
 // src/workflow/engine.ts
 import { execFile as execFile3 } from "child_process";
 import { appendFile, mkdir, writeFile } from "fs/promises";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 
 // src/workflow/doctor.ts
 import { existsSync as existsSync2, readdirSync, statSync as statSync2 } from "fs";
-import { delimiter, isAbsolute, join as join4 } from "path";
+import { delimiter, isAbsolute, join as join5 } from "path";
 import { LineCounter as LineCounter2, parseDocument as parseDocument4 } from "yaml";
 function configLocator(configFile) {
   if (!configFile) return () => void 0;
@@ -5184,14 +5223,14 @@ function configLocator(configFile) {
 }
 function findProgram(name, root, env = process.env, platform = process.platform) {
   if (name.includes("/") || name.includes("\\")) {
-    const path = isAbsolute(name) ? name : join4(root, name);
+    const path = isAbsolute(name) ? name : join5(root, name);
     return existsSync2(path) ? path : void 0;
   }
   const extensions = platform === "win32" ? ["", ...(env.PATHEXT ?? ".EXE;.CMD;.BAT;.COM").split(";").map((e) => e.toLowerCase())] : [""];
   const dirs = (env.PATH ?? env.Path ?? "").split(delimiter).filter(Boolean);
   for (const dir of dirs) {
     for (const ext of extensions) {
-      const file = join4(dir, name + ext);
+      const file = join5(dir, name + ext);
       try {
         if (statSync2(file).isFile()) return file;
       } catch {
@@ -5204,7 +5243,7 @@ var onPath = (name, root, env = process.env) => findProgram(name, root, env) !==
 var isBatchScript = (path) => /\.(cmd|bat)$/i.test(path);
 var SKILL_DIRS = [".claude/skills", ".agents/skills"];
 var sddSkillsIn = (root, skillsDir) => {
-  const dir = join4(root, skillsDir);
+  const dir = join5(root, skillsDir);
   return existsSync2(dir) ? readdirSync(dir).filter((n) => n.startsWith("sdd-")).sort() : [];
 };
 function findSddSkills(root) {
@@ -5215,8 +5254,8 @@ function findSddSkills(root) {
   return void 0;
 }
 function detectPreset(root, skillsDir) {
-  if (existsSync2(join4(root, "openspec"))) return "openspec";
-  if (existsSync2(join4(root, ".specify"))) return "spec-kit";
+  if (existsSync2(join5(root, "openspec"))) return "openspec";
+  if (existsSync2(join5(root, ".specify"))) return "spec-kit";
   const found = skillsDir ? sddSkillsIn(root, skillsDir).length > 0 : findSddSkills(root);
   return found ? "custom" : void 0;
 }
@@ -5232,7 +5271,7 @@ function workflowDoctor(root, profile, options = {}) {
     const driver = stage2.driver;
     if (driver.kind === "skill") {
       const file = skillFile(profile, driver.name);
-      if (!existsSync2(join4(root, file))) {
+      if (!existsSync2(join5(root, file))) {
         diagnostics.push(
           createDiagnostic("CS0704", {
             ...location(["stages", index, "driver", "skill"]),
@@ -5295,7 +5334,7 @@ function workflowDoctor(root, profile, options = {}) {
     "spec-kit": ".specify/"
   };
   const folder = expected[profile.preset];
-  if (folder && !existsSync2(join4(root, folder))) {
+  if (folder && !existsSync2(join5(root, folder))) {
     diagnostics.push(
       createDiagnostic("CS0700", {
         severity: "warning",
@@ -6015,11 +6054,11 @@ var describeStage = (stage2) => ({
   }
 });
 async function writeStage(root, run, now = /* @__PURE__ */ new Date()) {
-  for (const change of run.changes) await writeFile(join5(root, change.file), change.text, "utf8");
+  for (const change of run.changes) await writeFile(join6(root, change.file), change.text, "utf8");
   if (!run.forced) return;
   const common = findGitCommonDir(root);
   if (!common) return;
-  const dir = join5(common, "catspec");
+  const dir = join6(common, "catspec");
   await mkdir(dir, { recursive: true });
   const entry = {
     at: now.toISOString(),
@@ -6028,7 +6067,7 @@ async function writeStage(root, run, now = /* @__PURE__ */ new Date()) {
     target: run.target,
     overridden: run.diagnostics.filter((d) => FORCED.has(d.code)).map((d) => `${d.code} ${d.message}`)
   };
-  await appendFile(join5(dir, "workflow-overrides.log"), `${JSON.stringify(entry)}
+  await appendFile(join6(dir, "workflow-overrides.log"), `${JSON.stringify(entry)}
 `, "utf8");
 }
 function runCommand(root, args, timeoutMs = 10 * 6e4, platform = process.platform, env = process.env) {
@@ -6183,6 +6222,7 @@ export {
   agentSteps,
   applyLock,
   applyPatch,
+  architectureMatcher,
   attributeMatches,
   baselineFromLock,
   baselineFromSymbol,
@@ -6232,6 +6272,7 @@ export {
   hookWorkflowDiagnostics,
   importTargets,
   inModule,
+  isArchitectureSpecText,
   isBatchScript,
   isEnforced,
   isListedPath,
@@ -6258,6 +6299,7 @@ export {
   parseErrorDiagnostics,
   parseLock,
   parseSpecSource,
+  plainAdrIds,
   planSync,
   qualifiedNameMatches,
   queryDiagnostics,
@@ -6271,6 +6313,7 @@ export {
   rewriteSymbol,
   runCommand,
   runTestCommand,
+  sameAdrId,
   serializeLock,
   shapeOf,
   signatureText,