@voidaliot/swaml-cli 0.16.0 → 0.17.1

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,
@@ -169651,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 {
@@ -169691,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) {
@@ -170213,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 };
@@ -170747,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();
@@ -171097,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(".");
@@ -171126,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.");
@@ -171200,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.");
@@ -171245,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.");
@@ -171264,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)) {
@@ -171316,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.`);
@@ -171330,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;
@@ -175080,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 canonical2 = (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)) {
@@ -175096,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) {
@@ -175137,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) => {
@@ -175150,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) => ({
@@ -175360,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",
@@ -175376,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;
@@ -175529,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;
@@ -175612,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);
@@ -175636,7 +175672,7 @@ 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 (kind2 !== "iv" && 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 };
@@ -175754,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;
       }
     }
@@ -175778,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 ?? "" } } : {} },
@@ -178267,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 = [];
@@ -202812,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" };
@@ -205330,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);
@@ -205365,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({
@@ -205388,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",
@@ -205522,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) => ({
@@ -205652,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, {}),
@@ -221145,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,
@@ -221640,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)) })
         ] }) })
@@ -222605,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",
@@ -222727,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,
@@ -222835,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 }
               }
             ),
@@ -222869,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,
@@ -223314,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: [
@@ -223495,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();
@@ -224778,7 +224840,7 @@ function parseArguments(args2, flags) {
 // packages/cli/package.json
 var package_default = {
   name: "swaml-diagram",
-  version: "0.16.0",
+  version: "0.17.1",
   private: true,
   type: "module",
   scripts: {

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.16.0",
+  version: "0.17.1",
   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;

package/package.json

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