@ybotok/loam 0.1.0-beta.3 → 0.2.0-alpha.13

package/dist/core/c4/splice/landscape-merge.js

@@ -0,0 +1,337 @@
+import { parentIdOf } from "../../kernel/ids/fqn/ancestors.js";
+import { errorText, loadSource } from "../likec4.js";
+import { firstUnlocated, unlocatedReason } from "../locate/unlocated.js";
+import { elementService, serviceOf } from "../resolve/service.js";
+import { kindsDeclared, scanModel } from "../source-scan.js";
+import { matchLineEndings, spliceSource } from "./authored-source.js";
+import { assertSpliceVisible, LandscapeSpliceError, } from "./contract.js";
+import { assertMergeableDelta } from "./delta-blocks.js";
+import { relSortKey, relStatementKey, scannedStatementKey } from "./identity/edges.js";
+import { newAdditions } from "./identity/existing.js";
+import { planInteriors } from "./identity/interior.js";
+import { ownerOf } from "./identity/owner.js";
+import { elementSpot, relSpot, topStatements } from "./placement.js";
+import { nestedInsert } from "./text/spot.js";
+/* ------------------------------------------------------------------ */
+/* Merging                                                             */
+/* ------------------------------------------------------------------ */
+/**
+ * Plan the merge of the feature's new elements + relationships into the living
+ * landscape's `model { ... }` block (preserving the rest of the file).
+ *
+ * The additions are SPLICED from delta.likec4 as authored — byte for byte,
+ * technology, style, icons, links, metadata, nested children and all — never
+ * re-serialized from the parsed model: a rebuild keeps only the fields loam
+ * models, and every field it forgets is authored detail destroyed. The one
+ * edit on the way over is dropping the feature's own tag — the additions are
+ * baseline now (SCHEMA.md documents the drop as why unarchive restores bytes
+ * instead of recomputing) — and a construct the strip empties goes with it.
+ *
+ * Placement is deterministic and SERVICE-GROUPED (the spot* helpers in
+ * placement.ts):
+ * a top-level addition lands beside what already belongs to its service, so
+ * two concurrent archives touching different services usually splice on
+ * different lines and git merges their PRs — the single shared append point
+ * every archive used to hit made two concurrent archives conflict BY
+ * CONSTRUCTION. A NESTED element lands inside its parent's block — inside the
+ * living parent when the landscape already has it, riding verbatim inside the
+ * spliced parent when the parent is new from the same delta — never as a flat
+ * dotted id at top level, which LikeC4 rejects. The additions carry no marker
+ * comment: which archive added what is the git history's to say.
+ *
+ * Existence is checked semantically against the parsed landscape AND against
+ * every extending model the request carries (by element id/title and by edge
+ * identity), so re-archiving is idempotent whichever document the additions
+ * landed in — `./identity/existing.ts` holds that phase and its two joins, and
+ * this function only turns the collision it reports into the refusal.
+ *
+ * Splicing is text surgery, so the computed result is PARSED before it is
+ * returned: a merged landscape LikeC4 rejects refuses the archive at plan time
+ * (merge-failed, nothing written — the unparseable-delta discipline) instead
+ * of landing in the living docs.
+ *
+ * NOT EVERYTHING LANDS HERE. A service whose model EXTENDS this map owns its
+ * own interior, and an addition nested under such a service is ROUTED to that
+ * model instead (`./identity/owner.ts` decides, `./model/merge.ts` splices).
+ * Until it was, a delta's container landed in the map and the service was
+ * `c4.invalid` — a duplicate declaration — the moment its model wrote the same
+ * container, which is exactly what the adopt brief tells it to do
+ * (verification 2026-09-04, E1). With no extending models in the request this
+ * function behaves as it always did.
+ *
+ * Routing per ADDITION is not the whole of it, because a service the feature
+ * INTRODUCES carries its interior in one element's authored bytes and those
+ * children carry no feature tag of their own. `./identity/interior.ts` decides, once
+ * per such block, whether it hands that interior to the model — cut out of what
+ * lands on the map — or rides whole; the routing below DEFERS to that decision
+ * for everything written inside the block, which is what keeps the two from
+ * placing the same child twice.
+ */
+export async function planLandscapeMerge(merge) {
+    const { landscapeText: text, deltaText, deltaElements, newEls, newRels, featureId } = merge;
+    const models = merge.models ?? [];
+    // What every extending model borrows from this map: its kinds, without which
+    // a model's scan reads `container outbox` and `a .delivers b` as property lines.
+    const borrowed = kindsDeclared(text);
+    // First, and before the early return for "nothing to add": a block this merge
+    // cannot carry is lost whether or not the delta also has tagged elements to
+    // splice. See delta-blocks.ts.
+    assertMergeableDelta(deltaText);
+    const land = await loadSource(text);
+    if (land.errors.length > 0) {
+        throw new LandscapeSpliceError(`landscape.likec4 has ${land.errors.length} error(s) — fix it before archiving`);
+    }
+    // Service binding for the existence joins AND for routing and placement:
+    // living elements first (they win a shared id), the delta's after — a spliced
+    // statement's id resolves to its service the moment its bytes land in the scan.
+    const bindEls = [...land.elements, ...deltaElements.filter((d) => !land.elements.some((l) => l.id === d.id))];
+    // What the living fleet already has — the map AND every extending model, by id
+    // and by title. `./identity/existing.ts` holds both joins and their asymmetry.
+    const added = newAdditions({
+        livingEls: land.elements,
+        livingRels: land.relationships,
+        bindEls,
+        deltaElements,
+        candidates: { els: newEls, rels: newRels },
+        models,
+        borrowed,
+    });
+    if (added.collision !== undefined) {
+        const { addition: e, living: m } = added.collision;
+        throw new LandscapeSpliceError(`the delta's '${e.id}' (bound to service '${e.service}') shares the title '${e.title}' with '${m.id}' (bound to service '${m.service}') — a title join across services would silently drop the addition; ` +
+            `retitle one of them, or reuse the id '${m.id}' if they really are the same element`);
+    }
+    const addedEls = added.els;
+    const addedRels = added.rels;
+    const owner = ownerOf({
+        bindEls,
+        living: new Set(land.elements.map((e) => e.id)),
+        declared: added.declaredIds,
+        added: new Set(addedEls.map((e) => e.id)),
+        models,
+    });
+    // Nothing to add: the same shape the merge returned before routing existed,
+    // and the reason it is decided HERE rather than after the loops below — a
+    // no-op archive must not have to scan the delta, nor answer the landscape
+    // guards further down, which refuse documents this merge is not touching.
+    // Equivalent to the old "nothing reached the map and nothing was routed":
+    // every addition ends up in one of those two, so an empty pair means both.
+    if (addedEls.length === 0 && addedRels.length === 0) {
+        return { content: null, addedEls: [], addedRels: [], models: [] };
+    }
+    const scan = scanModel(deltaText);
+    if (scan === null) {
+        throw new LandscapeSpliceError("delta.likec4 has no model block — nothing to splice the additions from");
+    }
+    // Everything below either locates a declaration's authored bytes or refuses.
+    // `spliced` remembers the delta ranges already carried over, so a child whose
+    // parent is itself new is recognised as riding inside the parent's text and
+    // is never inserted twice.
+    const byId = new Map(scan.elements.map((e) => [e.id, e]));
+    // Relationships: match each parsed addition back to its statement in the
+    // delta source — full identity (`relStatementKey`), consumed one statement
+    // per addition so duplicates stay duplicates. Built before the routing
+    // because routing has to know WHERE an edge was written: one drawn inside a
+    // block that rides whole is already on the map. A statement is keyed with the
+    // tags its kind gives it, which the parsed addition carries and its text does not.
+    const pool = new Map();
+    for (const s of scan.rels) {
+        const k = scannedStatementKey(s, merge.deltaKindTags ?? {});
+        pool.set(k, [...(pool.get(k) ?? []), s]);
+    }
+    const interiors = planInteriors({ scan, deltaElements, owner, addedEls });
+    const routed = new Map();
+    const into = (model) => {
+        const existing = routed.get(model.path);
+        if (existing !== undefined)
+            return existing;
+        const fresh = { model, els: [], rels: [], borrowed };
+        routed.set(model.path, fresh);
+        return fresh;
+    };
+    for (const share of interiors.routed)
+        into(share.model).els.push(...share.els);
+    const mapEls = [];
+    for (const e of addedEls) {
+        const src = byId.get(e.id);
+        // Written inside a block that has already decided: a split block handed it
+        // to the model with its siblings, and a whole one carries it onto the map
+        // in the parent's own bytes, where the splice loop's `rides` finds it. Both
+        // are placed exactly once, which is the point of asking the block first.
+        const fate = src === undefined ? null : interiors.covering(src);
+        if (fate === "split")
+            continue;
+        const model = fate === "whole" ? undefined : owner(parentIdOf(e.id));
+        if (model === undefined)
+            mapEls.push(e);
+        else
+            into(model).els.push(e);
+    }
+    const mapRels = [];
+    for (const r of addedRels) {
+        // An edge written inside a block that rides whole names its endpoints by
+        // their LOCAL names and reads only there; it stays with its block.
+        const stmts = pool.get(relStatementKey(r)) ?? [];
+        const inBlock = stmts.length > 0 && stmts.every((s) => interiors.covering(s) !== null);
+        // Otherwise the SOURCE decides: a call is drawn where the caller draws its
+        // calls, and only when the source is not itself interior does the target's
+        // owner get the edge. A service-level edge belongs to neither and stays on
+        // the map.
+        const model = inBlock ? undefined : owner(parentIdOf(r.source)) ?? owner(parentIdOf(r.target));
+        if (model === undefined)
+            mapRels.push(r);
+        else
+            into(model).rels.push(r);
+    }
+    const touchesMap = mapEls.length > 0 || mapRels.length > 0;
+    const spliced = [];
+    const rides = (start, end) => spliced.some((r) => start >= r.start && end <= r.end);
+    // The living model, scanned on MASKED source (scanModel) and RE-SCANNED
+    // after every splice: each addition lands in the text exactly as the
+    // previous one left it, so an archive of N additions produces the same
+    // bytes as N single-addition archives run back to back. Placement then
+    // composes per statement — the unit the order-independence argument below
+    // is stated in — instead of per archive, where a batch computed against a
+    // stale layout could interleave with itself. Masking matters — a `model {`
+    // spelled inside a comment or string above the real block must not capture
+    // the match, or every top-level addition lands inside the comment (legal
+    // LikeC4, so the parse net below would pass a landscape containing none of
+    // the architecture).
+    let content = text;
+    let livingScan = scanModel(content);
+    let stmts = livingScan === null ? [] : topStatements(livingScan, bindEls);
+    const rescan = () => {
+        livingScan = scanModel(content);
+        stmts = livingScan === null ? [] : topStatements(livingScan, bindEls);
+    };
+    const requireModel = () => {
+        if (livingScan === null)
+            throw new LandscapeSpliceError("landscape.likec4 has no model block");
+        return livingScan;
+    };
+    // Built fresh at every use, never captured: `content` and `stmts` are rebound
+    // by each rescan, and a region assembled before a splice describes a document
+    // that no longer exists.
+    const modelRegion = () => ({ text: content, stmts, blocks: requireModel().blocks });
+    // Every insert must be one the next scan sees (`assertSpliceVisible`).
+    const applyAt = (at, insert, what) => {
+        const before = livingScan;
+        content = content.slice(0, at) + insert + content.slice(at);
+        rescan();
+        assertSpliceVisible(before, livingScan, what);
+    };
+    const applyTop = (spot, block, what) => {
+        // A bare spot shares its line with other text (the closing brace, or a
+        // statement the block displaces) — it brings its own newlines; a
+        // line-start spot slots between lines.
+        applyAt(spot.at, spot.bare ? `\n${block}\n` : `${block}\n`, what);
+    };
+    // Placement walks the scanned statement layout, so a declaration the scan
+    // cannot see is one placement would blindly splice around — LikeC4 accepts
+    // two declarations on one line, but scanModel's statement head runs to the
+    // end of the line, so the second rides invisibly inside the first: an
+    // element bound to its service would miss its neighborhood, and a bodyless
+    // parent gaining a body could wrap the wrong declaration. Refuse
+    // mechanically (the parse-net discipline) instead of splicing blind.
+    //
+    // THAT something is unlocated is decided here, from the parse already in
+    // hand; WHAT and why is `firstUnlocated`'s, at the price of a second parse on
+    // this path alone. The message used to guess "most often two declarations
+    // sharing one line" whatever the map held, and a fleet read it over a
+    // declaration on a line of its own in a second `model { }` block the scan
+    // did not read then (2026-10): it names LikeC4's line now, and a shared line
+    // only when that line shows one.
+    if (livingScan !== null) {
+        const seen = new Set(livingScan.elements.map((e) => e.id));
+        const blind = land.elements.some((e) => !seen.has(e.id)) || livingScan.rels.length < land.relationships.length;
+        if (blind)
+            throw new LandscapeSpliceError(unlocatedReason("landscape.likec4", await firstUnlocated(text, livingScan)));
+    }
+    const livingParentOf = (parentId) => {
+        if (livingScan === null)
+            return null;
+        const direct = livingScan.elements.find((e) => e.id === parentId);
+        if (direct !== undefined)
+            return direct;
+        // The delta may spell an existing element under its own id; the title is
+        // the stable cross-namespace name (the same rule the existence check uses).
+        const title = deltaElements.find((e) => e.id === parentId)?.title;
+        const livingId = title === undefined ? undefined : land.elements.find((e) => e.title === title)?.id;
+        if (livingId === undefined)
+            return null;
+        return livingScan.elements.find((e) => e.id === livingId) ?? null;
+    };
+    // Ancestors first: a spliced parent covers its children before they are seen.
+    const depth = (id) => id.split(".").length;
+    const sortedEls = [...mapEls].sort((a, b) => depth(a.id) - depth(b.id) || (byId.get(a.id)?.start ?? 0) - (byId.get(b.id)?.start ?? 0));
+    for (const e of sortedEls) {
+        const src = byId.get(e.id);
+        if (src === undefined) {
+            throw new LandscapeSpliceError(`cannot locate '${e.id}' in delta.likec4 — the landscape merge splices authored source, and this declaration was not found`);
+        }
+        if (rides(src.start, src.end))
+            continue;
+        // Every split block's children, whichever block they belong to:
+        // `spliceSource` keeps only the ranges that fall inside the bytes it is
+        // carrying, so a block riding inside ANOTHER new block still loses its own
+        // interior on the way to the map.
+        const omit = interiors.omit;
+        const dot = e.id.lastIndexOf(".");
+        if (dot === -1) {
+            const spot = elementSpot(modelRegion(), e.id, elementService(e));
+            applyTop(spot, spliceSource(deltaText, src, { featureId, indent: "  ", omit }), e.id);
+            spliced.push({ start: src.start, end: src.end });
+            continue;
+        }
+        const parentId = e.id.slice(0, dot);
+        const parent = livingParentOf(parentId);
+        if (parent === null) {
+            throw new LandscapeSpliceError(`'${e.id}' nests under '${parentId}', which is neither in the living landscape nor added by this delta — there is nowhere to insert it`);
+        }
+        const nested = nestedInsert(content, parent, spliceSource(deltaText, src, { featureId, indent: parent.indent + "  ", omit }));
+        applyAt(nested.at, nested.insert, e.id);
+        spliced.push({ start: src.start, end: src.end });
+    }
+    // Each map-bound addition takes its statement out of the pool built above:
+    // one statement per addition, so duplicates stay duplicates.
+    for (const r of mapRels) {
+        const s = pool.get(relStatementKey(r))?.shift();
+        if (s === undefined) {
+            throw new LandscapeSpliceError(`cannot locate the '${r.source} -> ${r.target}' relationship in delta.likec4 — the landscape merge splices authored source, and no matching declaration was found`);
+        }
+        if (rides(s.start, s.end))
+            continue;
+        const key = relSortKey(deltaElements, r);
+        // Deliberately no `known` fleet set: this resolves only the anchor a new
+        // relationship lands after (placement.ts's reason — cosmetic grouping,
+        // safety-netted by the re-parse below), never which service a check
+        // grades.
+        const spot = relSpot(modelRegion(), serviceOf(deltaElements, r.source), key);
+        applyTop(spot, spliceSource(deltaText, s, { featureId, indent: "  " }), `${r.source} -> ${r.target}`);
+    }
+    // The safety net: prove the computed landscape parses before anything is
+    // written. Splice bugs — and legal inputs the living document cannot absorb,
+    // like a kind its specification never declares — refuse here, at plan time,
+    // instead of corrupting the one file the whole fleet reads. Skipped when
+    // every addition was routed away: the text is the one already parsed above,
+    // and the models get their own net from the caller, which is the only side
+    // that can stage a model beside the map it extends.
+    // The splice composed bytes from two documents, and the delta's newlines are
+    // not necessarily the map's. Corrected before the net, so what is proven is
+    // what would be written.
+    content = matchLineEndings(text, content);
+    if (touchesMap) {
+        const check = await loadSource(content);
+        if (check.errors.length > 0) {
+            const detail = check.errors
+                .slice(0, 3)
+                .map(errorText)
+                .join("; ");
+            throw new LandscapeSpliceError(`the merged landscape would not parse (${check.errors.length} error(s): ${detail}) — nothing was written. ` +
+                `The delta's additions do not fit the living landscape as authored — most often an element kind or tag ` +
+                `its specification block does not declare; fix the landscape's specification or the delta, then re-run`);
+        }
+    }
+    return { content: touchesMap ? content : null, addedEls: mapEls, addedRels: mapRels, models: [...routed.values()] };
+}
+//# sourceMappingURL=landscape-merge.js.map

