@sdd-method/author-cli 0.12.1 → 0.14.0

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/quality-scores.js

@@ -119,7 +119,7 @@ const num = (v) => {
     return null;
 };
 /**
- * The review's other assessed inputs (M-ADR 0230 §4.9, Proposed): `inputs:` as a list of paths, or of `{path}`
+ * The review's other assessed inputs (M-ADR 0230 §4.9): `inputs:` as a list of paths, or of `{path}`
  * entries, each read at the review's corpus_ref. ';'-joined; null when the review names none.
  */
 function inputPaths(v) {

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

@@ -18,7 +18,7 @@
 //   change_work_order   per (change, repository): the record's work order, agreed or completed.
 //   change_work_item    per (change, work item): the ids its proposal's `## Work Items` section lists, keyed by
 //                       the undated name so the row survives archive.
-//   requirement_revisions  one row per distinct text of a requirement (schema 6.0.0, M-ADR 0230 §4.7, Proposed): the
+//   requirement_revisions  one row per distinct text of a requirement (schema 6.0.0, M-ADR 0230 §4.7): the
 //                       living spec's is current, an agreed open change's ADDED or MODIFIED block intended, an
 //                       archived change's block the living spec no longer holds history. Identified by its digest.
 //   requirement_assertions per (revision, repository): observed from a baseline's `**Observed in:**` line;

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.1.0"
 schema_owner: "sdd-method"
 schema_status: "generated"
 enums:
@@ -645,7 +645,7 @@ enums:
       description: Its change archived on a passing judge, with this repository's work order implementing it.
     - value: observed
       description: Independent evidence from this repository's code matches (a baseline's characterization tests or a reverse snapshot).
-    description: The kind of evidence an assertion is about one revision, in one repository (M-ADR 0230 §4.7, Proposed).
+    description: The kind of evidence an assertion is about one revision, in one repository (M-ADR 0230 §4.7).
   change_status:
     values:
     - value: proposed
@@ -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
@@ -714,14 +714,14 @@ enums:
       description: Observations, scores and findings, about a named revision.
     - value: execution
       description: "The change records and the build itself: changes, work orders, lineage, and the provenance the build or aggregation stamps."
-    description: Where a catalogue's facts, or a column's, are authored (M-ADR 0230 §4.1, Proposed). Each catalogue carries one; a column carries one only where it differs.
+    description: Where a catalogue's facts, or a column's, are authored (M-ADR 0230 §4.1). Each catalogue carries one; a column carries one only where it differs.
   relationship_end_cardinality:
     values:
     - value: exactly-one
     - value: zero-or-one
     - value: one-or-more
     - value: zero-or-more
-    description: "How many entities one end of a relationship holds for one entity at the other end (M-ADR 0230 §4.3, Proposed): a Mermaid ER end marker (|| exactly one, |o or o| zero or one, }| or |{ one or more, }o or o{ zero or more). A TypeQL relationship is zero-or-more at both ends, because the subset admits no participation cardinality; a role's @card is a cardinality invariant (domain_invariants). Replaced entity_relationship_cardinality in schema 6.0.0."
+    description: "How many entities one end of a relationship holds for one entity at the other end (M-ADR 0230 §4.3): a Mermaid ER end marker (|| exactly one, |o or o| zero or one, }| or |{ one or more, }o or o{ zero or more). A TypeQL relationship is zero-or-more at both ends, because the subset admits no participation cardinality; a role's @card is a cardinality invariant (domain_invariants). Replaced entity_relationship_cardinality in schema 6.0.0."
   domain_invariant_kind:
     values:
     - value: unique
@@ -732,7 +732,7 @@ enums:
       description: A bound on how many entities the named relationship relates, stated in the statement.
     - value: rule
       description: Any other rule, stated in the statement.
-    description: The type of a domain invariant (M-ADR 0230 §4.3, Proposed).
+    description: The type of a domain invariant (M-ADR 0230 §4.3).
   revision_state:
     values:
     - value: current
