@ybotok/loam 0.2.0-alpha.5 → 0.2.0-alpha.6

package/dist/core/c4/service-model/slice.js

@@ -0,0 +1,188 @@
+/**
+ * The service's OWN part of a per-service project — derived, because LikeC4
+ * does not record it.
+ *
+ * Measured at the 1.59.2 pin: `$data.views[id]` carries a `sourcePath` and
+ * `$data.elements[fqn]` carries NO source-document field at all. So after the
+ * map and one extending model have been parsed together there is nothing in the
+ * parse output that says which of the two files declared a given element. The
+ * answer has to be reconstructed, and this module is the reconstruction: DIFF
+ * the project against the architecture-alone load, and resolve what is left
+ * through the same element→service resolver every fleet check already joins on.
+ *
+ * Why it matters that this is exact rather than approximate: every model-
+ * dependent check reads the slice as if it were the standalone file it used to
+ * read — `c4.no-relationships`, `health.dependency-unmodelled`, `Covers:`
+ * resolution, the attested-call scan. Too WIDE and a service is graded against
+ * the whole fleet map (every service would suddenly have relationships, and
+ * every dependency would resolve). Too NARROW and a service that models its
+ * partners correctly is told it models nothing.
+ */
+import { properAncestorIds } from "../../kernel/ids/fqn/ancestors.js";
+import { serviceResolver } from "../resolve/service.js";
+/**
+ * A relationship's identity for the DIFF, and every field of it is one loam
+ * already reads somewhere.
+ *
+ * There is no id to join on: LikeC4 mints relationship ids per parse, so the
+ * same edge in two loads of overlapping document sets is two different ids.
+ * Endpoints alone are not enough either — a fleet may draw two edges between
+ * the same pair (`api -> kafka 'publishes'` and `api -> kafka 'consumes'`), and
+ * collapsing them would let a model silently inherit one of the map's. So the
+ * key is everything a check can branch on: the endpoints, the label, and the
+ * three metadata keys plus the tag set, sorted because tag order is authoring
+ * order and means nothing.
+ */
+function relKey(rel) {
+    return JSON.stringify([
+        rel.source,
+        rel.target,
+        rel.title ?? "",
+        rel.op ?? "",
+        rel.publishes ?? "",
+        rel.consumes ?? "",
+        [...rel.tags].sort(),
+    ]);
+}
+/**
+ * The service's own slice of a per-service project.
+ *
+ * OWN is resolution PLUS NESTING, and the second half is not a widening for
+ * convenience — it is the only thing that keeps a model's own file from being
+ * filtered against it.
+ *
+ * Resolution first: every project element whose id resolves to this service,
+ * whether the model added it or the map already declared it. The bound element
+ * itself has to be in — a standalone model declared it, and every check that
+ * reads "the service's elements" expects it.
+ *
+ * Then nesting, because resolution alone ejects a child the author wrote INSIDE
+ * their own `extend` block. `serviceResolver`'s second rung answers with the
+ * nearest ancestor whose TITLE names a real `services/<id>/` directory, and that
+ * rung sees the child before it sees the parent: a container written as
+ * `store = database 'db'` under `extend svcA { … }` resolves to a service called
+ * `db` the moment some other team has adopted one, and svcA's own element is
+ * bound by title only. The model then reported one element fewer than it
+ * declares, a `Covers: svcA.store` line was convicted as a typo, and
+ * `c4.element-unowned` told the author their own container belonged in somebody
+ * else's model. A standalone model was never filtered against its own file at
+ * all, so every one of those is a regression the second shape introduced.
+ *
+ * So: an OWN ROOT is an own element none of whose proper ancestors is own — the
+ * element the author actually extended — and everything nested under one is own
+ * too. Id nesting under the extended element is evidence nobody had to guess at,
+ * and it outranks a title guess. It does NOT outrank an explicit
+ * `metadata { service '…' }` binding, which is a claim somebody wrote down: a
+ * map that nests one service's element inside another's keeps both on the right
+ * side of the line.
+ *
+ * OWN RELATIONSHIPS are the diff: the project's edges minus the ones the
+ * architecture documents already have. Resolution cannot decide this one, and
+ * the reason is the whole point of the fleet map: the map is where cross-service
+ * edges live, so `checkoutWeb -> paymentService` resolves to this service at one
+ * end and must NOT become part of the model's own relationships — otherwise
+ * every service would be graded as declaring calls it never wrote, and
+ * `landscape.service-isolated` (which asks whether the map's edges and the
+ * model's agree) would be answering about itself.
+ *
+ * The diff is a MULTISET difference, not a set one, and that distinction is the
+ * whole grade for a model that agrees with the map. A model may legitimately
+ * draw an edge the map also draws, spelled identically —
+ * `marketplace.paymentService -> stripe 'Authorizes cards'` — and under a set
+ * difference every such edge would vanish from the model's own list. Then
+ * `attestedCalls` finds no attested call, `landscape.service-isolated` reports a
+ * service that talks to nobody, the adopt brief's `landscape.attested` list
+ * comes back empty and `c4.no-relationships` fires on a model full of edges. So
+ * each structural key drops `min(architecture, project)` occurrences and the
+ * rest are the model's: one copy in the map cancels exactly one copy here.
+ *
+ * PARTNERS are the endpoints of the model's own edges that lie outside the
+ * service, AND every ancestor of such an endpoint that the project holds. The
+ * ancestors are not tidiness: a standalone model had to declare `kafka` in order
+ * to draw an edge at `kafka.orderEvents`, and health.yaml names the dependency
+ * `kafka`. Dropping the ancestor would turn a fleet's dependency declarations
+ * into `health.dependency-unmodelled` findings the day it migrated its models,
+ * with nothing in the docs having changed.
+ *
+ * UNOWNED is what the model added outside its own element — present in the
+ * project, absent from the architecture load, and resolving to somebody else. A
+ * new top-level element (`ledger` beside the map's systems) and a child added
+ * under another service's element both land here, and both are things the map
+ * or the other service should be declaring instead.
+ */
+export function sliceForService(input) {
+    const resolve = serviceResolver(input.project.elements, input.known);
+    const byId = new Map(input.project.elements.map((e) => [e.id, e]));
+    const ownIds = new Set(input.project.elements.filter((e) => resolve(e.id) === input.service).map((e) => e.id));
+    // The elements the author extended: own, with nothing own above them. Frozen
+    // before the loop below adds anything, so a child pulled in by nesting cannot
+    // itself become a root and widen the set a second time.
+    const roots = [...ownIds].filter((id) => !properAncestorIds(id).some((up) => ownIds.has(up)));
+    for (const element of input.project.elements) {
+        if (ownIds.has(element.id))
+            continue;
+        if (!roots.some((root) => element.id.startsWith(`${root}.`)))
+            continue;
+        // The one thing nesting does not outrank. An explicit binding anywhere at or
+        // above this element names its service outright, and a map that files one
+        // service's element under another's would otherwise hand the outer service
+        // every element of the inner one.
+        if (boundServiceOf(element.id, byId) !== undefined)
+            continue;
+        ownIds.add(element.id);
+    }
+    // One budget per structural key: the map's copies cancel the project's, one
+    // for one, and what the budget does not cover is the model's own.
+    const budget = new Map();
+    for (const rel of input.architecture.relationships) {
+        const k = relKey(rel);
+        budget.set(k, (budget.get(k) ?? 0) + 1);
+    }
+    const relationships = input.project.relationships.filter((rel) => {
+        const k = relKey(rel);
+        const left = budget.get(k) ?? 0;
+        if (left === 0)
+            return true;
+        budget.set(k, left - 1);
+        return false;
+    });
+    const partnerIds = new Set();
+    for (const rel of relationships) {
+        for (const endpoint of [rel.source, rel.target]) {
+            if (ownIds.has(endpoint))
+                continue;
+            for (const id of [endpoint, ...properAncestorIds(endpoint)]) {
+                if (byId.has(id) && !ownIds.has(id))
+                    partnerIds.add(id);
+            }
+        }
+    }
+    // Project order for both lists, never the order ids happened to be
+    // discovered in: the elements of a service are printed, counted and diffed,
+    // and a set that reorders itself between two runs of the same command is a
+    // diff nobody can read.
+    const archElementIds = new Set(input.architecture.elements.map((e) => e.id));
+    return {
+        elements: input.project.elements.filter((e) => ownIds.has(e.id) || partnerIds.has(e.id)),
+        relationships,
+        unowned: input.project.elements.filter((e) => !archElementIds.has(e.id) && !ownIds.has(e.id)),
+    };
+}
+/**
+ * The nearest explicit `metadata { service '…' }` binding at or above an id, or
+ * undefined when nothing on the chain declares one.
+ *
+ * `serviceResolver`'s first rung, asked on its own — because the caller above
+ * needs to tell that rung's answer apart from the two guesses below it, and the
+ * resolver returns one `DeclaredService` for all three. A binding is a claim
+ * somebody wrote down; a title match is evidence, and a bare title is a guess.
+ */
+function boundServiceOf(id, byId) {
+    for (const candidate of [id, ...properAncestorIds(id)]) {
+        const bound = byId.get(candidate)?.service;
+        if (bound !== undefined)
+            return bound;
+    }
+    return undefined;
+}
+//# sourceMappingURL=slice.js.map

package/dist/core/c4/service-model/slice.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"slice.js","sourceRoot":"","sources":["../../../../src/core/c4/service-model/slice.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The service's OWN part of a per-service project — derived, because LikeC4\n * does not record it.\n *\n * Measured at the 1.59.2 pin: `$data.views[id]` carries a `sourcePath` and\n * `$data.elements[fqn]` carries NO source-document field at all. So after the\n * map and one extending model have been parsed together there is nothing in the\n * parse output that says which of the two files declared a given element. The\n * answer has to be reconstructed, and this module is the reconstruction: DIFF\n * the project against the architecture-alone load, and resolve what is left\n * through the same element→service resolver every fleet check already joins on.\n *\n * Why it matters that this is exact rather than approximate: every model-\n * dependent check reads the slice as if it were the standalone file it used to\n * read — `c4.no-relationships`, `health.dependency-unmodelled`, `Covers:`\n * resolution, the attested-call scan. Too WIDE and a service is graded against\n * the whole fleet map (every service would suddenly have relationships, and\n * every dependency would resolve). Too NARROW and a service that models its\n * partners correctly is told it models nothing.\n */\nimport { properAncestorIds } from \"../../kernel/ids/fqn/ancestors.js\";\nimport type { Elem, LoadedDoc, Rel } from \"../likec4.js\";\nimport { serviceResolver } from \"../resolve/service.js\";\n\n/** What one service owns inside a project that also holds the fleet map. */\nexport interface OwnSlice {\n  /** The service's own elements, plus the partner elements its own edges point at. */\n  elements: Elem[];\n  /** Only the relationships this model added — the project's, minus the map's. */\n  relationships: Rel[];\n  /** Elements this model added OUTSIDE its own element: the `c4.element-unowned` set. */\n  unowned: Elem[];\n}\n\nexport interface SliceRequest {\n  /** The per-service project: the architecture documents and this model, parsed together. */\n  project: LoadedDoc;\n  /** The same architecture documents parsed WITHOUT the model — the diff's other half. */\n  architecture: LoadedDoc;\n  /** The `services/<…>/<id>` directory name this model belongs to. */\n  service: string;\n  /** Every service directory that exists, so an edge into a modelled container resolves to its owner. */\n  known: ReadonlySet<string>;\n}\n\n/**\n * A relationship's identity for the DIFF, and every field of it is one loam\n * already reads somewhere.\n *\n * There is no id to join on: LikeC4 mints relationship ids per parse, so the\n * same edge in two loads of overlapping document sets is two different ids.\n * Endpoints alone are not enough either — a fleet may draw two edges between\n * the same pair (`api -> kafka 'publishes'` and `api -> kafka 'consumes'`), and\n * collapsing them would let a model silently inherit one of the map's. So the\n * key is everything a check can branch on: the endpoints, the label, and the\n * three metadata keys plus the tag set, sorted because tag order is authoring\n * order and means nothing.\n */\nfunction relKey(rel: Rel): string {\n  return JSON.stringify([\n    rel.source,\n    rel.target,\n    rel.title ?? \"\",\n    rel.op ?? \"\",\n    rel.publishes ?? \"\",\n    rel.consumes ?? \"\",\n    [...rel.tags].sort(),\n  ]);\n}\n\n/**\n * The service's own slice of a per-service project.\n *\n * OWN is resolution PLUS NESTING, and the second half is not a widening for\n * convenience — it is the only thing that keeps a model's own file from being\n * filtered against it.\n *\n * Resolution first: every project element whose id resolves to this service,\n * whether the model added it or the map already declared it. The bound element\n * itself has to be in — a standalone model declared it, and every check that\n * reads \"the service's elements\" expects it.\n *\n * Then nesting, because resolution alone ejects a child the author wrote INSIDE\n * their own `extend` block. `serviceResolver`'s second rung answers with the\n * nearest ancestor whose TITLE names a real `services/<id>/` directory, and that\n * rung sees the child before it sees the parent: a container written as\n * `store = database 'db'` under `extend svcA { … }` resolves to a service called\n * `db` the moment some other team has adopted one, and svcA's own element is\n * bound by title only. The model then reported one element fewer than it\n * declares, a `Covers: svcA.store` line was convicted as a typo, and\n * `c4.element-unowned` told the author their own container belonged in somebody\n * else's model. A standalone model was never filtered against its own file at\n * all, so every one of those is a regression the second shape introduced.\n *\n * So: an OWN ROOT is an own element none of whose proper ancestors is own — the\n * element the author actually extended — and everything nested under one is own\n * too. Id nesting under the extended element is evidence nobody had to guess at,\n * and it outranks a title guess. It does NOT outrank an explicit\n * `metadata { service '…' }` binding, which is a claim somebody wrote down: a\n * map that nests one service's element inside another's keeps both on the right\n * side of the line.\n *\n * OWN RELATIONSHIPS are the diff: the project's edges minus the ones the\n * architecture documents already have. Resolution cannot decide this one, and\n * the reason is the whole point of the fleet map: the map is where cross-service\n * edges live, so `checkoutWeb -> paymentService` resolves to this service at one\n * end and must NOT become part of the model's own relationships — otherwise\n * every service would be graded as declaring calls it never wrote, and\n * `landscape.service-isolated` (which asks whether the map's edges and the\n * model's agree) would be answering about itself.\n *\n * The diff is a MULTISET difference, not a set one, and that distinction is the\n * whole grade for a model that agrees with the map. A model may legitimately\n * draw an edge the map also draws, spelled identically —\n * `marketplace.paymentService -> stripe 'Authorizes cards'` — and under a set\n * difference every such edge would vanish from the model's own list. Then\n * `attestedCalls` finds no attested call, `landscape.service-isolated` reports a\n * service that talks to nobody, the adopt brief's `landscape.attested` list\n * comes back empty and `c4.no-relationships` fires on a model full of edges. So\n * each structural key drops `min(architecture, project)` occurrences and the\n * rest are the model's: one copy in the map cancels exactly one copy here.\n *\n * PARTNERS are the endpoints of the model's own edges that lie outside the\n * service, AND every ancestor of such an endpoint that the project holds. The\n * ancestors are not tidiness: a standalone model had to declare `kafka` in order\n * to draw an edge at `kafka.orderEvents`, and health.yaml names the dependency\n * `kafka`. Dropping the ancestor would turn a fleet's dependency declarations\n * into `health.dependency-unmodelled` findings the day it migrated its models,\n * with nothing in the docs having changed.\n *\n * UNOWNED is what the model added outside its own element — present in the\n * project, absent from the architecture load, and resolving to somebody else. A\n * new top-level element (`ledger` beside the map's systems) and a child added\n * under another service's element both land here, and both are things the map\n * or the other service should be declaring instead.\n */\nexport function sliceForService(input: SliceRequest): OwnSlice {\n  const resolve = serviceResolver(input.project.elements, input.known);\n  const byId = new Map(input.project.elements.map((e) => [e.id, e]));\n  const ownIds = new Set(\n    input.project.elements.filter((e) => resolve(e.id) === input.service).map((e) => e.id),\n  );\n  // The elements the author extended: own, with nothing own above them. Frozen\n  // before the loop below adds anything, so a child pulled in by nesting cannot\n  // itself become a root and widen the set a second time.\n  const roots = [...ownIds].filter((id) => !properAncestorIds(id).some((up) => ownIds.has(up)));\n  for (const element of input.project.elements) {\n    if (ownIds.has(element.id)) continue;\n    if (!roots.some((root) => element.id.startsWith(`${root}.`))) continue;\n    // The one thing nesting does not outrank. An explicit binding anywhere at or\n    // above this element names its service outright, and a map that files one\n    // service's element under another's would otherwise hand the outer service\n    // every element of the inner one.\n    if (boundServiceOf(element.id, byId) !== undefined) continue;\n    ownIds.add(element.id);\n  }\n\n  // One budget per structural key: the map's copies cancel the project's, one\n  // for one, and what the budget does not cover is the model's own.\n  const budget = new Map<string, number>();\n  for (const rel of input.architecture.relationships) {\n    const k = relKey(rel);\n    budget.set(k, (budget.get(k) ?? 0) + 1);\n  }\n  const relationships = input.project.relationships.filter((rel) => {\n    const k = relKey(rel);\n    const left = budget.get(k) ?? 0;\n    if (left === 0) return true;\n    budget.set(k, left - 1);\n    return false;\n  });\n\n  const partnerIds = new Set<string>();\n  for (const rel of relationships) {\n    for (const endpoint of [rel.source, rel.target]) {\n      if (ownIds.has(endpoint)) continue;\n      for (const id of [endpoint, ...properAncestorIds(endpoint)]) {\n        if (byId.has(id) && !ownIds.has(id)) partnerIds.add(id);\n      }\n    }\n  }\n\n  // Project order for both lists, never the order ids happened to be\n  // discovered in: the elements of a service are printed, counted and diffed,\n  // and a set that reorders itself between two runs of the same command is a\n  // diff nobody can read.\n  const archElementIds = new Set(input.architecture.elements.map((e) => e.id));\n  return {\n    elements: input.project.elements.filter((e) => ownIds.has(e.id) || partnerIds.has(e.id)),\n    relationships,\n    unowned: input.project.elements.filter((e) => !archElementIds.has(e.id) && !ownIds.has(e.id)),\n  };\n}\n\n/**\n * The nearest explicit `metadata { service '…' }` binding at or above an id, or\n * undefined when nothing on the chain declares one.\n *\n * `serviceResolver`'s first rung, asked on its own — because the caller above\n * needs to tell that rung's answer apart from the two guesses below it, and the\n * resolver returns one `DeclaredService` for all three. A binding is a claim\n * somebody wrote down; a title match is evidence, and a bare title is a guess.\n */\nfunction boundServiceOf(id: string, byId: ReadonlyMap<string, Elem>): string | undefined {\n  for (const candidate of [id, ...properAncestorIds(id)]) {\n    const bound = byId.get(candidate)?.service;\n    if (bound !== undefined) return bound;\n  }\n  return undefined;\n}\n"]}