package/dist/core/c4/splice/landscape-merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"landscape-merge.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/landscape-merge.ts"],"names":[],"mappings":"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","sourcesContent":["\nimport { parentIdOf } from \"../../kernel/ids/fqn/ancestors.js\";\nimport { errorText, loadSource, type Elem, type Rel } from \"../likec4.js\";\nimport { firstUnlocated, unlocatedReason } from \"../locate/unlocated.js\";\nimport { elementService, serviceOf } from \"../resolve/service.js\";\nimport { kindsDeclared, scanModel, type ScannedElement, type ScannedModel, type ScannedRel } from \"../source-scan.js\";\nimport { matchLineEndings, spliceSource } from \"./authored-source.js\";\nimport {\n  assertSpliceVisible,\n  LandscapeSpliceError,\n  type ExtendingModel,\n  type LandscapeMergeRequest,\n  type LandscapePlan,\n  type ModelAdditions,\n} from \"./contract.js\";\nimport { assertMergeableDelta } from \"./delta-blocks.js\";\nimport { relSortKey, relStatementKey, scannedStatementKey } from \"./identity/edges.js\";\nimport { newAdditions } from \"./identity/existing.js\";\nimport { planInteriors } from \"./identity/interior.js\";\nimport { ownerOf } from \"./identity/owner.js\";\nimport { elementSpot, relSpot, topStatements, type ModelRegion } from \"./placement.js\";\nimport { nestedInsert, type Spot } from \"./text/spot.js\";\n\n/* ------------------------------------------------------------------ */\n/* Merging                                                             */\n/* ------------------------------------------------------------------ */\n\n/**\n * Plan the merge of the feature's new elements + relationships into the living\n * landscape's `model { ... }` block (preserving the rest of the file).\n *\n * The additions are SPLICED from delta.likec4 as authored — byte for byte,\n * technology, style, icons, links, metadata, nested children and all — never\n * re-serialized from the parsed model: a rebuild keeps only the fields loam\n * models, and every field it forgets is authored detail destroyed. The one\n * edit on the way over is dropping the feature's own tag — the additions are\n * baseline now (SCHEMA.md documents the drop as why unarchive restores bytes\n * instead of recomputing) — and a construct the strip empties goes with it.\n *\n * Placement is deterministic and SERVICE-GROUPED (the spot* helpers in\n * placement.ts):\n * a top-level addition lands beside what already belongs to its service, so\n * two concurrent archives touching different services usually splice on\n * different lines and git merges their PRs — the single shared append point\n * every archive used to hit made two concurrent archives conflict BY\n * CONSTRUCTION. A NESTED element lands inside its parent's block — inside the\n * living parent when the landscape already has it, riding verbatim inside the\n * spliced parent when the parent is new from the same delta — never as a flat\n * dotted id at top level, which LikeC4 rejects. The additions carry no marker\n * comment: which archive added what is the git history's to say.\n *\n * Existence is checked semantically against the parsed landscape AND against\n * every extending model the request carries (by element id/title and by edge\n * identity), so re-archiving is idempotent whichever document the additions\n * landed in — `./identity/existing.ts` holds that phase and its two joins, and\n * this function only turns the collision it reports into the refusal.\n *\n * Splicing is text surgery, so the computed result is PARSED before it is\n * returned: a merged landscape LikeC4 rejects refuses the archive at plan time\n * (merge-failed, nothing written — the unparseable-delta discipline) instead\n * of landing in the living docs.\n *\n * NOT EVERYTHING LANDS HERE. A service whose model EXTENDS this map owns its\n * own interior, and an addition nested under such a service is ROUTED to that\n * model instead (`./identity/owner.ts` decides, `./model/merge.ts` splices).\n * Until it was, a delta's container landed in the map and the service was\n * `c4.invalid` — a duplicate declaration — the moment its model wrote the same\n * container, which is exactly what the adopt brief tells it to do\n * (verification 2026-09-04, E1). With no extending models in the request this\n * function behaves as it always did.\n *\n * Routing per ADDITION is not the whole of it, because a service the feature\n * INTRODUCES carries its interior in one element's authored bytes and those\n * children carry no feature tag of their own. `./identity/interior.ts` decides, once\n * per such block, whether it hands that interior to the model — cut out of what\n * lands on the map — or rides whole; the routing below DEFERS to that decision\n * for everything written inside the block, which is what keeps the two from\n * placing the same child twice.\n */\nexport async function planLandscapeMerge(merge: LandscapeMergeRequest): Promise<LandscapePlan> {\n  const { landscapeText: text, deltaText, deltaElements, newEls, newRels, featureId } = merge;\n  const models = merge.models ?? [];\n  // What every extending model borrows from this map: its kinds, without which\n  // a model's scan reads `container outbox` and `a .delivers b` as property lines.\n  const borrowed = kindsDeclared(text);\n  // First, and before the early return for \"nothing to add\": a block this merge\n  // cannot carry is lost whether or not the delta also has tagged elements to\n  // splice. See delta-blocks.ts.\n  assertMergeableDelta(deltaText);\n  const land = await loadSource(text);\n  if (land.errors.length > 0) {\n    throw new LandscapeSpliceError(`landscape.likec4 has ${land.errors.length} error(s) — fix it before archiving`);\n  }\n  // Service binding for the existence joins AND for routing and placement:\n  // living elements first (they win a shared id), the delta's after — a spliced\n  // statement's id resolves to its service the moment its bytes land in the scan.\n  const bindEls = [...land.elements, ...deltaElements.filter((d) => !land.elements.some((l) => l.id === d.id))];\n  // What the living fleet already has — the map AND every extending model, by id\n  // and by title. `./identity/existing.ts` holds both joins and their asymmetry.\n  const added = newAdditions({\n    livingEls: land.elements,\n    livingRels: land.relationships,\n    bindEls,\n    deltaElements,\n    candidates: { els: newEls, rels: newRels },\n    models,\n    borrowed,\n  });\n  if (added.collision !== undefined) {\n    const { addition: e, living: m } = added.collision;\n    throw new LandscapeSpliceError(\n      `the delta's '${e.id}' (bound to service '${e.service}') shares the title '${e.title}' with '${m.id}' (bound to service '${m.service}') — a title join across services would silently drop the addition; ` +\n        `retitle one of them, or reuse the id '${m.id}' if they really are the same element`,\n    );\n  }\n  const addedEls = added.els;\n  const addedRels = added.rels;\n\n  const owner = ownerOf({\n    bindEls,\n    living: new Set(land.elements.map((e) => e.id)),\n    declared: added.declaredIds,\n    added: new Set(addedEls.map((e) => e.id)),\n    models,\n  });\n  // Nothing to add: the same shape the merge returned before routing existed,\n  // and the reason it is decided HERE rather than after the loops below — a\n  // no-op archive must not have to scan the delta, nor answer the landscape\n  // guards further down, which refuse documents this merge is not touching.\n  // Equivalent to the old \"nothing reached the map and nothing was routed\":\n  // every addition ends up in one of those two, so an empty pair means both.\n  if (addedEls.length === 0 && addedRels.length === 0) {\n    return { content: null, addedEls: [], addedRels: [], models: [] };\n  }\n\n  const scan = scanModel(deltaText);\n  if (scan === null) {\n    throw new LandscapeSpliceError(\"delta.likec4 has no model block — nothing to splice the additions from\");\n  }\n\n  // Everything below either locates a declaration's authored bytes or refuses.\n  // `spliced` remembers the delta ranges already carried over, so a child whose\n  // parent is itself new is recognised as riding inside the parent's text and\n  // is never inserted twice.\n  const byId = new Map(scan.elements.map((e) => [e.id, e]));\n  // Relationships: match each parsed addition back to its statement in the\n  // delta source — full identity (`relStatementKey`), consumed one statement\n  // per addition so duplicates stay duplicates. Built before the routing\n  // because routing has to know WHERE an edge was written: one drawn inside a\n  // block that rides whole is already on the map. A statement is keyed with the\n  // tags its kind gives it, which the parsed addition carries and its text does not.\n  const pool = new Map<string, ScannedRel[]>();\n  for (const s of scan.rels) {\n    const k = scannedStatementKey(s, merge.deltaKindTags ?? {});\n    pool.set(k, [...(pool.get(k) ?? []), s]);\n  }\n\n  const interiors = planInteriors({ scan, deltaElements, owner, addedEls });\n  const routed = new Map<string, ModelAdditions>();\n  const into = (model: ExtendingModel): ModelAdditions => {\n    const existing = routed.get(model.path);\n    if (existing !== undefined) return existing;\n    const fresh: ModelAdditions = { model, els: [], rels: [], borrowed };\n    routed.set(model.path, fresh);\n    return fresh;\n  };\n  for (const share of interiors.routed) into(share.model).els.push(...share.els);\n\n  const mapEls: Elem[] = [];\n  for (const e of addedEls) {\n    const src = byId.get(e.id);\n    // Written inside a block that has already decided: a split block handed it\n    // to the model with its siblings, and a whole one carries it onto the map\n    // in the parent's own bytes, where the splice loop's `rides` finds it. Both\n    // are placed exactly once, which is the point of asking the block first.\n    const fate = src === undefined ? null : interiors.covering(src);\n    if (fate === \"split\") continue;\n    const model = fate === \"whole\" ? undefined : owner(parentIdOf(e.id));\n    if (model === undefined) mapEls.push(e);\n    else into(model).els.push(e);\n  }\n  const mapRels: Rel[] = [];\n  for (const r of addedRels) {\n    // An edge written inside a block that rides whole names its endpoints by\n    // their LOCAL names and reads only there; it stays with its block.\n    const stmts = pool.get(relStatementKey(r)) ?? [];\n    const inBlock = stmts.length > 0 && stmts.every((s) => interiors.covering(s) !== null);\n    // Otherwise the SOURCE decides: a call is drawn where the caller draws its\n    // calls, and only when the source is not itself interior does the target's\n    // owner get the edge. A service-level edge belongs to neither and stays on\n    // the map.\n    const model = inBlock ? undefined : owner(parentIdOf(r.source)) ?? owner(parentIdOf(r.target));\n    if (model === undefined) mapRels.push(r);\n    else into(model).rels.push(r);\n  }\n  const touchesMap = mapEls.length > 0 || mapRels.length > 0;\n\n  const spliced: Array<{ start: number; end: number }> = [];\n  const rides = (start: number, end: number): boolean =>\n    spliced.some((r) => start >= r.start && end <= r.end);\n\n  // The living model, scanned on MASKED source (scanModel) and RE-SCANNED\n  // after every splice: each addition lands in the text exactly as the\n  // previous one left it, so an archive of N additions produces the same\n  // bytes as N single-addition archives run back to back. Placement then\n  // composes per statement — the unit the order-independence argument below\n  // is stated in — instead of per archive, where a batch computed against a\n  // stale layout could interleave with itself. Masking matters — a `model {`\n  // spelled inside a comment or string above the real block must not capture\n  // the match, or every top-level addition lands inside the comment (legal\n  // LikeC4, so the parse net below would pass a landscape containing none of\n  // the architecture).\n  let content = text;\n  let livingScan = scanModel(content);\n  let stmts = livingScan === null ? [] : topStatements(livingScan, bindEls);\n  const rescan = (): void => {\n    livingScan = scanModel(content);\n    stmts = livingScan === null ? [] : topStatements(livingScan, bindEls);\n  };\n  const requireModel = (): ScannedModel => {\n    if (livingScan === null) throw new LandscapeSpliceError(\"landscape.likec4 has no model block\");\n    return livingScan;\n  };\n  // Built fresh at every use, never captured: `content` and `stmts` are rebound\n  // by each rescan, and a region assembled before a splice describes a document\n  // that no longer exists.\n  const modelRegion = (): ModelRegion => ({ text: content, stmts, blocks: requireModel().blocks });\n  // Every insert must be one the next scan sees (`assertSpliceVisible`).\n  const applyAt = (at: number, insert: string, what: string): void => {\n    const before = livingScan;\n    content = content.slice(0, at) + insert + content.slice(at);\n    rescan();\n    assertSpliceVisible(before, livingScan, what);\n  };\n  const applyTop = (spot: Spot, block: string, what: string): void => {\n    // A bare spot shares its line with other text (the closing brace, or a\n    // statement the block displaces) — it brings its own newlines; a\n    // line-start spot slots between lines.\n    applyAt(spot.at, spot.bare ? `\\n${block}\\n` : `${block}\\n`, what);\n  };\n\n  // Placement walks the scanned statement layout, so a declaration the scan\n  // cannot see is one placement would blindly splice around — LikeC4 accepts\n  // two declarations on one line, but scanModel's statement head runs to the\n  // end of the line, so the second rides invisibly inside the first: an\n  // element bound to its service would miss its neighborhood, and a bodyless\n  // parent gaining a body could wrap the wrong declaration. Refuse\n  // mechanically (the parse-net discipline) instead of splicing blind.\n  //\n  // THAT something is unlocated is decided here, from the parse already in\n  // hand; WHAT and why is `firstUnlocated`'s, at the price of a second parse on\n  // this path alone. The message used to guess \"most often two declarations\n  // sharing one line\" whatever the map held, and a fleet read it over a\n  // declaration on a line of its own in a second `model { }` block the scan\n  // did not read then (2026-10): it names LikeC4's line now, and a shared line\n  // only when that line shows one.\n  if (livingScan !== null) {\n    const seen = new Set(livingScan.elements.map((e) => e.id));\n    const blind = land.elements.some((e) => !seen.has(e.id)) || livingScan.rels.length < land.relationships.length;\n    if (blind) throw new LandscapeSpliceError(unlocatedReason(\"landscape.likec4\", await firstUnlocated(text, livingScan)));\n  }\n\n  const livingParentOf = (parentId: string): ScannedElement | null => {\n    if (livingScan === null) return null;\n    const direct = livingScan.elements.find((e) => e.id === parentId);\n    if (direct !== undefined) return direct;\n    // The delta may spell an existing element under its own id; the title is\n    // the stable cross-namespace name (the same rule the existence check uses).\n    const title = deltaElements.find((e) => e.id === parentId)?.title;\n    const livingId = title === undefined ? undefined : land.elements.find((e) => e.title === title)?.id;\n    if (livingId === undefined) return null;\n    return livingScan.elements.find((e) => e.id === livingId) ?? null;\n  };\n\n  // Ancestors first: a spliced parent covers its children before they are seen.\n  const depth = (id: string): number => id.split(\".\").length;\n  const sortedEls = [...mapEls].sort(\n    (a, b) => depth(a.id) - depth(b.id) || (byId.get(a.id)?.start ?? 0) - (byId.get(b.id)?.start ?? 0),\n  );\n  for (const e of sortedEls) {\n    const src = byId.get(e.id);\n    if (src === undefined) {\n      throw new LandscapeSpliceError(\n        `cannot locate '${e.id}' in delta.likec4 — the landscape merge splices authored source, and this declaration was not found`,\n      );\n    }\n    if (rides(src.start, src.end)) continue;\n    // Every split block's children, whichever block they belong to:\n    // `spliceSource` keeps only the ranges that fall inside the bytes it is\n    // carrying, so a block riding inside ANOTHER new block still loses its own\n    // interior on the way to the map.\n    const omit = interiors.omit;\n    const dot = e.id.lastIndexOf(\".\");\n    if (dot === -1) {\n      const spot = elementSpot(modelRegion(), e.id, elementService(e));\n      applyTop(spot, spliceSource(deltaText, src, { featureId, indent: \"  \", omit }), e.id);\n      spliced.push({ start: src.start, end: src.end });\n      continue;\n    }\n    const parentId = e.id.slice(0, dot);\n    const parent = livingParentOf(parentId);\n    if (parent === null) {\n      throw new LandscapeSpliceError(\n        `'${e.id}' nests under '${parentId}', which is neither in the living landscape nor added by this delta — there is nowhere to insert it`,\n      );\n    }\n    const nested = nestedInsert(\n      content,\n      parent,\n      spliceSource(deltaText, src, { featureId, indent: parent.indent + \"  \", omit }),\n    );\n    applyAt(nested.at, nested.insert, e.id);\n    spliced.push({ start: src.start, end: src.end });\n  }\n\n  // Each map-bound addition takes its statement out of the pool built above:\n  // one statement per addition, so duplicates stay duplicates.\n  for (const r of mapRels) {\n    const s = pool.get(relStatementKey(r))?.shift();\n    if (s === undefined) {\n      throw new LandscapeSpliceError(\n        `cannot locate the '${r.source} -> ${r.target}' relationship in delta.likec4 — the landscape merge splices authored source, and no matching declaration was found`,\n      );\n    }\n    if (rides(s.start, s.end)) continue;\n    const key = relSortKey(deltaElements, r);\n    // Deliberately no `known` fleet set: this resolves only the anchor a new\n    // relationship lands after (placement.ts's reason — cosmetic grouping,\n    // safety-netted by the re-parse below), never which service a check\n    // grades.\n    const spot = relSpot(modelRegion(), serviceOf(deltaElements, r.source), key);\n    applyTop(spot, spliceSource(deltaText, s, { featureId, indent: \"  \" }), `${r.source} -> ${r.target}`);\n  }\n\n  // The safety net: prove the computed landscape parses before anything is\n  // written. Splice bugs — and legal inputs the living document cannot absorb,\n  // like a kind its specification never declares — refuse here, at plan time,\n  // instead of corrupting the one file the whole fleet reads. Skipped when\n  // every addition was routed away: the text is the one already parsed above,\n  // and the models get their own net from the caller, which is the only side\n  // that can stage a model beside the map it extends.\n  // The splice composed bytes from two documents, and the delta's newlines are\n  // not necessarily the map's. Corrected before the net, so what is proven is\n  // what would be written.\n  content = matchLineEndings(text, content);\n  if (touchesMap) {\n    const check = await loadSource(content);\n    if (check.errors.length > 0) {\n      const detail = check.errors\n        .slice(0, 3)\n        .map(errorText)\n        .join(\"; \");\n      throw new LandscapeSpliceError(\n        `the merged landscape would not parse (${check.errors.length} error(s): ${detail}) — nothing was written. ` +\n          `The delta's additions do not fit the living landscape as authored — most often an element kind or tag ` +\n          `its specification block does not declare; fix the landscape's specification or the delta, then re-run`,\n      );\n    }\n  }\n\n  return { content: touchesMap ? content : null, addedEls: mapEls, addedRels: mapRels, models: [...routed.values()] };\n}\n"]}

