@milehimikey/em 1.5.0 → 1.6.0

package/dist/emit/glossaryJson.d.ts

@@ -0,0 +1,13 @@
+import { Glossary, GlossaryConflict } from "../model/glossary.js";
+export declare const GLOSSARY_SCHEMA_VERSION = "1.0";
+/** One input file: what it was called on the command line, hashed source. */
+export interface GlossaryFileSide {
+    label: string;
+    source: string;
+}
+/**
+ * Build the `em glossary --json` document. Pretty-printed (2-space), no
+ * trailing newline — the caller adds it, same convention as `buildExport`/
+ * `buildDiffJson`.
+ */
+export declare function buildGlossaryJson(glossary: Glossary, conflicts: GlossaryConflict[], sources: GlossaryFileSide[]): string;

package/dist/emit/glossaryJson.js

@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: MIT
+// Builds the `em glossary --json` document: a versioned, deterministic
+// envelope around a `Glossary` + its `GlossaryConflict[]` (see
+// ../model/glossary.ts). Its own `glossarySchemaVersion`, independent of `em
+// export`'s `SCHEMA_VERSION` — a glossary is an N-model aggregate term
+// dictionary, a different-shaped artifact than a single model's snapshot, and
+// `em glossary` never reads or requires an existing `em export` document (it
+// recompiles each input file itself, the same way `em diff` does).
+import { createHash } from "node:crypto";
+import { GENERATOR_NAME, GENERATOR_VERSION } from "./json.js";
+export const GLOSSARY_SCHEMA_VERSION = "1.0";
+function serializeSide(side) {
+    return {
+        label: side.label,
+        sha256: createHash("sha256").update(side.source, "utf8").digest("hex"),
+    };
+}
+/**
+ * Build the `em glossary --json` document. Pretty-printed (2-space), no
+ * trailing newline — the caller adds it, same convention as `buildExport`/
+ * `buildDiffJson`.
+ */
+export function buildGlossaryJson(glossary, conflicts, sources) {
+    const doc = {
+        glossarySchemaVersion: GLOSSARY_SCHEMA_VERSION,
+        generator: { name: GENERATOR_NAME, version: GENERATOR_VERSION },
+        models: sources.map(serializeSide),
+        elements: glossary.elements,
+        fields: glossary.fields,
+        personas: glossary.personas,
+        contexts: glossary.contexts,
+        conflicts,
+    };
+    return JSON.stringify(doc, null, 2);
+}
+//# sourceMappingURL=glossaryJson.js.map

package/dist/emit/glossaryJson.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"glossaryJson.js","sourceRoot":"","sources":["../../src/emit/glossaryJson.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,uEAAuE;AACvE,+DAA+D;AAC/D,6EAA6E;AAC7E,uEAAuE;AACvE,8EAA8E;AAC9E,6EAA6E;AAC7E,mEAAmE;AAEnE,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAE9D,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAC;AAQ7C,SAAS,aAAa,CAAC,IAAsB;IAC3C,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;KACvE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAC/B,QAAkB,EAClB,SAA6B,EAC7B,OAA2B;IAE3B,MAAM,GAAG,GAAG;QACV,qBAAqB,EAAE,uBAAuB;QAC9C,SAAS,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,iBAAiB,EAAE;QAC/D,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QAClC,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,MAAM,EAAE,QAAQ,CAAC,MAAM;QACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,QAAQ,EAAE,QAAQ,CAAC,QAAQ;QAC3B,SAAS;KACV,CAAC;IACF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACtC,CAAC"}

package/dist/emit/json.d.ts

@@ -2,7 +2,7 @@ import { NormalizedModel } from "../model/model.js";
 import { Diagnostic } from "../model/validate.js";
 export declare const GENERATOR_NAME = "@milehimikey/em";
 export declare const GENERATOR_VERSION: string;
