@voidaliot/swaml-cli 0.15.0 → 0.17.0

package/dist/cli.mjs

@@ -152480,7 +152480,7 @@ var require_react_dom_server_legacy_node_development = __commonJS({
         h1 = 3266489909 * (h1 & 65535) + ((3266489909 * (h1 >>> 16) & 65535) << 16) & 4294967295;
         return (h1 ^ h1 >>> 16) >>> 0;
       }
-      function typeName(value2) {
+      function typeName2(value2) {
         return "function" === typeof Symbol && Symbol.toStringTag && value2[Symbol.toStringTag] || value2.constructor.name || "Object";
       }
       function willCoercionThrow(value2) {
@@ -152498,7 +152498,7 @@ var require_react_dom_server_legacy_node_development = __commonJS({
           return console.error(
             "The provided `%s` attribute is an unsupported type %s. This value must be coerced to a string before using it here.",
             attributeName,
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function checkCSSPropertyStringCoercion(value2, propName) {
@@ -152506,14 +152506,14 @@ var require_react_dom_server_legacy_node_development = __commonJS({
           return console.error(
             "The provided `%s` CSS property is an unsupported type %s. This value must be coerced to a string before using it here.",
             propName,
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function checkHtmlStringCoercion(value2) {
         if (willCoercionThrow(value2))
           return console.error(
             "The provided HTML markup uses a value of unsupported type %s. This value must be coerced to a string before using it here.",
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function isAttributeNameSafe(attributeName) {
@@ -154854,7 +154854,7 @@ var require_react_dom_server_legacy_node_development = __commonJS({
         willCoercionThrow(value2) && (console.error(
           "The provided `%s` option is an unsupported type %s. This value must be coerced to a string before using it here.",
           name2,
-          typeName(value2)
+          typeName2(value2)
         ), testStringCoercion(value2));
         return ("" + value2).replace(
           regexForLinkHeaderQuotedParamValueContext,
@@ -160025,7 +160025,7 @@ var require_react_dom_server_node_development = __commonJS({
       function byteLengthOfChunk(chunk) {
         return "string" === typeof chunk ? Buffer.byteLength(chunk, "utf8") : chunk.byteLength;
       }
-      function typeName(value2) {
+      function typeName2(value2) {
         return "function" === typeof Symbol && Symbol.toStringTag && value2[Symbol.toStringTag] || value2.constructor.name || "Object";
       }
       function willCoercionThrow(value2) {
@@ -160043,7 +160043,7 @@ var require_react_dom_server_node_development = __commonJS({
           return console.error(
             "The provided `%s` attribute is an unsupported type %s. This value must be coerced to a string before using it here.",
             attributeName,
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function checkCSSPropertyStringCoercion(value2, propName) {
@@ -160051,14 +160051,14 @@ var require_react_dom_server_node_development = __commonJS({
           return console.error(
             "The provided `%s` CSS property is an unsupported type %s. This value must be coerced to a string before using it here.",
             propName,
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function checkHtmlStringCoercion(value2) {
         if (willCoercionThrow(value2))
           return console.error(
             "The provided HTML markup uses a value of unsupported type %s. This value must be coerced to a string before using it here.",
-            typeName(value2)
+            typeName2(value2)
           ), testStringCoercion(value2);
       }
       function isAttributeNameSafe(attributeName) {
@@ -162556,7 +162556,7 @@ var require_react_dom_server_node_development = __commonJS({
         willCoercionThrow(value2) && (console.error(
           "The provided `%s` option is an unsupported type %s. This value must be coerced to a string before using it here.",
           name2,
-          typeName(value2)
+          typeName2(value2)
         ), testStringCoercion(value2));
         return ("" + value2).replace(
           regexForLinkHeaderQuotedParamValueContext,
@@ -169329,12 +169329,26 @@ function depthInside(outer, all2) {
 }
 
 // packages/diagram-protocol/out/overlay.js
-var without = (meta) => {
-  if (!meta || !("overlay" in meta))
-    return meta;
-  const { overlay: _overlay, ...rest } = meta;
-  return rest;
-};
+function withoutDecoration(value2, kind2) {
+  if (!value2 || kind2 === void 0)
+    return void 0;
+  const previous3 = value2.previous && withoutDecoration(value2.previous, kind2);
+  if (value2.kind === kind2)
+    return previous3;
+  if (previous3 === value2.previous)
+    return value2;
+  const { previous: _previous, ...rest } = value2;
+  return previous3 ? { ...rest, previous: previous3 } : rest;
+}
+function clearDecoration(item, kind2) {
+  if (!("overlay" in item))
+    return item;
+  const overlay = withoutDecoration(item.overlay, kind2);
+  if (overlay === item.overlay)
+    return item;
+  const { overlay: _overlay, ...rest } = item;
+  return overlay ? { ...rest, overlay } : rest;
+}
 function overlayDecoration(item) {
   const value2 = item?.overlay ?? item?.meta?.overlay;
   return value2 && typeof value2 === "object" ? value2 : void 0;
@@ -169344,20 +169358,12 @@ function diagramOverlays(model) {
 }
 function clearDiagramOverlay(model, kind2) {
   const kept = diagramOverlays(model).filter((item) => kind2 !== void 0 && item.kind !== kind2);
-  const owned = (meta) => !kind2 || meta?.overlay?.kind === kind2;
-  const clean2 = (item) => owned(item.meta) && item.meta && "overlay" in item.meta ? { ...item, meta: without(item.meta) } : item;
-  const markers = (meta) => Array.isArray(meta?.markers) ? { ...meta, markers: meta.markers.map((marker) => {
-    if (!("overlay" in marker) || kind2 && marker.overlay.kind !== kind2)
-      return marker;
-    const { overlay: _overlay, ...rest } = marker;
-    return rest;
-  }) } : meta;
-  const fragments = Array.isArray(model.meta?.fragments) ? model.meta.fragments.map((fragment2) => {
-    if (!("overlay" in fragment2) || kind2 && fragment2.overlay.kind !== kind2)
-      return fragment2;
-    const { overlay: _overlay, ...rest } = fragment2;
-    return rest;
-  }) : model.meta?.fragments;
+  const clean2 = (item) => {
+    const meta = item.meta && clearDecoration(item.meta, kind2);
+    return meta === item.meta ? item : { ...item, meta };
+  };
+  const markers = (meta) => Array.isArray(meta?.markers) ? { ...meta, markers: meta.markers.map((marker) => clearDecoration(marker, kind2)) } : meta;
+  const fragments = Array.isArray(model.meta?.fragments) ? model.meta.fragments.map((fragment2) => clearDecoration(fragment2, kind2)) : model.meta?.fragments;
   return {
     ...model,
     nodes: model.nodes.map((node2) => {
@@ -169373,18 +169379,18 @@ function applyDiagramOverlay(model, overlay) {
   const base2 = clearDiagramOverlay(model, overlay.kind);
   const decorations = overlay.stale ? {} : overlay.elements, markers = overlay.stale ? {} : overlay.markers ?? {};
   let decorated = 0;
-  const tag = (value2) => {
+  const tag = (value2, previous3) => {
     decorated++;
-    return { ...value2, kind: overlay.kind };
+    return { ...value2, kind: overlay.kind, ...previous3 ? { previous: previous3 } : {} };
   };
-  const decorate = (item) => decorations[item.id] ? { ...item, meta: { ...item.meta, overlay: tag(decorations[item.id]) } } : item;
+  const decorate = (item) => decorations[item.id] ? { ...item, meta: { ...item.meta, overlay: tag(decorations[item.id], item.meta?.overlay) } } : item;
   const nodes2 = base2.nodes.map((node2) => {
     const next = decorate(node2);
     if (!Array.isArray(next.meta?.markers))
       return next;
-    return { ...next, meta: { ...next.meta, markers: next.meta.markers.map((marker) => typeof marker.statement === "string" && markers[marker.statement] ? { ...marker, overlay: tag(markers[marker.statement]) } : marker) } };
+    return { ...next, meta: { ...next.meta, markers: next.meta.markers.map((marker) => typeof marker.statement === "string" && markers[marker.statement] ? { ...marker, overlay: tag(markers[marker.statement], marker.overlay) } : marker) } };
   });
-  const fragments = Array.isArray(base2.meta?.fragments) ? base2.meta.fragments.map((fragment2) => typeof fragment2.id === "string" && decorations[fragment2.id] ? { ...fragment2, overlay: tag(decorations[fragment2.id]) } : fragment2) : base2.meta?.fragments;
+  const fragments = Array.isArray(base2.meta?.fragments) ? base2.meta.fragments.map((fragment2) => typeof fragment2.id === "string" && decorations[fragment2.id] ? { ...fragment2, overlay: tag(decorations[fragment2.id], fragment2.overlay) } : fragment2) : base2.meta?.fragments;
   const edges = base2.edges.map(decorate), frames = base2.frames?.map(decorate);
   const { elements: _elements, markers: _markers, ...summary } = overlay;
   return {
@@ -169645,6 +169651,21 @@ init_semantic();
 init_lib2();
 init_ast2();
 init_semantic();
+
+// packages/language-server/src/diagram-names.ts
+init_names();
+function diagramElementName(path7, sourceSpelling = false) {
+  return (sourceSpelling ? parsePathInput(path7) : path7).replace(/^.*(?:::|\.)/u, "");
+}
+function usageName(definition3) {
+  const words = definition3.split(/[^A-Za-z0-9_]+/u).filter(Boolean);
+  if (!words.length || /[^A-Za-z0-9_ ]/u.test(definition3)) return definition3[0].toLowerCase() + definition3.slice(1);
+  const lower2 = (word) => /^[A-Z0-9]+$/u.test(word) ? word.toLowerCase() : word[0].toLowerCase() + word.slice(1);
+  const value2 = lower2(words[0]) + words.slice(1).map((word) => word[0].toUpperCase() + word.slice(1)).join("");
+  return /^[_A-Za-z]/u.test(value2) ? value2 : "_" + value2;
+}
+
+// packages/language-server/src/behavior-projection.ts
 var text = (node2) => node2?.$cstNode?.text.replace(/\s+/gu, " ").trim() ?? "";
 var args = (values) => values.map(text).join(", ");
 var Builder = class {
@@ -169685,7 +169706,7 @@ var Builder = class {
   }
   place(pkg, path7, structure2) {
     const id2 = diagramId(pkg.name + "::" + path7);
-    this.lifeline({ id: id2, name: path7, role: "occurrence", path: path7, type: definitionName(structure2), source: source(structure2) });
+    this.lifeline({ id: id2, name: diagramElementName(path7), role: "occurrence", path: path7, type: definitionName(structure2), source: source(structure2) });
     return { pkg, path: path7, structure: structure2, routes: this.routesOf(pkg), lifeline: id2 };
   }
   message(item) {
@@ -170207,7 +170228,7 @@ function executable(root6, ctx, options2) {
     const id3 = diagramId(pkg.name + "::" + occurrence.path);
     if (participants.some((item) => item.id === id3)) continue;
     const type = isComponentUsage(occurrence.structure) ? occurrence.structure.definition?.ref?.name : void 0;
-    participants.push(node2({ id: id3, name: occurrence.path, role: "occurrence", path: occurrence.path, type, source: source(occurrence.structure) }, false));
+    participants.push(node2({ id: id3, name: diagramElementName(occurrence.path), role: "occurrence", path: occurrence.path, type, source: source(occurrence.structure) }, false));
   }
   const occurrencePath = isScenario(root6) ? void 0 : options2.path?.includes("::") ? options2.path.slice(options2.path.indexOf("::") + 2, options2.path.lastIndexOf(".")) : projection2.lifelines[0]?.path ?? projection2.lifelines[0]?.name;
   return { id: id2, name: root6.name, kind: projection2.root.kind, subjectId: subject ? diagramId(identity2(subject)) : void 0, ...occurrencePath ? { occurrencePath } : {}, source: source(root6), projection: projection2, participants };
@@ -170314,14 +170335,14 @@ function siteAt(document4, position3, sites) {
 }
 
 // packages/language-server/src/run-evidence.ts
-init_lib2();
 init_ast2();
 init_semantic();
 var store = /* @__PURE__ */ new Map();
-var canonical = (revisions2) => Object.fromEntries(Object.entries(revisions2).map(([uri, value2]) => [URI2.parse(uri).toString(), value2]));
+var sourceKeys = (revisions2) => Object.fromEntries(Object.entries(revisions2).map(([uri, value2]) => [sourceUriKey(uri), value2]));
+var currentEvidence = (evidence2, revisions2) => runEvidenceCurrent({ sourceRevisions: sourceKeys(evidence2.sourceRevisions) }, revisions2);
 function storedRunEvidence(revisions2) {
-  const current = canonical(revisions2);
-  return [...store.values()].reverse().map((item) => runEvidenceCurrent(item, current) ? item : { ...item, stale: true });
+  const current = sourceKeys(revisions2);
+  return [...store.values()].reverse().filter((item) => Object.hasOwn(current, sourceUriKey(item.caseUri))).map((item) => currentEvidence(item, current) ? item : { ...item, stale: true });
 }
 
 // packages/language-server/src/inlay-hints.ts
@@ -170741,15 +170762,6 @@ function memberUsersStubs(models, owner2, member, initial) {
   return users.map(({ structure: structure2, port }) => memberStubs(structure2, port.name, member, member.direction === "provides" !== port.reversed, (type) => initial(structure2, type)));
 }
 
-// packages/language-server/src/diagram-names.ts
-function usageName(definition3) {
-  const words = definition3.split(/[^A-Za-z0-9_]+/u).filter(Boolean);
-  if (!words.length || /[^A-Za-z0-9_ ]/u.test(definition3)) return definition3[0].toLowerCase() + definition3.slice(1);
-  const lower2 = (word) => /^[A-Z0-9]+$/u.test(word) ? word.toLowerCase() : word[0].toLowerCase() + word.slice(1);
-  const value2 = lower2(words[0]) + words.slice(1).map((word) => word[0].toUpperCase() + word.slice(1)).join("");
-  return /^[_A-Za-z]/u.test(value2) ? value2 : "_" + value2;
-}
-
 // packages/language-server/src/diagram-port-connections.ts
 init_lib2();
 init_ast2();
@@ -171091,24 +171103,33 @@ var fresh2 = (base2, used) => {
 };
 var forwards = (structure2, port) => members(structure2).filter(isConnect).some((link4) => link4.source === port && link4.target.includes(".") || link4.target === port && link4.source.includes("."));
 var memberNames = (structure2) => new Set(members(structure2).map((item) => item.name).filter(Boolean));
-function lifeline(models, home, value2, what) {
+function lifeline(models, home, value2, what, scenario) {
   const typed2 = value2.trim();
-  if (typed2 === "\xABtest\xBB" || typed2.endsWith("::$test")) return { kind: "test" };
-  if (typed2.endsWith("::$script")) throw Error("A use case without actors has no lifeline to act from. Associate an actor with it first.");
   const gate2 = /^(.*)::\$port:(.+)$/u.exec(typed2), id2 = gate2 ? gate2[1] : typed2;
+  const ids = [.../* @__PURE__ */ new Set([id2, parsePathInput(id2)])];
   const find3 = (pkg, path7) => connectionRoutes(pkg).occurrences.find((item) => item.path === path7);
-  const packages = [home, ...models.flatMap((model) => model.packages).filter((item) => local3(item) && item !== home)];
-  for (const pkg of packages) {
-    const prefix = diagramId(pkg.name) + "::";
-    if (!id2.startsWith(prefix)) continue;
-    const found2 = find3(pkg, id2.slice(prefix.length).split("::").join("."));
+  const prefix = diagramId(home.name) + "::";
+  let found = ids.filter((candidate) => candidate.startsWith(prefix) || !candidate.includes("::")).map((candidate) => find3(home, (candidate.startsWith(prefix) ? candidate.slice(prefix.length) : candidate).split("::").join("."))).find(Boolean);
+  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure, ...gate2 ? { port: gate2[2] } : {} };
+  const scenarioId = scenario && diagramId(identity2(scenario));
+  if (scenario && (typed2 === "\xABtest\xBB" || ids.includes(scenarioId + "::$test"))) {
+    if (scenario.kind !== "test") throw Error("Only a test calls its subject directly; a use case acts through the ports of its actors.");
+    return { kind: "test" };
+  }
+  if (scenario?.kind === "useCase" && ids.includes(scenarioId + "::$script")) throw Error("A use case without actors has no lifeline to act from. Associate an actor with it first.");
+  const packages = models.flatMap((model) => model.packages).filter((item) => local3(item) && item !== home);
+  for (const candidate of ids) for (const pkg of packages) {
+    const prefix2 = diagramId(pkg.name) + "::";
+    if (!candidate.startsWith(prefix2)) continue;
+    const found2 = find3(pkg, candidate.slice(prefix2.length).split("::").join("."));
     if (found2) return { kind: "occurrence", pkg, path: found2.path, structure: found2.structure, ...gate2 ? { port: gate2[2] } : {} };
   }
-  const found = find3(home, parsePathInput(id2).split("::").join("."));
-  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure };
+  found = ids.map((candidate) => find3(home, candidate.split("::").join("."))).find(Boolean);
+  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure, ...gate2 ? { port: gate2[2] } : {} };
   throw Error(`${typed2} is not an occurrence of ${home.name}. Choose one of its lifelines for where the message ${what}.`);
 }
 function connected(from, to) {
+  if (to) samePackage(from, to);
   const routes = connectionRoutes(from.pkg), out = [];
   for (const link4 of routes.links) for (const [mine, other] of [[0, 1], [1, 0]]) {
     const end = link4.ends[mine], peer = link4.ends[other], cut = end.lastIndexOf("."), peerCut = peer.lastIndexOf(".");
@@ -171120,6 +171141,9 @@ function connected(from, to) {
   }
   return out;
 }
+function samePackage(from, to) {
+  if (from.pkg !== to.pkg) throw Error("Messages cannot connect occurrences from different packages. Choose lifelines of the same package.");
+}
 function addMessage(plan, request) {
   const { models } = plan, kind2 = request.kind;
   if (!["send", "publish", "call"].includes(kind2)) throw Error("Choose send, publish or call for the message.");
@@ -171194,6 +171218,7 @@ function useMember(w2, port, initiator, emitter) {
   return shape;
 }
 function newRoute(w2, initiator, receiver, portName, emitter) {
+  samePackage(initiator, receiver);
   const first2 = declaring(initiator.structure), second = declaring(receiver.structure);
   if (first2 === second) throw Error(`${initiator.path} and ${receiver.path} share one declaration. Connect them in Interconnect View first.`);
   for (const structure2 of [first2, second]) if (!local3(structure2)) throw Error("Standard-library declarations are read-only.");
@@ -171239,8 +171264,10 @@ function scriptMessage(w2, scenario, pkg) {
   const subject = caseSubject(scenario), { request, kind: kind2, name: name2, segments } = w2;
   const typedFrom = request.from?.trim() || (segments.length === 3 ? segments[0] : "");
   if (!typedFrom) throw Error("Choose the lifeline the message starts on, or write actor.port.member.");
-  const from = lifeline(w2.plan.models, pkg, typedFrom, "starts");
-  let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends") : void 0;
+  const from = lifeline(w2.plan.models, pkg, typedFrom, "starts", scenario);
+  let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends", scenario) : void 0;
+  if (from.kind === "occurrence" && from.pkg !== pkg || to?.kind === "occurrence" && to.pkg !== pkg)
+    throw Error(`A case uses only occurrences of its own package. Choose lifelines from ${pkg.name}.`);
   if (from.kind === "test") {
     if (scenario.kind !== "test") throw Error("Only a test calls its subject directly; a use case acts through the ports of its actors.");
     if (kind2 !== "call") throw Error("A test calls operations of its subject. To send or publish, start the message on an actor.");
@@ -171258,7 +171285,7 @@ function scriptMessage(w2, scenario, pkg) {
     const args2 = request.value?.trim() || parameters2.map((type) => w2.initial(scenario, type)).join(", ");
     return callStatement(formatPath(to.path) + "." + formatName(name2) + "(" + args2 + ")", name2, result, scenario);
   }
-  const isActor = (item) => item?.kind === "occurrence" && !item.path.includes(".") && item.structure !== subject && !active(item.structure);
+  const isActor = (item) => item?.kind === "occurrence" && item.pkg === pkg && !item.path.includes(".") && item.structure !== subject && !active(item.structure);
   const outgoing = isActor(from) || !isActor(to);
   const actor = outgoing ? from : to;
   if (!isActor(actor)) {
@@ -171310,7 +171337,9 @@ function operationMessage(w2, executable2, pkg) {
     return found && { kind: "occurrence", pkg, path: found.path, structure: found.structure };
   })();
   let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends") : void 0;
-  if (from?.kind === "occurrence" && to?.kind === "occurrence" && to.path === from.path || !from && !to) {
+  if (from?.kind === "occurrence" && !runs(from)) throw Error(`${executable2.name} does not run on ${from.path}. Start the message on its activation.`);
+  if (from?.kind === "occurrence" && to?.kind === "occurrence") samePackage(from, to);
+  if (from?.kind === "occurrence" && to?.kind === "occurrence" && to.pkg === from.pkg && to.path === from.path || !from && !to) {
     if (kind2 !== "call") throw Error("A component does not send to itself. Call one of its operations, or draw the message to another lifeline.");
     const op = members(structure2).filter(isExecutable).find((item) => item.name === name2), sig = op && signatureOf(op);
     if (op === executable2) throw Error(`${name2} would call itself. Choose another operation.`);
@@ -171324,7 +171353,6 @@ function operationMessage(w2, executable2, pkg) {
     return callStatement(formatName(name2) + "(" + args3 + ")", name2, result, executable2);
   }
   if (from?.kind !== "occurrence") throw Error("Start the message on the lifeline of a component occurrence.");
-  if (!runs(from)) throw Error(`${executable2.name} does not run on ${from.path}. Start the message on its activation.`);
   const portName = segments.length === 2 ? segments[0] : void 0;
   if (!to) {
     const peer = connected(from).find((item) => !portName || item.port.name === portName)?.peer;
@@ -174210,12 +174238,12 @@ async function effectiveConfiguration(services, key, uri) {
 init_lib2();
 init_formatter2();
 function configuredFormat(document4, services, settings, editor) {
-  const canonical5 = formatDocument(document4), lexer = services.parser.Lexer;
+  const canonical4 = formatDocument(document4), lexer = services.parser.Lexer;
   const tokenize3 = (text8) => {
     const result = lexer.tokenize(text8);
     return [...result.tokens, ...result.hidden].filter((token) => token.tokenType.name !== "WS").sort((left, right) => left.startOffset - right.startOffset);
   };
-  const originalText = document4.textDocument.getText(), original2 = tokenize3(originalText), tokens = tokenize3(canonical5);
+  const originalText = document4.textDocument.getText(), original2 = tokenize3(originalText), tokens = tokenize3(canonical4);
   if (original2.length !== tokens.length || tokens.some((token, index3) => token.image !== original2[index3].image)) throw Error("Formatting would change a source token.");
   const size = Number.isInteger(settings.indentSize) && settings.indentSize > 0 ? Math.min(16, settings.indentSize) : Math.max(1, Math.min(16, editor.tabSize || 2));
   const tabs = settings.indentStyle === "tabs" || settings.indentStyle !== "spaces" && !editor.insertSpaces;
@@ -174230,14 +174258,14 @@ function configuredFormat(document4, services, settings, editor) {
   }
   let output = "", previousEnd = 0, originalEnd = 0, column2 = 0, continuationIndent = "";
   tokens.forEach((token, index3) => {
-    let gap = canonical5.slice(previousEnd, token.startOffset);
+    let gap = canonical4.slice(previousEnd, token.startOffset);
     const originalGap = originalText.slice(originalEnd, original2[index3].startOffset);
-    const lineStart = canonical5.lastIndexOf("\n", token.startOffset - 1) + 1;
-    const canonicalIndent = /^ */u.exec(canonical5.slice(lineStart))[0].length / 2;
+    const lineStart = canonical4.lastIndexOf("\n", token.startOffset - 1) + 1;
+    const canonicalIndent = /^ */u.exec(canonical4.slice(lineStart))[0].length / 2;
     const indentation = unit2.repeat(canonicalIndent);
     let chunkEnd = token.endOffset + 1;
     for (let next = index3 + 1; next < tokens.length && tokens[next].startOffset === chunkEnd; next++) chunkEnd = tokens[next].endOffset + 1;
-    const chunkWidth = canonical5.slice(token.startOffset, chunkEnd).length;
+    const chunkWidth = canonical4.slice(token.startOffset, chunkEnd).length;
     if (gap.includes("\n")) {
       gap = "\n".repeat(separated.has(original2[index3].startOffset) ? blankLines + 1 : 1) + indentation;
       continuationIndent = indentation + unit2;
@@ -174404,9 +174432,9 @@ function validationModels(documents) {
   return [...new Set(documents.flatMap((d2) => isModel(d2.parseResult.value) ? workspaceModels.get(d2.parseResult.value) ?? [d2.parseResult.value] : []))];
 }
 function proposedErrors(before, candidates) {
-  const canonical5 = (value2) => Array.isArray(value2) ? value2.map(canonical5) : value2 && typeof value2 === "object" ? Object.fromEntries(Object.entries(value2).sort(([a3], [b10]) => a3.localeCompare(b10)).map(([key2, value3]) => [key2, canonical5(value3)])) : value2;
+  const canonical4 = (value2) => Array.isArray(value2) ? value2.map(canonical4) : value2 && typeof value2 === "object" ? Object.fromEntries(Object.entries(value2).sort(([a3], [b10]) => a3.localeCompare(b10)).map(([key2, value3]) => [key2, canonical4(value3)])) : value2;
   const errors = (document4) => (document4.diagnostics ?? []).filter((d2) => d2.severity === 1);
-  const key = (diagnostics) => JSON.stringify(diagnostics.map((d2) => JSON.stringify(canonical5(d2))).sort());
+  const key = (diagnostics) => JSON.stringify(diagnostics.map((d2) => JSON.stringify(canonical4(d2))).sort());
   return candidates.flatMap((document4) => {
     const uri = document4.uri.toString(), previous3 = before.find((source3) => source3.uri === uri), diagnostics = errors(document4);
     if (previous3 && previous3.text === document4.textDocument.getText()) {
@@ -174578,11 +174606,11 @@ function providerModule() {
 // packages/language-server/src/timing-evidence.ts
 init_lib2();
 init_edition();
-var canonical2 = (uri) => URI2.parse(uri).toString();
-var revisions = (values) => Object.fromEntries(Object.entries(values).map(([uri, value2]) => [canonical2(uri), value2]));
+var canonical = (uri) => URI2.parse(uri).toString();
+var revisions = (values) => Object.fromEntries(Object.entries(values).map(([uri, value2]) => [canonical(uri), value2]));
 var evidence = /* @__PURE__ */ new Map();
 function getTimingEvidence(uri, sourceRevisions) {
-  const run = evidence.get(canonical2(uri));
+  const run = evidence.get(canonical(uri));
   sourceRevisions = revisions(sourceRevisions);
   if (!run) return void 0;
   const keys3 = Object.keys(run.sourceRevisions).sort(), current = Object.keys(sourceRevisions).sort();
@@ -174657,6 +174685,7 @@ init_semantic();
 // packages/language-server/src/test-inspection.ts
 init_ast2();
 init_semantic();
+init_names();
 
 // packages/language-server/src/run-cases.ts
 init_ast2();
@@ -175073,15 +175102,15 @@ init_names();
 var cell = (text8) => ({ text: text8 ?? "" });
 var column = (label2, value2) => ({ label: label2, cell: (entry) => cell(value2(entry)) });
 var original = (label2, index3) => ({ label: label2, cell: (entry) => entry.row.cells[index3] });
-var elementName = (path7) => path7.replace(/^.*(?:::|\.)/, "");
+var elementName = diagramElementName;
 var shortType = (type) => elementName(typeKey(type));
 var display = (text8, fullText) => ({ text: text8 ?? "", ...fullText && fullText !== text8 ? { fullText } : {} });
 var named = (label2, value2) => ({ label: label2, cell: (entry) => {
   const paths = value2(entry);
-  return display(paths.map(elementName).join("\n"), paths.join("\n"));
+  return display(paths.map((path7) => elementName(path7, true)).join("\n"), paths.join("\n"));
 } });
 var typed = (label2, value2) => ({ label: label2, cell: (entry) => display(value2(entry, shortType), value2(entry, typeKey)) });
-var canonical3 = (path7) => formatPath(parsePathInput(path7));
+var canonical2 = formatPath;
 var attributes = (entry) => isRequirement(entry.ast) ? entry.ast.attributes : isComponentDef(entry.ast) || isComponentUsage(entry.ast) ? members(entry.ast).filter(isAttribute) : [];
 function valueText(value2, type) {
   if (isLiteral(value2)) {
@@ -175089,7 +175118,7 @@ function valueText(value2, type) {
     if (value2.boolean !== void 0) return value2.boolean;
     if (value2.number !== void 0) return String(value2.number);
   }
-  if (!type?.size && isEnumType(type?.type?.ref) && isReferenceExpression(value2)) return parsePathInput(value2.path).split(".").at(-1);
+  if (!type?.size && isEnumType(type?.type?.ref) && isReferenceExpression(value2)) return elementName(value2.path);
   return value2.$cstNode?.text ?? "";
 }
 function attributeCell(entry, name2, source3) {
@@ -175130,7 +175159,7 @@ function gridCategoryTables(entries2, models, source3) {
   const start3 = [original("Name", 0), original("Kind", 1)], end = [original("Documentation", 3), sourceFile];
   const type = { label: "Type", cell: (entry) => {
     const declared = entry.row.cells[2];
-    return entry.node.shape === "annotation" ? declared : { ...declared, ...display(elementName(declared.text ?? ""), declared.text) };
+    return entry.node.shape === "annotation" ? declared : { ...declared, ...display(entry.node.typeDisplayName ?? elementName(declared.text ?? "", true), declared.text) };
   } };
   const tables = [];
   const add = (id2, category, label2, rows, columns) => {
@@ -175143,7 +175172,7 @@ function gridCategoryTables(entries2, models, source3) {
       rows: rows.map((entry) => ({ ...entry.row, cells: columns.map((column2) => column2.cell(entry)) }))
     });
   };
-  const pillName = (path7) => ({ text: elementName(path7), fullText: path7 });
+  const pillName = (path7) => ({ text: elementName(path7, true), fullText: path7 });
   const satisfies = { label: "Satisfies", cell: (entry) => ({
     tooltip: "Authored satisfy links identify satisfying designs. These links record intent, not proof or a passed run.",
     pills: claims.filter((item) => item.claim.requirement.ref === entry.ast).map((item) => ({
@@ -175227,7 +175256,7 @@ function gridCategoryTables(entries2, models, source3) {
       case "interface":
         columns = [
           ...start3,
-          column("Endpoints", (entry) => isConnect(entry.ast) ? canonical3(entry.ast.source) + " \u2194 " + canonical3(entry.ast.target) : ""),
+          column("Endpoints", (entry) => isConnect(entry.ast) ? canonical2(entry.ast.source) + " \u2194 " + canonical2(entry.ast.target) : ""),
           named("Policy", (entry) => isConnect(entry.ast) && entry.ast.policy?.ref ? [formatPath(identity2(entry.ast.policy.ref))] : []),
           column("Settings", (entry) => isQosPolicy(entry.ast) ? entry.ast.settings.map((setting) => formatName(setting.name) + " = " + (setting.duration ?? setting.value)?.$cstNode?.text).join("\n") : ""),
           named("Root", (entry) => isDeployment(entry.ast) && entry.ast.root.ref ? [formatPath(identity2(entry.ast.root.ref))] : []),
@@ -175240,7 +175269,7 @@ function gridCategoryTables(entries2, models, source3) {
         columns = [
           ...start3,
           type,
-          named("Subjects", (entry) => isView(entry.ast) ? entry.ast.subject ? [canonical3(entry.ast.subject)] : entry.ast.selections.map((selection2) => canonical3(selection2.subject)) : []),
+          named("Subjects", (entry) => isView(entry.ast) ? entry.ast.subject ? [canonical2(entry.ast.subject)] : entry.ast.selections.map((selection2) => canonical2(selection2.subject)) : []),
           column("Selections", (entry) => isView(entry.ast) ? entry.ast.selections.map((selection2) => selection2.$cstNode.text).join("\n") : ""),
           ...end
         ];
@@ -175248,7 +175277,7 @@ function gridCategoryTables(entries2, models, source3) {
       case "package":
         columns = [
           ...start3,
-          column("Imports", (entry) => isPackage(entry.ast) ? entry.ast.imports.map((item) => canonical3(item.namespace)).join("\n") : ""),
+          column("Imports", (entry) => isPackage(entry.ast) ? entry.ast.imports.map((item) => canonical2(item.namespace)).join("\n") : ""),
           ...end
         ];
         break;
@@ -175353,6 +175382,7 @@ function convert(n2) {
   return {
     id: id2,
     name: n2.name,
+    ...n2.kind === "package" && n2.name.includes("::") ? { nameDisplayName: diagramElementName(n2.name) } : {},
     keyword: ["component", "port"].includes(n2.kind) && isDef ? n2.kind + " def" : n2.kind === "useCase" ? "use case" : n2.kind,
     isDef,
     shape: n2.kind === "operation" ? "action" : n2.kind === "state" ? "state" : n2.kind === "package" ? "package" : ["useCase", "test"].includes(n2.kind) ? "usecase" : "box",
@@ -175369,7 +175399,19 @@ function requirementDocumentation(node2) {
   return [...new Set([documentationText2(node2), ...node2.attributes.filter((attribute) => ["description", "text"].includes(attribute.name) && isLiteral(attribute.value) && typeof attribute.value.text === "string").map((attribute) => attribute.value.text), ...sourceComments(node2).map((comment) => comment.text)].filter((text8) => !!text8))];
 }
 function requirementAttributes(node2) {
-  return isRequirement(node2) ? node2.attributes.filter((attribute) => !["description", "text"].includes(attribute.name)).map((attribute) => ({ name: attribute.name, type: typeKey(attribute.type), value: attribute.value.$cstNode.text })) : [];
+  return isRequirement(node2) ? node2.attributes.filter((attribute) => !["description", "text"].includes(attribute.name)).map((attribute) => ({ name: attribute.name, type: typeKey(attribute.type), ...typeKey(attribute.type) !== typeCaption(attribute.type) ? { typeDisplayName: typeCaption(attribute.type) } : {}, value: attribute.value.$cstNode.text })) : [];
+}
+var typeName = (type) => type?.primitive ?? (type?.type?.ref ? type.type.ref.name : "?");
+var typeCaption = (type) => type ? typeName(type) + (type.size !== void 0 ? "[" + type.size + "]" : "") : "void";
+function nodeTypeCaption(node2) {
+  if (isAttribute(node2) || isLocalVariable(node2) || isField(node2)) return typeCaption(node2.type);
+  if (isPortUsage(node2)) return node2.definition?.ref?.name ?? (node2.definition ? diagramElementName(node2.definition.$refText) : "inline");
+  if (isComponentUsage(node2)) return node2.definition?.ref?.name;
+  if (isExecutable(node2)) {
+    const sig = signature(node2);
+    return "(" + (sig?.parameters.map((parameter) => (parameter.direction ?? "in") + " " + parameter.name + ": " + typeCaption(parameter.type)).join(", ") ?? "") + ") returns " + typeCaption(sig?.result);
+  }
+  return void 0;
 }
 function withCommentCards(model, ctx) {
   if (model.kind !== "gv" && model.kind !== "cv") return model;
@@ -175522,7 +175564,7 @@ function packageLinkRows(ctx, entries2) {
     for (const claim of pkg.satisfactions) {
       const requirement = claim.requirement.ref;
       const design = diagramId(pkg.name + "::" + claim.design);
-      rows.push(row(claim, "satisfy", design, requirement ? diagramId(identity2(requirement)) : claim.requirement.$refText, parsePathInput(claim.design), requirement?.name ?? claim.requirement.$refText));
+      rows.push(row(claim, "satisfy", design, requirement ? diagramId(identity2(requirement)) : claim.requirement.$refText, diagramElementName(claim.design), requirement?.name ?? claim.requirement.$refText));
     }
     for (const link4 of pkg.verifications) {
       const test = link4.test.ref, requirement = link4.requirement.ref;
@@ -175605,6 +175647,7 @@ async function buildCurrentDiagram(services, params) {
     if (!ast) continue;
     const node2 = model.nodes.find((n2) => n2.id === diagramId(entry.id));
     if (node2) {
+      node2.typeDisplayName = nodeTypeCaption(ast);
       node2.meta = { ...node2.meta, gvDocumentation: documentationText2({ documentation: ast.documentation }), ...isRequirement(ast) ? { swamlRequirementDocumentation: requirementDocumentation(ast) } : {}, declarationId: diagramId(identity2(ast)), expandedFromDefinition: diagramId(identity2(ast)) !== node2.id, localDeclaration: diagramId(identity2(ast)) === node2.id };
       for (const port of node2.ports ?? []) {
         const candidate = ctx.candidates.find((c3) => diagramId(c3.path) === port.id), declaration = candidate?.node ?? (port.meta?.structuralPort ? portAtOccurrence(ctx.candidates, port.id)?.port : void 0);
@@ -175629,14 +175672,14 @@ async function buildCurrentDiagram(services, params) {
       model.nodes.push({ id: id2, name: s2.$cstNode.text, keyword: "schedule", shape: "action", isDef: false, parent: diagramId(entry.id), source: source(s2), meta: { nonExecutableGrouping: true, gvExplicit: true, gvOwnerId: diagramId(entry.id), gvInScope: true, gvUsage: false } });
       model.edges.push({ id: id2 + "->target", from: id2, to: diagramId(entry.id + "." + s2.operation), kind: "dependency", label: s2.kind === "after" ? "successful completion" : "activation", source: source(s2) });
     });
-    if (node2 && entry.ports?.length) node2.compartments = [{ title: "Ports", items: entry.ports.flatMap((p2) => p2.members.map((m2) => ({ text: m2.direction + " " + m2.kind + " " + p2.name + "." + m2.name + (m2.kind === "attribute" ? ": " + m2.type : "(" + m2.parameters.map((v2) => v2.direction + " " + v2.name + ": " + v2.type).join(", ") + ")" + (m2.kind === "operation" ? " returns " + m2.type : "")), source: node2.ports?.find((x2) => x2.id === node2.id + "::" + p2.name + "::" + m2.name)?.source ?? node2.source }))) }, ...node2.compartments ?? []];
+    if (node2 && entry.ports?.length) node2.compartments = [{ title: "Ports", items: entry.ports.flatMap((p2) => p2.members.map((m2) => ({ text: m2.direction + " " + m2.kind + " " + p2.name + "." + m2.name + (m2.kind === "attribute" ? ": " + diagramElementName(m2.type) : "(" + m2.parameters.map((v2) => v2.direction + " " + v2.name + ": " + diagramElementName(v2.type)).join(", ") + ")" + (m2.kind === "operation" ? " returns " + diagramElementName(m2.type) : "")), source: node2.ports?.find((x2) => x2.id === node2.id + "::" + p2.name + "::" + m2.name)?.source ?? node2.source }))) }, ...node2.compartments ?? []];
     if (node2 && isPortUsage(ast)) {
       node2.type = ast.definition?.$refText ?? "inline";
       node2.meta = { ...node2.meta, optional: ast.optional, reversed: ast.reversed };
     }
     if (node2 && isState(ast)) {
       if (ast.final) node2.shape = "final";
-      node2.meta = { ...node2.meta, stateOwnerId: node2.parent };
+      node2.meta = { ...node2.meta, stateOwnerId: node2.parent, statement: statementIdentity(ast) };
     }
     if (isExecutable(ast)) for (const state2 of body(ast)?.states ?? []) state2.transitions.forEach((transition2, index3) => {
       const from = diagramId(entry.id + "." + state2.name), to = diagramId(entry.id + "." + transition2.target);
@@ -175652,7 +175695,7 @@ async function buildCurrentDiagram(services, params) {
         label: triggerGuard + (transition2.effect.statements.length ? " / " + effectText : ""),
         source: source(transition2),
         effect: transition2.effect.statements.length ? { id: effectId, role: "effect", declarationId: diagramId(identity2(ast)) + "::" + state2.name + "::$transition:" + index3 + "::$effect", ownerId: from, summary: effectText, text: effectText, source: source(transition2), bodySource: source(transition2.effect), provenance: diagramId(identity2(ast)) === diagramId(entry.id) ? "local" : "inherited", status: "available" } : void 0,
-        meta: { semanticKind: "transition", sourceOrder: index3, guardText: guard2 ?? "", transitionTriggerGuard: triggerGuard, effectText }
+        meta: { semanticKind: "transition", sourceOrder: index3, guardText: guard2 ?? "", transitionTriggerGuard: triggerGuard, effectText, statement: statementIdentity(transition2) }
       });
     });
     if ((isExecutable(ast) || isScenario(ast) && ast.statements.length) && kind2 === "fv") addOperationFlow(model, entry, ast);
@@ -175747,7 +175790,7 @@ async function buildCurrentDiagram(services, params) {
       let current = op;
       while (current && (current.id !== anchor || flowFrame(current))) {
         if (frames.has(current.id)) break;
-        frames.set(current.id, { id: current.id, label: current.name, keyword: current.keyword, parent: current.parent, source: current.source, type: current.type, ports: current.keyword === "operation" ? current.ports : void 0, meta: { ...current.meta, swamlScope: true, contextOnly: !flowFrame(current) } });
+        frames.set(current.id, { id: current.id, label: current.name, keyword: current.keyword, parent: current.parent, source: current.source, type: current.type, typeDisplayName: current.typeDisplayName, ports: current.keyword === "operation" ? current.ports : void 0, meta: { ...current.meta, swamlScope: true, contextOnly: !flowFrame(current) } });
         current = current.parent ? scopedNodes.get(current.parent) : void 0;
       }
     }
@@ -175771,7 +175814,7 @@ async function buildCurrentDiagram(services, params) {
       const typeField = ast && gridTypeField(ast);
       const documentationEditable = writable2 && !!(authoredDocumentation !== void 0 || ast && gridDocumentationInsertion(ast));
       const row = { id: n2.id, name: n2.name, keyword: n2.keyword, source: rowSource, cells: [
-        { text: n2.name, ...writable2 ? { edit: { kind: "name", value: n2.name } } : {} },
+        { text: n2.nameDisplayName ?? n2.name, ...n2.nameDisplayName && n2.nameDisplayName !== n2.name ? { fullText: n2.name } : {}, ...writable2 ? { edit: { kind: "name", value: n2.name } } : {} },
         { text: n2.keyword },
         { text: n2.type ?? typeField?.value ?? "", ...writable2 && typeField ? { edit: { kind: "type", value: typeField.value } } : {} },
         { text: documentation.join("\n\n"), documentation, ...documentationEditable ? { edit: { kind: "doc", value: authoredDocumentation ?? "" } } : {} },
@@ -175788,7 +175831,7 @@ async function buildCurrentDiagram(services, params) {
     const candidateEvidence = getTimingEvidence(params.uri, revisions2), runPrefixes = (result) => result.target.kind === "package" ? ctx.models.flatMap((m2) => m2.packages).filter((p2) => p2.name === result.target.identity).flatMap((p2) => p2.elements.filter(isComponentUsage).map((root6) => p2.name + "::" + root6.name + ".")) : [result.target.identity + "."];
     const evidence2 = candidateEvidence && contracts.some((c2) => runPrefixes(candidateEvidence.result).some((prefix) => c2.functionPath.startsWith(prefix))) ? candidateEvidence : void 0;
     const runPackage = evidence2 && (evidence2.result.target.kind === "package" ? evidence2.result.target.identity : evidence2.result.target.identity.slice(0, evidence2.result.target.identity.lastIndexOf("::")));
-    const canonical5 = (path7) => path7.includes("::") ? path7 : runPackage + "::" + path7;
+    const canonical4 = (path7) => path7.includes("::") ? path7 : runPackage + "::" + path7;
     const selectedSubjects = new Set(contracts.map((c2) => c2.functionPath));
     const endNs = evidence2 ? evidence2.result.status === "horizon" ? evidence2.result.options.untilNs : evidence2.result.timeNs : 0;
     const timing = evidence2 && projectOperationTiming(evidence2.result), requestActivations = /* @__PURE__ */ new Map();
@@ -175798,7 +175841,7 @@ async function buildCurrentDiagram(services, params) {
       const markers = timing.markers.filter((m2) => (m2.activation ?? (m2.kind === "timeout" && typeof m2.correlation === "string" ? requestActivations.get(m2.correlation) : void 0)) === id2);
       return {
         id: id2,
-        functionPath: canonical5(values[0].subject),
+        functionPath: canonical4(values[0].subject),
         outcome: timing.markers.find((m2) => m2.activation === id2)?.kind ?? "open",
         intervals: values.map((i2) => ({ state: i2.phase, start: { timeNs: i2.startNs }, end: { timeNs: i2.endNs ?? endNs }, open: i2.endNs === void 0 })),
         markers: markers.map((m2) => ({ kind: m2.kind, point: { timeNs: m2.timeNs, ordinal: m2.ordinal }, correlation: typeof m2.correlation === "string" ? m2.correlation : void 0, detail: m2.subject }))
@@ -176514,13 +176557,13 @@ ${JSON.stringify(source3.range)}` : void 0;
     allocation: "allocations"
   };
   for (const child of children2) {
-    const canonical5 = canonicalById.get(child.id) ?? canonicalBySource.get(sourceKey5(child.source) ?? "");
+    const canonical4 = canonicalById.get(child.id) ?? canonicalBySource.get(sourceKey5(child.source) ?? "");
     const kind2 = child.keyword.replace(/^ref\s+/, "").replace(/\s+def$/, "");
     const wiringFeature = !child.isDef && /^(?:connection|interface|connector)$/.test(kind2);
-    const title = wiringFeature && node2.shape !== "package" ? "features" : node2.shape === "package" ? "members" : canonical5?.compartment.title ?? (child.isDef ? "definitions" : titles[kind2] ?? "members");
+    const title = wiringFeature && node2.shape !== "package" ? "features" : node2.shape === "package" ? "members" : canonical4?.compartment.title ?? (child.isDef ? "definitions" : titles[kind2] ?? "members");
     const definition3 = index3.byId.get(index3.definition.get(child.id) ?? "");
     const type = child.type ?? definition3?.name;
-    const text8 = node2.shape === "package" || child.isDef ? `\xAB${child.keyword}\xBB ${child.name}` : canonical5?.item.text ?? (kind2 === "doc" ? child.type ?? child.name : `${child.name}${type ? ` : ${type}` : ""}${child.multiplicity ? ` ${child.multiplicity}` : ""}${child.value !== void 0 ? ` = ${child.value}` : ""}`);
+    const text8 = node2.shape === "package" || child.isDef ? `\xAB${child.keyword}\xBB ${child.name}` : canonical4?.item.text ?? (kind2 === "doc" ? child.type ?? child.name : `${child.name}${type ? ` : ${type}` : ""}${child.multiplicity ? ` ${child.multiplicity}` : ""}${child.value !== void 0 ? ` = ${child.value}` : ""}`);
     const group = groups.get(title) ?? { title, items: [], expandable: false, expanded: false };
     group.items.push({ text: text8, source: child.source, membership: child.membership, node: child });
     groups.set(title, group);
@@ -177377,10 +177420,10 @@ function projectGvStructureRelationships(input) {
     ...record2.body.nodes.map((node2) => node2.id)
   ]));
   for (const node2 of model.nodes) if (node2.meta?.gvRelationshipId || node2.meta?.gvRelationshipBodyOf) omitted.add(node2.id);
-  const sourceKeys = new Set(records.map((record2) => sourceKey4(record2.declaration)).filter(Boolean));
+  const sourceKeys2 = new Set(records.map((record2) => sourceKey4(record2.declaration)).filter(Boolean));
   const primaryIds = new Set(records.flatMap((record2) => record2.edges.map((edge) => edge.id)));
   const nodes2 = model.nodes.filter((node2) => !omitted.has(node2.id));
-  const edges = model.edges.filter((edge) => edge.meta?.connectionDefinitionGraphical !== true && !primaryIds.has(edge.id) && !omitted.has(edge.from) && !omitted.has(edge.to) && !(sourceKeys.has(sourceKey4(edge)) && !["composition", "owningMembership", "definedBy", "reference"].includes(edge.kind)));
+  const edges = model.edges.filter((edge) => edge.meta?.connectionDefinitionGraphical !== true && !primaryIds.has(edge.id) && !omitted.has(edge.from) && !omitted.has(edge.to) && !(sourceKeys2.has(sourceKey4(edge)) && !["composition", "owningMembership", "definedBy", "reference"].includes(edge.kind)));
   for (const record2 of records) {
     if (!canDisclose(record2) || !gvElementIsExpanded(record2.declaration, expanded2)) continue;
     let displayOwner = record2.ownerId;
@@ -178260,13 +178303,14 @@ function annotationLines(text8, width) {
 }
 function requirementContent(node2) {
   const documentation = Array.isArray(node2.meta?.swamlRequirementDocumentation) ? node2.meta.swamlRequirementDocumentation.filter((text8) => typeof text8 === "string") : [];
-  const attributes2 = Array.isArray(node2.meta?.swamlRequirementAttributes) ? node2.meta.swamlRequirementAttributes.filter((attribute) => !!attribute && typeof attribute.name === "string" && typeof attribute.type === "string" && typeof attribute.value === "string") : [];
+  const attributes2 = Array.isArray(node2.meta?.swamlRequirementAttributes) ? node2.meta.swamlRequirementAttributes.filter((attribute) => !!attribute && typeof attribute.name === "string" && typeof attribute.type === "string" && typeof attribute.value === "string" && (attribute.typeDisplayName === void 0 || typeof attribute.typeDisplayName === "string")) : [];
   return { documentation, attributes: attributes2 };
 }
 function requirementFallback(node2, width, maximumLines = Number.POSITIVE_INFINITY) {
   const content3 = requirementContent(node2), documentation = content3.documentation.join("\n\n");
-  const attributes2 = content3.attributes.map((attribute) => `${attribute.name}: ${attribute.type} = ${attribute.value}`).join("\n");
-  const text8 = [documentation, attributes2].filter(Boolean).join("\n\n");
+  const attributes2 = content3.attributes.map((attribute) => `${attribute.name}: ${attribute.typeDisplayName ?? attribute.type} = ${attribute.value}`).join("\n");
+  const canonicalAttributes = content3.attributes.map((attribute) => `${attribute.name}: ${attribute.type} = ${attribute.value}`).join("\n");
+  const text8 = [documentation, canonicalAttributes].filter(Boolean).join("\n\n");
   const units = Math.max(1, Math.floor(width / 6.2));
   const attributeLines = attributes2 ? attributes2.split(/\r?\n/u).flatMap((line2) => {
     const wrapped = [];
@@ -190343,7 +190387,7 @@ var xy = (p2) => `${fmt(p2.x)},${fmt(p2.y)}`;
 function cleanPolyline(points) {
   return clean(points);
 }
-function canonical4(points) {
+function canonical3(points) {
   return clean(points.map(rounded));
 }
 function clean(points) {
@@ -190647,7 +190691,7 @@ var OrthogonalRouteIndex = class _OrthogonalRouteIndex {
   }
   /** Add one settled route. Input is compared on the rounded grid, never mutated. */
   add(points, tags) {
-    const route = canonical4([...points]);
+    const route = canonical3([...points]);
     const horizontals = [];
     const verticals = [];
     for (let i2 = 1; i2 < route.length; i2 += 1) {
@@ -190680,7 +190724,7 @@ var OrthogonalRouteIndex = class _OrthogonalRouteIndex {
   /** Count strict perpendicular intersections. Endpoint contacts and parallel
    * overlaps are joins/continuations, not route crossings. */
   crossingCount(points) {
-    const route = canonical4([...points]);
+    const route = canonical3([...points]);
     let count = 0;
     for (let i2 = 1; i2 < route.length; i2 += 1) {
       const a3 = route[i2 - 1], b10 = route[i2];
@@ -190710,7 +190754,7 @@ var OrthogonalRouteIndex = class _OrthogonalRouteIndex {
    * geometry is indexed once by {@link add}, so a shared structural bus has
    * one occupancy cost rather than one per semantic member. */
   overlapCount(points) {
-    const route = canonical4([...points]);
+    const route = canonical3([...points]);
     let count = 0;
     for (let i2 = 1; i2 < route.length; i2 += 1) {
       const a3 = route[i2 - 1], b10 = route[i2];
@@ -197403,10 +197447,10 @@ function registerEdgeSideHandles(nodes2, edges) {
       const node2 = byId.get(id2);
       const parsed = parseSideAnchorHandleId(handle2);
       if (!node2 || !parsed) continue;
-      const canonical5 = sideAnchorHandleId(parsed.side, parsed.offset);
-      if (canonical5 !== handle2) {
-        if (end === "source") edge.sourceHandle = canonical5;
-        else edge.targetHandle = canonical5;
+      const canonical4 = sideAnchorHandleId(parsed.side, parsed.offset);
+      if (canonical4 !== handle2) {
+        if (end === "source") edge.sourceHandle = canonical4;
+        else edge.targetHandle = canonical4;
         if (edge.data?.settledGeometry) edge.data = { ...edge.data, settledGeometry: void 0 };
       }
       const current = node2.data.edgeSideAnchors?.[parsed.side] ?? [];
@@ -202805,6 +202849,9 @@ var import_react5 = __toESM(require_react());
 
 // packages/extension/src/swaml-name.ts
 init_names();
+function swamlPathName(value2) {
+  return value2.split(/::|\./u).at(-1) ?? value2;
+}
 
 // packages/extension/src/webview/diagram/toolbox.ts
 var ELEMENT_LABELS = { useCase: "use case" };
@@ -205323,6 +205370,18 @@ var TIME_ORIGIN = 240;
 var TIME_WIDTH = 900;
 var TIME_ROW_HEIGHT = 72;
 var TIME_CHART_WIDTH = TIME_ORIGIN + TIME_WIDTH + 24;
+function sameSource2(left, right) {
+  return !!left && !!right && left.uri === right.uri && left.revision === right.revision && left.range.start.line === right.range.start.line && left.range.start.character === right.range.start.character && left.range.end.line === right.range.end.line && left.range.end.character === right.range.end.character;
+}
+function timingExecutable(model, id2) {
+  const matches = id2 ? model.nodes.filter((item) => item.id === id2) : [];
+  return matches.length && matches.every((item) => item === matches[0] || sameSource2(item.source, matches[0].source)) ? matches[0] : void 0;
+}
+function timeContextTarget(model, node2) {
+  const executable2 = timingExecutable(model, node2.data.modelId)?.source, shown2 = node2.data.source;
+  const before = (left, right) => left.line < right.line || left.line === right.line && left.character <= right.character;
+  return node2.data.kind !== "axis" && node2.data.modelId && executable2 && shown2 && executable2.uri === shown2.uri && executable2.revision === shown2.revision && before(executable2.range.start, shown2.range.start) && before(shown2.range.end, executable2.range.end) ? node2.data.modelId : void 0;
+}
 function timeScale(horizonNs) {
   const target2 = Math.max(1, horizonNs) / 8, magnitude = 10 ** Math.floor(Math.log10(target2));
   const stepNs = Math.max(1, ([1, 2, 5, 10].find((n2) => n2 * magnitude >= target2) ?? 10) * magnitude);
@@ -205358,9 +205417,8 @@ function timeNodes(model) {
   if (!timing) return [];
   const trace = timing.trace, scale = trace ? timeScale(trace.endNs) : void 0, nodes2 = [];
   const participantLines = (path7) => {
-    const name2 = path7.replace((trace?.target ?? model.root.qname) + ".", "").replace(/^[^:]+::/, "");
-    const split = name2.lastIndexOf(".");
-    return split < 0 ? textLines(name2 + "()", 25) : [...textLines(name2.slice(0, split), 25), ...textLines(name2.slice(split + 1) + "()", 25)];
+    const split = path7.lastIndexOf(".");
+    return split < 0 ? textLines(swamlPathName(path7) + "()", 25) : [...textLines(swamlPathName(path7.slice(0, split)), 25), ...textLines(swamlPathName(path7.slice(split + 1)) + "()", 25)];
   };
   const add = (id2, x2, y3, width, height, data) => {
     nodes2.push({
@@ -205381,8 +205439,8 @@ function timeNodes(model) {
   const paths = [.../* @__PURE__ */ new Set([...timing.contracts.map((c2) => c2.functionPath), ...trace?.activations.map((a3) => a3.functionPath) ?? []])];
   for (const path7 of paths) {
     const contractIndex = timing.contracts.findIndex((c2) => c2.functionPath === path7), contract = timing.contracts[contractIndex];
-    const executable2 = contract?.modelId ? model.nodes.find((n2) => n2.id === contract.modelId) : model.nodes[contractIndex];
-    const source3 = executable2?.source, modelId = contract?.modelId ?? executable2?.id ?? "";
+    const executable2 = timingExecutable(model, contract?.modelId ?? model.nodes[contractIndex]?.id);
+    const source3 = executable2?.source, modelId = executable2?.id ?? "";
     const declared = contract?.declared ?? (contract?.wcetNs !== void 0 || contract?.deadlineNs !== void 0);
     const detail = contract ? [
       declared ? "Declared contract" : "No timing contract declared",
@@ -205515,7 +205573,8 @@ var TimeView = (0, import_react10.forwardRef)(function TimeView2({
   onShowGridChange,
   onViewportChange,
   onSelect,
-  onReveal
+  onReveal,
+  onContextNode
 }, ref) {
   const [layoutRevision, setLayoutRevision] = (0, import_react10.useState)(0);
   const nodes2 = (0, import_react10.useMemo)(() => timeNodes(model).map((node2) => ({
@@ -205645,6 +205704,13 @@ var TimeView = (0, import_react10.forwardRef)(function TimeView2({
       },
       onPaneClick: () => onSelect(void 0),
       onNodeClick: (_event, node2) => onSelect(node2.data.modelId || void 0),
+      onNodeContextMenu: onContextNode ? (event, node2) => {
+        const id2 = timeContextTarget(model, node2);
+        if (!id2) return;
+        event.preventDefault();
+        event.stopPropagation();
+        onContextNode(id2, event.clientX, event.clientY);
+      } : void 0,
       onNodeDoubleClick: (_event, node2) => onReveal(node2.data.source, node2.data.modelId, true),
       children: [
         showGrid && /* @__PURE__ */ (0, import_jsx_runtime9.jsx)(DiagramGrid, {}),
@@ -221138,6 +221204,11 @@ function OverlayNodeBadge({ item, w: w2 }) {
 
 // packages/extension/src/webview/diagram/flow/nodes.tsx
 var import_jsx_runtime19 = __toESM(require_jsx_runtime());
+function elementTitle(element3) {
+  const type = element3.type ?? (typeof element3.meta?.gvDefinitionId === "string" ? element3.meta.gvDefinitionId : void 0);
+  return [element3.id, type, ...element3.actions?.map((action) => `${action.role}: ${action.status}, ${action.provenance}
+${action.summary}`) ?? []].filter(Boolean).join("\n");
+}
 var SIDES = [...PORT_DOCK_SIDES];
 var POS = {
   top: Position3.Top,
@@ -221633,7 +221704,7 @@ function BoxBody({ node: node2, w: w2, h: h2, showMult, quietTitle = false }) {
           ] }) }),
           /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("tbody", { children: requirementAttributes2.map((attribute) => /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("tr", { children: [
             /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("td", { children: attribute.name }),
-            /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("td", { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("code", { children: attribute.type }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("td", { title: attribute.typeDisplayName !== void 0 ? attribute.type : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("code", { children: attribute.typeDisplayName ?? attribute.type }) }),
             /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("td", { children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("code", { children: attribute.value }) })
           ] }, attribute.name)) })
         ] }) })
@@ -222598,8 +222669,7 @@ function NodeBody({ node: semanticNode, data, selectedPortId, hoveredPortId, mov
   const clip = !fittedGvBox && !connectionBar && (!CLIP_EXEMPT.has(node2.shape) || data.kind === "gv" && node2.shape === "actor");
   const elementColorClass = diagramElementColorClass(diagramElementColorTypeForNode(node2.shape, node2.keyword));
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("svg", { className: `rf-node-svg ${elementColorClass}${overlayClassName(node2)}`, width: w2, height: h2, style: { overflow: "visible" }, children: [
-    node2.actions?.length ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("title", { children: node2.actions.map((action) => `${action.role}: ${action.status}, ${action.provenance}
-${action.summary}`).join("\n\n") }) : null,
+    /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("title", { children: elementTitle(semanticNode) }),
     /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(NodeSurface, { node: node2, w: w2, h: h2 }),
     clip ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(
       "svg",
@@ -222720,7 +222790,7 @@ function SwamlNode({ id: id2, data, draggable, selected: selected2, width, heigh
       {
         ref: containerRef,
         className: `rf-node${isLifeline ? " rf-lifeline" : ""}${selected2 ? " selected" : ""}${nodeSideStartable ? " rf-node-graph" : ""}${dropClass}${draggable === false ? "" : " rf-node-movable"}`,
-        title: typeof node2.meta?.statementHelp === "string" ? node2.name + "\n\n" + node2.meta.statementHelp : void 0,
+        title: typeof node2.meta?.statementHelp === "string" ? node2.name + "\n\n" + node2.meta.statementHelp : elementTitle(node2),
         style: {
           width: w2,
           height: h2,
@@ -222828,7 +222898,7 @@ function SwamlNode({ id: id2, data, draggable, selected: selected2, width, heigh
               "div",
               {
                 className: "dseq-lifeline-header-hit",
-                title: node2.name,
+                title: elementTitle(node2),
                 style: { left: 0, top: 0, width: w2, height: SEQ_LIFELINE_HEAD_HEIGHT }
               }
             ),
@@ -222862,7 +222932,7 @@ function SwamlNode({ id: id2, data, draggable, selected: selected2, width, heigh
             "div",
             {
               className: "rf-node-header",
-              title: node2.name,
+              title: elementTitle(node2),
               style: {
                 left: 0,
                 top: 0,
@@ -223307,8 +223377,7 @@ function FrameNode({ id: id2, data, selected: selected2, width, height, position
           }
         ) : null,
         /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("svg", { className: `rf-node-svg ${elementColorClass}`, width: w2, height: h2, style: { overflow: "visible" }, children: [
-          frame2.actions?.length ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("title", { children: frame2.actions.map((action) => `${action.role}: ${action.status}, ${action.provenance}
-${action.summary}`).join("\n\n") }) : null,
+          /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("title", { children: elementTitle(frame2) }),
           /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("rect", { className: "dframe-hover-band", x: 0, y: 0, width: w2, height: h2, rx: 12, fill: "none", stroke: "transparent" }),
           /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("g", { className: `dshape-surface${frameRectangleSurface(frame2, data.kind, w2, h2) ? " dshape-rectangle" : ""}`, children: isPackage2 && data.kind === "gv" ? /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("path", { className: `dframe-rect package${isLibraryPackage ? " library" : ""}${data.isContainer ? " container" : ""}`, d: packageFramePath(w2, h2) }) : /* @__PURE__ */ (0, import_jsx_runtime19.jsx)("rect", { className: `dframe-rect${frame2.meta?.gvReferenceFeature === true ? " dreference-feature" : ""}${data.isContainer ? " container" : ""}${frameSemanticClass ? ` ${frameSemanticClass}` : ""}${frame2.meta?.boundaryBox === true ? " boundary" : ""}${frame2.meta?.parallel === true ? " parallel" : ""}${frame2.meta?.loop === true ? " loop" : ""}${isStructuredControl ? " structured-control" : ""}${isStructuredControl && !isNamedStructuredAction ? " structured-anonymous" : ""}${frame2.meta?.performerLane === true ? " performer" : ""}${frame2.meta?.performerConflict === true ? " performer-conflict" : ""}${frame2.meta?.exhibitBoundary === true ? " exhibitor" : ""}${frame2.meta?.connectionFrame === true ? " dconnection-open" : ""}`, x: 0, y: 0, width: w2, height: h2, rx: frame2.isDef === true ? 0 : 12 }) }),
           /* @__PURE__ */ (0, import_jsx_runtime19.jsxs)("svg", { width: w2, height: h2, overflow: clipFrameContent ? "hidden" : "visible", children: [
@@ -223488,7 +223557,7 @@ ${action.summary}`).join("\n\n") }) : null,
               width: frame2.meta?.gvCanExpand === true ? Math.max(0, w2 - 28) : "100%",
               height: isStructuredControl && !isNamedStructuredAction ? frameHeaderHeight : titleHeaderHeight
             },
-            title: isStructuredControl && !isNamedStructuredAction && structuredCondition ? `Double-click to edit the condition; drag to move \xAB${structuredKeyword}\xBB` : diagramDisplayNames(frame2).name || `\xAB${structuredKeyword}\xBB${structuredCondition ? ` ${structuredCondition}` : ""}`,
+            title: isStructuredControl && !isNamedStructuredAction && structuredCondition ? `Double-click to edit the condition; drag to move \xAB${structuredKeyword}\xBB` : elementTitle(frame2),
             onDoubleClick: isStructuredControl && !isNamedStructuredAction && structuredCondition ? (e2) => {
               e2.preventDefault();
               e2.stopPropagation();
@@ -224746,6 +224815,9 @@ function configuredDiagnostics(diagnostics, settings) {
     return [{ ...diagnostic, severity }];
   });
 }
+function diagnosticsFailPolicy(loaded, strict = false) {
+  return loaded.diagnostics.some((item) => item.severity === 1 || (strict || loaded.settings.get(item.uri)?.["swaml.lint.profile"] === "strict") && item.severity === 2) || configuredDiagnostics(loaded.diagnostics, loaded.settings).some((item) => item.severity === 1);
+}
 function parseArguments(args2, flags) {
   const values = {}, switches = /* @__PURE__ */ new Set(), inputs = [];
   for (let index3 = 0; index3 < args2.length; index3++) {
@@ -224768,7 +224840,7 @@ function parseArguments(args2, flags) {
 // packages/cli/package.json
 var package_default = {
   name: "swaml-diagram",
-  version: "0.15.0",
+  version: "0.17.0",
   private: true,
   type: "module",
   scripts: {
@@ -224806,7 +224878,7 @@ async function validateMain(args2) {
     for (const item of diagnostics) console.log(`${item.file}:${item.line}:${item.column}: ${item.severity === 1 ? "error" : item.severity === 2 ? "warning" : "info"} ${item.code ?? ""}: ${item.message}`);
     if (!diagnostics.length) console.log(loaded.diagnostics.some((item) => item.severity === 1) ? `swa.ml source is invalid; ${loaded.diagnostics.length} diagnostic(s) hidden by display settings. Use --no-config to inspect them.` : `Validated ${documents.length} swa.ml file(s), swa.ml 2.1 (implementation 3.0.0).`);
   }
-  return loaded.diagnostics.some((item) => item.severity === 1 || (switches.has("strict") || loaded.settings.get(item.uri)?.["swaml.lint.profile"] === "strict") && item.severity === 2) || diagnostics.some((item) => item.severity === 1) ? 1 : 0;
+  return diagnosticsFailPolicy(loaded, switches.has("strict")) ? 1 : 0;
 }
 
 // packages/cli/src/main.ts
@@ -224835,7 +224907,7 @@ async function diagramMain(args2) {
   const sidecar = switches.has("no-config") ? void 0 : readSideCar(root6, file);
   const settings = switches.has("no-config") ? diagramSettingsFor(void 0) : diagramSettingsFor(readProjectConfig(root6), readWorkspaceSettings(root6));
   const loaded = await loadWorkspace([file, ...values.workspace ? [values.workspace] : []], { languageVersion: values["language-version"], noConfig: switches.has("no-config") });
-  if (loaded.diagnostics.some((item) => item.severity === 1 || switches.has("strict") && item.severity === 2)) {
+  if (diagnosticsFailPolicy(loaded, switches.has("strict"))) {
     for (const item of loaded.diagnostics) console.error(`${item.file}:${item.line}:${item.column}: ${item.code ?? ""} ${item.message}`);
     return 1;
   }

package/dist/validate.mjs

@@ -43725,7 +43725,7 @@ var init_swaml_module = __esm({
 // packages/cli/package.json
 var package_default = {
   name: "swaml-diagram",
-  version: "0.15.0",
+  version: "0.17.0",
   private: true,
   type: "module",
   scripts: {
@@ -44494,6 +44494,16 @@ init_semantic();
 init_ast2();
 init_semantic();
 
+// packages/language-server/src/diagram-names.ts
+init_names();
+function usageName(definition) {
+  const words = definition.split(/[^A-Za-z0-9_]+/u).filter(Boolean);
+  if (!words.length || /[^A-Za-z0-9_ ]/u.test(definition)) return definition[0].toLowerCase() + definition.slice(1);
+  const lower = (word) => /^[A-Z0-9]+$/u.test(word) ? word.toLowerCase() : word[0].toLowerCase() + word.slice(1);
+  const value = lower(words[0]) + words.slice(1).map((word) => word[0].toUpperCase() + word.slice(1)).join("");
+  return /^[_A-Za-z]/u.test(value) ? value : "_" + value;
+}
+
 // packages/language-server/src/diagrams.ts
 init_names();
 
@@ -45490,15 +45500,6 @@ function resolveSelection(services, uri, selection) {
 // packages/language-server/src/diagram-edits.ts
 init_presentation();
 
-// packages/language-server/src/diagram-names.ts
-function usageName(definition) {
-  const words = definition.split(/[^A-Za-z0-9_]+/u).filter(Boolean);
-  if (!words.length || /[^A-Za-z0-9_ ]/u.test(definition)) return definition[0].toLowerCase() + definition.slice(1);
-  const lower = (word) => /^[A-Z0-9]+$/u.test(word) ? word.toLowerCase() : word[0].toLowerCase() + word.slice(1);
-  const value = lower(words[0]) + words.slice(1).map((word) => word[0].toUpperCase() + word.slice(1)).join("");
-  return /^[_A-Za-z]/u.test(value) ? value : "_" + value;
-}
-
 // packages/language-server/src/statement-edits.ts
 init_lib2();
 init_ast2();
@@ -45723,24 +45724,33 @@ var fresh2 = (base, used) => {
 };
 var forwards = (structure2, port) => members(structure2).filter(isConnect).some((link) => link.source === port && link.target.includes(".") || link.target === port && link.source.includes("."));
 var memberNames = (structure2) => new Set(members(structure2).map((item) => item.name).filter(Boolean));
-function lifeline(models, home, value, what) {
+function lifeline(models, home, value, what, scenario) {
   const typed = value.trim();
-  if (typed === "\xABtest\xBB" || typed.endsWith("::$test")) return { kind: "test" };
-  if (typed.endsWith("::$script")) throw Error("A use case without actors has no lifeline to act from. Associate an actor with it first.");
   const gate = /^(.*)::\$port:(.+)$/u.exec(typed), id = gate ? gate[1] : typed;
+  const ids = [.../* @__PURE__ */ new Set([id, parsePathInput(id)])];
   const find = (pkg, path4) => connectionRoutes(pkg).occurrences.find((item) => item.path === path4);
-  const packages = [home, ...models.flatMap((model) => model.packages).filter((item) => local(item) && item !== home)];
-  for (const pkg of packages) {
-    const prefix = diagramId(pkg.name) + "::";
-    if (!id.startsWith(prefix)) continue;
-    const found2 = find(pkg, id.slice(prefix.length).split("::").join("."));
+  const prefix = diagramId(home.name) + "::";
+  let found = ids.filter((candidate) => candidate.startsWith(prefix) || !candidate.includes("::")).map((candidate) => find(home, (candidate.startsWith(prefix) ? candidate.slice(prefix.length) : candidate).split("::").join("."))).find(Boolean);
+  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure, ...gate ? { port: gate[2] } : {} };
+  const scenarioId = scenario && diagramId(identity2(scenario));
+  if (scenario && (typed === "\xABtest\xBB" || ids.includes(scenarioId + "::$test"))) {
+    if (scenario.kind !== "test") throw Error("Only a test calls its subject directly; a use case acts through the ports of its actors.");
+    return { kind: "test" };
+  }
+  if (scenario?.kind === "useCase" && ids.includes(scenarioId + "::$script")) throw Error("A use case without actors has no lifeline to act from. Associate an actor with it first.");
+  const packages = models.flatMap((model) => model.packages).filter((item) => local(item) && item !== home);
+  for (const candidate of ids) for (const pkg of packages) {
+    const prefix2 = diagramId(pkg.name) + "::";
+    if (!candidate.startsWith(prefix2)) continue;
+    const found2 = find(pkg, candidate.slice(prefix2.length).split("::").join("."));
     if (found2) return { kind: "occurrence", pkg, path: found2.path, structure: found2.structure, ...gate ? { port: gate[2] } : {} };
   }
-  const found = find(home, parsePathInput(id).split("::").join("."));
-  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure };
+  found = ids.map((candidate) => find(home, candidate.split("::").join("."))).find(Boolean);
+  if (found) return { kind: "occurrence", pkg: home, path: found.path, structure: found.structure, ...gate ? { port: gate[2] } : {} };
   throw Error(`${typed} is not an occurrence of ${home.name}. Choose one of its lifelines for where the message ${what}.`);
 }
 function connected(from, to) {
+  if (to) samePackage(from, to);
   const routes = connectionRoutes(from.pkg), out = [];
   for (const link of routes.links) for (const [mine, other] of [[0, 1], [1, 0]]) {
     const end = link.ends[mine], peer = link.ends[other], cut = end.lastIndexOf("."), peerCut = peer.lastIndexOf(".");
@@ -45752,6 +45762,9 @@ function connected(from, to) {
   }
   return out;
 }
+function samePackage(from, to) {
+  if (from.pkg !== to.pkg) throw Error("Messages cannot connect occurrences from different packages. Choose lifelines of the same package.");
+}
 function addMessage(plan, request) {
   const { models } = plan, kind2 = request.kind;
   if (!["send", "publish", "call"].includes(kind2)) throw Error("Choose send, publish or call for the message.");
@@ -45826,6 +45839,7 @@ function useMember(w2, port, initiator, emitter) {
   return shape;
 }
 function newRoute(w2, initiator, receiver, portName, emitter) {
+  samePackage(initiator, receiver);
   const first2 = declaring(initiator.structure), second = declaring(receiver.structure);
   if (first2 === second) throw Error(`${initiator.path} and ${receiver.path} share one declaration. Connect them in Interconnect View first.`);
   for (const structure2 of [first2, second]) if (!local(structure2)) throw Error("Standard-library declarations are read-only.");
@@ -45871,8 +45885,10 @@ function scriptMessage(w2, scenario, pkg) {
   const subject = caseSubject(scenario), { request, kind: kind2, name, segments } = w2;
   const typedFrom = request.from?.trim() || (segments.length === 3 ? segments[0] : "");
   if (!typedFrom) throw Error("Choose the lifeline the message starts on, or write actor.port.member.");
-  const from = lifeline(w2.plan.models, pkg, typedFrom, "starts");
-  let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends") : void 0;
+  const from = lifeline(w2.plan.models, pkg, typedFrom, "starts", scenario);
+  let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends", scenario) : void 0;
+  if (from.kind === "occurrence" && from.pkg !== pkg || to?.kind === "occurrence" && to.pkg !== pkg)
+    throw Error(`A case uses only occurrences of its own package. Choose lifelines from ${pkg.name}.`);
   if (from.kind === "test") {
     if (scenario.kind !== "test") throw Error("Only a test calls its subject directly; a use case acts through the ports of its actors.");
     if (kind2 !== "call") throw Error("A test calls operations of its subject. To send or publish, start the message on an actor.");
@@ -45890,7 +45906,7 @@ function scriptMessage(w2, scenario, pkg) {
     const args = request.value?.trim() || parameters2.map((type) => w2.initial(scenario, type)).join(", ");
     return callStatement(formatPath(to.path) + "." + formatName(name) + "(" + args + ")", name, result, scenario);
   }
-  const isActor = (item) => item?.kind === "occurrence" && !item.path.includes(".") && item.structure !== subject && !active(item.structure);
+  const isActor = (item) => item?.kind === "occurrence" && item.pkg === pkg && !item.path.includes(".") && item.structure !== subject && !active(item.structure);
   const outgoing = isActor(from) || !isActor(to);
   const actor = outgoing ? from : to;
   if (!isActor(actor)) {
@@ -45942,7 +45958,9 @@ function operationMessage(w2, executable, pkg) {
     return found && { kind: "occurrence", pkg, path: found.path, structure: found.structure };
   })();
   let to = request.to?.trim() ? lifeline(w2.plan.models, pkg, request.to, "ends") : void 0;
-  if (from?.kind === "occurrence" && to?.kind === "occurrence" && to.path === from.path || !from && !to) {
+  if (from?.kind === "occurrence" && !runs(from)) throw Error(`${executable.name} does not run on ${from.path}. Start the message on its activation.`);
+  if (from?.kind === "occurrence" && to?.kind === "occurrence") samePackage(from, to);
+  if (from?.kind === "occurrence" && to?.kind === "occurrence" && to.pkg === from.pkg && to.path === from.path || !from && !to) {
     if (kind2 !== "call") throw Error("A component does not send to itself. Call one of its operations, or draw the message to another lifeline.");
     const op = members(structure2).filter(isExecutable).find((item) => item.name === name), sig = op && signatureOf(op);
     if (op === executable) throw Error(`${name} would call itself. Choose another operation.`);
@@ -45956,7 +45974,6 @@ function operationMessage(w2, executable, pkg) {
     return callStatement(formatName(name) + "(" + args2 + ")", name, result, executable);
   }
   if (from?.kind !== "occurrence") throw Error("Start the message on the lifeline of a component occurrence.");
-  if (!runs(from)) throw Error(`${executable.name} does not run on ${from.path}. Start the message on its activation.`);
   const portName = segments.length === 2 ? segments[0] : void 0;
   if (!to) {
     const peer = connected(from).find((item) => !portName || item.port.name === portName)?.peer;
@@ -48663,6 +48680,7 @@ init_semantic();
 // packages/language-server/src/test-inspection.ts
 init_ast2();
 init_semantic();
+init_names();
 
 // packages/language-server/src/run-cases.ts
 init_ast2();
@@ -49013,6 +49031,9 @@ function configuredDiagnostics(diagnostics, settings) {
     return [{ ...diagnostic, severity }];
   });
 }
+function diagnosticsFailPolicy(loaded, strict = false) {
+  return loaded.diagnostics.some((item) => item.severity === 1 || (strict || loaded.settings.get(item.uri)?.["swaml.lint.profile"] === "strict") && item.severity === 2) || configuredDiagnostics(loaded.diagnostics, loaded.settings).some((item) => item.severity === 1);
+}
 function parseArguments(args, flags) {
   const values = {}, switches = /* @__PURE__ */ new Set(), inputs = [];
   for (let index = 0; index < args.length; index++) {
@@ -49058,7 +49079,7 @@ async function validateMain(args) {
     for (const item of diagnostics) console.log(`${item.file}:${item.line}:${item.column}: ${item.severity === 1 ? "error" : item.severity === 2 ? "warning" : "info"} ${item.code ?? ""}: ${item.message}`);
     if (!diagnostics.length) console.log(loaded.diagnostics.some((item) => item.severity === 1) ? `swa.ml source is invalid; ${loaded.diagnostics.length} diagnostic(s) hidden by display settings. Use --no-config to inspect them.` : `Validated ${documents.length} swa.ml file(s), swa.ml 2.1 (implementation 3.0.0).`);
   }
-  return loaded.diagnostics.some((item) => item.severity === 1 || (switches.has("strict") || loaded.settings.get(item.uri)?.["swaml.lint.profile"] === "strict") && item.severity === 2) || diagnostics.some((item) => item.severity === 1) ? 1 : 0;
+  return diagnosticsFailPolicy(loaded, switches.has("strict")) ? 1 : 0;
 }
 
 // packages/cli/src/validate-main.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voidaliot/swaml-cli",
-  "version": "0.15.0",
+  "version": "0.17.0",
   "description": "swa.ml model validation and SVG/CSV diagram export",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE",