@sdd-method/maintain-cli 0.13.1 → 0.14.0

package/dist/lib/catalogue/aggregate.js

@@ -344,7 +344,7 @@ export async function runCatalogueAggregate(inputs, write) {
             findings.add("coverage", `feature_repo: ${added} row(s) re-derived at aggregate tier for features that had NO anchor at member tier — evidence tokens naming a repo registered by another contributor resolve only against the merged repositories; already-anchored features are not widened (M-ADR 0198 §4.1 as amended; ${contributors.length} contributor doc trees scanned)`);
         }
     }
-    // M-ADR 0229 §4.4 (Proposed): journey_requirement re-derived over the merged rows. A journey is often catalogued
+    // M-ADR 0229 §4.4: journey_requirement re-derived over the merged rows. A journey is often catalogued
     // in an application SDD and the requirements its steps cite in the platform's behaviour store, so neither member
     // holds both join inputs; each reports the tag as external. Each contributor's tagged end-to-end files (its own
     // manifest's journeys.test_paths) and its journey features' living specs are read again here against the MERGED
@@ -400,7 +400,7 @@ export async function runCatalogueAggregate(inputs, write) {
         rederiveAppend(rowsByCatalogue, "journey_requirement", rederived);
         const added = (rowsByCatalogue.get("journey_requirement") ?? []).length - before;
         if (added > 0) {
-            findings.add("coverage", `journey_requirement: ${added} row(s) derived at aggregate tier, where a journey and the requirements it cites are catalogued in different SDDs (M-ADR 0229 §4.4, Proposed; ${contributors.length} contributor(s) read)`);
+            findings.add("coverage", `journey_requirement: ${added} row(s) derived at aggregate tier, where a journey and the requirements it cites are catalogued in different SDDs (M-ADR 0229 §4.4; ${contributors.length} contributor(s) read)`);
         }
         for (const u of unresolved)
             findings.add("orphan", `journey_requirement: unresolved against the merged catalogue: ${u}`);
@@ -2106,12 +2106,12 @@ export function rekeyLegacyContractRefs(schema, rowsByCatalogue, findings) {
         rowsByCatalogue.set(cat.name, kept);
         for (const [oldId, count] of [...perOldId.entries()].sort((a, b) => a[0].localeCompare(b[0]))) {
             findings.add("inferred", `${cat.name}: ${count} cross-SDD reference(s) to "${oldId}" re-keyed to "${legacyMap.get(oldId)[0]}" — ` +
-                `2.x kindless contract id migrated per the 3.0.0 map (regenerable, not drift; M-ADR 0203 §4.4)`);
+                `an earlier-form contract id (2.x kindless, or a pre-7.0.0 unsplit stem) migrated per the contract-id map (regenerable, not drift; M-ADR 0203 §4.4)`);
         }
         for (const [oldId, targets] of [...ambiguousOld.entries()].sort((a, b) => a[0].localeCompare(b[0]))) {
             ambiguous++;
-            findings.add("convention", `${cat.name}: references to "${oldId}" map to ${targets.length} contracts at 3.0.0 [${targets.join(", ")}] — ` +
-                `a 2.x cross-family collision; the referencing SDD must qualify with the kind-suffixed id; left dangling (M-ADR 0203 §4.4)`);
+            findings.add("convention", `${cat.name}: references to "${oldId}" map to ${targets.length} current contracts [${targets.join(", ")}] — ` +
+                `a cross-family collision under the earlier form; the referencing SDD must qualify with the current id; left dangling (M-ADR 0203 §4.4)`);
         }
     }
     return { rekeyed, deduped, ambiguous };

package/dist/lib/catalogue/build.js

@@ -44,6 +44,8 @@ import { deriveAdrGoverns } from "./builders/adr-governs.js";
 import { buildContractRevisions } from "./builders/contract-revisions.js";
 import { buildJourneyRequirement } from "./builders/journey-requirement.js";
 import { buildDomains, buildProducts, buildApplicationDataPlaneBindings, buildApplicationDataPlaneDeviations, buildApplicationConformanceCoverage, buildImplementations, buildRepositories, buildServices, buildCapabilities, buildCapabilityService, buildCapabilityAdr, buildCapabilityFeature, buildCapabilityContract, buildAdrs, buildAdrSupersedes, buildFeatures, buildFeatureGroups, buildFeatureGrounding, buildCapabilitySpec, buildContracts, buildDeclaredExternalContracts, buildRepoEdges, deriveFeatureRepoFromServices, buildRepoCapabilityExemption, buildServiceCapabilityExemption, buildEvents, buildServiceEvent, buildCapabilityEvent, buildFeatureEvent, buildServiceContract, buildServiceContractConsumes, buildFeatureContract, buildDomainModels, buildCapabilityDomainModel, buildFeatureDomainModel, buildFeatureSubscriptionChannels, buildProductPlatformDependencies, buildGlossaryItems, backfillGlossaryRelations, buildGlossaryXref, buildC4Systems, buildC4Containers, buildC4Components, buildC4ExternalSystems, buildExternalSystemExemption, buildContainerDependency, reportEntryIdReferentCollisions, buildSystemExternalDependency, buildPersonaC4System, buildPersonaContainer, buildPersonas, buildQualityScores, buildScaffolds, buildScreens, buildUserJourneys, buildPersonaJourney, buildPersonaFeature, buildJourneyFeature, buildProductEdges, buildIntegrations, entitySlug, buildEntitiesFromManifest, buildEntitiesFromMermaid, buildServiceEntityFromTables, enrichEntityPersistenceKind, buildC4ContainerEntity, buildC4SystemEntity, } from "./builders/index.js";
+import { mergeEntities } from "./builders/entity-merge.js";
+import { loadAliasMap } from "./builders/service-entity-tables.js";
 import { buildIntegrationComponents } from "./builders/integration-components.js";
 import { loadReverseProductQuality } from "./reverse-product-quality.js";
 import { loadTraceabilityManifests } from "./traceability-loader.js";
@@ -895,8 +897,8 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
         findings,
         knownServiceIds,
         aliases: serviceContractAliases,
-        // M-ADR 0203 §4.4 cut window: alias targets authored as 2.x kindless
-        // contract ids re-key against this build's kind-suffixed rows.
+        // M-ADR 0203 §4.4 cut window: alias targets authored as 2.x kindless contract ids, or with a pre-7.0.0
+        // unsplit stem, re-key against this build's rows.
         legacyContractIdMap: buildLegacyContractIdMap(out.get("contracts") ?? []),
     });
     out.set("service_contract", [...exposesRows, ...consumesRows]);
@@ -1196,7 +1198,7 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
         out.set("adrs", deriveAdrGoverns(out.get("adrs") ?? [], out.get("adr_supersedes") ?? [], r.changes, findings));
         // M-ADR 0230 §4.2 (Proposed): each contract's revisions by digest, active beside agreed.
         out.set("contract_revisions", await buildContractRevisions({ sddPath, findings, contracts: out.get("contracts") ?? [], changes: r.changes }));
