@memoarchitect/tools 0.13.0 → 0.15.0

package/packages/tools/lib/model/element-index.js

@@ -0,0 +1,316 @@
+// ─── Element index ────────────────────────────────────────────────────────────
+//
+// `qualified name → element`, plus the lookups that let an authored reference
+// find its way to one.
+//
+// **An element's id is its qualified name**, built the way SysML builds one:
+// the owner chain, joined with `::`, rooted at the declaring package.
+//
+//     memo_examples_ros_mobile_robot::nodeSafetyMonitor::scanSubscriber
+//
+// It used to be the short name alone, which is not a key the language promises
+// to be unique — a name is scoped to its owner. Two parts each owning a port
+// called `scanSubscriber` is ordinary, correct SysML, and it made two elements
+// compete for one map entry: the last one built won, the other was gone, and
+// nothing was said. Measured 2026-09-19 in `ros-mobile-robot`, where
+// `nodeNavigation` and `nodeSafetyMonitor` each declare `in port
+// scanSubscriber`; the flow to the safety monitor's port degraded to an edge on
+// the node, because `resolveEndpoint` checked the owner, found the wrong one,
+// and gave up one segment short.
+//
+// The authored short name is kept on `shortName`, because it is what the source
+// says and what a reader should see. `id` is for identity; `shortName` is for
+// display; `name` remains the human label from `attribute redefines name`.
+//
+// Two elements can still collide — two packages that each declare `clinician`
+// at top level produce two different ids, but a reference to a bare
+// `clinician` cannot say which. That is reported rather than guessed; see
+// `lookup`.
+// ─────────────────────────────────────────────────────────────────────────────
+/** The `ParseError.code` every ambiguous bare reference carries. */
+export const AMBIGUOUS_ELEMENT_REFERENCE = 'ambiguous-element-reference';
+/** The `ParseError.code` a duplicate qualified name carries. */
+export const ELEMENT_NAME_COLLISION = 'element-name-collision';
+/** The `ParseError.code` two named relationships sharing a qualified name carry. */
+export const RELATIONSHIP_NAME_COLLISION = 'relationship-name-collision';
+/** The separator SysML uses between the segments of a qualified name. */
+export const QUALIFIER = '::';
+/**
+ * The qualified name of a declaration.
+ *
+ * `ownerId` is the owning element's own qualified id, so the chain builds
+ * itself one hop at a time and a port three levels down reads as the path you
+ * would type in the source.
+ */
+export function qualifiedId(shortName, packageName, ownerId) {
+    if (ownerId)
+        return `${ownerId}${QUALIFIER}${shortName}`;
+    if (packageName)
+        return `${packageName}${QUALIFIER}${shortName}`;
+    return shortName;
+}
+export function shortNameOf(id) {
+    if (id === undefined)
+        return undefined;
+    const at = id.lastIndexOf(QUALIFIER);
+    return at === -1 ? id : id.slice(at + QUALIFIER.length);
+}
+/**
+ * The 1-based declaration line of a Langium AST node.
+ *
+ * Typed loosely on purpose: the builder passes a mix of generated AST nodes and
+ * the structural `UsageNode` shape it declares for itself, and neither is worth
+ * a cast at nine call sites.
+ */
+export function declarationLine(node) {
+    const cst = node?.$cstNode;
+    const line = cst?.range?.start?.line;
+    return typeof line === 'number' ? line + 1 : undefined;
+}
+/**
+ * `qualified name → element`, with the lookups an authored reference needs.
+ *
+ * Extends `Map` so that every function already typed `Map<string, MemoElement>`
+ * keeps working: `get` is exact and means "this qualified id". Everything that
+ * starts from something a person wrote goes through `lookup` or `resolvePath`.
+ */
+export class ElementIndex extends Map {
+    /** Every pair that competed for one qualified name. */
+    collisions = [];
+    /** Bare references that more than one element answered to. */
+    ambiguities = [];
+    /** Every pair of named relationships that competed for one qualified name. */
+    relationshipCollisions = [];
+    /** Short name → the qualified ids declaring it, in declaration order. */
+    byShortName = new Map();
+    /** Declaration lines of the elements that landed, for collision reports. */
+    lines = new Map();
+    /**
+     * Named relationships by qualified id — the identity half of §9.1's
+     * "single canonical identity for a named flow/interface that can also
+     * serve as a relationship target".
+     *
+     * A read-only facade, deliberately: the entries here ARE the objects in
+     * `MemoModel.relationships`, not copies of them, so a named flow has one
+     * record and not a record plus a proxy. Nothing may be added here that is
+     * not also pushed onto the relationship list, and nothing here is an
+     * element — a flow is an edge, and putting a fabricated `MemoElement` in
+     * the elements map would make every census, view and filter count it as
+     * one more part.
+     */
+    relationships = new Map();
+    /** Short name → the qualified relationship ids declaring it. */
+    relationshipsByShortName = new Map();
+    /** Declaration lines of the named relationships, for collision reports. */
+    relationshipLines = new Map();
+    /**
+     * Add an element under its own qualified `id`. Returns whether it landed —
+     * false means one was already there and this one was dropped, either as a
+     * duplicate arrival or as a recorded collision.
+     */
+    define(element, node) {
+        const existing = this.get(element.id);
+        const line = declarationLine(node);
+        if (!existing) {
+            super.set(element.id, element);
+            if (line !== undefined)
+                this.lines.set(element.id, line);
+            const short = element.shortName || shortNameOf(element.id);
+            const ids = this.byShortName.get(short) ?? [];
+            ids.push(element.id);
+            this.byShortName.set(short, ids);
+            return true;
+        }
+        if (isSameDeclaration(existing, element))
+            return false;
+        // Same qualified name, same owner, two declarations. SysML forbids it
+        // and compilers reject it; MEMO says so too rather than dropping one.
+        this.collisions.push({
+            id: element.id,
+            kept: existing,
+            dropped: element,
+            keptLine: this.lines.get(element.id),
+            droppedLine: line,
+        });
+        return false;
+    }
+    /** The qualified ids that declare this short name. */
+    idsNamed(shortName) {
+        return this.byShortName.get(shortName) ?? [];
+    }
+    /**
+     * Find the element an authored reference names, from where it was written.
+     *
+     * The context is what makes a short name meaningful, and it is the same
+     * order SysML resolves in: the owner's own members, then the enclosing
+     * package, then anything visible. Two view packages that each declare
+     * `clinician` are two elements, and inside either package the bare word
+     * means that package's one — which is why the context is not optional in
+     * practice even though the parameter is.
+     *
+     *   1. the full qualified id;
+     *   2. a member of `ownerId` — `scanSubscriber` inside `nodeSafetyMonitor`;
+     *   3. a member of `packageName`, walking OUT through enclosing packages;
+     *   4. a TRAILING part of some qualified id, when exactly one ends that way
+     *      — `nodeLidar::scanPublisher` written from another package;
+     *   5. a bare short name, when exactly one element in the model carries it.
+     *
+     * A reference that survives all five with more than one candidate is
+     * recorded in `ambiguities` and resolves to nothing. Picking one would be
+     * picking by declaration order, which is the bug this index exists to stop.
+     */
+    lookup(reference, context) {
+        return this.resolveIn(reference, context, this, this.byShortName);
+    }
+    /**
+     * The five resolution steps above, over whichever identity map is asked.
+     *
+     * Elements and named relationships are separate maps — a flow is not an
+     * element — but a reference to either is written the same way and must
+     * resolve by the same rules, so the rules live here once. Ambiguity is
+     * recorded into the one shared list, because a reference that cannot
+     * decide is one diagnostic however it was declared.
+     */
+    resolveIn(reference, context, byId, byShortName) {
+        const exact = byId.get(reference);
+        if (exact)
+            return exact;
+        if (context?.ownerId) {
+            const owned = byId.get(`${context.ownerId}${QUALIFIER}${reference}`);
+            if (owned)
+                return owned;
+        }
+        // Out through the enclosing packages: a reference written in
+        // `A::B::C` sees `A::B::C::x`, then `A::B::x`, then `A::x`.
+        let scope = context?.packageName;
+        while (scope) {
+            const inScope = byId.get(`${scope}${QUALIFIER}${reference}`);
+            if (inScope)
+                return inScope;
+            const at = scope.lastIndexOf(QUALIFIER);
+            scope = at === -1 ? undefined : scope.slice(0, at);
+        }
+        const suffix = `${QUALIFIER}${reference}`;
+        const bySuffix = [...byId.keys()].filter(id => id.endsWith(suffix));
+        if (bySuffix.length === 1)
+            return byId.get(bySuffix[0]);
+        if (bySuffix.length > 1) {
+            this.recordAmbiguity(reference, bySuffix, context);
+            return undefined;
+        }
+        const named = byShortName.get(reference) ?? [];
+        if (named.length === 1)
+            return byId.get(named[0]);
+        if (named.length > 1)
+            this.recordAmbiguity(reference, named, context);
+        return undefined;
+    }
+    /**
+     * Record a named relationship under its own qualified `id`, so a later
+     * `allocate`, `satisfy`, `verify` or trace can name it.
+     *
+     * Returns whether it landed. False means another declaration already holds
+     * that qualified name, which is recorded in `relationshipCollisions` — the
+     * relationship itself still reaches the model as an edge, because the two
+     * facts are separate: the edge is real, the name is contested.
+     */
+    defineRelationship(relationship, node) {
+        const existing = this.relationships.get(relationship.id);
+        const line = declarationLine(node);
+        if (existing) {
+            if (existing === relationship)
+                return false;
+            this.relationshipCollisions.push({
+                id: relationship.id,
+                kept: existing,
+                dropped: relationship,
+                keptLine: this.relationshipLines.get(relationship.id),
+                droppedLine: line,
+            });
+            return false;
+        }
+        this.relationships.set(relationship.id, relationship);
+        if (line !== undefined)
+            this.relationshipLines.set(relationship.id, line);
+        const short = relationship.shortName || shortNameOf(relationship.id);
+        const ids = this.relationshipsByShortName.get(short) ?? [];
+        ids.push(relationship.id);
+        this.relationshipsByShortName.set(short, ids);
+        return true;
+    }
+    /** The named relationship an authored reference names, by the same rules as `lookup`. */
+    lookupRelationship(reference, context) {
+        return this.resolveIn(reference, context, this.relationships, this.relationshipsByShortName);
+    }
+    /**
+     * Whether this id addresses anything in the model — an element or a named
+     * relationship. What an edge endpoint has to satisfy, now that a flow can
+     * be one.
+     */
+    hasEntity(id) {
+        return this.has(id) || this.relationships.has(id);
+    }
+    /**
+     * Resolve a dotted feature path — `nodeSafetyMonitor.scanSubscriber.payload`
+     * — as far as it names elements.
+     *
+     * The first segment is looked up; each further segment is an owned member
+     * of what came before, which is an exact `owner::name` probe rather than a
+     * global search that then checks the owner. That check is what used to stop
+     * one segment short when the global search returned the wrong node's port.
+     *
+     * Returns the deepest element reached and whatever is left over — a port's
+     * `payload`, an action's parameter — which the caller keeps as the edge's
+     * end name.
+     */
+    resolvePath(reference, context) {
+        const segments = reference.split('.');
+        const before = this.ambiguities.length;
+        const head = this.lookup(segments[0], context);
+        // Whether THIS lookup is what could not decide. A caller that falls
+        // back to the bare reference when nothing resolved must not do so
+        // here: several elements answer to it, and an edge to the name would
+        // be an edge to whichever of them a reader assumed.
+        const ambiguous = this.ambiguities.length > before
+            || this.ambiguities.some(a => a.reference === segments[0]);
+        if (!head)
+            return { id: segments[0], end: segments.slice(1).join('.'), ambiguous };
+        let element = head;
+        let i = 1;
+        while (i < segments.length) {
+            const child = this.get(`${element.id}${QUALIFIER}${segments[i]}`);
+            if (!child)
+                break;
+            element = child;
+            i++;
+        }
+        return { element, id: element.id, end: segments.slice(i).join('.'), ambiguous };
+    }
+    recordAmbiguity(reference, candidates, context) {
+        const from = context?.file;
+        if (this.ambiguities.some(a => a.reference === reference && a.file === from))
+            return;
+        this.ambiguities.push({ reference, candidates, file: from });
+    }
+}
+/**
+ * An index built from elements that already have their ids — a model received
+ * over the wire, a hand-built test fixture, a conversion from another tool.
+ */
+export function toElementIndex(elements) {
+    const index = new ElementIndex();
+    const values = elements instanceof Map ? elements.values() : elements;
+    for (const element of values)
+        index.define(element);
+    return index;
+}
+/** Whether two entries are one declaration arriving twice. */
+function isSameDeclaration(a, b) {
+    return a.file === b.file && a.construct === b.construct;
+}
+/** Where an element sits, for a reader who has to go and look at both. */
+export function describeLocation(element, line) {
+    const at = line !== undefined ? `${element.file}:${line}` : element.file;
+    return `${at} (${element.construct} ${element.kind})`;
+}
+//# sourceMappingURL=element-index.js.map