@@ -741,14 +741,14 @@ enums:
       description: An agreed open change states it.
     - value: history
       description: Once published or stated, and no longer current.
-    description: Which view a revision belongs to (M-ADR 0230 §4.7, Proposed).
+    description: Which view a revision belongs to (M-ADR 0230 §4.7).
   change_effect_element_kind:
     values:
     - value: requirement
       description: A requirement, written by a behaviour delta.
     - value: structure
       description: An element of the structural model, written by a structural delta.
-    description: What kind of element a change effect writes (M-ADR 0230 §4.7, Proposed).
+    description: What kind of element a change effect writes (M-ADR 0230 §4.7).
   adr_governs:
     values:
     - value: current
@@ -757,7 +757,7 @@ enums:
       description: "The system as the agreed changes will leave it: the decision applies from its change's archive."
     - value: none
       description: "Neither: proposed, rejected, deprecated, superseded by a decision now in force, or its change withdrawn."
-    description: Which view a decision governs (M-ADR 0230 §4.2, Proposed).
+    description: Which view a decision governs (M-ADR 0230 §4.2).
   contract_revision_state:
     values:
     - value: agreed
@@ -768,7 +768,22 @@ enums:
       description: Applicable, with a sunset.
     - value: retired
       description: "No longer applicable: an archived change's revision the file no longer holds."
-    description: A contract revision's applicability in the published specification (M-ADR 0230 §4.2, Proposed).
+    description: A contract revision's applicability in the published specification (M-ADR 0230 §4.2).
+  ppt_archetype:
+    values:
+    - value: party
+      description: A person or an organisation.
+    - value: place
+      description: A location where things happen or are kept.
+    - value: thing
+      description: An object that is tracked individually.
+    - value: role
+      description: A way a party, place or thing takes part in something.
+    - value: moment-interval
+      description: Something that happens at a moment or over an interval, and is recorded.
+    - value: description
+      description: A catalogue-entry description that many things share.
+    description: An entity's Party-Place-Thing archetype, as the capability spec template classifies it (schema 7.1.0).
 catalogues:
   domains:
     primary_key: id
@@ -1220,7 +1235,7 @@ catalogues:
     - name: effective_change
       type: string
       nullable: true
-      description: "From the ADR's **Effective:** line (M-ADR 0230 §4.2, Proposed): the change whose archive makes the decision apply, by its undated name; empty when it applies on acceptance. Added in schema 6.0.0."
+      description: "From the ADR's **Effective:** line (M-ADR 0230 §4.2): the change whose archive makes the decision apply, by its undated name; empty when it applies on acceptance. Added in schema 6.0.0."
     - name: governs
       type: string
       nullable: true
@@ -1318,7 +1333,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
@@ -1503,7 +1518,7 @@ catalogues:
     - name: source
       type: string
       nullable: false
-      description: "capability-tree | product-map | capability-spec | structural-model. As of schema 6.0.0, source: structural-model is emitted for a capability only the structural model holds (M-ADR 0230 §4.3, Proposed)."
+      description: "capability-tree | product-map | capability-spec | structural-model. As of schema 6.0.0, source: structural-model is emitted for a capability only the structural model holds (M-ADR 0230 §4.3)."
       source_of_truth: derived
     - name: runway_classification
       type: string
@@ -1637,7 +1652,7 @@ catalogues:
     - name: source
       type: string
       nullable: false
