@milehimikey/em 1.13.1 → 1.14.1

package/dist/system/codeowners.d.ts

@@ -0,0 +1,77 @@
+import { GitRunner } from "../cli/diff-inputs.js";
+import type { SystemExportDoc } from "./verify.js";
+/** The managed block's marker name (`# GENERATED:em-codeowners:start` ... `:end`). */
+export declare const CODEOWNERS_MARKER = "em-codeowners";
+/** The doc comment written into the block: why the contract file lists every consumer. */
+export declare const CODEOWNERS_CONTRACT_NOTE = "Contract files list every consuming team: a change to a model's public surface cannot merge without the teams that depend on it.";
+export type CodeownersReason = "model-dir" | "contract" | "slices" | "slices-existing";
+export interface CodeownersEntry {
+    /** CODEOWNERS pattern, anchored with a leading `/`, forward slashes. */
+    path: string;
+    owners: string[];
+    reason: CodeownersReason;
+}
+/** One model as the generator needs it. `dir` is the model's directory relative to the
+ *  CODEOWNERS root ("" when the model sits at the root), `/`-separated. */
+export interface CodeownersModelInput {
+    key: string;
+    dir: string;
+    /** The header's `owner` entries, as written. */
+    owner: string[];
+    doc: SystemExportDoc;
+}
+export interface CodeownersPlan {
+    entries: CodeownersEntry[];
+    /** Human notes (a skipped non-handle owner); stderr in the CLI, never in the JSON. */
+    notes: string[];
+    /** Refusals: a model with no usable owner. Non-empty means no entries should be written. */
+    errors: string[];
+}
+/** The parsed lines of an existing CODEOWNERS, outside the managed block, as `{pattern, owners}`. */
+export declare function existingRules(text: string): Array<{
+    pattern: string;
+    owners: string[];
+}>;
+/** gitignore-style pattern match as CODEOWNERS applies it, for a file path relative to the
+ *  root. A pattern with a slash (other than a trailing one) is anchored at the root; one
+ *  without matches at any depth. `*` stops at `/`, `**` crosses it; a trailing `/` (or a
+ *  pattern naming a directory) covers everything beneath. */
+export declare function codeownersPatternMatches(pattern: string, path: string): boolean;
+/** Build the entries. Deterministic: system order, then dir / contract / slices per model. */
+export declare function planCodeowners(models: CodeownersModelInput[], existingText?: string): CodeownersPlan;
+/** The block body (between the marker lines): the explanatory comments, then one line per entry. */
+export declare function codeownersBlockBody(entries: CodeownersEntry[]): string;
+export type CodeownersStatus = "ok" | "missing" | "stale" | "no-markers" | "created" | "updated";
+export interface CodeownersResult {
+    /** The full file text the managed block implies (existing content untouched). */
+    text: string;
+    /** What `--check` would report; `created`/`updated` are the write-mode equivalents of
+     *  `missing`/`stale`+`no-markers`. */
+    state: "ok" | "missing" | "stale" | "no-markers";
+}
+/** Splice the block into `existing` (`null` = no file). Unmarked content is kept byte-for-byte;
+ *  a file with no markers gets the block appended after a blank line. */
+export declare function spliceCodeowners(existing: string | null, entries: CodeownersEntry[]): CodeownersResult;
+/** The files em looks for, in order, when no `-o` is given (GitHub's three locations). */
+export declare const CODEOWNERS_CANDIDATES: string[];
+export type RunCodeownersResult = {
+    ok: false;
+    message: string;
+} | {
+    ok: true;
+    /** The CODEOWNERS path (as given with `-o`, else root-joined; never absolutized). */
+    file: string;
+    plan: CodeownersPlan;
+    status: CodeownersStatus;
+    /** The file text after the splice (what `write` puts on disk). */
+    text: string;
+    /** True when the file on disk differs from `text` (a write is needed). */
+    changed: boolean;
+};
+/** Load the system, plan the entries and compute the spliced file. With `write`, also puts it
+ *  on disk (creating the file and its directory). `--check` callers pass `write: false` and
+ *  report `status`; the MCP tool is always read-only. */
+export declare function runCodeowners(target: string, opts: {
+    output?: string;
+    write: boolean;
+}, runGit?: GitRunner): RunCodeownersResult;