package/packages/tools/lib/model/element-index.js.map

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

package/packages/tools/lib/model/id-rebase.d.ts

@@ -0,0 +1,35 @@
+import type { IdentityRegistry } from './identity-registry.js';
+export interface IdChange {
+    /** The registry key, or `file:line` for an authored id. */
+    where: string;
+    from: string;
+    to: string;
+}
+export interface RegistryRebase {
+    registry: IdentityRegistry;
+    changes: IdChange[];
+}
+/** Renumber the branch's new short ids that collide with the target's. */
+export declare function rebaseRegistry(target: IdentityRegistry, branch: IdentityRegistry): RegistryRebase;
+/** `providedId = "X"` literals in a source text: the id, and where its quoted text starts and ends. */
+export declare function providedIdLiterals(text: string): {
+    id: string;
+    start: number;
+    end: number;
+    line: number;
+}[];
+export interface ProvidedIdRebase {
+    /** New text of each file that changes, keyed by project-relative path. */
+    files: Map<string, string>;
+    changes: IdChange[];
+}
+/**
+ * Renumber authored ids that two branches both wrote. `targetTexts` and `branchTexts` are the project's
+ * `.sysml` files at each side. A literal is a collision when the working tree holds it more often than
+ * the target does (summed over files); the surplus occurrences, taken from the files that have more of it
+ * than the target's copy of that file, are the branch's.
+ */
+export declare function rebaseProvidedIds(targetTexts: ReadonlyMap<string, string>, branchTexts: ReadonlyMap<string, string>, 
+/** Per file, the 1-based lines the branch added or changed against the target. */
+added?: ReadonlyMap<string, ReadonlySet<number>>): ProvidedIdRebase;
+//# sourceMappingURL=id-rebase.d.ts.map