-export declare const SCHEMA_VERSION = "1.0";
+export declare const SCHEMA_VERSION = "1.3";
 export interface ExportResult {
     /** Pretty-printed JSON, no trailing newline. */
     text: string;
@@ -14,6 +14,8 @@ export interface RefsResult {
     sliceKeys: string[];
     /** Internal `Element.id` -> stable export `ref`. */
     refById: Map<string, string>;
+    /** Internal `TypeDecl.id` -> stable export `ref` (`types/<slug(name)>`). */
+    refByTypeId: Map<string, string>;
     /** Ref-collision warnings raised while assigning keys/refs (duplicate names). */
     diagnostics: Diagnostic[];
 }
@@ -22,8 +24,20 @@ export interface RefsResult {
  * export ref (`<sliceKey>/<kind>.<slug(name)>`), in document order, deduped
  * with a `~2`, `~3`, … suffix on collision. Shared by `em export` (this
  * module) and `em diff` (`src/model/diff.ts`), which both need the same
- * edit-stable identity scheme to match elements/slices across models.
+ * edit-stable identity scheme to match elements/slices across models. Also
+ * assigns every declared type its export ref (`types/<slug(name)>`) — types
+ * aren't slice-scoped, so no sliceKey prefix, same dedup-with-warning
+ * machinery otherwise.
  */
 export declare function computeRefs(model: NormalizedModel): RefsResult;
+export interface FieldExport {
+    name: string;
+    type: string | null;
+    typeRef: {
+        name: string;
+        ref: string;
+        array: boolean;
+    } | null;
+}
 /** Build the `em export` document for an already-validated (error-free) model. */
 export declare function buildExport(model: NormalizedModel, diagnostics: Diagnostic[], source: string, path: string): ExportResult;

package/dist/emit/json.js

@@ -11,20 +11,23 @@ import { createHash } from "node:crypto";
 import { readFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
-import { resolveByName } from "../model/model.js";
+import { resolveByName, resolveTypeRef } from "../model/model.js";
 import { dedupe, kebabSlug } from "../util/slug.js";
 // Read once from package.json (two levels up from src/emit/ and dist/emit/
 // alike) so `generator.version` can never drift from the released version.
 // tsconfig targets NodeNext without resolveJsonModule, hence fs over import.
 export const GENERATOR_NAME = "@milehimikey/em";
 export const GENERATOR_VERSION = JSON.parse(readFileSync(join(dirname(fileURLToPath(import.meta.url)), "..", "..", "package.json"), "utf8")).version;
-export const SCHEMA_VERSION = "1.0";
+export const SCHEMA_VERSION = "1.3";
 /**
  * Assign every slice its export key (`slug(name)`) and every element its
  * export ref (`<sliceKey>/<kind>.<slug(name)>`), in document order, deduped
  * with a `~2`, `~3`, … suffix on collision. Shared by `em export` (this
  * module) and `em diff` (`src/model/diff.ts`), which both need the same
- * edit-stable identity scheme to match elements/slices across models.
+ * edit-stable identity scheme to match elements/slices across models. Also
+ * assigns every declared type its export ref (`types/<slug(name)>`) — types
+ * aren't slice-scoped, so no sliceKey prefix, same dedup-with-warning
+ * machinery otherwise.
  */
 export function computeRefs(model) {
     const diagnostics = [];
@@ -62,11 +65,43 @@ export function computeRefs(model) {
             refById.set(el.id, ref);
         }
     });
-    return { sliceKeys, refById, diagnostics };
+    const usedTypeRefs = new Set();
+    const refByTypeId = new Map();
+    for (const t of model.types) {
+        const base = `types/${kebabSlug(t.name)}`;
+        const ref = dedupe(base, usedTypeRefs, "~");
+        if (ref !== base) {
+            diagnostics.push({
+                severity: "warning",
+                message: `duplicate type "${t.name}" (export ref "${base}" already used); rename for a stable export ref`,
+                line: t.line,
+            });
+        }
+        refByTypeId.set(t.id, ref);
+    }
+    return { sliceKeys, refById, refByTypeId, diagnostics };
+}
+/**
+ * Export a single field, additively: `name`/`type` are exactly what today's consumers already
+ * see. `typeRef` is the new, purely-additive key — non-null only when `type` (bare or `[]`-
+ * suffixed) names a declared `type`, else `null`, same as every field in a model that declares
+ * no `type` blocks at all. Shared by both a declared type's own fields (`model.types[].fields`)
+ * and ordinary element fields (`model.slices[].elements[].fields`) so both get identical
+ * resolution.
+ */
+function fieldExport(f, typesByName, refByTypeId) {
+    const resolved = resolveTypeRef(f.type, typesByName);
+    return {
+        name: f.name,
+        type: f.type ?? null,
+        typeRef: resolved
+            ? { name: resolved.typeDecl.name, ref: refByTypeId.get(resolved.typeDecl.id), array: resolved.array }
+            : null,
+    };
 }
 /** Build the `em export` document for an already-validated (error-free) model. */
 export function buildExport(model, diagnostics, source, path) {
-    const { sliceKeys, refById, diagnostics: extra } = computeRefs(model);
+    const { sliceKeys, refById, refByTypeId, diagnostics: extra } = computeRefs(model);
     const refOf = (id) => id ? refById.get(id) ?? null : null;
     const fromOf = (el) => {
         if (!el.from || el.from.length === 0)
@@ -82,23 +117,39 @@ export function buildExport(model, diagnostics, source, path) {
             personas: model.personas,
             contexts: model.contexts,
             hasAutomation: model.hasAutomation,
+            // Declared named types (MIL-64) — independent of the slice timeline, so listed
+            // once here rather than nested inside any slice.
+            types: model.types.map((t) => ({
+                ref: refByTypeId.get(t.id),
+                name: t.name,
+                line: t.line,
+                fields: t.fields.map((f) => fieldExport(f, model.typesByName, refByTypeId)),
+            })),
             slices: model.slices.map((slice, sliceIndex) => ({
                 key: sliceKeys[sliceIndex],
                 name: slice.name,
                 index: slice.index,
+                // Link to the ticket/conversation this slice traces back to (MIL-69).
+                // Distinct from the document's top-level `source` (the .em file's own
+                // path/sha256 provenance) — same key name, different scope.
+                source: slice.source ?? null,
                 line: slice.line,
                 elements: slice.elements.map((el) => ({
                     ref: refById.get(el.id),
                     kind: el.kind,
                     name: el.name,
                     line: el.line,
-                    fields: el.fields ? el.fields.map((f) => ({ name: f.name, type: f.type ?? null })) : null,
+                    fields: el.fields
+                        ? el.fields.map((f) => fieldExport(f, model.typesByName, refByTypeId))
+                        : null,
                     note: el.note ?? null,
                     issue: el.issue ?? null,
+                    divergence: el.divergence ?? null,
                     from: fromOf(el),
                     persona: el.persona ?? null,
                     context: el.context ?? null,
                     again: el.again === true,
+                    public: el.public === true,
                     logicalRef: el.kind === "view" && el.again === true ? refOf(el.logicalId) : null,
                 })),
             })),

package/dist/emit/json.js.map

@@ -1 +1 @@
-{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/emit/json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/emit/json.ts"],"names":[],"mappings":"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"}

package/dist/emit/theme.d.ts

@@ -5,5 +5,8 @@ export interface NodeStyle {
     fontColor: string;
 }
 export declare function styleFor(kind: ElementKind): NodeStyle;
+/** Color for a slice's header cell given its doc's Status value (already
+ *  lowercased by parseSliceDoc), or null to keep the default header color. */
+export declare function statusStyle(status: string | null): NodeStyle | null;
 /** Arrow colour keyed on the source element's kind. */
 export declare function edgeColorFor(kind: ElementKind | undefined): string;

package/dist/emit/theme.js

@@ -13,6 +13,25 @@ const STYLES = {
 export function styleFor(kind) {
     return STYLES[kind];
 }
+// Slice-status colors — recognized values from the slice.md template's
+// `- **Status:** {{draft | reviewed | ready-to-implement | implemented}}`
+// (see src/catalog/sliceDoc.ts / .claude/skills/event-modeling/templates/slice.md).
+// Deliberately reuses the element-kind palette above rather than inventing new
+// hexes, so the diagram's color vocabulary stays small. `draft`, a missing doc,
+// and any unrecognized string are NOT in this map on purpose — statusStyle()
+// returns null for those and the caller keeps the existing neutral header gray
+// (see HEADER_FILL/HEADER_BORDER in emit/dot.ts), since "no signal yet" and "not
+// reviewed yet" both read the same visually.
+const STATUS_STYLES = {
+    reviewed: STYLES.command,
+    "ready-to-implement": STYLES.event,
+    implemented: STYLES.view,
+};
+/** Color for a slice's header cell given its doc's Status value (already
+ *  lowercased by parseSliceDoc), or null to keep the default header color. */
+export function statusStyle(status) {
+    return status ? (STATUS_STYLES[status.toLowerCase()] ?? null) : null;
+}
 /** Arrow colour keyed on the source element's kind. */
 export function edgeColorFor(kind) {
     switch (kind) {

package/dist/emit/theme.js.map

@@ -1 +1 @@
-{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/emit/theme.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,qCAAqC;AAUrC,MAAM,MAAM,GAAmC;IAC7C,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAChE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACrE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAClE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACnE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACxE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACvE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAClE,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;CAC1E,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,IAAiB;IACxC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,YAAY,CAAC,IAA6B;IACxD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,SAAS,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,SAAS,CAAC;QACnB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa;YAChB,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}
+{"version":3,"file":"theme.js","sourceRoot":"","sources":["../../src/emit/theme.ts"],"names":[],"mappings":"AAAA,+BAA+B;AAC/B,qCAAqC;AAUrC,MAAM,MAAM,GAAmC;IAC7C,EAAE,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAChE,OAAO,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACrE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAClE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACnE,UAAU,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACxE,SAAS,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IACvE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;IAClE,WAAW,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE;CAC1E,CAAC;AAEF,MAAM,UAAU,QAAQ,CAAC,IAAiB;IACxC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,uEAAuE;AACvE,0EAA0E;AAC1E,oFAAoF;AACpF,+EAA+E;AAC/E,gFAAgF;AAChF,6EAA6E;AAC7E,+EAA+E;AAC/E,iFAAiF;AACjF,6CAA6C;AAC7C,MAAM,aAAa,GAA8B;IAC/C,QAAQ,EAAE,MAAM,CAAC,OAAO;IACxB,oBAAoB,EAAE,MAAM,CAAC,KAAK;IAClC,WAAW,EAAE,MAAM,CAAC,IAAI;CACzB,CAAC;AAEF;8EAC8E;AAC9E,MAAM,UAAU,WAAW,CAAC,MAAqB;IAC/C,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACvE,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,YAAY,CAAC,IAA6B;IACxD,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,SAAS;YACZ,OAAO,SAAS,CAAC;QACnB,KAAK,MAAM;YACT,OAAO,SAAS,CAAC;QACnB,KAAK,OAAO;YACV,OAAO,SAAS,CAAC;QACnB,KAAK,YAAY,CAAC;QAClB,KAAK,WAAW,CAAC;QACjB,KAAK,MAAM,CAAC;QACZ,KAAK,aAAa;YAChB,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC"}

package/dist/model/diff.d.ts

@@ -1,6 +1,6 @@
 import { NormalizedModel } from "./model.js";
 import { ElementKind } from "../parser/ast.js";
-export type ChangeType = "slice-added" | "slice-removed" | "element-added" | "element-removed" | "element-moved" | "field-added" | "field-removed" | "field-changed" | "from-added" | "from-removed" | "note-added" | "note-removed" | "note-changed" | "issue-opened" | "issue-resolved" | "issue-changed" | "arrow-added" | "arrow-removed";
+export type ChangeType = "slice-added" | "slice-removed" | "source-added" | "source-removed" | "source-changed" | "element-added" | "element-removed" | "element-moved" | "field-added" | "field-removed" | "field-changed" | "from-added" | "from-removed" | "note-added" | "note-removed" | "note-changed" | "issue-opened" | "issue-resolved" | "issue-changed" | "event-marked-public" | "event-unmarked-public" | "arrow-added" | "arrow-removed" | "type-added" | "type-removed" | "type-field-added" | "type-field-removed" | "type-field-changed";
 /**
  * One reported change. Not every field applies to every `type` — see
  * formatEntry() for which fields each variant reads.
@@ -9,24 +9,48 @@ export interface ChangeEntry {
     type: ChangeType;
     kind?: ElementKind;
     name?: string;
+    /** This entry's `em export` element/type ref (`<sliceKey>/<kind>.<slug>` or `types/<slug>`)
+     *  — lets a JSON consumer join back to an `em export` document without re-deriving the
+     *  slug. Undefined for change types with no single ref (`slice-added/removed`, `source-*`,
+     *  `arrow-*`). */
+    ref?: string;
     sliceName?: string;
+    /** This entry's `em export` slice key. Undefined for types (not slice-scoped) and arrows. */
+    sliceKey?: string;
     fromSlice?: string;
+    /** `fromSlice`'s `em export` slice key, for `element-moved` only. */
+    fromSliceKey?: string;
     toSlice?: string;
+    /** `toSlice`'s `em export` slice key, for `element-moved` only. */
+    toSliceKey?: string;
     field?: string;
     fieldType?: string | null;
     oldType?: string | null;
     newType?: string | null;
     source?: string;
+    oldSource?: string;
+    newSource?: string;
     oldNote?: string;
     newNote?: string;
     oldText?: string;
     newText?: string;
     from?: string;
     to?: string;
+    /**
+     * The canonical (old-side) element's `divergence` annotation, when this change/removal
+     * involves an element that carries one — not a suppression, a citation: the finding is
+     * still reported in full, annotated with the reasoned, ratified deviation a consumer (e.g.
+     * the conform loop) can use to classify it as accepted rather than real drift. `null` when
+     * the involved element (if any) carries no annotation, or when the change type has no
+     * single canonical-side element to check (`slice-added/removed`, `arrow-added/removed`,
+     * `element-added`, `element-moved` — out of scope for v1, see model.ts's `divergence` doc).
+     */
+    acceptedDivergence?: string | null;
 }
 export interface DiffCounts {
     slicesAdded: number;
     slicesRemoved: number;
+    sourceChanges: number;
     elementsAdded: number;
     elementsRemoved: number;
     elementsMoved: number;
@@ -36,8 +60,19 @@ export interface DiffCounts {
     issuesOpened: number;
     issuesResolved: number;
     issuesChanged: number;
+    eventsMarkedPublic: number;
+    eventsUnmarkedPublic: number;
     arrowsAdded: number;
     arrowsRemoved: number;
+    /** Changes/removals whose `acceptedDivergence` is non-null — cited, not subtracted, from
+     *  the other counts above (an element-removed with an accepted divergence still counts
+     *  toward `elementsRemoved` too; this is a cross-cutting tally, not a separate bucket). */
+    acceptedDivergences: number;
+    /** Declared `type` (MIL-64) additions/removals and field changes on surviving types. No
+     *  move detection — types aren't slice-scoped, so there's nothing to move between. */
+    typesAdded: number;
+    typesRemoved: number;
+    typeFieldChanges: number;
 }
 export interface ModelDiff {
     /** Additions and changes, in new-file document order. */