-      description: "feature-tree | feature-set | capability-spec | feature-spec | feature-grounding | structural-model. As of schema 6.0.0, source: structural-model is emitted for a feature only the structural model holds (M-ADR 0230 §4.3, Proposed). NOTE: feature-tree-group source removed in 1.3.0 — groups are now first-class in feature_groups.csv. As of schema 2.2.0, source: feature-tree is emitted by the canonical builder for rows derived from feature-tree.md bullets. As of schema 2.5.0, source: feature-grounding is emitted for rows derived from `docs/domains/<dom>/design/<capability>/feature-grounding.md` markdown tables (per M-ADR 0143). As of schema 2.7.0, source: capability-spec is emitted by the canonical builder for rows derived from `## Feature Grounding (code-path trace)` tables in `docs/domains/<dom>/product/<capability>.md` capability spec markdown (per M-ADR 0145). Feature-grounding and capability-spec rows are both capability-owned: product_id is empty; capability_id resolves from the file path."
+      description: "feature-tree | feature-set | capability-spec | feature-spec | feature-grounding | structural-model. As of schema 6.0.0, source: structural-model is emitted for a feature only the structural model holds (M-ADR 0230 §4.3). NOTE: feature-tree-group source removed in 1.3.0 — groups are now first-class in feature_groups.csv. As of schema 2.2.0, source: feature-tree is emitted by the canonical builder for rows derived from feature-tree.md bullets. As of schema 2.5.0, source: feature-grounding is emitted for rows derived from `docs/domains/<dom>/design/<capability>/feature-grounding.md` markdown tables (per M-ADR 0143). As of schema 2.7.0, source: capability-spec is emitted by the canonical builder for rows derived from `## Feature Grounding (code-path trace)` tables in `docs/domains/<dom>/product/<capability>.md` capability spec markdown (per M-ADR 0145). Feature-grounding and capability-spec rows are both capability-owned: product_id is empty; capability_id resolves from the file path."
       source_of_truth: derived
     - name: runway
       type: string
@@ -1646,7 +1661,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 +1775,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 +1961,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 +2226,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
@@ -2255,6 +2270,10 @@ catalogues:
       nullable: true
       description: The platform this row belongs to — sdd_id of its platform-root. Stamped by the aggregator per M-ADR 0208 §4.4 (preserve-if-set, fill rule by pull path); left empty by per-SDD builders. Added in 3.7.0.
       source_of_truth: execution
+    - name: ppt_archetype
+      type: string
+      nullable: true
+      description: "The entity's Party-Place-Thing archetype (ppt_archetype). A structure fact: where the SDD has a structural model, the model holds it, and a change states it in its deltas. In an SDD without a model it is read from the capability specs' Entity Classification tables: the first archetype a row's archetype cell names, colour labels and qualifiers aside (Moment alone is moment-interval, PartyRole is role); a cell naming none, an entity no table row resolves to, and two tables disagreeing are reported. Added in schema 7.1.0 (M-ADR 0230)."
     description: "Data-model entity (a structural realisation of a concept inside a domain's data model). Distinct from glossary_items (vocabulary-level) and from domain_models (file-level). Added in schema 2.13.0 per M-ADR 0159. Forward source: `models[].entities[]` in glossary-alignment-manifest.yaml. Reverse source: `EntityName { ... }` declarations inside `erDiagram` fences in `docs/domains/{domain}/architecture/data-model.mermaid.md`. PK uses an entity-aware slug that normalises across UPPER_SNAKE and PascalCase authoring styles."
     foreign_keys:
     - column: domain_id
@@ -2268,6 +2287,7 @@ catalogues:
       nullable: true
     column_enums:
       persistence_kind: enums.persistence_kind
+      ppt_archetype: enums.ppt_archetype
   repo_capability:
     primary_key: id
     source_of_truth: derived
@@ -3933,7 +3953,7 @@ catalogues:
     - name: input_paths
       type: string
       nullable: true
-      description: "';'-separated paths of the review's other assessed inputs (its `inputs:` list, M-ADR 0230 §4.9, Proposed), beside target_path: a feature's UX evidence, say. Each is read at corpus_ref, so a later edit to any of them makes the score stale, as an edit to the target does. Added in schema 6.0.0."
+      description: "';'-separated paths of the review's other assessed inputs (its `inputs:` list, M-ADR 0230 §4.9), beside target_path: a feature's UX evidence, say. Each is read at corpus_ref, so a later edit to any of them makes the score stale, as an edit to the target does. Added in schema 6.0.0."
     - name: staleness_basis
       type: string
       nullable: false