package/dist/core/c4/splice/model/merge.js

@@ -0,0 +1,151 @@
+import { scanModel } from "../../source-scan.js";
+import { matchLineEndings, spliceSource } from "../authored-source.js";
+import { assertSpliceVisible, LandscapeSpliceError } from "../contract.js";
+import { relStatementKey, scannedStatementKey } from "../identity/edges.js";
+import { HOME_BLOCK } from "../placement.js";
+import { closeSpot, nestedInsert, spotAfter } from "../text/spot.js";
+/** The merged model source. Refuses (never guesses) when the delta or the model cannot be read. */
+export function spliceModel(req) {
+    const { additions, deltaText, featureId } = req;
+    const { model, borrowed } = additions;
+    const scan = scanModel(deltaText);
+    if (scan === null) {
+        throw new LandscapeSpliceError("delta.likec4 has no model block — nothing to splice the additions from");
+    }
+    const byId = new Map(scan.elements.map((e) => [e.id, e]));
+    const pool = new Map();
+    for (const s of scan.rels) {
+        const k = scannedStatementKey(s, req.deltaKindTags ?? {});
+        pool.set(k, [...(pool.get(k) ?? []), s]);
+    }
+    // Read with the map's kinds: the model declares none, and a `container
+    // outbox` frame or an `a .delivers b` edge it cannot see is a parent with
+    // nowhere to nest into, or an anchor the next edge lands above.
+    let content = withModelBlock(model.text, borrowed);
+    let live = read(content, model.path, borrowed);
+    // The delta ranges already carried over, so a child whose parent is itself
+    // new is recognised as riding inside the parent's text — the same rule the
+    // landscape merge states, and the reason `node` inside a new `cache` is never
+    // spliced twice.
+    const spliced = [];
+    const rides = (start, end) => spliced.some((r) => start >= r.start && end <= r.end);
+    // Every insert must be one the next scan sees — the landscape merge's backstop.
+    const applyAt = (at, insert, what) => {
+        const before = live;
+        content = content.slice(0, at) + insert + content.slice(at);
+        live = read(content, model.path, borrowed);
+        assertSpliceVisible(before, live, what);
+    };
+    // Ancestors first, exactly as the landscape merge orders them: a spliced
+    // parent covers its children before they are seen.
+    const depth = (id) => id.split(".").length;
+    const ordered = [...additions.els].sort((a, b) => depth(a.id) - depth(b.id) || (byId.get(a.id)?.start ?? 0) - (byId.get(b.id)?.start ?? 0));
+    for (const e of ordered) {
+        const src = byId.get(e.id);
+        if (src === undefined) {
+            throw new LandscapeSpliceError(`cannot locate '${e.id}' in delta.likec4 — the model merge splices authored source, and this declaration was not found`);
+        }
+        if (rides(src.start, src.end))
+            continue;
+        const [at, insert] = elementInsert({
+            content,
+            live,
+            block: (indent) => spliceSource(deltaText, src, { featureId, indent }),
+            parent: parentIdOf(e),
+        });
+        applyAt(at, insert, e.id);
+        spliced.push({ start: src.start, end: src.end });
+    }
+    for (const r of additions.rels) {
+        const s = pool.get(relStatementKey(r))?.shift();
+        if (s === undefined) {
+            throw new LandscapeSpliceError(`cannot locate the '${r.source} -> ${r.target}' relationship in delta.likec4 — the model merge splices authored source, and no matching declaration was found`);
+        }
+        if (rides(s.start, s.end))
+            continue;
+        const { close } = live.blocks[HOME_BLOCK];
+        const base = blockIndent(content, close);
+        // Top-level in the model block: an edge written inside an `extend` block is
+        // that block's, and anchoring after it would splice into someone's body.
+        // And in the HOME block: the anchor's own close is what `spotAfter` clamps
+        // to, and an edge last in a later block would otherwise pull this one there.
+        const top = live.rels.filter((x) => x.block === HOME_BLOCK && !live.elements.some((el) => x.start > el.start && x.start < el.end));
+        const anchor = top.at(-1);
+        const spot = anchor === undefined ? closeSpot(content, close) : spotAfter(content, close, anchor.end);
+        const block = spliceSource(deltaText, s, { featureId, indent: `${base}  ` });
+        applyAt(spot.at, spot.bare ? `\n${block}\n` : `${block}\n`, `${r.source} -> ${r.target}`);
+    }
+    // The delta's newlines are not necessarily this model's, and a merge that left
+    // both conventions in one file is noise in every editor and every diff — the
+    // same correction the landscape merge makes, from the same helper
+    // (verification 2026-09-04, W-CRLF).
+    return matchLineEndings(model.text, content);
+}
+/** The parent an addition nests under. Routing only ever sends nested ids here. */
+function parentIdOf(e) {
+    return e.id.slice(0, e.id.lastIndexOf("."));
+}
+/**
+ * Where one element's block goes, as `(offset, text)`.
+ *
+ * Two arms, and the second is the one that makes a freshly adopted service
+ * work: a model that has never named this container's parent has no `extend`
+ * block for it, so the merge writes one rather than refusing. A parent the
+ * merged project will not resolve is caught by the caller's parse net, which is
+ * the only reader that can see the map and the model together.
+ */
+function elementInsert(req) {
+    const { content, live, block, parent } = req;
+    const declared = live.elements.find((x) => x.id === parent);
+    if (declared !== undefined) {
+        const nested = nestedInsert(content, declared, block(`${declared.indent}  `));
+        return [nested.at, nested.insert];
+    }
+    const { close } = live.blocks[HOME_BLOCK];
+    const base = blockIndent(content, close);
+    const body = `${base}  extend ${parent} {\n${block(`${base}    `)}\n${base}  }`;
+    const spot = closeSpot(content, close);
+    return [spot.at, spot.bare ? `\n${body}\n` : `${body}\n`];
+}
+/**
+ * The model, with a `model { }` block appended when the file has none.
+ *
+ * `../../service-model/shape.ts` answers `extending` for an empty file, a
+ * views-only file and a tags-only `specification { }` — three shapes it calls
+ * legal on purpose — so routing hands those models a nested addition, and
+ * refusing there took a whole legal shape away from `loam archive` for a
+ * document the merge is perfectly able to author (review of E1: before the
+ * routing existed, the same delta merged onto the map). It is the call
+ * `elementInsert` already makes one level down — a model that has never named
+ * the parent gains the `extend` block rather than refusing — and the caller's
+ * parse net proves the result either way.
+ */
+function withModelBlock(text, borrowed) {
+    if (scanModel(text, borrowed) !== null)
+        return text;
+    const pad = text === "" || text.endsWith("\n") ? "" : "\n";
+    return `${text}${pad}model {\n}\n`;
+}
+/**
+ * The model's `model { }` block, re-scanned after every splice so each addition
+ * lands in the text the previous one left — the landscape merge's rule, for the
+ * same reason: placement composes per statement, not per archive.
+ *
+ * `withModelBlock` guarantees the FIRST read finds one, so a null here means a
+ * splice destroyed the block it was writing into: mechanical, so it refuses at
+ * plan time with nothing written, exactly as the parse nets do.
+ */
+function read(content, path, borrowed) {
+    const scan = scanModel(content, borrowed);
+    if (scan === null) {
+        throw new LandscapeSpliceError(`merging this feature's additions left ${path} without a model block — nothing was written; re-run after reporting it`);
+    }
+    return scan;
+}
+/** The indentation of the line the model block's closing brace sits on, or "" when it shares one. */
+function blockIndent(text, close) {
+    const lineStart = text.lastIndexOf("\n", close - 1) + 1;
+    const before = text.slice(lineStart, close);
+    return /^[ \t]*$/.test(before) ? before : "";
+}
+//# sourceMappingURL=merge.js.map