package/dist/system/codeowners.js

@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: MIT
+// `em system codeowners` (MIL-234): turn the models' `owner` handles and the translations'
+// `consumes` refs into a managed CODEOWNERS block, so review of a model's public surface is
+// routed by the platform, not by convention. Three kinds of entry, per model in system order:
+//   - the model's design directory (`<modelDir>/`) -> the model's own team(s);
+//   - its contract file (`<modelDir>/contracts/<modelKey>.tsp`) -> the producer's team(s) FIRST,
+//     then every team whose model has a translation that `consumes` one of its refs (sorted).
+//     The contract carries no source hash (R12), so internal edits never touch it: only a real
+//     change of the public surface summons the consuming teams;
+//   - the model's slice docs (`<modelDir>/slices/**`) -> the model's team(s), unless the repo's
+//     own CODEOWNERS already routes them (the ratification convention, docs/ci.md) — in which
+//     case that rule is restated after the directory entry, because CODEOWNERS is last-match-
+//     wins and the directory entry would otherwise silently take the ratifiers' review away.
+// The planning half is pure over export documents (compile isolation, MIL-194): paths are handed
+// in CODEOWNERS-root-relative and nothing there touches the filesystem. `runCodeowners` at the
+// bottom is the thin fs half the CLI and the MCP tool share, so both load the system, find the
+// file and splice the block identically.
+import { existsSync, readFileSync, writeFileSync, mkdirSync } from "node:fs";
+import { basename, dirname, join, relative, resolve, sep } from "node:path";
+import { realGit } from "../cli/diff-inputs.js";
+import { loadSystem } from "../cli/systemInputs.js";
+import { parseContractRef } from "../model/qualifiedRef.js";
+import { isOwnerHandle } from "../model/validate.js";
+import { applyMarker, markerPair } from "../util/markers.js";
+/** The managed block's marker name (`# GENERATED:em-codeowners:start` ... `:end`). */
+export const CODEOWNERS_MARKER = "em-codeowners";
+/** The doc comment written into the block: why the contract file lists every consumer. */
+export const CODEOWNERS_CONTRACT_NOTE = "Contract files list every consuming team: a change to a model's public surface cannot merge without the teams that depend on it.";
+const dedupe = (xs) => [...new Set(xs)];
+const usable = (owners) => dedupe(owners.filter(isOwnerHandle));
+/** `/<dir>/<rest>` with the root case handled and spaces escaped the CODEOWNERS way. */
+function patternFor(dir, rest) {
+    const joined = dir === "" ? rest : `${dir}/${rest}`;
+    return `/${joined}`.replace(/ /g, "\\ ");
+}
+/** The parsed lines of an existing CODEOWNERS, outside the managed block, as `{pattern, owners}`. */
+export function existingRules(text) {
+    const out = [];
+    const outside = stripManagedBlock(text);
+    for (const raw of outside.split(/\r?\n/)) {
+        const line = raw.trim();
+        if (line === "" || line.startsWith("#"))
+            continue;
+        const parts = line.split(/\s+/);
+        if (parts.length < 2)
+            continue;
+        out.push({ pattern: parts[0], owners: parts.slice(1) });
+    }
+    return out;
+}
+function stripManagedBlock(text) {
+    const { start, end } = markerPair(CODEOWNERS_MARKER, "hash");
+    const s = text.indexOf(start);
+    const e = text.indexOf(end);
+    if (s < 0 || e < s)
+        return text;
+    return text.slice(0, s) + text.slice(e + end.length);
+}
+/** gitignore-style pattern match as CODEOWNERS applies it, for a file path relative to the
+ *  root. A pattern with a slash (other than a trailing one) is anchored at the root; one
+ *  without matches at any depth. `*` stops at `/`, `**` crosses it; a trailing `/` (or a
+ *  pattern naming a directory) covers everything beneath. */
+export function codeownersPatternMatches(pattern, path) {
+    let p = pattern.replace(/\\ /g, " ");
+    const anchored = p.startsWith("/") || p.slice(0, -1).includes("/");
+    p = p.replace(/^\//, "");
+    const dirOnly = p.endsWith("/");
+    if (dirOnly)
+        p = p.slice(0, -1);
+    let re = "";
+    for (let i = 0; i < p.length; i++) {
+        const c = p[i];
+        if (c === "*") {
+            if (p[i + 1] === "*") {
+                i++;
+                if (p[i + 1] === "/") {
+                    i++;
+                    re += "(?:.*/)?";
+                }
+                else
+                    re += ".*";
+            }
+            else
+                re += "[^/]*";
+        }
+        else if (c === "?")
+            re += "[^/]";
+        else
+            re += c.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+    }
+    const prefix = anchored ? "^" : "^(?:.*/)?";
+    return new RegExp(`${prefix}${re}(?:/.*)?$`).test(path);
+}
+/** The last existing rule that routes `path`, ignoring a bare catch-all `*` (it is a default,
+ *  not a decision about slice docs). */
+function routedBy(rules, path) {
+    let hit = null;
+    for (const r of rules) {
+        if (r.pattern === "*" || r.pattern === "/*")
+            continue;
+        if (codeownersPatternMatches(r.pattern, path))
+            hit = r;
+    }
+    return hit;
+}
+/** Build the entries. Deterministic: system order, then dir / contract / slices per model. */
+export function planCodeowners(models, existingText = "") {
+    const notes = [];
+    const errors = [];
+    const rules = existingRules(existingText);
+    const ownersOf = new Map();
+    for (const m of models) {
+        const good = usable(m.owner);
+        for (const o of m.owner) {
+            if (!isOwnerHandle(o))
+                notes.push(`model "${m.key}": skipping owner "${o}" — not a CODEOWNERS handle (use "@user", "@org/team" or an email)`);
+        }
+        if (good.length === 0) {
+            errors.push(m.owner.length === 0
+                ? `model "${m.key}" has no \`owner\` — add \`owner "@org/team"\` to its \`model\` header line`
+                : `model "${m.key}" has no usable owner — every \`owner\` entry is free text; use "@user", "@org/team" or an email`);
+        }
+        ownersOf.set(m.key, good);
+    }
+    // consumer teams per producing model: the owners of every model with a translation that
+    // consumes one of the producer's refs. Refs to models outside the system and self-refs
+    // route nothing (`em system` reports those).
+    const consumers = new Map();
+    for (const m of models) {
+        for (const slice of m.doc.model.slices) {
+            for (const el of slice.elements) {
+                if (el.kind !== "translation")
+                    continue;
+                for (const ref of el.consumes ?? []) {
+                    const parsed = parseContractRef(ref);
+                    if (!parsed || parsed.modelKey === m.key)
+                        continue;
+                    consumers.set(parsed.modelKey, [...(consumers.get(parsed.modelKey) ?? []), ...(ownersOf.get(m.key) ?? [])]);
+                }
+            }
+        }
+    }
+    const entries = [];
+    for (const m of models) {
+        const own = ownersOf.get(m.key) ?? [];
+        if (own.length === 0)
+            continue;
+        entries.push({ path: patternFor(m.dir, ""), owners: own, reason: "model-dir" });
+        const consuming = dedupe(consumers.get(m.key) ?? []).filter((o) => !own.includes(o)).sort();
+        entries.push({ path: patternFor(m.dir, `contracts/${m.key}.tsp`), owners: [...own, ...consuming], reason: "contract" });
+        const sample = m.dir === "" ? "slices/x.md" : `${m.dir}/slices/x.md`;
+        const existing = routedBy(rules, sample);
+        if (existing === null)
+            entries.push({ path: patternFor(m.dir, "slices/**"), owners: own, reason: "slices" });
+        else
+            entries.push({ path: patternFor(m.dir, "slices/**"), owners: existing.owners, reason: "slices-existing" });
+    }
+    return { entries, notes, errors };
+}
+/** The block body (between the marker lines): the explanatory comments, then one line per entry. */
+export function codeownersBlockBody(entries) {
+    const lines = [
+        "# Generated by `em system codeowners` from each model's `owner` and each translation's `consumes`.",
+        "# Re-run it after changing either; `em system codeowners --check` fails on drift.",
+        `# ${CODEOWNERS_CONTRACT_NOTE}`,
+        ...entries.map((e) => `${e.path} ${e.owners.join(" ")}`),
+    ];
+    return lines.join("\n");
+}
+/** Splice the block into `existing` (`null` = no file). Unmarked content is kept byte-for-byte;
+ *  a file with no markers gets the block appended after a blank line. */
+export function spliceCodeowners(existing, entries) {
+    const { start, end } = markerPair(CODEOWNERS_MARKER, "hash");
+    const body = codeownersBlockBody(entries);
+    if (existing === null)
+        return { text: `${start}\n${body}\n${end}\n`, state: "missing" };
+    const spliced = applyMarker(existing, CODEOWNERS_MARKER, body, "hash");
+    if (spliced !== null)
+        return { text: spliced, state: spliced === existing ? "ok" : "stale" };
+    const sep = existing === "" ? "" : existing.endsWith("\n") ? "\n" : "\n\n";
+    return { text: `${existing}${sep}${start}\n${body}\n${end}\n`, state: "no-markers" };
+}
+/** The files em looks for, in order, when no `-o` is given (GitHub's three locations). */
+export const CODEOWNERS_CANDIDATES = ["CODEOWNERS", ".github/CODEOWNERS", "docs/CODEOWNERS"];
+/** The directory CODEOWNERS paths are relative to: the parent of a `.github/` or `docs/`
+ *  CODEOWNERS, else the file's own directory. */
+function rootOfCodeownersFile(file) {
+    const dir = dirname(file);
+    const name = basename(dir);
+    return name === ".github" || name === "docs" ? dirname(dir) : dir;
+}
+/** Load the system, plan the entries and compute the spliced file. With `write`, also puts it
+ *  on disk (creating the file and its directory). `--check` callers pass `write: false` and
+ *  report `status`; the MCP tool is always read-only. */
+export function runCodeowners(target, opts, runGit = realGit) {
+    const loaded = loadSystem(target, runGit);
+    if (!loaded.ok) {
+        return {
+            ok: false,
+            message: `${target} could not be loaded — ${loaded.diagnostics.map((d) => `${d.file}${d.line ? `:${d.line}` : ""}: ${d.message}`).join("; ")}`,
+        };
+    }
+    let file;
+    let root;
+    if (opts.output !== undefined) {
+        file = opts.output;
+        root = rootOfCodeownersFile(file);
+    }
+    else {
+        const start = loaded.manifestPath !== null ? dirname(loaded.manifestPath) : loaded.discovery.root;
+        const up = runGit(["-C", start, "rev-parse", "--show-cdup"]);
+        root = up.status === 0 ? join(start, up.stdout.trim()) : start;
+        file = join(root, CODEOWNERS_CANDIDATES.find((c) => existsSync(join(root, c))) ?? "CODEOWNERS");
+    }
+    const notes = [];
+    const inputs = [];
+    for (const m of loaded.models) {
+        if (m.sourceKind !== "em") {
+            notes.push(`model "${m.key}": sourced from an export document, not a .em file — it has no design directory to route; skipped`);
+            continue;
+        }
+        const rel = relative(resolve(root), resolve(dirname(m.file)));
+        if (rel === ".." || rel.startsWith(`..${sep}`)) {
+            return { ok: false, message: `model "${m.key}" (${m.file}) lives outside the CODEOWNERS root ${root} — pass -o with a CODEOWNERS file at or above its directory` };
+        }
+        inputs.push({ key: m.key, dir: rel.split(sep).join("/"), owner: m.owner, doc: m.doc });
+    }
+    const existing = existsSync(file) ? readFileSync(file, "utf8") : null;
+    const plan = planCodeowners(inputs, existing ?? "");
+    plan.notes.unshift(...notes);
+    if (plan.errors.length > 0)
+        return { ok: false, message: plan.errors.join("\n") };
+    const spliced = spliceCodeowners(existing, plan.entries);
+    const changed = spliced.state !== "ok";
+    if (opts.write && changed) {
+        mkdirSync(dirname(file), { recursive: true });
+        writeFileSync(file, spliced.text);
+    }
+    const status = opts.write && changed ? (spliced.state === "missing" ? "created" : "updated") : spliced.state;
+    return { ok: true, file, plan, status, text: spliced.text, changed };
+}
+//# sourceMappingURL=codeowners.js.map

package/dist/system/codeowners.js.map

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

package/dist/system/manifest.d.ts

@@ -1,13 +1,16 @@
 import type { Diagnostic } from "../model/validate.js";
-/** The only manifest schema version accepted (`systemSchemaVersion`). Bumped, with a range
- *  check here, the day the manifest's shape changes incompatibly. */
-export declare const SYSTEM_MANIFEST_SCHEMA_VERSION = "1.0";
+/** The manifest schema version em writes and expects (`systemSchemaVersion`). */
+export declare const SYSTEM_MANIFEST_SCHEMA_VERSION = "2.0";
+/** The previous version, still accepted for reading (with a `system-manifest-outdated`
+ *  warning) until a repo runs `em upgrade`'s `system-manifest` step. */
+export declare const LEGACY_SYSTEM_MANIFEST_SCHEMA_VERSION = "1.0";
 export interface ManifestModel {
     /** The manifest's own key for this model — by MIL-193's rule the kebab-slug of the declared
      *  model name, and verified against the export's `model.key` by src/system/verify.ts. */
     key: string;
     /** A `.em` file or an `em export --json` document, as written (relative to the manifest). */
     source: string;
+    /** 1.0 manifests only — always `null` on a 2.0 manifest (owners live on the model header). */
     owner: string | null;
     /** 1-based line of the model's entry in the manifest, for diagnostics. */
     line: number;
@@ -22,12 +25,14 @@ export interface ManifestSeam {
     line: number;
 }
 export interface SystemManifest {
+    /** `"2.0"`, or `"1.0"` for a legacy manifest read for compatibility. */
     systemSchemaVersion: string;
+    /** 1-based line of the `systemSchemaVersion` entry, for the `system-manifest-outdated` warning. */
+    versionLine: number;
     name: string | null;
     /** Manifest order — the order `em system` lists models and context-map nodes. */
     models: ManifestModel[];
-    /** Manifest order; empty when the manifest declares none (valid — every `public` element then
-     *  reports `dangling-public-event`). */
+    /** 1.0 manifests only (always `[]` on 2.0): the legacy declared seams, manifest order. */
     seams: ManifestSeam[];
 }
 export type ParseManifestResult = {

package/dist/system/manifest.js

@@ -1,8 +1,14 @@
 // SPDX-License-Identifier: MIT
-// Parses a seam manifest (`system.yaml`, MIL-194) into a plain, validated shape — the declared
-// list of models in a system plus the seams binding one model's `public` event/view to another
-// model's reaction. This is the one place the manifest's own schema is enforced; everything
-// downstream (src/system/verify.ts) trusts the returned `SystemManifest`.
+// Parses a system manifest (`system.yaml`, MIL-194 / MIL-235) into a plain, validated shape —
+// the declared list of models in a system. This is the one place the manifest's own schema is
+// enforced; everything downstream (src/system/verify.ts) trusts the returned `SystemManifest`.
+//
+// Schema 2.0 (MIL-235) is membership ONLY: `systemSchemaVersion`, `name`, `models: {key:
+// {source}}`. Seams moved to the consuming translation (`consumes <model>:<kind>.<slug>`) and
+// owners to the model header (`model "Name" owner "Team"`), so a 2.0 manifest carrying
+// `seams:`/`owner:` is invalid and the message points at `em upgrade`. Schema 1.0 (seams +
+// owners in the manifest) is still READ — so `em system` on an unmigrated estate keeps
+// verifying — and `verifySystem` warns `system-manifest-outdated`; nothing writes 1.0 any more.
 //
 // YAML because the manifest is human-authored (and JSON is a YAML subset, so a `.json` manifest
 // parses here unchanged). Pure: text in, manifest + diagnostics out — the caller (src/cli/
@@ -11,12 +17,20 @@
 // `LineCounter`, so a shape error points at the offending entry, not just "the manifest".
 import { LineCounter, parseDocument, isMap, isSeq, isScalar } from "yaml";
 import { pushDiag } from "../model/rules.js";
-/** The only manifest schema version accepted (`systemSchemaVersion`). Bumped, with a range
- *  check here, the day the manifest's shape changes incompatibly. */
-export const SYSTEM_MANIFEST_SCHEMA_VERSION = "1.0";
-const TOP_KEYS = new Set(["systemSchemaVersion", "name", "models", "seams"]);
-const MODEL_KEYS = new Set(["source", "owner"]);
+// 1.0 (MIL-194): models {source, owner?} + seams [{from, to, description?}].
+// 2.0 (MIL-235): models {source} only — seams are `consumes` clauses, owners are model headers.
+/** The manifest schema version em writes and expects (`systemSchemaVersion`). */
+export const SYSTEM_MANIFEST_SCHEMA_VERSION = "2.0";
+/** The previous version, still accepted for reading (with a `system-manifest-outdated`
+ *  warning) until a repo runs `em upgrade`'s `system-manifest` step. */
+export const LEGACY_SYSTEM_MANIFEST_SCHEMA_VERSION = "1.0";
+const TOP_KEYS_V2 = new Set(["systemSchemaVersion", "name", "models"]);
+const MODEL_KEYS_V2 = new Set(["source"]);
+const TOP_KEYS_V1 = new Set(["systemSchemaVersion", "name", "models", "seams"]);
+const MODEL_KEYS_V1 = new Set(["source", "owner"]);
 const SEAM_KEYS = new Set(["from", "to", "description"]);
+/** Shared tail of every "this moved out of the manifest" message. */
+const RUN_UPGRADE = "run `em upgrade <model>.em --apply` to migrate";
 /** Parse and shape-check manifest text. Every problem is a `system-manifest-invalid` error
  *  diagnostic (never a throw), and `ok: false` means the manifest can't be used at all — the
  *  caller refuses rather than verifying a partial system. Unknown keys are errors, not ignored:
@@ -39,23 +53,32 @@ export function parseManifest(text) {
     }
     const root = doc.contents;
     if (!isMap(root)) {
-        invalid("manifest must be a YAML mapping with `systemSchemaVersion`, `models`, and optionally `name`/`seams`");
+        invalid("manifest must be a YAML mapping with `systemSchemaVersion`, `models`, and optionally `name`");
         return { ok: false, diagnostics };
     }
-    for (const pair of root.items) {
-        const key = scalarString(pair.key);
-        if (key === undefined || !TOP_KEYS.has(key)) {
-            invalid(`unknown top-level key ${describeKey(pair.key)} — expected one of: ${[...TOP_KEYS].join(", ")}`, lineOf(pair));
-        }
-    }
-    // systemSchemaVersion — required, and exactly the one version this em understands.
+    // systemSchemaVersion — required: "2.0", or the legacy "1.0" (read-only compatibility).
     const versionNode = root.get("systemSchemaVersion", true);
     const version = scalarString(versionNode);
     if (version === undefined) {
         invalid(`missing or non-string \`systemSchemaVersion\` — set \`systemSchemaVersion: "${SYSTEM_MANIFEST_SCHEMA_VERSION}"\``, lineOf(versionNode));
     }
-    else if (version !== SYSTEM_MANIFEST_SCHEMA_VERSION) {
-        invalid(`unsupported systemSchemaVersion "${version}" — this em accepts "${SYSTEM_MANIFEST_SCHEMA_VERSION}"`, lineOf(versionNode));
+    else if (version !== SYSTEM_MANIFEST_SCHEMA_VERSION && version !== LEGACY_SYSTEM_MANIFEST_SCHEMA_VERSION) {
+        invalid(`unsupported systemSchemaVersion "${version}" — this em accepts "${SYSTEM_MANIFEST_SCHEMA_VERSION}" ` +
+            `(and reads "${LEGACY_SYSTEM_MANIFEST_SCHEMA_VERSION}" for compatibility)`, lineOf(versionNode));
+    }
+    // An unknown/missing version is checked against 2.0's key set — the shape em writes today.
+    const legacy = version === LEGACY_SYSTEM_MANIFEST_SCHEMA_VERSION;
+    const topKeys = legacy ? TOP_KEYS_V1 : TOP_KEYS_V2;
+    const modelKeys = legacy ? MODEL_KEYS_V1 : MODEL_KEYS_V2;
+    for (const pair of root.items) {
+        const key = scalarString(pair.key);
+        if (!legacy && key === "seams") {
+            invalid(`\`seams:\` is not part of systemSchemaVersion "${SYSTEM_MANIFEST_SCHEMA_VERSION}" — a seam is declared on the consuming ` +
+                `translation (\`consumes <modelKey>:<kind>.<slug>\`); ${RUN_UPGRADE}`, lineOf(pair));
+        }
+        else if (key === undefined || !topKeys.has(key)) {
+            invalid(`unknown top-level key ${describeKey(pair.key)} — expected one of: ${[...topKeys].join(", ")}`, lineOf(pair));
+        }
     }
     // name — optional string.
     const nameNode = root.get("name", true);
@@ -71,7 +94,7 @@ export function parseManifest(text) {
     const models = [];
     const modelsNode = root.get("models", true);
     if (!isMap(modelsNode)) {
-        invalid("`models` must be a mapping of model key -> { source, owner? } with at least one entry", lineOf(modelsNode ?? root));
+        invalid("`models` must be a mapping of model key -> { source } with at least one entry", lineOf(modelsNode ?? root));
     }
     else if (modelsNode.items.length === 0) {
         invalid("`models` must declare at least one model", lineOf(modelsNode));
@@ -91,15 +114,20 @@ export function parseManifest(text) {
             }
             for (const p of entry.items) {
                 const k = scalarString(p.key);
-                if (k === undefined || !MODEL_KEYS.has(k))
-                    invalid(`model "${key}": unknown key ${describeKey(p.key)} — expected source, owner`, lineOf(p));
+                if (!legacy && k === "owner") {
+                    invalid(`model "${key}": \`owner:\` is not part of systemSchemaVersion "${SYSTEM_MANIFEST_SCHEMA_VERSION}" — owners live on the ` +
+                        `model header (\`model "Name" owner "Team"\`); ${RUN_UPGRADE}`, lineOf(p));
+                }
+                else if (k === undefined || !modelKeys.has(k)) {
+                    invalid(`model "${key}": unknown key ${describeKey(p.key)} — expected ${[...modelKeys].join(", ")}`, lineOf(p));
+                }
             }
             const source = scalarString(entry.get("source", true));
             if (source === undefined || source.trim() === "") {
                 invalid(`model "${key}": \`source\` must be a non-empty path string`, line);
                 continue;
             }
-            const ownerNode = entry.get("owner", true);
+            const ownerNode = legacy ? entry.get("owner", true) : undefined;
             let owner = null;
             if (ownerNode !== undefined) {
                 const o = scalarString(ownerNode);
@@ -111,9 +139,9 @@ export function parseManifest(text) {
             models.push({ key, source, owner, line: line ?? 1 });
         }
     }
-    // seams — optional sequence of `{ from, to, description? }`.
+    // seams — 1.0 only: optional sequence of `{ from, to, description? }`.
     const seams = [];
-    const seamsNode = root.get("seams", true);
+    const seamsNode = legacy ? root.get("seams", true) : undefined;
     if (seamsNode !== undefined && !(isScalar(seamsNode) && seamsNode.value === null)) {
         if (!isSeq(seamsNode)) {
             invalid("`seams` must be a list of { from, to, description? } entries", lineOf(seamsNode));
@@ -155,7 +183,7 @@ export function parseManifest(text) {
         return { ok: false, diagnostics };
     return {
         ok: true,
-        manifest: { systemSchemaVersion: version, name, models, seams },
+        manifest: { systemSchemaVersion: version, versionLine: lineOf(versionNode) ?? 1, name, models, seams },
         diagnostics,
     };
 }

package/dist/system/manifest.js.map

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

package/dist/system/migrateManifest.d.ts

@@ -0,0 +1,28 @@
+import { SystemManifest } from "./manifest.js";
+import type { SystemExportDoc } from "./verify.js";
+export interface MigrationMember {
+    /** The manifest key. */
+    key: string;
+    /** Path the step reads/writes (manifest dir joined with `source`). */
+    file: string;
+    /** The `.em` source text, or `null` when the member is an `em export --json` document. */
+    text: string | null;
+    doc: SystemExportDoc;
+}
+export type ManifestMigrationPlan = {
+    ok: true;
+    manifestText: string;
+    /** Rewritten `.em` files, member order; only files that actually change. */
+    files: {
+        file: string;
+        text: string;
+    }[];
+    /** Human-readable summary lines (one per consumes/owner write), for the step's reason. */
+    summary: string[];
+} | {
+    ok: false;
+    message: string;
+};
+/** Plan the whole migration. `manifest` must be a parsed 1.0 manifest; `members` one entry per
+ *  manifest model, same order. */
+export declare function planManifestMigration(manifestText: string, manifest: SystemManifest, members: MigrationMember[]): ManifestMigrationPlan;