@@ -4752,7 +4772,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "Edge: evidence about one revision of a requirement, in one repository that implements it (M-ADR 0230 §4.7, Proposed; replaces requirement_status in schema 6.0.0). Derived, never authored: observed from a baseline's **Observed in:** line, declared-shipped from an archived change's PASS verdict through its work orders' implements lists, each about the revision that change's delta states. An assertion is current while its revision is, and history once a later change moves the requirement, so evidence about one revision is never read as proof of another. An agreed change is not an assertion: it is an intended revision (requirement_revisions) and a change effect (change_effects). Per (revision, repository), the latest assertion wins."
+    description: "Edge: evidence about one revision of a requirement, in one repository that implements it (M-ADR 0230 §4.7; replaces requirement_status in schema 6.0.0). Derived, never authored: observed from a baseline's **Observed in:** line, declared-shipped from an archived change's PASS verdict through its work orders' implements lists, each about the revision that change's delta states. An assertion is current while its revision is, and history once a later change moves the requirement, so evidence about one revision is never read as proof of another. An agreed change is not an assertion: it is an intended revision (requirement_revisions) and a change effect (change_effects). Per (revision, repository), the latest assertion wins."
     natural_key:
     - revision_id
     - repo_id
@@ -4904,7 +4924,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
@@ -4955,7 +4975,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "An attribute of a domain-model entity, an element of its own (M-ADR 0230 §4.3, Proposed): adding a field to an entity adds an attribute and does not modify the entity. Built from the domain model: a Mermaid ER diagram's attribute lines, or a TypeQL entity's owned attributes. Authored in the structural model (openspec/structure/) where an SDD has one. Added in schema 5.1.0; built from domain models since 6.0.0."
+    description: "An attribute of a domain-model entity, an element of its own (M-ADR 0230 §4.3): adding a field to an entity adds an attribute and does not modify the entity. Built from the domain model: a Mermaid ER diagram's attribute lines, or a TypeQL entity's owned attributes. Authored in the structural model (openspec/structure/) where an SDD has one. Added in schema 5.1.0; built from domain models since 6.0.0."
     natural_key:
     - entity_id
     - name
@@ -5012,7 +5032,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "A named relationship from one domain-model entity to another, an element of its own (M-ADR 0230 §4.3, Proposed). Built from the domain model: a Mermaid ER diagram's relationship lines, or a TypeQL binary relation, with each end's cardinality and role. Authored in the structural model (openspec/structure/) where an SDD has one. Added in schema 5.1.0; built from domain models since 6.0.0, when one cardinality became two, one per end."
+    description: "A named relationship from one domain-model entity to another, an element of its own (M-ADR 0230 §4.3). Built from the domain model: a Mermaid ER diagram's relationship lines, or a TypeQL binary relation, with each end's cardinality and role. Authored in the structural model (openspec/structure/) where an SDD has one. Added in schema 5.1.0; built from domain models since 6.0.0, when one cardinality became two, one per end."
     natural_key:
     - from_entity_id
     - to_entity_id
@@ -5065,7 +5085,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "A domain invariant, a typed element of the domain model (M-ADR 0230 §4.3, Proposed): a rule the entity's data always satisfies. It is structure, not intent, wherever it is first written. Built from the domain model's keys: a primary key (PK, or a TypeQL @key) or a unique key (UK) is a unique invariant over its attributes, and a TypeQL role's @card is a cardinality invariant on its relationship. Authored in the structural model (openspec/structure/) where an SDD has one, which can state every kind. Added in schema 5.1.0; built from domain models since 6.0.0."
+    description: "A domain invariant, a typed element of the domain model (M-ADR 0230 §4.3): a rule the entity's data always satisfies. It is structure, not intent, wherever it is first written. Built from the domain model's keys: a primary key (PK, or a TypeQL @key) or a unique key (UK) is a unique invariant over its attributes, and a TypeQL role's @card is a cardinality invariant on its relationship. Authored in the structural model (openspec/structure/) where an SDD has one, which can state every kind. Added in schema 5.1.0; built from domain models since 6.0.0."
     foreign_keys:
     - column: entity_id
       references: entities.id