package/dist/core/c4/splice/model/merge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge.js","sourceRoot":"","sources":["../../../../../src/core/c4/splice/model/merge.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The other half of the archive's C4 merge: what a feature adds INSIDE a\n * service, spliced into the service's own extending `model.likec4`.\n *\n * `../landscape-merge.ts` routes the additions (`../identity/owner.ts` states\n * the rule) and this carries them over, by the same discipline: authored source,\n * byte for byte,\n * with the feature's own tag stripped and the indentation rebased — never a\n * re-serialization of the parsed model, which keeps only the fields loam models.\n *\n * PLACEMENT IS SIMPLER HERE, and deliberately so. The map groups additions by\n * service because every service writes into it and concurrent archives must\n * merge in git; a service model has ONE service in it, so there is no\n * neighborhood to join. An element lands inside the `extend <fqn> { … }` block\n * that owns its parent — or inside its parent's own block when the model\n * already declares that container — and a model with no `extend` block for the\n * fqn gains one at the end of its `model { }` block, as a model with no `model\n * { }` block at all gains that. A relationship lands after the last top-level\n * relationship of that block, or last in it. A model written in SEVERAL\n * `model { }` blocks is read whole — a parent's `extend` frame is found in\n * whichever block holds it — and \"its block\" for everything else is\n * `HOME_BLOCK`, the first, for the reasons `../placement.ts` gives the map.\n *\n * WHAT THIS DOES NOT DO IS PROVE THE RESULT. The landscape merge parses its own\n * output because a landscape is a self-contained document; an extending model\n * is not — it is read beside the `architecture/` project, and staging that set\n * means touching the docs repo. So the parse net lives with the caller\n * (`commands/archive/plan/model/extending.ts`), which is also the side that\n * holds the merged MAP the model must be proven against.\n */\nimport type { Elem } from \"../../likec4.js\";\nimport { scanModel, type ScanKinds, type ScannedModel, type ScannedRel } from \"../../source-scan.js\";\nimport { matchLineEndings, spliceSource } from \"../authored-source.js\";\nimport { assertSpliceVisible, LandscapeSpliceError, type KindTags, type ModelAdditions } from \"../contract.js\";\nimport { relStatementKey, scannedStatementKey } from \"../identity/edges.js\";\nimport { HOME_BLOCK } from \"../placement.js\";\nimport { closeSpot, nestedInsert, spotAfter } from \"../text/spot.js\";\n\nexport interface ModelMergeRequest {\n  /** One model's share of the merge, as `planLandscapeMerge` routed it. */\n  additions: ModelAdditions;\n  /** delta.likec4 as authored — the bytes the additions are spliced from. */\n  deltaText: string;\n  featureId: string;\n  /** The delta's relationship kinds' tags — the landscape merge's own reason (`../identity/edges.ts`). */\n  deltaKindTags?: KindTags;\n}\n\n/** The merged model source. Refuses (never guesses) when the delta or the model cannot be read. */\nexport function spliceModel(req: ModelMergeRequest): string {\n  const { additions, deltaText, featureId } = req;\n  const { model, borrowed } = additions;\n  const scan = scanModel(deltaText);\n  if (scan === null) {\n    throw new LandscapeSpliceError(\"delta.likec4 has no model block — nothing to splice the additions from\");\n  }\n  const byId = new Map(scan.elements.map((e) => [e.id, e]));\n  const pool = new Map<string, ScannedRel[]>();\n  for (const s of scan.rels) {\n    const k = scannedStatementKey(s, req.deltaKindTags ?? {});\n    pool.set(k, [...(pool.get(k) ?? []), s]);\n  }\n\n  // Read with the map's kinds: the model declares none, and a `container\n  // outbox` frame or an `a .delivers b` edge it cannot see is a parent with\n  // nowhere to nest into, or an anchor the next edge lands above.\n  let content = withModelBlock(model.text, borrowed);\n  let live = read(content, model.path, borrowed);\n  // The delta ranges already carried over, so a child whose parent is itself\n  // new is recognised as riding inside the parent's text — the same rule the\n  // landscape merge states, and the reason `node` inside a new `cache` is never\n  // spliced twice.\n  const spliced: Array<{ start: number; end: number }> = [];\n  const rides = (start: number, end: number): boolean =>\n    spliced.some((r) => start >= r.start && end <= r.end);\n  // Every insert must be one the next scan sees — the landscape merge's backstop.\n  const applyAt = (at: number, insert: string, what: string): void => {\n    const before = live;\n    content = content.slice(0, at) + insert + content.slice(at);\n    live = read(content, model.path, borrowed);\n    assertSpliceVisible(before, live, what);\n  };\n\n  // Ancestors first, exactly as the landscape merge orders them: a spliced\n  // parent covers its children before they are seen.\n  const depth = (id: string): number => id.split(\".\").length;\n  const ordered = [...additions.els].sort(\n    (a, b) => depth(a.id) - depth(b.id) || (byId.get(a.id)?.start ?? 0) - (byId.get(b.id)?.start ?? 0),\n  );\n  for (const e of ordered) {\n    const src = byId.get(e.id);\n    if (src === undefined) {\n      throw new LandscapeSpliceError(\n        `cannot locate '${e.id}' in delta.likec4 — the model merge splices authored source, and this declaration was not found`,\n      );\n    }\n    if (rides(src.start, src.end)) continue;\n    const [at, insert] = elementInsert({\n      content,\n      live,\n      block: (indent) => spliceSource(deltaText, src, { featureId, indent }),\n      parent: parentIdOf(e),\n    });\n    applyAt(at, insert, e.id);\n    spliced.push({ start: src.start, end: src.end });\n  }\n\n  for (const r of additions.rels) {\n    const s = pool.get(relStatementKey(r))?.shift();\n    if (s === undefined) {\n      throw new LandscapeSpliceError(\n        `cannot locate the '${r.source} -> ${r.target}' relationship in delta.likec4 — the model merge splices authored source, and no matching declaration was found`,\n      );\n    }\n    if (rides(s.start, s.end)) continue;\n    const { close } = live.blocks[HOME_BLOCK]!;\n    const base = blockIndent(content, close);\n    // Top-level in the model block: an edge written inside an `extend` block is\n    // that block's, and anchoring after it would splice into someone's body.\n    // And in the HOME block: the anchor's own close is what `spotAfter` clamps\n    // to, and an edge last in a later block would otherwise pull this one there.\n    const top = live.rels.filter(\n      (x) => x.block === HOME_BLOCK && !live.elements.some((el) => x.start > el.start && x.start < el.end),\n    );\n    const anchor = top.at(-1);\n    const spot = anchor === undefined ? closeSpot(content, close) : spotAfter(content, close, anchor.end);\n    const block = spliceSource(deltaText, s, { featureId, indent: `${base}  ` });\n    applyAt(spot.at, spot.bare ? `\\n${block}\\n` : `${block}\\n`, `${r.source} -> ${r.target}`);\n  }\n  // The delta's newlines are not necessarily this model's, and a merge that left\n  // both conventions in one file is noise in every editor and every diff — the\n  // same correction the landscape merge makes, from the same helper\n  // (verification 2026-09-04, W-CRLF).\n  return matchLineEndings(model.text, content);\n}\n\n/** The parent an addition nests under. Routing only ever sends nested ids here. */\nfunction parentIdOf(e: Elem): string {\n  return e.id.slice(0, e.id.lastIndexOf(\".\"));\n}\n\ninterface ElementInsert {\n  content: string;\n  live: ScannedModel;\n  /** The authored block at a given indent — computed late, because the indent depends on where it lands. */\n  block: (indent: string) => string;\n  parent: string;\n}\n\n/**\n * Where one element's block goes, as `(offset, text)`.\n *\n * Two arms, and the second is the one that makes a freshly adopted service\n * work: a model that has never named this container's parent has no `extend`\n * block for it, so the merge writes one rather than refusing. A parent the\n * merged project will not resolve is caught by the caller's parse net, which is\n * the only reader that can see the map and the model together.\n */\nfunction elementInsert(req: ElementInsert): [number, string] {\n  const { content, live, block, parent } = req;\n  const declared = live.elements.find((x) => x.id === parent);\n  if (declared !== undefined) {\n    const nested = nestedInsert(content, declared, block(`${declared.indent}  `));\n    return [nested.at, nested.insert];\n  }\n  const { close } = live.blocks[HOME_BLOCK]!;\n  const base = blockIndent(content, close);\n  const body = `${base}  extend ${parent} {\\n${block(`${base}    `)}\\n${base}  }`;\n  const spot = closeSpot(content, close);\n  return [spot.at, spot.bare ? `\\n${body}\\n` : `${body}\\n`];\n}\n\n/**\n * The model, with a `model { }` block appended when the file has none.\n *\n * `../../service-model/shape.ts` answers `extending` for an empty file, a\n * views-only file and a tags-only `specification { }` — three shapes it calls\n * legal on purpose — so routing hands those models a nested addition, and\n * refusing there took a whole legal shape away from `loam archive` for a\n * document the merge is perfectly able to author (review of E1: before the\n * routing existed, the same delta merged onto the map). It is the call\n * `elementInsert` already makes one level down — a model that has never named\n * the parent gains the `extend` block rather than refusing — and the caller's\n * parse net proves the result either way.\n */\nfunction withModelBlock(text: string, borrowed: ScanKinds): string {\n  if (scanModel(text, borrowed) !== null) return text;\n  const pad = text === \"\" || text.endsWith(\"\\n\") ? \"\" : \"\\n\";\n  return `${text}${pad}model {\\n}\\n`;\n}\n\n/**\n * The model's `model { }` block, re-scanned after every splice so each addition\n * lands in the text the previous one left — the landscape merge's rule, for the\n * same reason: placement composes per statement, not per archive.\n *\n * `withModelBlock` guarantees the FIRST read finds one, so a null here means a\n * splice destroyed the block it was writing into: mechanical, so it refuses at\n * plan time with nothing written, exactly as the parse nets do.\n */\nfunction read(content: string, path: string, borrowed: ScanKinds): ScannedModel {\n  const scan = scanModel(content, borrowed);\n  if (scan === null) {\n    throw new LandscapeSpliceError(\n      `merging this feature's additions left ${path} without a model block — nothing was written; re-run after reporting it`,\n    );\n  }\n  return scan;\n}\n\n/** The indentation of the line the model block's closing brace sits on, or \"\" when it shares one. */\nfunction blockIndent(text: string, close: number): string {\n  const lineStart = text.lastIndexOf(\"\\n\", close - 1) + 1;\n  const before = text.slice(lineStart, close);\n  return /^[ \\t]*$/.test(before) ? before : \"\";\n}\n"]}