package/dist/core/c4/source-scan.js

@@ -109,6 +109,29 @@ export function scanModel(text) {
         }
         const head = code.slice(stmtStart, headEnd);
         const parentId = stack.length > 0 ? stack[stack.length - 1].id : "";
+        // `extend <fqn> { … }` — the extending model's one construct, and the only
+        // frame here whose id is not minted from the enclosing scope: it names an
+        // element the fleet map already declares, so its children are `<fqn>.<name>`
+        // and a reference inside it resolves against that scope. Without this the
+        // block fell through to the property-line arm and everything in it was
+        // invisible, which is why the archive spliced a service's interior into the
+        // map instead (verification 2026-09-04, E1).
+        const extended = opener === -1 ? null : /^extend\s+([A-Za-z_][\w.-]*)\s*$/.exec(head);
+        if (extended !== null) {
+            const id = parentId === "" ? extended[1] : `${parentId}.${extended[1]}`;
+            const el = {
+                id,
+                start: stmtStart,
+                end: headEnd,
+                bodyOpen: opener,
+                bodyClose: -1,
+                indent: indentOf(stmtStart),
+                extend: true,
+            };
+            stack.push({ id, el });
+            i = opener + 1;
+            continue;
+        }
         // Classify: `name = kind` first, then a relationship (the arrow cannot hide
         // in a string — the head is masked), then the `kind name` form, else a
         // property/tag line that is consumed whole, nested block included.
@@ -133,6 +156,9 @@ export function scanModel(text) {
                 bodyClose: -1,
                 indent: indentOf(stmtStart),
             };