@@ -5111,7 +5131,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: "One row per distinct text of a requirement (M-ADR 0230 §4.7, Proposed; schema 6.0.0). Derived from the behaviour store: the living spec's text is current; an agreed open change's ADDED or MODIFIED block is intended; an archived change's block the living spec no longer holds is history. A revision is identified by its digest, so the same text is one revision wherever it appears."
+    description: "One row per distinct text of a requirement (M-ADR 0230 §4.7; schema 6.0.0). Derived from the behaviour store: the living spec's text is current; an agreed open change's ADDED or MODIFIED block is intended; an archived change's block the living spec no longer holds is history. A revision is identified by its digest, so the same text is one revision wherever it appears."
     foreign_keys:
     - column: requirement_id
       references: requirements.id
@@ -5160,7 +5180,7 @@ catalogues:
       type: string
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
-    description: "One row per element a change writes (M-ADR 0230 §4.7, Proposed; schema 6.0.0): a requirement from its behaviour deltas, a structural element from its structural deltas (an archived change's from its effect record, structure/applied.yaml). Base and target are the revisions it moves the element between; a requirement's are revision ids (<requirement>@<12 hex digits of its digest>), catalogued in requirement_revisions except the target of a change not yet agreed; a structural element's are sha256 digests."
+    description: "One row per element a change writes (M-ADR 0230 §4.7; schema 6.0.0): a requirement from its behaviour deltas, a structural element from its structural deltas (an archived change's from its effect record, structure/applied.yaml). Base and target are the revisions it moves the element between; a requirement's are revision ids (<requirement>@<12 hex digits of its digest>), catalogued in requirement_revisions except the target of a change not yet agreed; a structural element's are sha256 digests."
     natural_key:
     - change_id
     - element_kind
@@ -5196,7 +5216,7 @@ catalogues:
     - name: sunset_date
       type: string
       nullable: true
-      description: "For a deprecated revision, the date it is retired. Not yet populated: the builder does not yet read a version's sunset date (BASELINE.md's optional sunset_date)."
+      description: "For a deprecated revision, the date it is retired: the sunset an archived change's agreement record states for the version (contracts[].deprecates.sunset, agreement-record schema 1.3.0). Empty for a version deprecated only in BASELINE.md, whose sunset is not read."
     - name: change_id
       type: string
       nullable: true
@@ -5212,7 +5232,7 @@ catalogues:
       nullable: true
       description: The platform SDD the row belongs to (stamped at aggregation).
       source_of_truth: execution
-    description: A contract version's content revisions, each identified by its content digest (M-ADR 0230 §4.2, Proposed; schema 6.0.0). The contract file's current content is active (deprecated where the contract is); a revision an agreed open change pins as the one it agrees (agreement record 1.2.0, contracts[].agrees) is agreed; one an archived change agreed that the file no longer holds is retired. A compatible amendment is a new revision at the same path, so an agreed revision and the active one coexist, both checked. Active is a claim about the published specification, not about deployment.
+    description: A contract version's content revisions, each identified by its content digest (M-ADR 0230 §4.2; schema 6.0.0). The contract file's current content is active (deprecated where the contract is); a revision an agreed open change pins as the one it agrees (agreement record 1.2.0, contracts[].agrees) is agreed; one an archived change agreed that the file no longer holds is retired. A compatible amendment is a new revision at the same path, so an agreed revision and the active one coexist, both checked. Active is a claim about the published specification, not about deployment.
     foreign_keys:
     - column: contract_id
       references: contracts.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.