package/packages/tools/lib/model/id-rebase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"id-rebase.d.ts","sourceRoot":"","sources":["../../src/model/id-rebase.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE/D,MAAM,WAAW,QAAQ;IACrB,2DAA2D;IAC3D,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,cAAc;IAC3B,QAAQ,EAAE,gBAAgB,CAAC;IAC3B,OAAO,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,0EAA0E;AAC1E,wBAAgB,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,gBAAgB,GAAG,cAAc,CA0CjG;AAED,uGAAuG;AACvG,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,CAQ3G;AAED,MAAM,WAAW,gBAAgB;IAC7B,0EAA0E;IAC1E,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,OAAO,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAC7B,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC;AAClF,kFAAkF;AAClF,KAAK,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,GACjD,gBAAgB,CAiElB"}

package/packages/tools/lib/model/id-rebase.js

@@ -0,0 +1,199 @@
+// ─── Ids that two branches both handed out ───────────────────────────────────
+//
+// A short id is the next free number in its prefix family. Two branches that each add an element
+// take the same next number (`REQ-124` on both), and both entries survive a merge of
+// `memo.identity.yaml` because they are different keys. The model then has two elements with one id.
+//
+// This plans the repair, measured against the branch the work is going to land on:
+//
+//   * the target's ids are kept: an element the target already has keeps its id, whatever the
+//     branch's file says;
+//   * an element the target does not have, whose number is at or below the target's high-water mark
+//     in its family (a number the target already handed out, or retired), gets the next free
+//     number above it;
+//   * a number above the mark is left alone. It collides with nothing in the target, and renumbering
+//     it would repoint a reference for no reason.
+//
+//   * two new elements that took the same number above the mark (two sibling branches merged into
+//     this one) are told apart by key order: the first keeps the number, the others are renumbered.
+//
+// The same is done for ids an author wrote in a `providedId` literal, which are text in a source
+// file: a literal that appears more often than at the target. Which occurrences are the branch's own
+// comes from the lines the branch added or changed when the caller has them (`added`, from a diff
+// against the target); without that, the last occurrences in a file are taken to be the branch's.
+// ─────────────────────────────────────────────────────────────────────────────
+import { parseShortId } from './short-id.js';
+/** Renumber the branch's new short ids that collide with the target's. */
+export function rebaseRegistry(target, branch) {
+    const highWater = new Map();
+    const take = (shortId) => {
+        const parsed = shortId ? parseShortId(shortId) : null;
+        if (parsed)
+            highWater.set(parsed.prefix, Math.max(highWater.get(parsed.prefix) ?? 0, parsed.seq));
+    };
+    for (const entry of Object.values(target))
+        take(entry.shortId);
+    const targetHigh = new Map(highWater);
+    for (const [key, entry] of Object.entries(branch))
+        if (key in target)
+            take(entry.shortId);
+    const registry = {};
+    const changes = [];
+    const fresh = Object.keys(branch).filter(key => !(key in target)).sort((a, b) => {
+        const pa = parseShortId(branch[a].shortId ?? '');
+        const pb = parseShortId(branch[b].shortId ?? '');
+        return (pa?.seq ?? 0) - (pb?.seq ?? 0) || a.localeCompare(b);
+    });
+    for (const [key, entry] of Object.entries(branch))
+        if (key in target)
+            registry[key] = target[key] ?? entry;
+    // Keep the branch's own ids that do not collide, so the new numbers stay clear of them.
+    // Two new elements with one number above the target's mark are two sibling branches' work merged
+    // into this one: nothing in the target says which came first, so the first in key order keeps it.
+    const colliding = new Set();
+    const kept = new Set();
+    for (const key of fresh) {
+        const shortId = branch[key].shortId;
+        const parsed = shortId ? parseShortId(shortId) : null;
+        if (parsed && (parsed.seq <= (targetHigh.get(parsed.prefix) ?? 0) || kept.has(shortId)))
+            colliding.add(key);
+        else {
+            take(shortId);
+            if (shortId)
+                kept.add(shortId);
+        }
+    }
+    for (const key of fresh) {
+        const entry = branch[key];
+        const parsed = entry.shortId ? parseShortId(entry.shortId) : null;
+        if (!colliding.has(key) || !parsed) {
+            registry[key] = entry;
+            continue;
+        }
+        const next = (highWater.get(parsed.prefix) ?? 0) + 1;
+        highWater.set(parsed.prefix, next);
+        const to = `${parsed.prefix}-${next}`;
+        registry[key] = { ...entry, shortId: to };
+        changes.push({ where: key, from: entry.shortId, to });
+    }
+    return { registry, changes };
+}
+/** `providedId = "X"` literals in a source text: the id, and where its quoted text starts and ends. */
+export function providedIdLiterals(text) {
+    const out = [];
+    const pattern = /providedId\s*=\s*"([^"\\]+)"/g;
+    for (let match = pattern.exec(text); match; match = pattern.exec(text)) {
+        const start = match.index + match[0].indexOf('"') + 1;
+        out.push({ id: match[1], start, end: start + match[1].length, line: text.slice(0, start).split('\n').length });
+    }
+    return out;
+}
+/**
+ * Renumber authored ids that two branches both wrote. `targetTexts` and `branchTexts` are the project's
+ * `.sysml` files at each side. A literal is a collision when the working tree holds it more often than
+ * the target does (summed over files); the surplus occurrences, taken from the files that have more of it
+ * than the target's copy of that file, are the branch's.
+ */
+export function rebaseProvidedIds(targetTexts, branchTexts, 
+/** Per file, the 1-based lines the branch added or changed against the target. */
+added) {
+    const count = (texts) => {
+        const total = new Map();
+        const perFile = new Map();
+        for (const [file, text] of texts) {
+            const here = new Map();
+            for (const { id } of providedIdLiterals(text)) {
+                here.set(id, (here.get(id) ?? 0) + 1);
+                total.set(id, (total.get(id) ?? 0) + 1);
+            }
+            perFile.set(file, here);
+        }
+        return { total, perFile };
+    };
+    const target = count(targetTexts);
+    const branch = count(branchTexts);
+    const used = new Set(branch.total.keys());
+    const highWater = new Map();
+    for (const id of new Set([...target.total.keys(), ...branch.total.keys()])) {
+        const parsed = parseShortId(id);
+        if (parsed)
+            highWater.set(parsed.prefix, Math.max(highWater.get(parsed.prefix) ?? 0, parsed.seq));
+    }
+    const files = new Map();
+    const changes = [];
+    for (const [id, total] of branch.total) {
+        const wasThere = target.total.get(id) ?? 0;
+        const parsed = parseShortId(id);
+        if (!parsed || total <= 1)
+            continue;
+        // With the diff, the branch's occurrences are the ones on lines it added. One the target never
+        // had may stay once (the first), since it clashes only with a sibling's copy of it.
+        const ownOf = (file, text) => providedIdLiterals(text)
+            .filter(literal => literal.id === id && added?.get(file)?.has(literal.line));
+        let spare = wasThere === 0 ? 1 : 0;
+        for (const [file, text] of branchTexts) {
+            const hereNow = branch.perFile.get(file)?.get(id) ?? 0;
+            const hadHere = target.perFile.get(file)?.get(id) ?? 0;
+            let surplus;
+            if (added) {
+                const own = ownOf(file, text);
+                const skip = Math.min(spare, own.length);
+                spare -= skip;
+                surplus = own.slice(skip);
+            }
+            else {
+                // More copies than the target had: the extra ones are new, and clash.
+                if (wasThere === 0 || total <= wasThere || hereNow <= hadHere)
+                    continue;
+                // The surplus occurrences in this file are the last ones: the target's copies come first in
+                // the file the branch only added to.
+                surplus = providedIdLiterals(text).filter(literal => literal.id === id).slice(hadHere);
+            }
+            if (surplus.length === 0)
+                continue;
+            let edited = files.get(file) ?? text;
+            for (const literal of surplus.reverse()) {
+                const next = (highWater.get(parsed.prefix) ?? 0) + 1;
+                highWater.set(parsed.prefix, next);
+                const to = `${parsed.prefix}-${next}`;
+                used.add(to);
+                edited = edited.slice(0, literal.start) + to + edited.slice(literal.end);
+                changes.push({ where: `${file}:${literal.line}`, from: id, to });
+            }
+            files.set(file, edited);
+        }
+    }
+    followMentions(files, changes, targetTexts);
+    return { files, changes };
+}
+/**
+ * A file the target does not have, in which a literal was renumbered, is about the element that literal
+ * declares: the target's element of the old number lives in some other file. A mention of the old
+ * number in that file follows the renumber. Anywhere else the target kept the old number and a mention
+ * may be of either element, so it is left for its author (the command lists it).
+ */
+function followMentions(files, changes, targetTexts) {
+    for (const [file, text] of [...files]) {
+        if (targetTexts.has(file))
+            continue;
+        const renamed = new Map();
+        for (const change of changes)
+            if (change.where.startsWith(`${file}:`)) {
+                renamed.set(change.from, (renamed.get(change.from) ?? new Set()).add(change.to));
+            }
+        let edited = text;
+        for (const [from, targets] of renamed) {
+            if (targets.size !== 1)
+                continue; // two different new numbers for one old one: which is meant is not known
+            const to = [...targets][0];
+            const pattern = new RegExp(`(?<![\\w-])${from.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')}(?![\\w-])`, 'g');
+            for (const match of [...edited.matchAll(pattern)].reverse()) {
+                const line = edited.slice(0, match.index).split('\n').length;
+                edited = edited.slice(0, match.index) + to + edited.slice(match.index + from.length);
+                changes.push({ where: `${file}:${line}`, from, to });
+            }
+        }
+        files.set(file, edited);
+    }
+}
+//# sourceMappingURL=id-rebase.js.map