-        // M-ADR 0229 §4.4 (Proposed): the requirements each journey cites, from its tagged end-to-end files or its
+        // M-ADR 0229 §4.4: the requirements each journey cites, from its tagged end-to-end files or its
         // journey feature's living spec.
         out.set("journey_requirement", await buildJourneyRequirement({
             sddPath,
@@ -1229,6 +1231,8 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
         findings,
         knownSystemIds,
         knownServiceIds,
+        // A malformed alias file is reported by the service_entity walker; not twice.
+        serviceIdByDisplayLower: (await loadAliasMap(sddPath, new FindingsLog())).byDisplayLower,
         knownDomainIds,
         containerIdByEntryIdOut: containerIdByEntryId,
         containerNameByEntryIdOut: containerNameByEntryId,
@@ -1343,12 +1347,14 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
     //     c4_containers.service_id.
     //   - c4-system-entity: aggregation roll-up over c4_container_entity ⋈
     //     c4_containers.system_id with container_count.
+    const platformWideEntityIds = new Set();
     const entitiesFromManifest = await buildEntitiesFromManifest({
         sddPath,
         findings,
         profile: manifest.profile,
         knownDomainIds,
         knownGlossaryIds,
+        platformWideIdsOut: platformWideEntityIds,
     });
     const entitiesFromMermaid = await buildEntitiesFromMermaid({
         sddPath,
@@ -1361,13 +1367,8 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
         knownGlossaryIds,
     });
     // Forward wins on attribute conflicts (matches per-adopter authoring intent
-    // per M-ADR 0159 §4.4). Reverse rows seed the map; forward overwrites.
-    const entitiesById = new Map();
-    for (const r of entitiesFromMermaid)
-        entitiesById.set(String(r["id"]), r);
-    for (const r of entitiesFromManifest)
-        entitiesById.set(String(r["id"]), r);
-    const entityRows = [...entitiesById.values()];
+    // per M-ADR 0159 §4.4), field by field; a platform-wide entry naming one domain entity is that entity.
+    const entityRows = mergeEntities(entitiesFromMermaid, entitiesFromManifest, findings, platformWideEntityIds);
     out.set("entities", entityRows);
     // Per M-ADR 0159 §4.9: now that entities.csv exists, append entity_glossary
     // rows for the reverse-method side. The forward-method emission via
@@ -1391,7 +1392,9 @@ async function collectRows(schema, manifest, findings, sddPath, snapshotStore) {
             domain_id: domainId,
             entity_name: name,
             glossary_item_id: glossaryId,
-            status: "matched_direct",
+            // A manifest entry folded into this entity keeps the alignment it was authored with; a data-model slug match
+            // is direct.
+            status: /(?:^|;)status=aligned(?:;|$)/.test(String(e["notes"] ?? "")) ? "aligned" : "matched_direct",
             source_sdd_id: "",
         });
     }

package/dist/lib/catalogue/builders/c4-containers.js

@@ -11,7 +11,8 @@
 //   - domain_id (nullable, denormalised) derived from the L2 file path:
 //     docs/domains/<slug>/... → <slug>; platform-wide L2 → empty.
 //   - service_id (optional) — opportunistic match on the C4 entry's id
-//     or a slug of its display name to a known service id.
+//     or a slug of its display name to a known service id, then on its
+//     display name through service-name-aliases.yaml.
 //
 // We only consider entries inside System_Boundary or Container_Boundary
 // blocks — mirrors the python reference and excludes Person/System_Ext
@@ -90,11 +91,14 @@ export async function buildC4Containers(inputs) {
                 continue;
             }
             seen.add(id);
+            const aliased = inputs.serviceIdByDisplayLower?.get(entry.name.toLowerCase()) ?? "";
             const serviceId = inputs.knownServiceIds.has(entry.entryId)
                 ? entry.entryId
                 : inputs.knownServiceIds.has(slug)
                     ? slug
-                    : "";
+                    : inputs.knownServiceIds.has(aliased)
+                        ? aliased
+                        : "";
             const domainId = file.domainId !== "" && inputs.knownDomainIds.has(file.domainId)
                 ? file.domainId
                 : "";

package/dist/lib/catalogue/builders/contracts.js

@@ -18,7 +18,7 @@
 import { readdir, readFile } from "node:fs/promises";
 import { extname, join, relative, sep } from "node:path";
 import { parse as parseYaml } from "yaml";
-import { contractIdWithKind } from "../contract-id.js";
+import { contractIdWithKind, contractKindlessSlug } from "../contract-id.js";
 const CONTRACTS_DIR_REL = "contracts";
 const DOCS_DOMAINS_DIR_REL = join("docs", "domains");
 const KIND_SPECS = [
@@ -117,8 +117,8 @@ export async function buildContracts(inputs) {
         // this format exists to end. A remaining collision is same-kind and
         // still reported.
         const kindless = entry.domain !== ""
-            ? slugify(`${entry.domain}-${stem}`)
-            : slugify(stem);
+            ? contractKindlessSlug(entry.domain, stem)
+            : contractKindlessSlug("", stem);
         const slug = contractIdWithKind(kindless, entry.kind);
         if (seen.has(slug)) {
             inputs.findings.add("divergence", `${entry.relPath}: contract id "${slug}" already emitted by an earlier file`);
@@ -311,13 +311,6 @@ function domainSegmentCanonical(relPath) {
         return "";
     return parts[2] ?? "";
 }
-function slugify(s) {
-    return s
-        .toLowerCase()
-        .replace(/^_+/, "") // turn _common into common
-        .replace(/[^a-z0-9]+/g, "-")
-        .replace(/^-+|-+$/g, "");
-}
 const DECLARED_KINDS = {
     openapi: "rest",
     proto: "rpc",
@@ -366,7 +359,7 @@ export function buildDeclaredExternalContracts(inputs) {
                 if (inputs.discoveredIdByPath.has(declared) || localBasenames.has(base))
                     continue;
                 const stem = stemOf(base);
-                const kindless = m.domain !== "" ? slugify(`${m.domain}-${stem}`) : slugify(stem);
+                const kindless = contractKindlessSlug(m.domain, stem);
                 const slug = contractIdWithKind(kindless, kind);
                 if (seenDeclaredPaths.has(declared)) {
                     // Same path, same contract: legitimate cross-capability sharing.

package/dist/lib/catalogue/builders/entities-manifest.js

@@ -24,8 +24,8 @@
 // - For each entities[] item with non-empty name, emit a row.
 // - Within-model dedup by id; if attributes diverge, fire [finding] divergence
 //   on first re-encounter.
-// - `status: superseded` entries carry extra `superseded_by` + `note` keys.
-//   Ingested as ordinary rows; superseded_by preserved in notes for future
+// - `status: superseded` entries emit no entity: a superseded term is history, and glossary_xref carries
+//   its supersedes edge (schema 7.0.0). Formerly ingested as ordinary rows; superseded_by preserved in notes for future
 //   Phase 5 promotion to an entity_supersedes edge.
 // - `glossary_term` resolved best-effort against glossary_items (exact term
 //   then entitySlug equality); leave empty and fire orphan on miss.
@@ -34,8 +34,8 @@ import { join } from "node:path";
 import { parse as parseYaml } from "yaml";
 import { entitySlug } from "./entity-slug.js";
 const MANIFEST_REL_PATH = join("docs", "platform", "reference", "glossary-alignment-manifest.yaml");
-const NON_CANONICAL_DOMAINS = new Set(["platform-wide", "", "platform_wide"]);
-const PLATFORM_WIDE_PK_PREFIX = "_platform-wide";
+export const NON_CANONICAL_DOMAINS = new Set(["platform-wide", "", "platform_wide"]);
+export const PLATFORM_WIDE_PK_PREFIX = "_platform-wide";
 export async function buildEntitiesFromManifest(inputs) {
     // Profile gate per M-ADR 0159 §4.2 amendment: only platform-profile SDDs
     // read the manifest. Sibling profiles (application-product, integration-
@@ -93,6 +93,10 @@ export async function buildEntitiesFromManifest(inputs) {
                 inputs.findings.add("convention", `${MANIFEST_REL_PATH}: model ${model.path ?? "(unknown)"} has an entities[] entry with empty name — skipped`);
                 continue;
             }
+            // A superseded entry is history, not an element: the glossary keeps its supersedes edge (glossary_xref), and
+            // the entity it names is its successor's.
+            if (String(entity.status ?? "").trim() === "superseded")
+                continue; // as glossary_xref reads it
             const slug = entitySlug(name);
             const id = domainId
                 ? `${domainId}-${slug}`
@@ -128,6 +132,8 @@ export async function buildEntitiesFromManifest(inputs) {
             }
             byId.set(id, row);
             rows.push(row);
+            if (NON_CANONICAL_DOMAINS.has(rawDomain))
+                inputs.platformWideIdsOut?.add(id);
         }
     }
     return rows;

package/dist/lib/catalogue/builders/entity-merge.js

@@ -0,0 +1,90 @@
+// entities: the data-model walker's rows merged with the glossary-alignment manifest's (M-ADR 0159 §4.4).
+//
+// Field by field: a manifest value wins where it is non-empty, and the data model's value stands where the
+// manifest is silent, so source_domain_model_id and the columns= note survive a manifest entry naming the
+// same entity. Notes from both are kept.
+//
+// A platform-wide manifest entry (`_platform-wide-<slug>`, M-ADR 0159 §4.2) whose slug names exactly one
+// domain entity (`<domain>-<slug>`) IS that entity: it fills the domain entity's empty fields and emits no row
+// of its own, so one entity is one element. Its glossary term moves with it, and the entity_glossary step
+// derives the edge from the domain entity. An entry matching no domain entity, or several, stays platform-wide
+// and is reported.
+import { PLATFORM_WIDE_PK_PREFIX } from "./entities-manifest.js";
+const MANIFEST_REL_PATH = "glossary-alignment-manifest.yaml";
+function filled(v) {
+    return v !== undefined && v !== null && String(v) !== "";
+}
+function joinNotes(a, b) {
+    const parts = [];
+    for (const v of [a, b]) {
+        for (const p of String(v ?? "").split(";"))
+            if (p !== "" && !parts.includes(p))
+                parts.push(p);
+    }
+    return parts.join(";");
+}
+/** `over`'s non-empty values on top of `base`; notes from both. */
+function overlay(base, over) {
+    const out = { ...base };
+    for (const [k, v] of Object.entries(over)) {
+        if (k === "notes")
+            out[k] = joinNotes(base[k], v);
+        else if (filled(v))
+            out[k] = v;
+    }
+    return out;
+}
+/** `extra`'s values only where `base` is empty; notes from both. */
+function fillEmpty(base, extra) {
+    const out = { ...base };
+    for (const [k, v] of Object.entries(extra)) {
+        if (k === "id" || k === "name" || k === "domain_id")
+            continue;
+        if (k === "notes")
+            out[k] = joinNotes(base[k], v);
+        else if (!filled(base[k]) && filled(v))
+            out[k] = v;
+    }
+    return out;
+}
+export function mergeEntities(fromDataModels, fromManifest, findings, 
+/** The sentinel ids from a platform-wide domain hint (entities-manifest's out-set): the only ones that fold. */
+platformWideIds) {
+    const byId = new Map();
+    for (const r of fromDataModels)
+        byId.set(String(r["id"]), r);
+    for (const r of fromManifest) {
+        const id = String(r["id"]);
+        const existing = byId.get(id);
+        byId.set(id, existing ? overlay(existing, r) : r);
+    }
+    const prefix = `${PLATFORM_WIDE_PK_PREFIX}-`;
+    for (const [id, row] of [...byId]) {
+        if (!id.startsWith(prefix) || !platformWideIds.has(id))
+            continue;
+        const slug = id.slice(prefix.length);
+        const matches = [...byId.values()].filter((e) => {
+            const dom = String(e["domain_id"] ?? "");
+            return dom !== "" && String(e["id"]) === `${dom}-${slug}`;
+        });
+        if (matches.length === 1) {
+            const target = matches[0];
+            const own = String(target["glossary_term"] ?? "");
+            const theirs = String(row["glossary_term"] ?? "");
+            if (own !== "" && theirs !== "" && own !== theirs) {
+                findings.add("divergence", `${MANIFEST_REL_PATH}: platform-wide entity ${row["name"]} names glossary term ${theirs}, but ${target["id"]} ` +
+                    `already names ${own} — kept ${own}`);
+            }
+            byId.set(String(target["id"]), fillEmpty(target, row));
+            byId.delete(id);
+        }
+        else if (matches.length === 0) {
+            findings.add("coverage", `${MANIFEST_REL_PATH}: platform-wide entity ${row["name"]} names no domain entity — kept as ${id}`);
+        }
+        else {
+            findings.add("divergence", `${MANIFEST_REL_PATH}: platform-wide entity ${row["name"]} names ${matches.length} domain entities (${matches.map((m) => m["id"]).join(", ")}) — kept as ${id}; give it a domain`);
+        }
+    }
+    return [...byId.values()];
+}
+//# sourceMappingURL=entity-merge.js.map

package/dist/lib/catalogue/builders/features.js

@@ -158,7 +158,7 @@ export function featureStatus(text) {
 }
 /**
  * A feature spec's kind (schema 4.4.0): the value of its `**Kind:**` line, lower-cased, else `feature`. An
- * obligation (M-ADR 0226, Proposed) and a journey feature (M-ADR 0229 §4.2, Proposed) say so; any other value is written as given, so
+ * obligation (M-ADR 0226, Proposed) and a journey feature (M-ADR 0229 §4.2) say so; any other value is written as given, so
  * the catalogue's vocabulary gate names the spec rather than a default hiding the mistake.
  */
 export function featureKind(text) {

package/dist/lib/catalogue/builders/glossary-xref.js

@@ -27,8 +27,9 @@
 //   4. Forward-method supersedes (new).
 //        models[].entities[] with status: superseded + superseded_by
 //      One row per supersedes mapping after resolving both endpoints'
-//      glossary_term against glossary_items.csv. Orphan finding when an
-//      endpoint doesn't resolve.
+//      glossary_term against glossary_items.csv: the successor (superseded_by)
+//      is the source and supersedes the superseded term, the target. Orphan
+//      finding when an endpoint doesn't resolve.
 //
 //   5. Forward-method entity-mapping (new, writes to entity_glossary).
 //        models[].entities[] with status ∈ {aligned, matched_direct} and
@@ -40,6 +41,7 @@
 import { readFile } from "node:fs/promises";
 import { join } from "node:path";
 import { parse as parseYaml } from "yaml";
+import { NON_CANONICAL_DOMAINS } from "./entities-manifest.js";
 const MANIFEST_REL_PATH = join("docs", "platform", "reference", "glossary-alignment-manifest.yaml");
 export async function buildGlossaryXref(inputs) {
     // Profile gate per M-ADR 0158 §amendment: the manifest is platform-owned;
@@ -259,14 +261,18 @@ export async function buildGlossaryXref(inputs) {
                         inputs.findings.add("orphan", `${MANIFEST_REL_PATH}: supersedes edge can't emit — target "${supersededBy}" (→ glossary "${targetEntity?.glossaryTerm ?? "?"}") doesn't resolve to a glossary item`);
                         continue;
                     }
-                    emitXref(sourceId, targetId, "supersedes");
+                    // The successor supersedes the superseded term: `source supersedes target`, as adr_supersedes reads.
+                    emitXref(targetId, sourceId, "supersedes");
                     continue;
                 }
                 if ((status === "aligned" || status === "matched_direct") && glossaryTerm !== "") {
                     // Entity-mapping walker writes to entity_glossary.csv.
                     if (domain === "" || !inputs.knownDomainIds.has(domain)) {
-                        // Domain not in this SDD's domains.csv — likely "platform-wide"
-                        // or another scope identifier. Skip with a coverage finding.
+                        // A platform-wide entry is the domain entity its slug names (entity-merge.ts), and the entity_glossary
+                        // edge is derived from that entity after the merge; the merge reports one it cannot place. Any other
+                        // domain not in this SDD's domains.csv is skipped with a coverage finding.
+                        if (NON_CANONICAL_DOMAINS.has(domain))
+                            continue;
                         inputs.findings.add("coverage", `${MANIFEST_REL_PATH}: entity ${name} domain "${domain}" not in known domains — entity_glossary row skipped`);
                         continue;
                     }

package/dist/lib/catalogue/builders/journey-requirement.js

@@ -1,4 +1,4 @@
-// journey_requirement: the requirements a user journey cites for its steps (M-ADR 0229 §4.4, Proposed; schema 4.4.0).
+// journey_requirement: the requirements a user journey cites for its steps (M-ADR 0229 §4.4; schema 4.4.0).
 //
 // Derived, never authored, from either master (§4.2):
 //   tag       option A: the end-to-end `.feature` files under the manifest's `journeys.test_paths`. A file tagged
@@ -64,13 +64,13 @@ export async function buildJourneyRequirement(inputs) {
         for (const m of text.matchAll(REQ_TAG)) {
             const quiet = atAggregate && inputs.reportedFeatureIds.has(m[1]);
             if (!knownFeatures.has(m[1])) {
-                findings.add("external", `${where}: @req:${m[1]}/${m[2]} names a feature this catalogue does not hold; resolves at aggregation (M-ADR 0229 §4.4, Proposed)`);
+                findings.add("external", `${where}: @req:${m[1]}/${m[2]} names a feature this catalogue does not hold; resolves at aggregation (M-ADR 0229 §4.4)`);
                 continue;
             }
             const ids = bySlug.get(`${m[1]}/${m[2]}`) ?? [];
             if (ids.length !== 1) {
                 if (!quiet)
-                    findings.add("orphan", `${where}: @req:${m[1]}/${m[2]} ${ids.length === 0 ? "names no requirement of that feature" : `matches ${ids.length} requirements of that feature`}; no journey_requirement row (M-ADR 0229 §4.4, Proposed)`);
+                    findings.add("orphan", `${where}: @req:${m[1]}/${m[2]} ${ids.length === 0 ? "names no requirement of that feature" : `matches ${ids.length} requirements of that feature`}; no journey_requirement row (M-ADR 0229 §4.4)`);
                 continue;
             }
             const id = `${journeyId}__${ids[0]}`;
@@ -95,7 +95,7 @@ export async function buildJourneyRequirement(inputs) {
                 continue;
             if (journeys.length > 1) {
                 if (!atAggregate)
-                    findings.add("divergence", `${where}: tagged with ${journeys.length} journeys (${journeys.join(", ")}); one file is one journey's master (M-ADR 0229 §4.2, Proposed)`);
+                    findings.add("divergence", `${where}: tagged with ${journeys.length} journeys (${journeys.join(", ")}); one file is one journey's master (M-ADR 0229 §4.2)`);
                 continue;
             }
             const journeyId = journeys[0];
@@ -129,7 +129,7 @@ export async function buildJourneyRequirement(inputs) {
         const journeys = [...new Set([...spec.matchAll(JOURNEY_TAG)].map((m) => m[1]))];
         if (journeys.length !== 1) {
             if (!atAggregate)
-                findings.add(journeys.length === 0 ? "orphan" : "divergence", `${where}: a journey feature's living spec ${journeys.length === 0 ? "names no journey (@journey:<journey-id>)" : `names ${journeys.length} journeys`}; one journey feature masters one journey (M-ADR 0229 §4.2, Proposed)`);
+                findings.add(journeys.length === 0 ? "orphan" : "divergence", `${where}: a journey feature's living spec ${journeys.length === 0 ? "names no journey (@journey:<journey-id>)" : `names ${journeys.length} journeys`}; one journey feature masters one journey (M-ADR 0229 §4.2)`);
             continue;
         }
         const journeyId = journeys[0];

package/dist/lib/catalogue/builders/service-contract-consumes.js

@@ -59,13 +59,13 @@ export async function buildServiceContractConsumes(inputs) {
             const mapped = inputs.legacyContractIdMap?.get(contractId);
             if (mapped !== undefined && mapped.length === 1) {
                 inputs.findings.add("inferred", `service_contract: alias target "${contractId}" (${serviceId} ← "${iface.interfaceText}") re-keyed to ` +
-                    `"${mapped[0]}" — 2.x kindless contract id migrated per the 3.0.0 map (regenerable, not drift); ` +
+                    `"${mapped[0]}" — an earlier-form contract id (2.x kindless, or a pre-7.0.0 unsplit stem) migrated per the contract-id map (regenerable, not drift); ` +
                     `update .sdd/service-contract-aliases.yaml to retire this finding`);
                 contractId = mapped[0];
             }
             else if (mapped !== undefined && mapped.length > 1) {
                 inputs.findings.add("convention", `service_contract: alias target "${contractId}" (${serviceId} ← "${iface.interfaceText}") maps to ` +
-                    `${mapped.length} contracts at 3.0.0 [${mapped.join(", ")}] — a 2.x cross-family collision; ` +
+                    `${mapped.length} current contracts [${mapped.join(", ")}] — a cross-family collision under the earlier form; ` +
                     `qualify the alias with the kind-suffixed id; edge dropped`);
                 continue;
             }

package/dist/lib/catalogue/builders/service-entity-tables.js

@@ -128,7 +128,7 @@ export async function buildServiceEntityFromTables(inputs) {
     }
     return [...rowsByPk.values()];
 }
-async function loadAliasMap(sddPath, findings) {
+export async function loadAliasMap(sddPath, findings) {
     const empty = { byDisplayLower: new Map() };
     const path = join(sddPath, ALIAS_REL_PATH);
     let text;

package/dist/lib/catalogue/canonical-schema.yaml

@@ -7,7 +7,7 @@
 # Emitted by sdd-cli's YAML emitter with no line folding; the three header scalars are quoted for the
 # textual readers downstream. The one deliberate difference from the authored form is schema_status:
 # the authored form says canonical; a projection never does.
-schema_version: "6.0.0"
+schema_version: "7.0.0"
 schema_owner: "sdd-method"
 schema_status: "generated"
 enums:
@@ -685,15 +685,15 @@ enums:
     - value: obligation
       description: Behaviour every feature in a population depends on, owned as a feature of its own (M-ADR 0226, Proposed).
     - value: journey
-      description: A user journey's joint behaviour, held in the behaviour store (M-ADR 0229 §4.2, option B; Proposed).
-    description: What a catalogued feature is (M-ADR 0226 and M-ADR 0229, both Proposed).
+      description: A user journey's joint behaviour, held in the behaviour store (M-ADR 0229 §4.2, option B).
+    description: What a catalogued feature is (M-ADR 0226, Proposed, and M-ADR 0229).
   journey_requirement_basis:
     values:
     - value: tag
       description: A @req tag in the journey's end-to-end test file (option A).
     - value: citation
       description: A citation in the journey feature's living spec (option B).
-    description: Where a journey's citation of a requirement was read (M-ADR 0229 §4.4, Proposed).
+    description: Where a journey's citation of a requirement was read (M-ADR 0229 §4.4).
   source_of_truth:
     values:
     - value: structure
@@ -1318,7 +1318,7 @@ catalogues:
     - name: relation
       type: string
       nullable: false
-      description: alias-of | conflicts-with | references | supersedes (extended in schema 2.12.0 per M-ADR 0158).
+      description: "alias-of | conflicts-with | references | supersedes (extended in schema 2.12.0 per M-ADR 0158). Read as source, relation, target: for supersedes the successor is the source and the superseded term the target."
     description: "Edge: cross-domain glossary relationships from glossary-alignment-manifest.yaml. Per M-ADR 0158, four walkers ingest into this catalogue: (a) forward declared pair-form {source, target} entries under aliases/conflicts, (b) reverse-method cross_domain_terms (emits references edges per referencer→owner), (c) reverse-method multi-domain conflicts (pair-wise expansion across domains[]), (d) forward-method supersedes (status: superseded entries with superseded_by back-link)."
     natural_key:
     - source_id
@@ -1646,7 +1646,7 @@ catalogues:
     - name: kind
       type: string
       nullable: false
-      description: "Bound to feature_kind: feature (the default), obligation (M-ADR 0226, Proposed) or journey (M-ADR 0229 §4.2, Proposed), from the feature spec's **Kind:** line."
+      description: "Bound to feature_kind: feature (the default), obligation (M-ADR 0226, Proposed) or journey (M-ADR 0229 §4.2), from the feature spec's **Kind:** line."
     - name: source_sdd_id
       type: string
       nullable: true
@@ -1760,7 +1760,7 @@ catalogues:
     - name: id
       type: string
       nullable: false
-      description: "{domain}-{stem}-{kind} — the kind component joined the id at schema 3.0.0 (M-ADR 0203 §4.4), ending the kindless collision class where one service published as two contract families (openapi + proto) minted one id (measured cost: 1 row + 2 edges permanently unrepresentable, plus legitimate shared-contract citation flagged as divergence). Mechanical migration: new id = old id + '-' + kind; `sdd-cli catalogue migration-map` emits the pairs, and authored alias targets (M-ADR 0147) re-key automatically during the cut window."
+      description: "{domain}-{stem}-{kind} — the kind component joined the id at schema 3.0.0 (M-ADR 0203 §4.4), ending the kindless collision class where one service published as two contract families (openapi + proto) minted one id (measured cost: 1 row + 2 edges permanently unrepresentable, plus legitimate shared-contract citation flagged as divergence). Mechanical migration: new id = old id + '-' + kind; `sdd-cli catalogue migration-map` emits the pairs, and authored alias targets (M-ADR 0147) re-key automatically during the cut window. From schema 7.0.0 the stem is split at its CamelCase boundaries as an entity name is (`OrderPlaced` → `order-placed`), and references to the unsplit form re-key the same way, from id, kind and spec_path."
     - name: name
       type: string
       nullable: false
@@ -1946,7 +1946,7 @@ catalogues:
     - name: service_id
       type: string
       nullable: true
-      description: Matched by container name ↔ service name/repo where possible.
+      description: Matched to a service id by the container's diagram id or display-name slug, then by its display name through docs/platform/reference/service-name-aliases.yaml.
     - name: type
       type: string
       nullable: true
@@ -2211,7 +2211,7 @@ catalogues:
     - name: id
       type: string
       nullable: false
-      description: "Slugged PK: {domain_id}-{entitySlug(name)}. For manifest-sourced rows with domain=platform-wide, the leading domain segment is empty (`-{entitySlug(name)}`) and the row carries a [finding] convention."
+      description: "Slugged PK: {domain_id}-{entitySlug(name)}. A glossary-manifest entry with domain=platform-wide is the domain entity its slug names when exactly one does, and adds no row of its own; one naming none, or several, is kept as `_platform-wide-{entitySlug(name)}` with a finding. A superseded manifest entry is no entity: glossary_xref holds its supersedes edge."
     - name: name
       type: string
       nullable: false
@@ -4904,7 +4904,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "Edge: a requirement a user journey cites for one of its steps (M-ADR 0229 §4.4, Proposed). Derived, never authored: from the @req tags in the journey's end-to-end test file, or from the citations in its journey feature's living spec. A journey with no row is untraced."
+    description: "Edge: a requirement a user journey cites for one of its steps (M-ADR 0229 §4.4). Derived, never authored: from the @req tags in the journey's end-to-end test file, or from the citations in its journey feature's living spec. A journey with no row is untraced."
     foreign_keys:
     - column: journey_id
       references: user_journeys.id

package/dist/lib/catalogue/contract-id.js

@@ -13,26 +13,46 @@
 // `sdd-cli catalogue migration-map`; the alias-file re-key (M-ADR 0147 targets
 // are authored copies of tool-minted ids — regenerable, not drift, the same
 // rule as external_system_exemption) consults the in-build form of it.
+/** A contract id's kindless slug (catalogue schema 7.0.0): CamelCase split, lower-cased, non-alphanumerics to `-`. */
+export function contractSlug(s) {
+    return legacySlug(s.replace(/([A-Z]{2,})([A-Z][a-z])/g, "$1-$2").replace(/([a-z0-9])([A-Z])/g, "$1-$2"));
+}
+/**
+ * A contract id's kindless slug from its domain segment and file stem: only the stem is CamelCase-split, so a
+ * domain directory keeps the slug it always had.
+ */
+export function contractKindlessSlug(domain, stem) {
+    if (domain === "")
+        return contractSlug(stem);
+    return [legacySlug(domain), contractSlug(stem)].filter((p) => p !== "").join("-");
+}
+/** The pre-7.0.0 slug: the same, without the CamelCase split. */
+function legacySlug(s) {
+    return s
+        .toLowerCase()
+        .replace(/^_+/, "") // turn _common into common
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+}
+function stemOfPath(specPath) {
+    const base = specPath.split(/[\\/]/).pop() ?? "";
+    return base.replace(/\.[^.]+$/, "");
+}
 /** The 3.0.0 contract id: the kindless slug with its kind appended. */
 export function contractIdWithKind(kindlessSlug, kind) {
     return kindlessSlug === "" ? "" : `${kindlessSlug}-${kind}`;
 }
 /**
- * legacy (2.x, kindless) id → the 3.0.0 kind-suffixed ids it maps to, from
- * built rows. More than one target means the id was a measured collision
- * under 2.x (two families sharing one kindless slug) — the consumer decides
- * which family is meant, loudly, never by guess.
+ * legacy id → the current ids it maps to, from built rows: the 2.x kindless id (→ 3.0.0), and the pre-7.0.0
+ * unsplit-stem id, with and without its kind. More than one target means the id was a measured collision
+ * under the old form (two families sharing one slug) — the consumer decides which family is meant, loudly,
+ * never by guess.
  */
 export function buildLegacyContractIdMap(rows) {
     const map = new Map();
-    for (const row of rows) {
-        const id = String(row["id"] ?? "");
-        const kind = String(row["kind"] ?? "");
-        if (id === "" || kind === "" || !id.endsWith(`-${kind}`))
-            continue;
-        const legacy = id.slice(0, -(kind.length + 1));
-        if (legacy === "")
-            continue;
+    const add = (legacy, id) => {
+        if (legacy === "" || legacy === id)
+            return;
         const ids = map.get(legacy);
         if (ids) {
             if (!ids.includes(id))
@@ -41,6 +61,23 @@ export function buildLegacyContractIdMap(rows) {
         else {
             map.set(legacy, [id]);
         }
+    };
+    for (const row of rows) {
+        const id = String(row["id"] ?? "");
+        const kind = String(row["kind"] ?? "");
+        if (id === "" || kind === "" || !id.endsWith(`-${kind}`))
+            continue;
+        const kindless = id.slice(0, -(kind.length + 1));
+        add(kindless, id);
+        // 7.0.0: the stem's segment as it read before the CamelCase split.
+        const stem = stemOfPath(String(row["spec_path"] ?? ""));
+        const split = contractSlug(stem);
+        const unsplit = legacySlug(stem);
+        if (split === "" || split === unsplit || !kindless.endsWith(split))
+            continue;
+        const oldKindless = kindless.slice(0, -split.length) + unsplit;
+        add(oldKindless, id);
+        add(`${oldKindless}-${kind}`, id);
     }
     for (const ids of map.values())
         ids.sort((a, b) => a.localeCompare(b));

package/dist/lib/catalogue/manifest-loader.js

@@ -218,7 +218,7 @@ const ManifestSchema = z.object({
     // Shared-library trait (sdd-manifest-schema 1.12.0, M-ADR 0217 §4.4). Profile-agnostic,
     // like `exemplar`; absent is the unmarked norm, no finding.
     shared_library: z.boolean().optional(),
-    // Where this estate's journey behaviour is mastered (sdd-manifest-schema 1.13.0, M-ADR 0229 §4.2, Proposed).
+    // Where this estate's journey behaviour is mastered (sdd-manifest-schema 1.13.0, M-ADR 0229 §4.2).
     // `master` is declared at the root, and journey-impact treats a member naming its platform as inheriting it.
     // `test_paths` is never inherited: it is relative to this SDD, so an SDD that holds end-to-end files declares
     // its own block, with the master and its paths. Unknown values fail at load.

package/dist/lib/catalogue/schema-compat.js

@@ -27,7 +27,7 @@
  * M-ADR 0134 §4.6 (canonical builder + aggregator).
  */
 export const SCHEMA_COMPAT = {
-    catalogue_schema: "^6.0.0",
+    catalogue_schema: "^7.0.0",
     sdd_manifest: "^1.0.0",
     aggregation_manifest: "^1.0.0",
 };

package/dist/lib/validate/dispatch.js

@@ -37,7 +37,7 @@ const BEHAVIOUR_STORE_VALIDATORS = [
         source: { kind: "native", run: async (ctx) => checkFeatureSpecPointers(ctx.targetRepo) },
         build: () => ({ status: "run", args: [] }),
     },
-    // The journeys a change can break, and whether its proposal names them (M-ADR 0229 §4.5, Proposed). Report only; [N/A] without journeys.
+    // The journeys a change can break, and whether its proposal names them (M-ADR 0229 §4.5). Report only; [N/A] without journeys.
     {
         name: "journey-impact",
         source: { kind: "native", run: async (ctx) => checkJourneyImpact(ctx.targetRepo) },

package/dist/lib/validate/journey-impact.js

@@ -1,5 +1,5 @@
-// journey-impact: the journeys a change can break, and whether its proposal names them (M-ADR 0229 §4.5, Proposed).
-// Report only (M-ADR 0229 §4.5, Proposed): every finding is a [WARN] and the check exits 0. Gate 0 carries this report; nothing
+// journey-impact: the journeys a change can break, and whether its proposal names them (M-ADR 0229 §4.5).
+// Report only (M-ADR 0229 §4.5): every finding is a [WARN] and the check exits 0. Gate 0 carries this report; nothing
 // blocks on it, and the judge does not fail a change for it.
 //
 // For each open change in the behaviour store (openspec/changes/<change>/, not the archive):
@@ -14,8 +14,8 @@
 // with no reason is reported too.
 //
 // Also reported: a journey citing a requirement of a feature its journey_feature rows do not name (one record or
-// the other is wrong, M-ADR 0229 §4.4, Proposed); and an SDD with catalogued journeys whose manifest declares no journey master and that names no
-// platform it inherits from (an unresolved root, M-ADR 0229 §4.2, Proposed). A member that names its platform inherits the
+// the other is wrong, M-ADR 0229 §4.4); and an SDD with catalogued journeys whose manifest declares no journey master and that names no
+// platform it inherits from (an unresolved root, M-ADR 0229 §4.2). A member that names its platform inherits the
 // root's declaration, which is checked at the root.
 //
 // Reads the aggregated catalogue (catalogues-aggregated/*.csv) where this SDD has one, since a root's changes can
@@ -100,7 +100,7 @@ export async function checkJourneyImpact(repo) {
     else if (platform)
         lines.push(`journey master: not declared here; inherited from platform ${platform}, where it is checked`);
     else
-        warnings.push(`.sdd/sdd-manifest.yaml: ${journeys.length} catalogued journey(s) and no journey master (journeys.master: test-file or store), and no platform to inherit one from: unresolved (M-ADR 0229 §4.2, Proposed)`);
+        warnings.push(`.sdd/sdd-manifest.yaml: ${journeys.length} catalogued journey(s) and no journey master (journeys.master: test-file or store), and no platform to inherit one from: unresolved (M-ADR 0229 §4.2)`);
     const jr = await csv(repo, "journey_requirement", dir);
     const jf = (await csv(repo, "journey_feature", dir)) ?? [];
     const featureKinds = new Map(((await csv(repo, "features", dir)) ?? []).map((f) => [f["id"], f["kind"] ?? ""]));
@@ -137,7 +137,7 @@ export async function checkJourneyImpact(repo) {
         if (touched.get(r["journey_id"])?.has(feature) || mismatched.has(key))
             continue;
         mismatched.add(key);
-        warnings.push(`journey ${r["journey_id"]} cites requirements of ${feature}, which its journey_feature rows do not name: the journey's related features or its tags are wrong (M-ADR 0229 §4.4, Proposed)`);
+        warnings.push(`journey ${r["journey_id"]} cites requirements of ${feature}, which its journey_feature rows do not name: the journey's related features or its tags are wrong (M-ADR 0229 §4.4)`);
     }
     const untracedCount = journeys.filter((j) => !traced.has(j["id"])).length;
     lines.push(`journeys: ${journeys.length} catalogued, ${journeys.length - untracedCount} traced to requirements, ${untracedCount} untraced`);
@@ -203,6 +203,6 @@ export async function checkJourneyImpact(repo) {
     const body = lines.map((l) => `${l}\n`).join("");
     if (warnings.length === 0)
         return { exitCode: 0, stdout: `journey-impact:\n${body}[PASS] journey-impact: every listed journey is named\n` };
-    return { exitCode: 0, stdout: `journey-impact:\n${body}${warnings.map((w) => `[WARN] ${w}\n`).join("")}[WARN] journey-impact: ${warnings.length} finding(s), report only (M-ADR 0229 §4.5, Proposed)\n` };
+    return { exitCode: 0, stdout: `journey-impact:\n${body}${warnings.map((w) => `[WARN] ${w}\n`).join("")}[WARN] journey-impact: ${warnings.length} finding(s), report only (M-ADR 0229 §4.5)\n` };
 }
 //# sourceMappingURL=journey-impact.js.map

package/dist/maintain-version.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.13.1",
-  "built_against_sdd_cli": "4.0.1"
+  "version": "0.14.0",
+  "built_against_sdd_cli": "5.0.0"
 }

package/dist/verify-version.json

@@ -1,4 +1,4 @@
 {
-  "version": "4.0.1",
-  "built_against_sdd_cli": "4.0.1"
+  "version": "5.0.0",
+  "built_against_sdd_cli": "5.0.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sdd-method/maintain-cli",
-  "version": "0.13.1",
-  "sddCliVersion": "4.0.1",
+  "version": "0.14.0",
+  "sddCliVersion": "5.0.0",
   "description": "Bring an SDD repository current and rebuild its derived model — sync, briefing, catalogue build and aggregate, pack build, context pull — plus every read-only verify verb. Ships only the code those verbs reach; it cannot author specification content. Authoring is in @sdd-method/sdd-cli.",
   "license": "UNLICENSED",
   "type": "module",