+            const titled = literalIn(stmtStart, headEnd)?.value;
+            if (titled !== undefined)
+                el.title = titled;
             if (opener !== -1) {
                 stack.push({ id, el });
                 i = opener + 1;

package/dist/core/c4/source-scan.js.map

@@ -1 +1 @@
-{"version":3,"file":"source-scan.js","sourceRoot":"","sources":["../../../src/core/c4/source-scan.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The text-level view of a LikeC4 document: which bytes each declaration owns.\n *\n * loam's archive merges the landscape by SPLICING authored text, not by\n * re-rendering a parsed model — a re-render would reformat every line somebody\n * wrote. So the merge needs both views of the same file: the parsed one\n * (`likec4.ts`) for what the model MEANS, and this one for where each\n * declaration physically is. A key only one of them reads is a key the merge\n * silently drops, which is why `metadata` handling is spelled out in both.\n */\nimport { maskSource, matchBrace, type SourceLiteral } from \"./source-mask.js\";\n\nexport interface ScannedElement {\n  /** Full dotted id — `parent.child` for a nested declaration. */\n  id: string;\n  /** Span of the whole declaration: first head character to one past its end. */\n  start: number;\n  end: number;\n  /** Its own body braces; -1 when the declaration has no body. */\n  bodyOpen: number;\n  bodyClose: number;\n  /** Leading whitespace of the declaration's first line. */\n  indent: string;\n}\n\n/** A relationship statement located in source, endpoints resolved to full ids (best effort). */\nexport interface ScannedRel {\n  source: string;\n  target: string;\n  title?: string;\n  op?: string;\n  /** `metadata { publishes '...' }` — see `Rel.publishes`. */\n  publishes?: string;\n  /** `metadata { consumes '...' }` — see `Rel.consumes`. */\n  consumes?: string;\n  tags: string[];\n  start: number;\n  end: number;\n  indent: string;\n}\n\nexport interface ScannedModel {\n  /** The `model` block's own braces. */\n  open: number;\n  close: number;\n  /** In document order. A nested declaration's span lies inside its parent's. */\n  elements: ScannedElement[];\n  rels: ScannedRel[];\n}\n\n/**\n * Locate every element and relationship declaration inside the top-level\n * `model { ... }` block of a LikeC4 source, with the byte range each one\n * occupies. This is the splice map `loam archive` merges the landscape with:\n * the parsed model says WHAT exists, this says WHERE its authored text is —\n * verbatim, so nothing the parser does not model (technology, style, links)\n * can be lost by rebuilding it.\n *\n * Both declaration forms are recognised — `name = kind ...` always, and\n * `kind name ...` for any kind the document's own `specification` block\n * declares. Relationship endpoints are resolved the way LikeC4 reads them:\n * innermost enclosing scope outward, then the top level, then a unique leaf\n * name anywhere; `it`/`this` (and an omitted source) mean the enclosing\n * element. A name that resolves nowhere is left as written — the caller's\n * match against the parsed model then fails loudly instead of guessing.\n *\n * Returns null when there is no model block. Callers only hand in documents\n * LikeC4 has already parsed, so the scan can trust balanced braces.\n */\nexport function scanModel(text: string): ScannedModel | null {\n  const { code, literals } = maskSource(text);\n  const m = /\\bmodel\\s*\\{/.exec(code);\n  if (!m) return null;\n  const open = m.index + m[0].length - 1;\n  const close = matchBrace(code, open);\n  if (close === -1) return null;\n\n  // Element kinds from the specification block(s): the `<kind> <name>`\n  // declaration form is recognisable only by its first token being a kind.\n  const kinds = new Set<string>();\n  for (const sm of code.matchAll(/\\bspecification\\s*\\{/g)) {\n    const sClose = matchBrace(code, sm.index + sm[0].length - 1);\n    if (sClose === -1) continue;\n    for (const em of code.slice(sm.index, sClose).matchAll(/\\belement\\s+([A-Za-z_][\\w-]*)/g)) {\n      kinds.add(em[1]!);\n    }\n  }\n\n  const indentOf = (at: number): string => {\n    const nl = text.lastIndexOf(\"\\n\", at - 1);\n    const ws = text.slice(nl + 1, at);\n    return /^[ \\t]*$/.test(ws) ? ws : \"\";\n  };\n  const literalIn = (from: number, to: number): SourceLiteral | undefined =>\n    literals.find((l) => l.start >= from && l.end <= to);\n  const keyedLiteral = (key: string, from: number, to: number): string | undefined => {\n    if (from === -1) return undefined;\n    const re = new RegExp(`\\\\b${key}\\\\b`, \"g\");\n    re.lastIndex = from;\n    const km = re.exec(code);\n    if (km === null || km.index >= to) return undefined;\n    return literalIn(km.index, to)?.value;\n  };\n  const trimmedEnd = (from: number, to: number): number => {\n    let e = to;\n    while (e > from && /\\s/.test(text[e - 1]!)) e -= 1;\n    return e;\n  };\n\n  const elements: ScannedElement[] = [];\n  interface RawRel {\n    srcLit?: string;\n    tgtLit: string;\n    parent: string;\n    start: number;\n    end: number;\n    indent: string;\n    title?: string;\n    op?: string;\n    publishes?: string;\n    consumes?: string;\n    tags: string[];\n  }\n  const raw: RawRel[] = [];\n  const stack: Array<{ id: string; el: ScannedElement }> = [];\n\n  let i = open + 1;\n  while (i < close) {\n    const ch = code[i]!;\n    if (/\\s/.test(ch)) {\n      i += 1;\n      continue;\n    }\n    if (ch === \"}\") {\n      const frame = stack.pop();\n      if (frame !== undefined) {\n        frame.el.bodyClose = i;\n        frame.el.end = i + 1;\n        elements.push(frame.el);\n      }\n      i += 1;\n      continue;\n    }\n\n    // A statement's head: up to its own `{`, the end of the line, or the\n    // enclosing block's `}` on the same line — whichever comes first.\n    const stmtStart = i;\n    let headEnd = close;\n    let opener = -1;\n    for (let j = i; j < close; j += 1) {\n      const c = code[j]!;\n      if (c === \"\\n\" || c === \"}\") {\n        headEnd = j;\n        break;\n      }\n      if (c === \"{\") {\n        opener = j;\n        headEnd = j;\n        break;\n      }\n    }\n    const head = code.slice(stmtStart, headEnd);\n    const parentId = stack.length > 0 ? stack[stack.length - 1]!.id : \"\";\n\n    // Classify: `name = kind` first, then a relationship (the arrow cannot hide\n    // in a string — the head is masked), then the `kind name` form, else a\n    // property/tag line that is consumed whole, nested block included.\n    let localName: string | null = null;\n    const assign = /^([A-Za-z_]\\w*)\\s*=\\s*[A-Za-z_]/.exec(head);\n    if (assign !== null) {\n      localName = assign[1]!;\n    } else if (!head.includes(\"->\")) {\n      const toks = head.trim().split(/\\s+/);\n      if (toks.length >= 2 && kinds.has(toks[0]!) && /^[A-Za-z_]\\w*$/.test(toks[1]!)) {\n        localName = toks[1]!;\n      }\n    }\n\n    if (localName !== null) {\n      const id = parentId === \"\" ? localName : `${parentId}.${localName}`;\n      const el: ScannedElement = {\n        id,\n        start: stmtStart,\n        end: headEnd,\n        bodyOpen: opener,\n        bodyClose: -1,\n        indent: indentOf(stmtStart),\n      };\n      if (opener !== -1) {\n        stack.push({ id, el });\n        i = opener + 1;\n      } else {\n        el.end = trimmedEnd(stmtStart, headEnd);\n        elements.push(el);\n        i = headEnd;\n      }\n      continue;\n    }\n\n    if (head.includes(\"->\")) {\n      const bClose = opener === -1 ? -1 : matchBrace(code, opener);\n      const stmtEnd = opener === -1 ? trimmedEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;\n      const am = /^([A-Za-z_][\\w.]*)?\\s*(?:-\\[[^\\]]*\\])?->\\s*([A-Za-z_][\\w.]*)/.exec(head);\n      if (am !== null) {\n        const arrowEnd = stmtStart + am[0].length;\n        const bodyFrom = opener === -1 ? -1 : opener + 1;\n        const bodyTo = opener === -1 ? -1 : stmtEnd - 1;\n        const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral(\"title\", bodyFrom, bodyTo);\n        const tags: string[] = [];\n        for (const tm of code.slice(stmtStart, stmtEnd).matchAll(/#([\\w-]+)/g)) tags.push(tm[1]!);\n        raw.push({\n          srcLit: am[1],\n          tgtLit: am[2]!,\n          parent: parentId,\n          start: stmtStart,\n          end: stmtEnd,\n          indent: indentOf(stmtStart),\n          title,\n          op: keyedLiteral(\"op\", bodyFrom, bodyTo),\n          publishes: keyedLiteral(\"publishes\", bodyFrom, bodyTo),\n          consumes: keyedLiteral(\"consumes\", bodyFrom, bodyTo),\n          tags,\n        });\n      }\n      i = Math.max(stmtEnd, headEnd);\n      continue;\n    }\n\n    if (opener !== -1) {\n      const bClose = matchBrace(code, opener);\n      i = bClose === -1 ? close : bClose + 1;\n    } else {\n      i = headEnd;\n    }\n  }\n\n  // Resolve relationship endpoints against everything declared anywhere in the\n  // model — LikeC4 resolution is not order-dependent, so neither is this.\n  const ids = new Set(elements.map((e) => e.id));\n  const byLeaf = new Map<string, string[]>();\n  for (const e of elements) {\n    const leaf = e.id.slice(e.id.lastIndexOf(\".\") + 1);\n    byLeaf.set(leaf, [...(byLeaf.get(leaf) ?? []), e.id]);\n  }\n  const resolve = (lit: string | undefined, enclosing: string): string => {\n    if (lit === undefined || lit === \"it\" || lit === \"this\") return enclosing;\n    const segs = lit.split(\".\");\n    let base: string | undefined;\n    for (let scope = enclosing; scope !== \"\" && base === undefined; ) {\n      if (ids.has(`${scope}.${segs[0]!}`)) base = `${scope}.${segs[0]!}`;\n      const dot = scope.lastIndexOf(\".\");\n      scope = dot === -1 ? \"\" : scope.slice(0, dot);\n    }\n    if (base === undefined && ids.has(segs[0]!)) base = segs[0]!;\n    if (base === undefined) {\n      const leafed = byLeaf.get(segs[0]!);\n      if (leafed !== undefined && leafed.length === 1) base = leafed[0]!;\n    }\n    return [base ?? segs[0]!, ...segs.slice(1)].join(\".\");\n  };\n\n  const rels: ScannedRel[] = raw.map((r) => ({\n    source: resolve(r.srcLit, r.parent),\n    target: resolve(r.tgtLit, r.parent),\n    title: r.title,\n    op: r.op,\n    publishes: r.publishes,\n    consumes: r.consumes,\n    tags: r.tags,\n    start: r.start,\n    end: r.end,\n    indent: r.indent,\n  }));\n\n  elements.sort((a, b) => a.start - b.start);\n  return { open, close, elements, rels };\n}\n"]}
+{"version":3,"file":"source-scan.js","sourceRoot":"","sources":["../../../src/core/c4/source-scan.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * The text-level view of a LikeC4 document: which bytes each declaration owns.\n *\n * loam's archive merges the landscape by SPLICING authored text, not by\n * re-rendering a parsed model — a re-render would reformat every line somebody\n * wrote. So the merge needs both views of the same file: the parsed one\n * (`likec4.ts`) for what the model MEANS, and this one for where each\n * declaration physically is. A key only one of them reads is a key the merge\n * silently drops, which is why `metadata` handling is spelled out in both.\n */\nimport { maskSource, matchBrace, type SourceLiteral } from \"./source-mask.js\";\n\nexport interface ScannedElement {\n  /** Full dotted id — `parent.child` for a nested declaration. */\n  id: string;\n  /** Span of the whole declaration: first head character to one past its end. */\n  start: number;\n  end: number;\n  /** Its own body braces; -1 when the declaration has no body. */\n  bodyOpen: number;\n  bodyClose: number;\n  /** Leading whitespace of the declaration's first line. */\n  indent: string;\n  /**\n   * The title the declaration's HEAD names — the first string literal before\n   * its body, which is where both declaration forms write it (pinned against\n   * the parser by `test/likec4-scan-parity.test.ts`).\n   *\n   * Absent when the head names none: LikeC4 then titles the element after its\n   * own name, and a default title is one the archive's title join must not\n   * match on — `splice/identity/declared.ts` says why, and why losing it costs\n   * that join nothing.\n   */\n  title?: string;\n  /**\n   * True for an `extend <fqn> { … }` frame — a block that DECLARES nothing and\n   * reopens an element another document owns. Its id is the fqn as written, and\n   * its children hang off that, which is what lets the archive splice a\n   * service's interior into the model that owns it. Placement must skip it: it\n   * is not a top-level declaration of this document, so anchoring beside it\n   * would group additions around a box that lives somewhere else.\n   */\n  extend?: true;\n}\n\n/** A relationship statement located in source, endpoints resolved to full ids (best effort). */\nexport interface ScannedRel {\n  source: string;\n  target: string;\n  title?: string;\n  op?: string;\n  /** `metadata { publishes '...' }` — see `Rel.publishes`. */\n  publishes?: string;\n  /** `metadata { consumes '...' }` — see `Rel.consumes`. */\n  consumes?: string;\n  tags: string[];\n  start: number;\n  end: number;\n  indent: string;\n}\n\nexport interface ScannedModel {\n  /** The `model` block's own braces. */\n  open: number;\n  close: number;\n  /** In document order. A nested declaration's span lies inside its parent's. */\n  elements: ScannedElement[];\n  rels: ScannedRel[];\n}\n\n/**\n * Locate every element and relationship declaration inside the top-level\n * `model { ... }` block of a LikeC4 source, with the byte range each one\n * occupies. This is the splice map `loam archive` merges the landscape with:\n * the parsed model says WHAT exists, this says WHERE its authored text is —\n * verbatim, so nothing the parser does not model (technology, style, links)\n * can be lost by rebuilding it.\n *\n * Both declaration forms are recognised — `name = kind ...` always, and\n * `kind name ...` for any kind the document's own `specification` block\n * declares. Relationship endpoints are resolved the way LikeC4 reads them:\n * innermost enclosing scope outward, then the top level, then a unique leaf\n * name anywhere; `it`/`this` (and an omitted source) mean the enclosing\n * element. A name that resolves nowhere is left as written — the caller's\n * match against the parsed model then fails loudly instead of guessing.\n *\n * Returns null when there is no model block. Callers only hand in documents\n * LikeC4 has already parsed, so the scan can trust balanced braces.\n */\nexport function scanModel(text: string): ScannedModel | null {\n  const { code, literals } = maskSource(text);\n  const m = /\\bmodel\\s*\\{/.exec(code);\n  if (!m) return null;\n  const open = m.index + m[0].length - 1;\n  const close = matchBrace(code, open);\n  if (close === -1) return null;\n\n  // Element kinds from the specification block(s): the `<kind> <name>`\n  // declaration form is recognisable only by its first token being a kind.\n  const kinds = new Set<string>();\n  for (const sm of code.matchAll(/\\bspecification\\s*\\{/g)) {\n    const sClose = matchBrace(code, sm.index + sm[0].length - 1);\n    if (sClose === -1) continue;\n    for (const em of code.slice(sm.index, sClose).matchAll(/\\belement\\s+([A-Za-z_][\\w-]*)/g)) {\n      kinds.add(em[1]!);\n    }\n  }\n\n  const indentOf = (at: number): string => {\n    const nl = text.lastIndexOf(\"\\n\", at - 1);\n    const ws = text.slice(nl + 1, at);\n    return /^[ \\t]*$/.test(ws) ? ws : \"\";\n  };\n  const literalIn = (from: number, to: number): SourceLiteral | undefined =>\n    literals.find((l) => l.start >= from && l.end <= to);\n  const keyedLiteral = (key: string, from: number, to: number): string | undefined => {\n    if (from === -1) return undefined;\n    const re = new RegExp(`\\\\b${key}\\\\b`, \"g\");\n    re.lastIndex = from;\n    const km = re.exec(code);\n    if (km === null || km.index >= to) return undefined;\n    return literalIn(km.index, to)?.value;\n  };\n  const trimmedEnd = (from: number, to: number): number => {\n    let e = to;\n    while (e > from && /\\s/.test(text[e - 1]!)) e -= 1;\n    return e;\n  };\n\n  const elements: ScannedElement[] = [];\n  interface RawRel {\n    srcLit?: string;\n    tgtLit: string;\n    parent: string;\n    start: number;\n    end: number;\n    indent: string;\n    title?: string;\n    op?: string;\n    publishes?: string;\n    consumes?: string;\n    tags: string[];\n  }\n  const raw: RawRel[] = [];\n  const stack: Array<{ id: string; el: ScannedElement }> = [];\n\n  let i = open + 1;\n  while (i < close) {\n    const ch = code[i]!;\n    if (/\\s/.test(ch)) {\n      i += 1;\n      continue;\n    }\n    if (ch === \"}\") {\n      const frame = stack.pop();\n      if (frame !== undefined) {\n        frame.el.bodyClose = i;\n        frame.el.end = i + 1;\n        elements.push(frame.el);\n      }\n      i += 1;\n      continue;\n    }\n\n    // A statement's head: up to its own `{`, the end of the line, or the\n    // enclosing block's `}` on the same line — whichever comes first.\n    const stmtStart = i;\n    let headEnd = close;\n    let opener = -1;\n    for (let j = i; j < close; j += 1) {\n      const c = code[j]!;\n      if (c === \"\\n\" || c === \"}\") {\n        headEnd = j;\n        break;\n      }\n      if (c === \"{\") {\n        opener = j;\n        headEnd = j;\n        break;\n      }\n    }\n    const head = code.slice(stmtStart, headEnd);\n    const parentId = stack.length > 0 ? stack[stack.length - 1]!.id : \"\";\n\n    // `extend <fqn> { … }` — the extending model's one construct, and the only\n    // frame here whose id is not minted from the enclosing scope: it names an\n    // element the fleet map already declares, so its children are `<fqn>.<name>`\n    // and a reference inside it resolves against that scope. Without this the\n    // block fell through to the property-line arm and everything in it was\n    // invisible, which is why the archive spliced a service's interior into the\n    // map instead (verification 2026-09-04, E1).\n    const extended = opener === -1 ? null : /^extend\\s+([A-Za-z_][\\w.-]*)\\s*$/.exec(head);\n    if (extended !== null) {\n      const id = parentId === \"\" ? extended[1]! : `${parentId}.${extended[1]!}`;\n      const el: ScannedElement = {\n        id,\n        start: stmtStart,\n        end: headEnd,\n        bodyOpen: opener,\n        bodyClose: -1,\n        indent: indentOf(stmtStart),\n        extend: true,\n      };\n      stack.push({ id, el });\n      i = opener + 1;\n      continue;\n    }\n\n    // Classify: `name = kind` first, then a relationship (the arrow cannot hide\n    // in a string — the head is masked), then the `kind name` form, else a\n    // property/tag line that is consumed whole, nested block included.\n    let localName: string | null = null;\n    const assign = /^([A-Za-z_]\\w*)\\s*=\\s*[A-Za-z_]/.exec(head);\n    if (assign !== null) {\n      localName = assign[1]!;\n    } else if (!head.includes(\"->\")) {\n      const toks = head.trim().split(/\\s+/);\n      if (toks.length >= 2 && kinds.has(toks[0]!) && /^[A-Za-z_]\\w*$/.test(toks[1]!)) {\n        localName = toks[1]!;\n      }\n    }\n\n    if (localName !== null) {\n      const id = parentId === \"\" ? localName : `${parentId}.${localName}`;\n      const el: ScannedElement = {\n        id,\n        start: stmtStart,\n        end: headEnd,\n        bodyOpen: opener,\n        bodyClose: -1,\n        indent: indentOf(stmtStart),\n      };\n      const titled = literalIn(stmtStart, headEnd)?.value;\n      if (titled !== undefined) el.title = titled;\n      if (opener !== -1) {\n        stack.push({ id, el });\n        i = opener + 1;\n      } else {\n        el.end = trimmedEnd(stmtStart, headEnd);\n        elements.push(el);\n        i = headEnd;\n      }\n      continue;\n    }\n\n    if (head.includes(\"->\")) {\n      const bClose = opener === -1 ? -1 : matchBrace(code, opener);\n      const stmtEnd = opener === -1 ? trimmedEnd(stmtStart, headEnd) : bClose === -1 ? close : bClose + 1;\n      const am = /^([A-Za-z_][\\w.]*)?\\s*(?:-\\[[^\\]]*\\])?->\\s*([A-Za-z_][\\w.]*)/.exec(head);\n      if (am !== null) {\n        const arrowEnd = stmtStart + am[0].length;\n        const bodyFrom = opener === -1 ? -1 : opener + 1;\n        const bodyTo = opener === -1 ? -1 : stmtEnd - 1;\n        const title = literalIn(arrowEnd, headEnd)?.value ?? keyedLiteral(\"title\", bodyFrom, bodyTo);\n        const tags: string[] = [];\n        for (const tm of code.slice(stmtStart, stmtEnd).matchAll(/#([\\w-]+)/g)) tags.push(tm[1]!);\n        raw.push({\n          srcLit: am[1],\n          tgtLit: am[2]!,\n          parent: parentId,\n          start: stmtStart,\n          end: stmtEnd,\n          indent: indentOf(stmtStart),\n          title,\n          op: keyedLiteral(\"op\", bodyFrom, bodyTo),\n          publishes: keyedLiteral(\"publishes\", bodyFrom, bodyTo),\n          consumes: keyedLiteral(\"consumes\", bodyFrom, bodyTo),\n          tags,\n        });\n      }\n      i = Math.max(stmtEnd, headEnd);\n      continue;\n    }\n\n    if (opener !== -1) {\n      const bClose = matchBrace(code, opener);\n      i = bClose === -1 ? close : bClose + 1;\n    } else {\n      i = headEnd;\n    }\n  }\n\n  // Resolve relationship endpoints against everything declared anywhere in the\n  // model — LikeC4 resolution is not order-dependent, so neither is this.\n  const ids = new Set(elements.map((e) => e.id));\n  const byLeaf = new Map<string, string[]>();\n  for (const e of elements) {\n    const leaf = e.id.slice(e.id.lastIndexOf(\".\") + 1);\n    byLeaf.set(leaf, [...(byLeaf.get(leaf) ?? []), e.id]);\n  }\n  const resolve = (lit: string | undefined, enclosing: string): string => {\n    if (lit === undefined || lit === \"it\" || lit === \"this\") return enclosing;\n    const segs = lit.split(\".\");\n    let base: string | undefined;\n    for (let scope = enclosing; scope !== \"\" && base === undefined; ) {\n      if (ids.has(`${scope}.${segs[0]!}`)) base = `${scope}.${segs[0]!}`;\n      const dot = scope.lastIndexOf(\".\");\n      scope = dot === -1 ? \"\" : scope.slice(0, dot);\n    }\n    if (base === undefined && ids.has(segs[0]!)) base = segs[0]!;\n    if (base === undefined) {\n      const leafed = byLeaf.get(segs[0]!);\n      if (leafed !== undefined && leafed.length === 1) base = leafed[0]!;\n    }\n    return [base ?? segs[0]!, ...segs.slice(1)].join(\".\");\n  };\n\n  const rels: ScannedRel[] = raw.map((r) => ({\n    source: resolve(r.srcLit, r.parent),\n    target: resolve(r.tgtLit, r.parent),\n    title: r.title,\n    op: r.op,\n    publishes: r.publishes,\n    consumes: r.consumes,\n    tags: r.tags,\n    start: r.start,\n    end: r.end,\n    indent: r.indent,\n  }));\n\n  elements.sort((a, b) => a.start - b.start);\n  return { open, close, elements, rels };\n}\n"]}

package/dist/core/c4/splice/authored-source.js

@@ -1,20 +1,59 @@
 import { maskSource, matchBrace } from "../source-mask.js";
+export function spliceSource(deltaText, decl, carry) {
+    const { featureId, indent: targetIndent, omit = [] } = carry;
+    const block = deltaText.slice(decl.start, decl.end);
+    const cuts = omit
+        .filter((r) => r.start >= decl.start && r.end <= decl.end)
+        .map((r) => wholeLines(block, r.start - decl.start, r.end - decl.start));
+    return reindent(stripFeatureTag(block, featureId, cuts), decl.indent, targetIndent);
+}
 /**
- * A declaration's authored source, ready to land in the living landscape:
- * byte-verbatim except that the feature's own tag is stripped and the
- * indentation is rebased from where the block sat in the delta to where it
- * lands. A construct the strip leaves empty goes too — a line that held only
- * the tag disappears whole, and `x = kind 'y' { #FEAT-1 }` lands as
- * `x = kind 'y'`, not as a pair of empty braces.
+ * Widen a cut to the whole lines it sits on, when it has them to itself.
+ *
+ * A scanned declaration's span starts at its first character and ends one past
+ * its last brace, so cutting it verbatim would leave the leading indent and the
+ * trailing newline behind as a blank line — and the emptied-line rule below only
+ * fires on a removal a line contains. A cut sharing its line with other code is
+ * left exactly as asked.
  */
-export function spliceSource(deltaText, decl, featureId, targetIndent) {
-    const block = deltaText.slice(decl.start, decl.end);
-    return reindent(stripFeatureTag(block, featureId), decl.indent, targetIndent);
+function wholeLines(block, start, end) {
+    const lineStart = block.lastIndexOf("\n", start - 1) + 1;
+    if (!/^[ \t]*$/.test(block.slice(lineStart, start)))
+        return [start, end];
+    const nl = block.indexOf("\n", end);
+    const to = nl === -1 ? block.length : nl;
+    if (!/^[ \t\r]*$/.test(block.slice(end, to)))
+        return [start, end];
+    return [lineStart, nl === -1 ? block.length : nl + 1];
+}
+/**
+ * Rewrite the line endings a merge INSERTED to the ones the document already
+ * uses.
+ *
+ * Splicing composes bytes from two files, and the delta's newlines are not
+ * necessarily the living document's: on a repository without `core.autocrlf`
+ * normalisation a CRLF landscape or model came back with a handful of bare-LF
+ * lines in the spliced region — two conventions in one file, noisy in an editor
+ * and in every diff (verification 2026-09-04, W-CRLF). One helper for both
+ * merges, because both had it.
+ *
+ * Only a document with ONE convention is corrected, and then in whichever
+ * direction it uses: a file that is already mixed has no convention to match, and
+ * guessing one would rewrite lines nobody touched.
+ */
+export function matchLineEndings(document, merged) {
+    const crlf = (document.match(/\r\n/g) ?? []).length;
+    const bare = (document.match(/(?<!\r)\n/g) ?? []).length;
+    if (crlf > 0 && bare === 0)
+        return merged.replace(/(?<!\r)\n/g, "\r\n");
+    if (bare > 0 && crlf === 0)
+        return merged.replace(/\r\n/g, "\n");
+    return merged;
 }
-function stripFeatureTag(block, featureId) {
+function stripFeatureTag(block, featureId, cuts) {
     const { code } = maskSource(block);
     const esc = featureId.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const removals = [];
+    const removals = cuts.map(([s, e]) => [s, e]);
     for (const m of block.matchAll(new RegExp(`#${esc}(?![\\w-])`, "g"))) {
         // Only tags in CODE count — a description quoting "#FEAT-1" is content.
         if (code.slice(m.index, m.index + m[0].length) !== m[0])
@@ -88,13 +127,21 @@ function applyRemovals(text, removals) {
  * Rebase a block's indentation: the `base` its lines carried in the delta
  * becomes `target`. The first line arrives with no leading whitespace (the
  * scanner's span starts at the declaration itself), so it only gains `target`.
+ *
+ * A CRLF delta's blank line is `"\r"`, not `""`, so splitting on `\n` alone used
+ * to hand a non-empty body to the rule below and every blank line inside a
+ * spliced block came out carrying the target indent as trailing whitespace. The
+ * carriage return is set aside and put back, which leaves the line's own ending
+ * exactly as authored for `matchLineEndings` to reconcile.
  */
 function reindent(block, base, target) {
     return block
         .split("\n")
         .map((line, k) => {
-        const body = k === 0 ? line : line.startsWith(base) ? line.slice(base.length) : line;
-        return body.length === 0 ? "" : target + body;
+        const cr = line.endsWith("\r");
+        const raw = cr ? line.slice(0, -1) : line;
+        const body = k === 0 ? raw : raw.startsWith(base) ? raw.slice(base.length) : raw;
+        return (body.length === 0 ? "" : target + body) + (cr ? "\r" : "");
     })
         .join("\n");
 }

package/dist/core/c4/splice/authored-source.js.map

@@ -1 +1 @@
-{"version":3,"file":"authored-source.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/authored-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { maskSource, matchBrace } from \"../source-mask.js\";\n\n/**\n * A declaration's authored source, ready to land in the living landscape:\n * byte-verbatim except that the feature's own tag is stripped and the\n * indentation is rebased from where the block sat in the delta to where it\n * lands. A construct the strip leaves empty goes too — a line that held only\n * the tag disappears whole, and `x = kind 'y' { #FEAT-1 }` lands as\n * `x = kind 'y'`, not as a pair of empty braces.\n */\nexport function spliceSource(\n  deltaText: string,\n  decl: { start: number; end: number; indent: string },\n  featureId: string,\n  targetIndent: string,\n): string {\n  const block = deltaText.slice(decl.start, decl.end);\n  return reindent(stripFeatureTag(block, featureId), decl.indent, targetIndent);\n}\n\nfunction stripFeatureTag(block: string, featureId: string): string {\n  const { code } = maskSource(block);\n  const esc = featureId.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n  const removals: Array<[number, number]> = [];\n  for (const m of block.matchAll(new RegExp(`#${esc}(?![\\\\w-])`, \"g\"))) {\n    // Only tags in CODE count — a description quoting \"#FEAT-1\" is content.\n    if (code.slice(m.index, m.index + m[0].length) !== m[0]) continue;\n    let s = m.index;\n    let e = s + m[0].length;\n    // Take the whitespace on ONE side with the token — trailing first, so\n    // `#FEAT-1 #critical` leaves `#critical` at its own indent, and a token at\n    // the end of a line does not leave a trailing space behind.\n    if (block[e] === \" \" || block[e] === \"\\t\") {\n      while (block[e] === \" \" || block[e] === \"\\t\") e += 1;\n    } else {\n      while (s > 0 && (block[s - 1] === \" \" || block[s - 1] === \"\\t\")) s -= 1;\n    }\n    removals.push([s, e]);\n  }\n  if (removals.length === 0) return block;\n\n  // A line the strip emptied disappears whole, newline included.\n  for (let lineStart = 0; lineStart < block.length; ) {\n    const nl = block.indexOf(\"\\n\", lineStart);\n    const lineEnd = nl === -1 ? block.length : nl + 1;\n    if (\n      removals.some(([s, e]) => s >= lineStart && e <= lineEnd) &&\n      /^\\s*$/.test(residual(block, lineStart, nl === -1 ? block.length : nl, removals))\n    ) {\n      removals.push([lineStart, lineEnd]);\n    }\n    lineStart = lineEnd;\n  }\n\n  // A body the strip emptied goes too, braces and all — but only one the strip\n  // emptied: braces that were authored empty are authored bytes and survive.\n  for (let at = code.indexOf(\"{\"); at !== -1; at = code.indexOf(\"{\", at + 1)) {\n    const closeAt = matchBrace(code, at);\n    if (closeAt === -1) continue;\n    if (!removals.some(([s, e]) => s > at && e <= closeAt)) continue;\n    if (!/^\\s*$/.test(residual(block, at + 1, closeAt, removals))) continue;\n    let s = at;\n    while (s > 0 && /\\s/.test(block[s - 1]!)) s -= 1;\n    removals.push([s, closeAt + 1]);\n  }\n  return applyRemovals(block, removals);\n}\n\n/** The text of [from, to) with the removal ranges cut out. */\nfunction residual(text: string, from: number, to: number, removals: Array<[number, number]>): string {\n  let out = \"\";\n  for (let i = from; i < to; i += 1) {\n    if (!removals.some(([s, e]) => i >= s && i < e)) out += text[i];\n  }\n  return out;\n}\n\nfunction applyRemovals(text: string, removals: Array<[number, number]>): string {\n  const sorted = [...removals].sort((a, b) => a[0] - b[0] || b[1] - a[1]);\n  let out = \"\";\n  let i = 0;\n  for (const [s, e] of sorted) {\n    if (s > i) out += text.slice(i, s);\n    if (e > i) i = e;\n  }\n  return out + text.slice(i);\n}\n\n/**\n * Rebase a block's indentation: the `base` its lines carried in the delta\n * becomes `target`. The first line arrives with no leading whitespace (the\n * scanner's span starts at the declaration itself), so it only gains `target`.\n */\nfunction reindent(block: string, base: string, target: string): string {\n  return block\n    .split(\"\\n\")\n    .map((line, k) => {\n      const body = k === 0 ? line : line.startsWith(base) ? line.slice(base.length) : line;\n      return body.length === 0 ? \"\" : target + body;\n    })\n    .join(\"\\n\");\n}\n"]}
+{"version":3,"file":"authored-source.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/authored-source.ts"],"names":[],"mappings":"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","sourcesContent":["import { maskSource, matchBrace } from \"../source-mask.js\";\n\n/** A half-open byte range of `deltaText`, as the source scan reports one. */\nexport interface SourceRange {\n  start: number;\n  end: number;\n}\n\n/**\n * A declaration's authored source, ready to land in the living landscape:\n * byte-verbatim except that the feature's own tag is stripped and the\n * indentation is rebased from where the block sat in the delta to where it\n * lands. A construct the strip leaves empty goes too — a line that held only\n * the tag disappears whole, and `x = kind 'y' { #FEAT-1 }` lands as\n * `x = kind 'y'`, not as a pair of empty braces.\n *\n * `omit` cuts named ranges of the delta out on the way over, and it exists for\n * one caller: a NEW service element whose interior belongs to that service's\n * extending model. The children come along in the parent's bytes — they carry no\n * feature tag of their own, because LikeC4 does not inherit tags, so nothing in\n * the addition set can see them — and the map must take the box without them or\n * the model can never declare them (verification 2026-09-04, refutation of E1).\n * The ranges join the tag's removals, so a body they empty collapses the same\n * way `#FEAT-1`-only braces do.\n */\n/** How a declaration is carried over: whose tag to drop, where it lands, and what to leave behind. */\nexport interface Carry {\n  featureId: string;\n  /** The indent of the position the block lands at. */\n  indent: string;\n  /** Delta ranges cut out on the way over — see the banner; `[]` when nothing rides separately. */\n  omit?: readonly SourceRange[];\n}\n\nexport function spliceSource(\n  deltaText: string,\n  decl: { start: number; end: number; indent: string },\n  carry: Carry,\n): string {\n  const { featureId, indent: targetIndent, omit = [] } = carry;\n  const block = deltaText.slice(decl.start, decl.end);\n  const cuts = omit\n    .filter((r) => r.start >= decl.start && r.end <= decl.end)\n    .map((r) => wholeLines(block, r.start - decl.start, r.end - decl.start));\n  return reindent(stripFeatureTag(block, featureId, cuts), decl.indent, targetIndent);\n}\n\n/**\n * Widen a cut to the whole lines it sits on, when it has them to itself.\n *\n * A scanned declaration's span starts at its first character and ends one past\n * its last brace, so cutting it verbatim would leave the leading indent and the\n * trailing newline behind as a blank line — and the emptied-line rule below only\n * fires on a removal a line contains. A cut sharing its line with other code is\n * left exactly as asked.\n */\nfunction wholeLines(block: string, start: number, end: number): [number, number] {\n  const lineStart = block.lastIndexOf(\"\\n\", start - 1) + 1;\n  if (!/^[ \\t]*$/.test(block.slice(lineStart, start))) return [start, end];\n  const nl = block.indexOf(\"\\n\", end);\n  const to = nl === -1 ? block.length : nl;\n  if (!/^[ \\t\\r]*$/.test(block.slice(end, to))) return [start, end];\n  return [lineStart, nl === -1 ? block.length : nl + 1];\n}\n\n/**\n * Rewrite the line endings a merge INSERTED to the ones the document already\n * uses.\n *\n * Splicing composes bytes from two files, and the delta's newlines are not\n * necessarily the living document's: on a repository without `core.autocrlf`\n * normalisation a CRLF landscape or model came back with a handful of bare-LF\n * lines in the spliced region — two conventions in one file, noisy in an editor\n * and in every diff (verification 2026-09-04, W-CRLF). One helper for both\n * merges, because both had it.\n *\n * Only a document with ONE convention is corrected, and then in whichever\n * direction it uses: a file that is already mixed has no convention to match, and\n * guessing one would rewrite lines nobody touched.\n */\nexport function matchLineEndings(document: string, merged: string): string {\n  const crlf = (document.match(/\\r\\n/g) ?? []).length;\n  const bare = (document.match(/(?<!\\r)\\n/g) ?? []).length;\n  if (crlf > 0 && bare === 0) return merged.replace(/(?<!\\r)\\n/g, \"\\r\\n\");\n  if (bare > 0 && crlf === 0) return merged.replace(/\\r\\n/g, \"\\n\");\n  return merged;\n}\n\nfunction stripFeatureTag(block: string, featureId: string, cuts: ReadonlyArray<[number, number]>): string {\n  const { code } = maskSource(block);\n  const esc = featureId.replace(/[.*+?^${}()|[\\]\\\\]/g, \"\\\\$&\");\n  const removals: Array<[number, number]> = cuts.map(([s, e]) => [s, e]);\n  for (const m of block.matchAll(new RegExp(`#${esc}(?![\\\\w-])`, \"g\"))) {\n    // Only tags in CODE count — a description quoting \"#FEAT-1\" is content.\n    if (code.slice(m.index, m.index + m[0].length) !== m[0]) continue;\n    let s = m.index;\n    let e = s + m[0].length;\n    // Take the whitespace on ONE side with the token — trailing first, so\n    // `#FEAT-1 #critical` leaves `#critical` at its own indent, and a token at\n    // the end of a line does not leave a trailing space behind.\n    if (block[e] === \" \" || block[e] === \"\\t\") {\n      while (block[e] === \" \" || block[e] === \"\\t\") e += 1;\n    } else {\n      while (s > 0 && (block[s - 1] === \" \" || block[s - 1] === \"\\t\")) s -= 1;\n    }\n    removals.push([s, e]);\n  }\n  if (removals.length === 0) return block;\n\n  // A line the strip emptied disappears whole, newline included.\n  for (let lineStart = 0; lineStart < block.length; ) {\n    const nl = block.indexOf(\"\\n\", lineStart);\n    const lineEnd = nl === -1 ? block.length : nl + 1;\n    if (\n      removals.some(([s, e]) => s >= lineStart && e <= lineEnd) &&\n      /^\\s*$/.test(residual(block, lineStart, nl === -1 ? block.length : nl, removals))\n    ) {\n      removals.push([lineStart, lineEnd]);\n    }\n    lineStart = lineEnd;\n  }\n\n  // A body the strip emptied goes too, braces and all — but only one the strip\n  // emptied: braces that were authored empty are authored bytes and survive.\n  for (let at = code.indexOf(\"{\"); at !== -1; at = code.indexOf(\"{\", at + 1)) {\n    const closeAt = matchBrace(code, at);\n    if (closeAt === -1) continue;\n    if (!removals.some(([s, e]) => s > at && e <= closeAt)) continue;\n    if (!/^\\s*$/.test(residual(block, at + 1, closeAt, removals))) continue;\n    let s = at;\n    while (s > 0 && /\\s/.test(block[s - 1]!)) s -= 1;\n    removals.push([s, closeAt + 1]);\n  }\n  return applyRemovals(block, removals);\n}\n\n/** The text of [from, to) with the removal ranges cut out. */\nfunction residual(text: string, from: number, to: number, removals: Array<[number, number]>): string {\n  let out = \"\";\n  for (let i = from; i < to; i += 1) {\n    if (!removals.some(([s, e]) => i >= s && i < e)) out += text[i];\n  }\n  return out;\n}\n\nfunction applyRemovals(text: string, removals: Array<[number, number]>): string {\n  const sorted = [...removals].sort((a, b) => a[0] - b[0] || b[1] - a[1]);\n  let out = \"\";\n  let i = 0;\n  for (const [s, e] of sorted) {\n    if (s > i) out += text.slice(i, s);\n    if (e > i) i = e;\n  }\n  return out + text.slice(i);\n}\n\n/**\n * Rebase a block's indentation: the `base` its lines carried in the delta\n * becomes `target`. The first line arrives with no leading whitespace (the\n * scanner's span starts at the declaration itself), so it only gains `target`.\n *\n * A CRLF delta's blank line is `\"\\r\"`, not `\"\"`, so splitting on `\\n` alone used\n * to hand a non-empty body to the rule below and every blank line inside a\n * spliced block came out carrying the target indent as trailing whitespace. The\n * carriage return is set aside and put back, which leaves the line's own ending\n * exactly as authored for `matchLineEndings` to reconcile.\n */\nfunction reindent(block: string, base: string, target: string): string {\n  return block\n    .split(\"\\n\")\n    .map((line, k) => {\n      const cr = line.endsWith(\"\\r\");\n      const raw = cr ? line.slice(0, -1) : line;\n      const body = k === 0 ? raw : raw.startsWith(base) ? raw.slice(base.length) : raw;\n      return (body.length === 0 ? \"\" : target + body) + (cr ? \"\\r\" : \"\");\n    })\n    .join(\"\\n\");\n}\n"]}

package/dist/core/c4/splice/contract.js.map

@@ -1 +1 @@
-{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/contract.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;CAAG","sourcesContent":["import type { Elem, Rel } from \"../likec4.js\";\n\n/**\n * A landscape merge the splicer could not compute. Every one is mechanical —\n * the input cannot be spliced as authored, never a judgment `--approve` may\n * override — and it is thrown at plan time, so nothing has been written.\n * `archiveErrorCode` (commands/archive/archive.ts) owns the mapping to `merge-failed`;\n * the splicer itself never names a CLI code.\n */\nexport class LandscapeSpliceError extends Error {}\n\nexport interface LandscapePlan {\n  /** The merged landscape source, or null when everything was already there. */\n  content: string | null;\n  addedEls: Elem[];\n  addedRels: Rel[];\n}\n\n/**\n * Everything the landscape splicer reads, as text and parsed views already in\n * hand. The merge is a pure text-to-text computation — reading the two files\n * (and deciding to write the result) stays with the caller, which is also what\n * keeps the splicer free of the staging layer.\n */\nexport interface LandscapeMergeRequest {\n  /** The living landscape.likec4, decoded by the caller's readUtf8. */\n  landscapeText: string;\n  /** delta.likec4 as authored — the bytes the additions are spliced from. */\n  deltaText: string;\n  /** EVERY element the delta declares — the title join and the parent lookup read past the tagged ones. */\n  deltaElements: Elem[];\n  /** The delta's elements tagged with the feature: the candidate additions. */\n  newEls: Elem[];\n  /** The delta's relationships tagged with the feature. */\n  newRels: Rel[];\n  featureId: string;\n}\n"]}
+{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../../../src/core/c4/splice/contract.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,OAAO,oBAAqB,SAAQ,KAAK;CAAG","sourcesContent":["import type { Elem, Rel } from \"../likec4.js\";\n\n/**\n * A landscape merge the splicer could not compute. Every one is mechanical —\n * the input cannot be spliced as authored, never a judgment `--approve` may\n * override — and it is thrown at plan time, so nothing has been written.\n * `archiveErrorCode` (commands/archive/archive.ts) owns the mapping to `merge-failed`;\n * the splicer itself never names a CLI code.\n */\nexport class LandscapeSpliceError extends Error {}\n\n/**\n * A service whose `model.likec4` EXTENDS the fleet map — the document that owns\n * that service's interior, and therefore the one a nested addition belongs in.\n *\n * The merge takes these as TEXT already in hand, exactly as it takes the\n * landscape: reading the fleet and writing the result stay with the caller.\n * A service with a standalone model, or none, is simply absent from the list,\n * and the merge then behaves as it did before the extending shape existed.\n */\nexport interface ExtendingModel {\n  /** The `services/<…>/<svc>` directory name — what an element's binding resolves to. */\n  service: string;\n  /** Repo-relative and `/`-separated: what a message names and where the caller writes. */\n  path: string;\n  /** The living model source, as authored. */\n  text: string;\n}\n\n/** What one extending model owes this feature — routed, not yet spliced. */\nexport interface ModelAdditions {\n  model: ExtendingModel;\n  els: Elem[];\n  rels: Rel[];\n}\n\nexport interface LandscapePlan {\n  /** The merged landscape source, or null when everything was already there. */\n  content: string | null;\n  addedEls: Elem[];\n  addedRels: Rel[];\n  /**\n   * The additions this merge routed AWAY from the map, per model that owns\n   * them. Empty when the request named no extending models — the shape every\n   * caller had before the routing existed. `./model/merge.ts` turns each entry\n   * into that model's merged text.\n   */\n  models: ModelAdditions[];\n}\n\n/**\n * Everything the landscape splicer reads, as text and parsed views already in\n * hand. The merge is a pure text-to-text computation — reading the two files\n * (and deciding to write the result) stays with the caller, which is also what\n * keeps the splicer free of the staging layer.\n */\nexport interface LandscapeMergeRequest {\n  /** The living landscape.likec4, decoded by the caller's readUtf8. */\n  landscapeText: string;\n  /** delta.likec4 as authored — the bytes the additions are spliced from. */\n  deltaText: string;\n  /** EVERY element the delta declares — the title join and the parent lookup read past the tagged ones. */\n  deltaElements: Elem[];\n  /** The delta's elements tagged with the feature: the candidate additions. */\n  newEls: Elem[];\n  /** The delta's relationships tagged with the feature. */\n  newRels: Rel[];\n  featureId: string;\n  /**\n   * The fleet's extending models. Omitted (or empty) is the pre-extending\n   * behaviour byte for byte: every addition lands on the map.\n   */\n  models?: readonly ExtendingModel[];\n}\n"]}

package/dist/core/c4/splice/identity/declared.js

@@ -0,0 +1,87 @@
+/**
+ * What the fleet's extending models ALREADY declare — the half of the archive's
+ * existence check that does not live on the map.
+ *
+ * The check has two joins: by id, and by TITLE for a delta that spells an
+ * element under its own identifier rather than the map's. Only the id half ever
+ * learned about the models the merge now writes into, so a container a service
+ * already draws under a different id was spliced in beside itself and the
+ * service silently grew two boxes with one name — while the SAME delta against
+ * the same title ON THE MAP adds nothing (review of E1). One rule, two
+ * documents, two answers.
+ *
+ * THE MODEL HALF IS SCOPED TO ITS SERVICE, and the map's is deliberately not.
+ * The map's global title index is the id-less fallback for documents written
+ * before `metadata { service }` existed, and it carries a hazard its own
+ * comment states: two services' boxes sharing a title join to each other unless
+ * both sides are bound. A service's interior is exactly where that would bite —
+ * every extending model in a fleet names a container 'api' — so a model's
+ * declaration joins by title only against an addition resolving to the SAME
+ * explicitly bound service. Either side unbound means no title join at all: an
+ * addition landing beside a namesake is a duplicate the author can see, and a
+ * wrongly skipped one is a container that quietly never arrived.
+ *
+ * The reader is the SCAN and not a parse, for the reason the caller states: ids
+ * are exact inside the fqn namespace the map and its models share, and parsing
+ * every model here would cost one LikeC4 workspace per service to answer a
+ * question about text. Two kinds of declaration therefore carry no title, and
+ * neither loses anything: one whose head names no title (LikeC4 titles it after
+ * its own name, and a model's default and a delta's differ exactly when their
+ * ids do — which the id join already covers) and one writing its title as a
+ * body property.
+ */
+import { ancestorIds } from "../../../kernel/ids/fqn/ancestors.js";
+/**
+ * Index the scanned models.
+ *
+ * `bindEls` is the corpus the service binding resolves against — the living
+ * map's elements plus the delta's, the same one routing uses, because a model's
+ * declaration is bound by an ancestor the MAP owns and a delta's addition by an
+ * ancestor either document may.
+ */
+export function modelDeclarations(scans, bindEls) {
+    const bound = new Map();
+    for (const e of bindEls)
+        if (e.service !== undefined)
+            bound.set(e.id, e.service);
+    // An EXPLICIT binding on the id or an ancestor, and nothing else.
+    // `serviceResolver`'s last rung answers with the element's own title or its
+    // raw id — the rung its own comment calls the one that lies — and here that
+    // would file two unbound services' containers under invented names and then
+    // let those names join.
+    const serviceOf = (id) => {
+        for (const candidate of ancestorIds(id)) {
+            const service = bound.get(candidate);
+            if (service !== undefined)
+                return service;
+        }
+        return undefined;
+    };
+    const ids = [];
+    const titles = new Set();
+    for (const { scan } of scans) {
+        for (const e of scan?.elements ?? []) {
+            // An `extend` frame declares nothing: it reopens an element the map owns.
+            if (e.extend === true)
+                continue;
+            ids.push(e.id);
+            if (e.title === undefined)
+                continue;
+            const service = serviceOf(e.id);
+            if (service !== undefined)
+                titles.add(titleKey(service, e.title));
+        }
+    }
+    return {
+        ids,
+        declaresTitle: (id, title) => {
+            const service = serviceOf(id);
+            return service !== undefined && titles.has(titleKey(service, title));
+        },
+    };
+}
+/** Length-prefixed: a service id and a title cannot spell another pair's key. */
+function titleKey(service, title) {
+    return `${service.length}:${service}${title}`;
+}
+//# sourceMappingURL=declared.js.map