package/packages/tools/lib/model/id-rebase.js.map

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

package/packages/tools/lib/model/identity-registry.d.ts

@@ -6,11 +6,36 @@ export interface ElementIdentity {
 }
 /** `package::name` → identity. */
 export type IdentityRegistry = Record<string, ElementIdentity>;
-/** The registry key for an element. */
+/**
+ * The registry key for an element: its qualified id, which already carries the
+ * declaring package as its first segment.
+ *
+ * It used to be `package` and the element's id joined, because an id was then a
+ * bare short name. Joining them now would produce `Pump::Pump::motor`. For a
+ * TOP-LEVEL element the two spellings are character-for-character identical —
+ * `Pump::pump1` either way — which is why no existing entry moves. A NESTED
+ * element's key gains the owner chain it always should have had, and
+ * `priorIdentityFor` below adopts the old entry so no shortId or uuid is
+ * re-minted by this change.
+ */
 export declare function identityKey(element: {
     id: string;
     package?: string;
 }): string;
+/**
+ * The identity an element already had, under this key or the one it used
+ * before qualified ids.
+ *
+ * A nested element was keyed `package::shortName` when a short name was an id;
+ * it is keyed `package::owner::shortName` now. Both are looked up, newest
+ * first, so a project's `memo.identity.yaml` survives the change without being
+ * rewritten and without a port silently acquiring a new `RMR-…`.
+ */
+export declare function priorIdentityFor(registry: IdentityRegistry, element: {
+    id: string;
+    package?: string;
+    shortName?: string;
+}): ElementIdentity | undefined;
 /**
  * Read the registry. A missing file is an empty registry, not an error: the
  * first build of a project legitimately has no prior identities.
@@ -32,8 +57,14 @@ export declare function parseIdentityRegistry(content: string): IdentityRegistry
  * The prior `shortId` assignments for one prefix family, as
  * `assignSequentialShortIds` expects them: element id → shortId.
  *
- * Keys are un-qualified here because assignment happens per prefix over element
- * ids; the qualified key is only the persistence form.
+ * Keys are the registry's own — an element's qualified id, which is what an
+ * element id now is. They used to be stripped to the last segment, because an
+ * id was then a bare short name and the two forms had to be bridged; stripping
+ * them now would make every key ambiguous again, which is the thing qualified
+ * ids exist to stop.
+ *
+ * An entry whose element is gone is kept: it matches nothing, and raising the
+ * high-water mark is exactly what retires its number.
  */
 export declare function priorShortIds(registry: IdentityRegistry): Map<string, string>;
 //# sourceMappingURL=identity-registry.d.ts.map

package/packages/tools/lib/model/identity-registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"identity-registry.d.ts","sourceRoot":"","sources":["../../src/model/identity-registry.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,kCAAkC;AAClC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAE/D,uCAAuC;AACvC,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE7E;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAI1E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,GAAE,gBAAqB,GAC7B,IAAI,CAGN;AAED,wEAAwE;AACxE,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAe5E;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAmBvE;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAO7E"}
+{"version":3,"file":"identity-registry.d.ts","sourceRoot":"","sources":["../../src/model/identity-registry.ts"],"names":[],"mappings":"AAoCA,eAAO,MAAM,iBAAiB,uBAAuB,CAAC;AAEtD,wCAAwC;AACxC,MAAM,WAAW,eAAe;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,kCAAkC;AAClC,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;AAE/D;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAE7E;AAED;;;;;;;;GAQG;AACH,wBAAgB,gBAAgB,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9D,eAAe,GAAG,SAAS,CAK7B;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,gBAAgB,CAI1E;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACjC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,gBAAgB,EAC1B,KAAK,GAAE,gBAAqB,GAC7B,IAAI,CAGN;AAED,wEAAwE;AACxE,wBAAgB,yBAAyB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,CAe5E;AAED,yEAAyE;AACzE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,gBAAgB,CAmBvE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,aAAa,CAAC,QAAQ,EAAE,gBAAgB,GAAG,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAM7E"}