@likec4/language-server 1.59.2 → 1.59.3

package/dist/chunks/module.mjs

@@ -1,7 +1,7 @@
 import { t as __name } from "./rolldown-runtime.mjs";
 import { t as LibIcons } from "./icons.mjs";
 import { Uri, isLikeC4Builtin, isNotLikeC4Builtin } from "../likec4lib.mjs";
-import { $ as isDynamicView, $n as isTextSizeProperty, $t as isLinkProperty, A as isAltSteps, An as isShapeSizeProperty, Ar as isWhereRelationParticipantTag, At as isFqnExprWith, B as isDeployedInstanceBody, Bn as isStep, Bt as isIconColorProperty, C as ModelViews, Cn as isRelationKindDotRef, Cr as isWhereRelation, Ct as isExtendRelation, D as SpecificationRelationshipKind, Dn as isRelationshipKind, Dr as isWhereRelationNegation, Dt as isFqnExprOrWhere, E as SpecificationElementKind, En as isRelationStyleProperty, Er as isWhereRelationMetadata, Et as isFqnExpr, F as isColorLiteral, Fn as isSpecificationElementStringProperty, Fr as compareByUri, Ft as isGlobalPredicateGroup, G as isDeploymentRelation, Gn as isStrictFqnElementRef, Gt as isImportsFromPoject, H as isDeploymentNode$1, Hn as isStepSeries, Hr as logger$10, Ht as isIconProperty, I as isColorProperty, In as isSpecificationRelationshipKind, It as isGlobalStyle, J as isDeploymentViewBody, Jn as isStyleProperty, Jt as isLibIcon, K as isDeploymentRelationBody, Kn as isStrictFqnRef, Kt as isInOutRelationExpr, L as isCustomElementProperties, Ln as isSpecificationRelationshipStringProperty, Lr as NoFileSystem, Lt as isGlobalStyleGroup, M as isArrowProperty, Mn as isSpecificationColor, Mr as isWhereTagEqual, Mt as isFqnRef, N as isBorderProperty, Nn as isSpecificationDeploymentNodeKind, Nr as isWildcardExpression, Nt as isFqnRefExpr, O as SpecificationRule, On as isRelationshipStyleProperty, Or as isWhereRelationParticipantKind, Ot as isFqnExprOrWith, P as isCatchBlock, Pn as isSpecificationElementKind, Pr as ADisposable, Pt as isGlobalDynamicPredicateGroup, Q as isDirectedRelationExpr, Qn as isTags, Qt as isLineProperty, R as isCustomRelationProperties, Rn as isSpecificationRule, Rt as isGlobals, S as ModelDeployments, Sn as isRelationExprWith, Sr as isWhereMetadataEqual, St as isExtendElementOrRelation, T as SpecificationDeploymentNodeKind, Tn as isRelationStringProperty, Tr as isWhereRelationKind, Tt as isFinallyBlock, U as isDeploymentNodeBody, Un as isStepStatement, Ut as isIconSizeProperty, V as isDeploymentElement, Vn as isStepOrSeries, Vr as logWarnError, Vt as isIconPositionProperty, W as isDeploymentNodeKind, Wn as isStepsBlock, Wt as isImported, X as isDeploymentViewRulePredicate, Xn as isTag, Xt as isLikeC4Lib, Y as isDeploymentViewRule, Yn as isSubflowStep, Yt as isLikeC4Grammar, Z as isDeploymentViewRuleStyle, Zn as isTagRef, Zt as isLikeC4View, _ as Globals, _n as isRelationBody, _r as isWhereElementKind, _t as isExpressions, a as LikeC4LanguageMetaData, an as isModel, ar as isViewRuleAutoLayout, at as isElement, b as LikeC4View, bn as isRelationExprOrWith, br as isWhereElementTag, bt as isExtendElement, c as DeploymentElement, cn as isMultipleProperty, cr as isViewRuleGroup, ct as isElementKindExpression, d as Element, dn as isNotesProperty, dr as isViewRuleStyle, dt as isElementStringProperty, en as isMarkdownOrString, er as isTryBlock, et as isDynamicViewBody, f as ElementKind, fn as isOpacityProperty, fr as isViewRuleStyleOrGlobalRef, ft as isElementStyleProperty, g as GlobalStyleId, gn as isRelation, gr as isWhereElementExpression, gt as isExpressionV2, h as GlobalPredicateGroup, hn as isRGBAColor, hr as isWhereElement, ht as isElementViewBody, i as LikeC4GeneratedSharedModule, in as isMetadataProperty, ir as isViewRuleAncestors, it as isDynamicViewRule, j as isAnyProperty, jn as isSizeProperty, jr as isWhereRelationTag, jt as isFqnExpressions, k as SpecificationTag, kn as isShapeProperty, kr as isWhereRelationParticipantMetadata, kt as isFqnExprWhere, l as DeploymentNode, ln as isNavigateToProperty, lr as isViewRulePredicate, lt as isElementProperty, m as GlobalDynamicPredicateGroup, mn as isPaddingSizeProperty, mr as isWhereBinaryExpression, mt as isElementView$1, n as safeCall, nn as isMetadataAttribute, nr as isViewProperty, nt as isDynamicViewGlobalPredicateRef, o as CustomColor, on as isModelDeployments, or as isViewRuleGlobalPredicateRef, ot as isElementBody, p as ExtendElement, pn as isOutgoingRelationExpr, pr as isViewStringProperty, pt as isElementTagExpression, q as isDeploymentView, qn as isStringProperty, qt as isIncomingRelationExpr, r as LikeC4GeneratedModule, rn as isMetadataBody, rr as isViewRule, rt as isDynamicViewIncludePredicate, s as DeployedInstance, sn as isModelViews, sr as isViewRuleGlobalStyle, st as isElementKind, t as performanceMark, tn as isMetadataArray, tr as isTryStep, tt as isDynamicViewDisplayVariantProperty, u as DeploymentNodeKind, un as isNotationProperty, ur as isViewRuleRank, ut as isElementRef, v as Imported, vn as isRelationExpr, vr as isWhereElementMetadata, vt as isExtendDeployment, w as RelationshipKind, wn as isRelationNavigateToProperty, wr as isWhereRelationExpression, wt as isExtendRelationBody, x as Model, xn as isRelationExprWhere, xr as isWhereKindEqual, xt as isExtendElementBody, y as LibIcon, yn as isRelationExprOrWhere, yr as isWhereElementNegation, yt as isExtendDeploymentBody, z as isDeployedInstance, zn as isSpecificationTag, zr as NoLikeC4ManualLayouts, zt as isHexColor } from "./utils.mjs";
+import { $ as isDynamicView, $n as isTextSizeProperty, $t as isLinkProperty, A as isAltSteps, An as isShapeSizeProperty, Ar as isWhereRelationParticipantMetadata, At as isFqnExprWith, B as isDeployedInstanceBody, Bn as isStep, Br as NoLikeC4ManualLayouts, Bt as isIconColorProperty, C as ModelViews, Cn as isRelationKindDotRef, Cr as isWhereMetadataEqual, Ct as isExtendRelation, D as SpecificationRelationshipKind, Dn as isRelationshipKind, Dr as isWhereRelationMetadata, Dt as isFqnExprOrWhere, E as SpecificationElementKind, En as isRelationStyleProperty, Er as isWhereRelationKind, Et as isFqnExpr, F as isColorLiteral, Fn as isSpecificationElementStringProperty, Fr as ADisposable, Ft as isGlobalPredicateGroup, G as isDeploymentRelation, Gn as isStrictFqnElementRef, Gt as isImportsFromPoject, H as isDeploymentNode$1, Hn as isStepSeries, Hr as logWarnError, Ht as isIconProperty, I as isColorProperty, In as isSpecificationRelationshipKind, Ir as compareByUri, It as isGlobalStyle, J as isDeploymentViewBody, Jn as isStyleProperty, Jt as isLibIcon, K as isDeploymentRelationBody, Kn as isStrictFqnRef, Kt as isInOutRelationExpr, L as isCustomElementProperties, Ln as isSpecificationRelationshipStringProperty, Lt as isGlobalStyleGroup, M as isArrowProperty, Mn as isSpecificationColor, Mr as isWhereRelationTag, Mt as isFqnRef, N as isBorderProperty, Nn as isSpecificationDeploymentNodeKind, Nr as isWhereTagEqual, Nt as isFqnRefExpr, O as SpecificationRule, On as isRelationshipStyleProperty, Or as isWhereRelationNegation, Ot as isFqnExprOrWith, P as isCatchBlock, Pn as isSpecificationElementKind, Pr as isWildcardExpression, Pt as isGlobalDynamicPredicateGroup, Q as isDirectedRelationExpr, Qn as isTags, Qt as isLineProperty, R as isCustomRelationProperties, Rn as isSpecificationRule, Rr as NoFileSystem, Rt as isGlobals, S as ModelDeployments, Sn as isRelationExprWith, Sr as isWhereKindEqual, St as isExtendElementOrRelation, T as SpecificationDeploymentNodeKind, Tn as isRelationStringProperty, Tr as isWhereRelationExpression, Tt as isFinallyBlock, U as isDeploymentNodeBody, Un as isStepStatement, Ur as logger$10, Ut as isIconSizeProperty, V as isDeploymentElement, Vn as isStepOrSeries, Vt as isIconPositionProperty, W as isDeploymentNodeKind, Wn as isStepsBlock, Wt as isImported, X as isDeploymentViewRulePredicate, Xn as isTag, Xt as isLikeC4Lib, Y as isDeploymentViewRule, Yn as isSubflowStep, Yt as isLikeC4Grammar, Z as isDeploymentViewRuleStyle, Zn as isTagRef, Zt as isLikeC4View, _ as Globals, _n as isRelationBody, _r as isWhereElementExpression, _t as isExpressions, a as LikeC4LanguageMetaData, an as isModel, ar as isViewRuleAncestors, at as isElement, b as LikeC4View, bn as isRelationExprOrWith, br as isWhereElementNegation, bt as isExtendElement, c as DeploymentElement, cn as isMultipleProperty, cr as isViewRuleGlobalStyle, ct as isElementKindExpression, d as Element, dn as isNotesProperty, dr as isViewRuleRank, dt as isElementStringProperty, en as isMarkdownOrString, er as isTryBlock, et as isDynamicViewBody, f as ElementKind, fn as isOpacityProperty, fr as isViewRuleStyle, ft as isElementStyleProperty, g as GlobalStyleId, gn as isRelation, gr as isWhereElement, gt as isExpressionV2, h as GlobalPredicateGroup, hn as isRGBAColor, hr as isWhereBinaryExpression, ht as isElementViewBody, i as LikeC4GeneratedSharedModule, in as isMetadataProperty, ir as isViewRule, it as isDynamicViewRule, j as isAnyProperty, jn as isSizeProperty, jr as isWhereRelationParticipantTag, jt as isFqnExpressions, k as SpecificationTag, kn as isShapeProperty, kr as isWhereRelationParticipantKind, kt as isFqnExprWhere, l as DeploymentNode, ln as isNavigateToProperty, lr as isViewRuleGroup, lt as isElementProperty, m as GlobalDynamicPredicateGroup, mn as isPaddingSizeProperty, mr as isViewStringProperty, mt as isElementView$1, n as safeCall, nn as isMetadataAttribute, nr as isViewOrderProperty, nt as isDynamicViewGlobalPredicateRef, o as CustomColor, on as isModelDeployments, or as isViewRuleAutoLayout, ot as isElementBody, p as ExtendElement, pn as isOutgoingRelationExpr, pr as isViewRuleStyleOrGlobalRef, pt as isElementTagExpression, q as isDeploymentView, qn as isStringProperty, qt as isIncomingRelationExpr, r as LikeC4GeneratedModule, rn as isMetadataBody, rr as isViewProperty, rt as isDynamicViewIncludePredicate, s as DeployedInstance, sn as isModelViews, sr as isViewRuleGlobalPredicateRef, st as isElementKind, t as performanceMark, tn as isMetadataArray, tr as isTryStep, tt as isDynamicViewDisplayVariantProperty, u as DeploymentNodeKind, un as isNotationProperty, ur as isViewRulePredicate, ut as isElementRef, v as Imported, vn as isRelationExpr, vr as isWhereElementKind, vt as isExtendDeployment, w as RelationshipKind, wn as isRelationNavigateToProperty, wr as isWhereRelation, wt as isExtendRelationBody, x as Model, xn as isRelationExprWhere, xr as isWhereElementTag, xt as isExtendElementBody, y as LibIcon, yn as isRelationExprOrWhere, yr as isWhereElementMetadata, yt as isExtendDeploymentBody, z as isDeployedInstance, zn as isSpecificationTag, zt as isHexColor } from "./utils.mjs";
 import { BuildDocuments, ChangeView, DidChangeModelNotification, DidChangeProjectsNotification, DidChangeSnapshotNotification, DidRequestOpenViewNotification, FetchComputedModel, FetchLayoutedModel, FetchProjects, FetchProjectsOverview, FetchTelemetryMetrics, FetchViewsFromAllProjects, GetDocumentTags, LayoutView, Locate, RegisterProject, ReloadProjects, ValidateLayout } from "../protocol.mjs";
 import { DefaultMap, DefaultWeakMap, MultiMap, ancestorsFqn, compareNatural, compareNaturalHierarchically, ifilter, invariant, isNonEmptyArray, isString, nameFromFqn, nonNullable, nonexhaustive, onNextTick, parentFqn, sortNaturalByFqn, sortParentsFirst, stringHash, toArray } from "@likec4/core/utils";
 import { loggable, wrapError } from "@likec4/log";
@@ -399,6 +399,12 @@ function _overlaps(folderA, folderB) {
 	const b = isString(folderB) ? folderB : folderB.folder;
 	return a === b || a.startsWith(b) || b.startsWith(a);
 }
+function sameFolder(folderA, folderB) {
+	return (isString(folderA) ? folderA : folderA.folder) === (isString(folderB) ? folderB : folderB.folder);
+}
+function hasAmbiguousIncludePathOverlap(includePath, otherIncludePath) {
+	return _overlaps(includePath, otherIncludePath) && !sameFolder(includePath, otherIncludePath);
+}
 function overlaps(...args) {
 	return purry(_overlaps, args);
 }
@@ -932,13 +938,16 @@ var ProjectsManager = class ProjectsManager extends ADisposable {
 		}
 		const exclude = config.exclude;
 		if (isNullish(exclude)) project.exclude = DefaultProject.exclude;
-		else if (hasAtLeast(exclude, 1)) project.exclude = picomatch([project.folderUri, ...map(project.includePaths ?? [], prop("uri"))].flatMap((root) => map(exclude, (p) => {
-			if (!isRelative(p) && !p.startsWith("**")) p = joinURL("**", p);
-			return cleanDoubleSlashes(joinRelativeURL(uriPathForMatcher(root), p));
-		})), {
-			contains: true,
-			dot: true
-		});
+		else if (hasAtLeast(exclude, 1)) {
+			const patterns = [project.folderUri, ...map(project.includePaths ?? [], prop("uri"))].flatMap((root) => map(exclude, (p) => {
+				if (!isRelative(p) && !p.startsWith("**")) p = joinURL("**", p);
+				return cleanDoubleSlashes(joinRelativeURL(uriPathForMatcher(root), p));
+			}));
+			project.exclude = picomatch(patterns, {
+				contains: true,
+				dot: true
+			});
+		}
 		if (!project.includePaths) return project;
 		for (const includePath of project.includePaths) for (const otherProject of this.#projects) {
 			if (otherProject.id === project.id) continue;
@@ -948,7 +957,7 @@ var ProjectsManager = class ProjectsManager extends ADisposable {
 				otherProjectId: otherProject.id
 			});
 			otherProject.includePaths?.forEach((otherIncludePath) => {
-				if (overlaps(includePath, otherIncludePath)) logger$9.warn("Project \"{projectId}\" include path \"{includePath}\" overlaps with project \"{otherProjectId}\" include path \"{otherIncludePath}\". Files in overlapping areas will only belong to one project.", {
+				if (hasAmbiguousIncludePathOverlap(includePath, otherIncludePath)) logger$9.warn("Project \"{projectId}\" include path \"{includePath}\" overlaps with project \"{otherProjectId}\" include path \"{otherIncludePath}\". Files in overlapping areas will only belong to one project.", {
 					projectId: project.id,
 					includePath: includePath.folder,
 					otherProjectId: otherProject.id,
@@ -1184,7 +1193,8 @@ function projectIdFrom(value) {
 //#endregion
 //#region src/utils/stringHash.ts
 function stringHash$1(...str) {
-	return stringHash(str.length > 1 ? str.join(":::") : str[0]);
+	var s = str.length > 1 ? str.join(":::") : str[0];
+	return stringHash(s);
 }
 __name(stringHash$1, "stringHash");
 
@@ -1354,7 +1364,7 @@ var LikeC4Formatter = class extends AbstractFormatter {
 		this.on(node, (n) => isRelation(n) || isDeploymentRelation(n), (n, f) => {
 			const sourceNodes = n?.source?.$cstNode ? [n?.source?.$cstNode] : [];
 			f.cst(sourceNodes).append(FormattingOptions$1.oneSpace);
-			f.keywords("]->").prepend(FormattingOptions$1.noSpace);
+			f.keywords("]->", "]<->").prepend(FormattingOptions$1.noSpace);
 			f.keywords("-[").append(FormattingOptions$1.noSpace);
 			f.nodes(...filter([n.target, n.tags], isTruthy)).prepend(FormattingOptions$1.oneSpace);
 			f.properties("title", "description", "technology").prepend(FormattingOptions$1.oneSpace);
@@ -1422,10 +1432,10 @@ var LikeC4Formatter = class extends AbstractFormatter {
 		this.on(node, isDeploymentView)?.keywords("deployment", "view").append(FormattingOptions$1.oneSpace);
 	}
 	formatLeafProperty(node) {
-		if (isElementStringProperty(node) || isRelationStringProperty(node) || isViewStringProperty(node) || isNotationProperty(node) || isNotesProperty(node) || isSpecificationElementStringProperty(node) || isSpecificationRelationshipStringProperty(node) || isColorProperty(node) || isLineProperty(node) || isArrowProperty(node) || isIconProperty(node) || isShapeProperty(node) || isBorderProperty(node) || isOpacityProperty(node) || isMultipleProperty(node) || isIconColorProperty(node) || isIconSizeProperty(node) || isIconPositionProperty(node) || isShapeSizeProperty(node) || isPaddingSizeProperty(node) || isTextSizeProperty(node)) {
+		if (isElementStringProperty(node) || isRelationStringProperty(node) || isViewStringProperty(node) || isViewOrderProperty(node) || isNotationProperty(node) || isNotesProperty(node) || isSpecificationElementStringProperty(node) || isSpecificationRelationshipStringProperty(node) || isColorProperty(node) || isLineProperty(node) || isArrowProperty(node) || isIconProperty(node) || isShapeProperty(node) || isBorderProperty(node) || isOpacityProperty(node) || isMultipleProperty(node) || isIconColorProperty(node) || isIconSizeProperty(node) || isIconPositionProperty(node) || isShapeSizeProperty(node) || isPaddingSizeProperty(node) || isTextSizeProperty(node)) {
 			const formatter = this.getNodeFormatter(node);
 			const colon = formatter.keyword(":");
-			const propertyName = formatter.keywords("title", "description", "technology", "summary", "notation", "notes", "color", "line", "head", "tail", "icon", "iconColor", "iconSize", "iconPosition", "shape", "border", "opacity", "multiple", "size", "padding", "textSize");
+			const propertyName = formatter.keywords("title", "description", "order", "technology", "summary", "notation", "notes", "color", "line", "head", "tail", "icon", "iconColor", "iconSize", "iconPosition", "shape", "border", "opacity", "multiple", "size", "padding", "textSize");
 			if (colon.nodes.length === 0) propertyName.append(FormattingOptions$1.oneSpace);
 			else colon.prepend(FormattingOptions$1.noSpace).append(FormattingOptions$1.oneSpace);
 			formatter.keyword(";").prepend(FormattingOptions$1.noSpace).append(FormattingOptions$1.newLine);
@@ -1460,10 +1470,12 @@ var LikeC4Formatter = class extends AbstractFormatter {
 		this.on(node, isElement, (n, f) => {
 			const kind = GrammarUtils.findNodeForProperty(n.$cstNode, "kind");
 			const name = GrammarUtils.findNodeForProperty(n.$cstNode, "name");
-			if (name && kind) if (compareRanges(name, kind) > 0) f.cst([kind]).append(FormattingOptions$1.oneSpace);
-			else {
-				f.cst([name]).append(FormattingOptions$1.oneSpace);
-				f.cst([kind]).prepend(FormattingOptions$1.oneSpace);
+			if (name && kind) {
+				if (compareRanges(name, kind) > 0) f.cst([kind]).append(FormattingOptions$1.oneSpace);
+				else {
+					f.cst([name]).append(FormattingOptions$1.oneSpace);
+					f.cst([kind]).prepend(FormattingOptions$1.oneSpace);
+				}
 			}
 			f.properties("props").prepend(FormattingOptions$1.oneSpace);
 		});
@@ -1512,10 +1524,12 @@ var LikeC4Formatter = class extends AbstractFormatter {
 		this.on(node, isDeploymentNode$1, (n, f) => {
 			const kind = GrammarUtils.findNodeForProperty(n.$cstNode, "kind");
 			const name = GrammarUtils.findNodeForProperty(n.$cstNode, "name");
-			if (name && kind) if (compareRanges(name, kind) > 0) f.cst([kind]).append(FormattingOptions$1.oneSpace);
-			else {
-				f.cst([name]).append(FormattingOptions$1.oneSpace);
-				f.cst([kind]).prepend(FormattingOptions$1.oneSpace);
+			if (name && kind) {
+				if (compareRanges(name, kind) > 0) f.cst([kind]).append(FormattingOptions$1.oneSpace);
+				else {
+					f.cst([name]).append(FormattingOptions$1.oneSpace);
+					f.cst([kind]).prepend(FormattingOptions$1.oneSpace);
+				}
 			}
 			f.properties("title").prepend(FormattingOptions$1.oneSpace);
 		});
@@ -1848,6 +1862,9 @@ var DefaultLikeC4LanguageServices = class {
 			default: nonexhaustive$1(params);
 		}
 	}
+	documentText(uri) {
+		return this.services.shared.workspace.LangiumDocuments.getDocument(URI.parse(uri))?.textDocument.getText();
+	}
 	/**
 	* Formats documents sequentially and returns a map of document URI → formatted source text.
 	*
@@ -1997,24 +2014,34 @@ var LikeC4CompletionProvider = class extends DefaultCompletionProvider {
 	}
 	completionForKeyword(context, keyword, acceptor) {
 		if (!this.filterKeyword(context, keyword)) return;
-		const acceptProperty = (insertAfterText) => {
+		/**
+		* The generated text starts with the keyword itself, so it must replace the
+		* already typed prefix. We provide an explicit `textEdit` instead of `insertText`,
+		* because clients that apply `insertText` at the cursor would duplicate the
+		* keyword (see https://github.com/likec4/likec4/issues/3091)
+		*/
+		const acceptReplacing = (item, newText) => {
+			const textEdit = this.buildCompletionTextEdit(context, keyword.value, newText);
+			if (!textEdit) return;
 			acceptor(context, {
 				label: keyword.value,
-				detail: `Insert ${keyword.value} property`,
-				kind: CompletionItemKind.Property,
 				insertTextFormat: InsertTextFormat.Snippet,
-				insertText: `${keyword.value} ${insertAfterText}`
+				...item,
+				textEdit
 			});
 		};
+		const acceptProperty = (insertAfterText) => {
+			acceptReplacing({
+				detail: `Insert ${keyword.value} property`,
+				kind: CompletionItemKind.Property
+			}, `${keyword.value} ${insertAfterText}`);
+		};
 		const acceptSnippet = ({ insertText, ...item }) => {
-			acceptor(context, {
-				label: keyword.value,
+			acceptReplacing({
 				detail: `Insert ${keyword.value}`,
 				kind: CompletionItemKind.Snippet,
-				insertTextFormat: InsertTextFormat.Snippet,
-				...item,
-				insertText: `${keyword.value} ${insertText}`
-			});
+				...item
+			}, `${keyword.value} ${insertText}`);
 		};
 		const acceptPropertyAndSuggest = (variants) => {
 			acceptProperty(`\${1|${variants.join(",")}|}$0`);
@@ -2149,13 +2176,11 @@ var LikeC4CompletionProvider = class extends DefaultCompletionProvider {
 				acceptPropertyAndSuggest(["sequence", "diagram"]);
 				break;
 			case ["include", "exclude"].includes(keyword.value):
-				acceptor(context, {
-					label: keyword.value,
+				acceptReplacing({
 					kind: CompletionItemKind.Operator,
 					detail: `Insert ${keyword.value} predicate`,
-					insertTextFormat: InsertTextFormat.PlainText,
-					insertText: `${keyword.value} `
-				});
+					insertTextFormat: InsertTextFormat.PlainText
+				}, `${keyword.value} `);
 				break;
 			default: acceptor(context, {
 				label: keyword.value,
@@ -2234,7 +2259,8 @@ var LikeC4DocumentLinkProvider = class {
 		if (isRelative(link)) {
 			const base = this.services.shared.workspace.ProjectsManager.getProject(doc).folderUri.toString();
 			const docURL = new URL(doc.uri.toString());
-			return withoutLeadingSlash(withoutBase(new URL(link, docURL).toString(), base));
+			const linkURL = new URL(link, docURL).toString();
+			return withoutLeadingSlash(withoutBase(linkURL, base));
 		}
 		return null;
 	}
@@ -2376,7 +2402,7 @@ var LikeC4DocumentSymbolProvider = class {
 		const nameNode = GrammarUtils.findNodeForProperty(cst, "name");
 		if (!nameNode || !cst) return [];
 		const name = astElement.name;
-		const detail = astElement.kind.$refText;
+		const detail = `(${astElement.kind.$refText})`;
 		return [{
 			kind: this.symbolKind(astElement),
 			name,
@@ -2453,7 +2479,7 @@ var LikeC4DocumentSymbolProvider = class {
 		const nameNode = this.nameProvider.getNameNode(astElement);
 		if (!nameNode || !cst) return [];
 		const name = this.nameProvider.getNameStrict(astElement);
-		const detail = astElement.kind.$refText;
+		const detail = `(${astElement.kind.$refText})`;
 		return [{
 			kind: this.symbolKind(astElement),
 			name,
@@ -2746,7 +2772,9 @@ var LikeC4SemanticTokenProvider = class extends AbstractSemanticTokenProvider {
 			mark.property("name").readonly.declaration.type();
 		});
 		when(isSpecificationTag, (mark) => {
-			if (isTruthy(mark.node.color)) mark.keyword("color").property();
+			if (isTruthy(mark.node.color) || isTruthy(mark.node.themeColor) || isTruthy(mark.node.customColor)) mark.keyword("color").property();
+			if (isTruthy(mark.node.customColor)) mark.property("customColor").enum();
+			if (isTruthy(mark.node.themeColor)) mark.property("themeColor").enum();
 		});
 		when(isAnyOf$1(isSpecificationElementKind, isSpecificationRelationshipKind, isSpecificationDeploymentNodeKind), (mark) => {
 			mark.property("kind").readonly.declaration.type();
@@ -3178,11 +3206,16 @@ var MergedSpecification = class {
 	/**
 	* Converts a parsed model into a C4 model relation.
 	*/
-	toModelRelation = ({ astPath: _astPath, source, target, kind, links, id, title, tags, ...model }) => {
+	toModelRelation = ({ astPath: _astPath, source, target, kind, links, id, title, tags, isBidirectional, ...model }) => {
+		const bidirectionalRelationship = (relationship) => isBidirectional ? {
+			...relationship,
+			isBidirectional,
+			tail: relationship.tail ?? relationship.head ?? "normal"
+		} : relationship;
 		if (isNonNullish(kind) && this.specs.relationships[kind]) {
 			const { multiple: _multiple, tags: specTags, ...spec } = this.specs.relationships[kind];
 			if (specTags && isNonEmptyArray(specTags)) tags = tags ? unique([...specTags, ...tags]) : specTags;
-			return {
+			return bidirectionalRelationship({
 				...spec,
 				...model,
 				...links && { links },
@@ -3192,17 +3225,17 @@ var MergedSpecification = class {
 				target,
 				kind,
 				id
-			};
+			});
 		}
-		return {
+		return bidirectionalRelationship({
 			...links && { links },
 			...model,
 			...tags && { tags },
-			title,
 			source,
 			target,
-			id
-		};
+			id,
+			title
+		});
 	};
 	/**
 	* Converts a parsed deployment model into a C4 deployment model
@@ -3353,6 +3386,19 @@ function assignNavigateTo(views) {
 	return views;
 }
 
+//#endregion
+//#region src/model/relationFingerprint.ts
+function relationFingerprint({ source, target, kind, title, isBidirectional }) {
+	let sourceKey = FqnRef$1.flatten(source);
+	let targetKey = FqnRef$1.flatten(target);
+	if (isBidirectional && targetKey < sourceKey) {
+		const normalizedSource = targetKey;
+		targetKey = sourceKey;
+		sourceKey = normalizedSource;
+	}
+	return stringHash$1("extend-relation", sourceKey, targetKey, kind ?? "default", title ?? "", isBidirectional ? "bidirectional" : "directed");
+}
+
 //#endregion
 //#region src/model/builder/MergedExtends.ts
 var MergedExtends = class {
@@ -3450,7 +3496,7 @@ function buildModelData(services, project, docs) {
 		}
 		return true;
 	}), map((rel) => {
-		const matchKey = stringHash$1("extend-relation", FqnRef$1.flatten(rel.source), FqnRef$1.flatten(rel.target), rel.kind ?? "default", rel.title ?? "");
+		const matchKey = relationFingerprint(rel);
 		const relExtends = relationExtends.filter((ext) => ext.id === matchKey);
 		if (relExtends.length === 0) return rel;
 		relExtends.forEach((ext) => matchedExtendIds.add(ext.astPath));
@@ -3562,6 +3608,10 @@ function buildModelData(services, project, docs) {
 	let views = pipe(parsedViews, indexBy(prop("id")));
 	if (parsedViews.some(isExtendsElementView)) views = resolveRulesExtendedViews(views);
 	for (const ext of relationExtends) if (!matchedExtendIds.has(ext.astPath)) logger$10.warn(`Relation extend at ${ext.astPath} does not match any relation in the model`);
+	const elementsForOutput = mapValues(elements, (el) => el.title.includes("\\/") ? {
+		...el,
+		title: el.title.replaceAll("\\/", "/")
+	} : el);
 	return {
 		data: {
 			[_stage$1]: "parsed",
@@ -3570,6 +3620,8 @@ function buildModelData(services, project, docs) {
 				id: project.id,
 				title: project.config.title ?? project.config.name,
 				styles: project.config.styles,
+				contactPerson: project.config.contactPerson,
+				metadata: project.config.metadata,
 				manualLayouts: project.config.manualLayouts,
 				inferTechnologyFromIcon: project.config.inferTechnologyFromIcon
 			}),
@@ -3585,7 +3637,7 @@ function buildModelData(services, project, docs) {
 				...metadataKeys.size > 0 && { metadataKeys: [...metadataKeys].sort(compareNatural) },
 				customColors
 			},
-			elements,
+			elements: elementsForOutput,
 			relations,
 			globals: c4Specification.globals,
 			views,
@@ -3602,6 +3654,29 @@ function buildModelData(services, project, docs) {
 //#endregion
 //#region src/model/model-builder.ts
 const builderLogger = logger$10.getChild("builder");
+function isRequestedImportedElement(fqns, element) {
+	for (const fqn of fqns) if (element.id === fqn || element.id.startsWith(`${fqn}.`)) return true;
+	return false;
+}
+function importedElementTitles(imports) {
+	const titles = /* @__PURE__ */ new Map();
+	for (const [projectId, elements] of entries(imports)) for (const element of elements) titles.set(GlobalFqn(projectId, element.id), element.title);
+	return titles;
+}
+function withImportedScopedViewTitles(views, imports) {
+	const titles = importedElementTitles(imports);
+	if (titles.size === 0) return views;
+	return mapValues(views, (view) => {
+		if (view[_type] === "element" && view.title === null && view.viewOf) {
+			const title = titles.get(view.viewOf);
+			if (title !== void 0) return {
+				...view,
+				title
+			};
+		}
+		return view;
+	});
+}
 var DefaultLikeC4ModelBuilder = class extends ADisposable {
 	services;
 	projects;
@@ -3680,14 +3755,15 @@ var DefaultLikeC4ModelBuilder = class extends ADisposable {
 				if (fqns.size === 0) return acc;
 				const anotherProject = this.unsafeSyncParseModelData(projectId);
 				if (anotherProject) {
-					const imported = [...fqns].flatMap((fqn) => anotherProject.data.elements[fqn] ?? []);
+					const imported = values(anotherProject.data.elements).filter((element) => isRequestedImportedElement(fqns, element));
 					if (hasAtLeast(imported, 1)) acc[projectId] = structuredClone(imported);
 				}
 				return acc;
 			}, {});
 			return {
 				...result.data,
-				imports
+				imports,
+				views: withImportedScopedViewTitles(result.data.views, imports)
 			};
 		});
 	}
@@ -4365,7 +4441,8 @@ const checkImportsFromPoject = (services) => {
 			});
 			return;
 		}
-		const projectId = projectIdFrom(getDocument$1(el));
+		const doc = getDocument$1(el);
+		const projectId = projectIdFrom(doc);
 		if (el.project === projectId) {
 			accept("error", "Imported project cannot be the same as the current project", {
 				node: el,
@@ -4469,11 +4546,13 @@ const relationChecks = (services) => {
 			});
 			return;
 		}
-		if (FqnRef.isImportRef(source)) if (FqnRef.isImportRef(target)) accept("warning", "Relationship between imported elements may not be visible in origin projects", { node: el });
-		else accept("warning", "Relationship from imported element to local element may not be visible in origin project", {
-			node: el,
-			property: "source"
-		});
+		if (FqnRef.isImportRef(source)) {
+			if (FqnRef.isImportRef(target)) accept("warning", "Relationship between imported elements may not be visible in origin projects", { node: el });
+			else accept("warning", "Relationship from imported element to local element may not be visible in origin project", {
+				node: el,
+				property: "source"
+			});
+		}
 		if (isSameHierarchy(FqnRef.flatten(source), FqnRef.flatten(target))) accept("error", "Invalid parent-child relationship", { node: el });
 	});
 };
@@ -4485,9 +4564,8 @@ const checkRelationBody = (_services) => {
 const extendRelationChecks = (services) => {
 	const modelParser = services.likec4.ModelParser;
 	const cache = new WorkspaceCache(services.shared, DocumentState.Linked);
-	const calcFingerprint = ({ source, target, kind, title }) => stringHash$1("extend-relation", FqnRef.flatten(source), FqnRef.flatten(target), kind ?? "default", title ?? "");
 	function getProjectFingerprints(projectId) {
-		return cache.get(projectId, () => new Set(pipe(services.shared.workspace.LangiumDocuments.projectDocuments(projectId).toArray(), flatMap((doc) => doc.c4Relations ?? []), map((rel) => calcFingerprint(rel)))));
+		return cache.get(projectId, () => new Set(pipe(services.shared.workspace.LangiumDocuments.projectDocuments(projectId).toArray(), flatMap((doc) => doc.c4Relations ?? []), map((rel) => relationFingerprint(rel)))));
 	}
 	return tryOrLog((el, accept) => {
 		const doc = AstUtils.getDocument(el);
@@ -4525,13 +4603,14 @@ const extendRelationChecks = (services) => {
 		const projectId = projectIdFrom(doc);
 		const kind = (el.kind ?? el.dotKind?.kind)?.ref?.name ?? "default";
 		const { title = "" } = parser.parseBaseProps({}, { title: el.title });
-		const extendKey = calcFingerprint({
+		const extendKey = relationFingerprint({
 			source,
 			target,
 			kind,
-			title
+			title,
+			isBidirectional: el.isBidirectional || void 0
 		});
-		if (!getProjectFingerprints(projectId).has(extendKey)) accept("warning", "This extend does not match any relation (by source, kind, target, title)", { node: el });
+		if (!getProjectFingerprints(projectId).has(extendKey)) accept("warning", "This extend does not match any relation (by source, kind, target, title, and directionality)", { node: el });
 	});
 };
 
@@ -4693,6 +4772,17 @@ const viewChecks = (services) => {
 		});
 	});
 };
+/**
+* Validates per-view navigation order values.
+*/
+const viewOrderChecks = (_services) => {
+	return tryOrLog((node, accept) => {
+		if (!Number.isSafeInteger(node.value) || node.value < 0) accept("error", "View order must be a non-negative safe integer", {
+			node,
+			property: "value"
+		});
+	});
+};
 
 //#endregion
 //#region src/validation/view-checks.ts
@@ -4804,7 +4894,8 @@ const checkFqnRefExpr = (services) => {
 const checkIncomingRelationExpr = (_services) => {
 	return tryOrLog((el, accept) => {
 		if (el.to.$type === "WildcardExpression" && !isInOutRelationExpr(el.$container)) {
-			if (isNullish(AstUtils.getContainerOfType(el, isElementView$1)?.viewOf)) accept("warning", "Predicate is ignored as it concerns all relationships", { node: el });
+			const view = AstUtils.getContainerOfType(el, isElementView$1);
+			if (isNullish(view?.viewOf)) accept("warning", "Predicate is ignored as it concerns all relationships", { node: el });
 		}
 	});
 };
@@ -4941,7 +5032,8 @@ function registerValidationChecks(services) {
 		ImportsFromPoject: checkImportsFromPoject(services),
 		ColorLiteral: colorLiteralRuleChecks(services),
 		DynamicViewDisplayVariantProperty: dynamicViewDisplayVariant(services),
-		ViewRuleRank: viewRuleRankChecks(services)
+		ViewRuleRank: viewRuleRankChecks(services),
+		ViewOrderProperty: viewOrderChecks(services)
 	});
 	const connection = services.shared.lsp.Connection;
 	if (connection) onNextTick(() => {
@@ -4960,6 +5052,48 @@ function registerValidationChecks(services) {
 //#endregion
 //#region src/model/parser/Base.ts
 const logger$4 = logger$10.getChild("parser");
+const BASIC_ESCAPES = {
+	b: "\b",
+	f: "\f",
+	n: "\n",
+	r: "\r",
+	t: "	",
+	v: "\v",
+	"0": "\0"
+};
+/**
+* Mirrors langium's default string conversion, except an escaped `\/` is kept as-is,
+* so @likec4/core's view-folder splitting can tell it apart from a real separator later on.
+*/
+function unescapeKeepingSlash(quoted) {
+	let result = "";
+	for (let i = 1; i < quoted.length - 1; i++) {
+		const c = quoted[i];
+		if (c === "\\") {
+			const next = quoted[++i] ?? "";
+			result += next === "/" ? "\\/" : BASIC_ESCAPES[next] ?? next;
+		} else result += c;
+	}
+	return result;
+}
+/**
+* Re-reads a title's raw token text (instead of the already-unescaped AST value) so an
+* escaped `\/` survives for the view-folder splitting logic. Returns `undefined` for
+* markdown (triple-quoted) titles, which don't support this escape.
+*/
+function parseTitleKeepingEscapedSlash(node) {
+	if (!node || !isString$1(node.text)) return;
+	const raw = node.$cstNode?.text;
+	return raw ? unescapeKeepingSlash(raw) : node.text;
+}
+/**
+* Same as {@link parseTitleKeepingEscapedSlash}, for an inline `String` property (not
+* wrapped in `MarkdownOrString`), such as an element's positional title.
+*/
+function parseInlineTitleKeepingEscapedSlash(containerNode, property, index = 0) {
+	const raw = GrammarUtils.findNodeForProperty(containerNode?.$cstNode, property, index)?.text;
+	return raw ? unescapeKeepingSlash(raw) : void 0;
+}
 function toSingleLine(str) {
 	if (str === null || str === void 0) return;
 	const without = removeIndent(str);
@@ -4977,6 +5111,13 @@ function removeIndent(str) {
 		default: return;
 	}
 }
+/**
+* Returns a non-negative safe view order while discarding recovered negative literals.
+*/
+function parseViewOrder(prop) {
+	if (!prop || /^\s*order\b\s*-/.test(prop.$cstNode?.text ?? "")) return;
+	return Number.isSafeInteger(prop.value) && prop.value >= 0 ? prop.value : void 0;
+}
 var BaseParser = class {
 	services;
 	doc;
@@ -5243,11 +5384,13 @@ var BaseParser = class {
 	parseBaseProps(props, override) {
 		const title = removeIndent(override?.title ?? parseMarkdownAsString(props.title));
 		const description = override?.description ? { txt: removeIndent(override.description) } : this.parseMarkdownOrString(props.description);
+		const summary = override?.summary ? { txt: removeIndent(override.summary) } : this.parseMarkdownOrString(props.summary);
+		const technology = toSingleLine(override?.technology) ?? removeIndent(parseMarkdownAsString(props.technology));
 		return exact({
 			title,
-			summary: override?.summary ? { txt: removeIndent(override.summary) } : this.parseMarkdownOrString(props.summary),
+			summary,
 			description,
-			technology: toSingleLine(override?.technology) ?? removeIndent(parseMarkdownAsString(props.technology))
+			technology
 		});
 	}
 };
@@ -5331,11 +5474,12 @@ function DeploymentModelParser(B) {
 				title: astNode.title,
 				summary: astNode.summary
 			});
+			const links = this.parseLinks(astNode.body);
 			return exact({
 				id,
 				element: target,
 				tags,
-				links: this.parseLinks(astNode.body),
+				links,
 				...baseProps,
 				style,
 				metadata
@@ -5346,9 +5490,11 @@ function DeploymentModelParser(B) {
 			const metadata = this.getMetadata(astNode.body?.props.find(isMetadataProperty));
 			const links = this.parseLinks(astNode.body);
 			if (!tags && isEmpty(metadata ?? {}) && !links) return null;
+			const id = this.resolveFqn(astNode);
+			const astPath = this.getAstNodePath(astNode);
 			return exact({
-				id: this.resolveFqn(astNode),
-				astPath: this.getAstNodePath(astNode),
+				id,
+				astPath,
 				metadata,
 				tags,
 				links
@@ -5374,8 +5520,9 @@ function DeploymentModelParser(B) {
 			const navigateTo = pipe(astNode.body?.props ?? [], filter(isRelationNavigateToProperty), first())?.value.view.ref?.name;
 			const titleDescAndTech = this.parseBaseProps(bodyProps, { title: astNode.title });
 			const styleProp = astNode.body?.props.find(isRelationStyleProperty);
+			const id = stringHash$1("deployment", this.docUri, astPath, source.deployment, target.deployment);
 			return exact({
-				id: stringHash$1("deployment", this.docUri, astPath, source.deployment, target.deployment),
+				id,
 				source,
 				target,
 				...titleDescAndTech,
@@ -5402,9 +5549,11 @@ function DeploymentViewParser(B) {
 			const astPath = this.getAstNodePath(astNode);
 			let id = astNode.name;
 			if (!id) id = "deployment_" + stringHash$1(this.doc.uri.toString(), astPath);
-			const { title = null, description = null } = this.parseBaseProps(pipe(props, filter(isViewStringProperty), mapToObj((p) => [p.key, p.value])));
+			const deploymentViewBodyProps = pipe(props, filter(isViewStringProperty), mapToObj((p) => [p.key, p.value]));
+			const { title = null, description = null } = this.parseBaseProps(deploymentViewBodyProps, { title: parseTitleKeepingEscapedSlash(deploymentViewBodyProps.title) });
 			const tags = this.convertTags(body);
 			const links = this.convertLinks(body);
+			const order = parseViewOrder(props.find(isViewOrderProperty));
 			ViewOps.writeId(astNode, id);
 			return {
 				[c4._type]: "deployment",
@@ -5412,6 +5561,7 @@ function DeploymentViewParser(B) {
 				astPath,
 				title: toSingleLine(title) ?? null,
 				description,
+				...order !== void 0 && { order },
 				tags,
 				links: isNonEmptyArray$1(links) ? links : null,
 				rules: this.tryMap("deployment", body.rules, (n) => this.parseDeploymentViewRule(n))
@@ -5962,7 +6112,7 @@ function ModelParser(B) {
 			let [_title, _summary, _technology] = astNode.props ?? [];
 			const bodyProps = pipe(astNode.body?.props ?? [], filter(isValid), filter(isElementStringProperty), mapToObj((p) => [p.key, p.value]));
 			const { title, ...descAndTech } = this.parseBaseProps(bodyProps, {
-				title: _title,
+				title: isDefined(_title) ? parseInlineTitleKeepingEscapedSlash(astNode, "props", 0) ?? _title : parseTitleKeepingEscapedSlash(bodyProps.title),
 				summary: _summary,
 				technology: _technology
 			});
@@ -5984,8 +6134,9 @@ function ModelParser(B) {
 			const links = this.parseLinks(astNode.body);
 			if (!tags && isEmptyish(metadata) && !links) return null;
 			const astPath = this.getAstNodePath(astNode);
+			const id = this.resolveFqn(astNode);
 			return exact$1({
-				id: this.resolveFqn(astNode),
+				id,
 				astPath,
 				metadata,
 				tags,
@@ -6004,9 +6155,17 @@ function ModelParser(B) {
 			if (!tags && isEmpty(metadata ?? {}) && !links) return null;
 			const kind = (astNode.kind ?? astNode.dotKind?.kind)?.ref?.name;
 			const { title = "" } = this.parseBaseProps({}, { title: astNode.title });
+			const id = relationFingerprint({
+				source,
+				target,
+				kind,
+				title,
+				isBidirectional: astNode.isBidirectional || void 0
+			});
 			return exact$1({
-				id: stringHash$1("extend-relation", FqnRef$1.flatten(source), FqnRef$1.flatten(target), kind ?? "default", title),
+				id,
 				astPath,
+				isBidirectional: astNode.isBidirectional || void 0,
 				metadata,
 				tags,
 				links
@@ -6040,11 +6199,13 @@ function ModelParser(B) {
 				technology: astNode.technology
 			});
 			const styleProp = astNode.body?.props.find(isRelationStyleProperty);
+			const id = stringHash$1(this.docUri, astPath, FqnRef$1.flatten(source), FqnRef$1.flatten(target));
 			return exact$1({
-				id: stringHash$1(this.docUri, astPath, FqnRef$1.flatten(source), FqnRef$1.flatten(target)),
+				id,
 				astPath,
 				source,
 				target,
+				isBidirectional: astNode.isBidirectional || void 0,
 				title,
 				metadata,
 				kind,
@@ -6152,7 +6313,7 @@ function SpecificationParser(B) {
 			for (const tagSpec of tags_specs) try {
 				const tag = tagSpec.tag.name;
 				const astPath = this.getAstNodePath(tagSpec.tag);
-				const color = tagSpec.color && this.parseColorLiteral(tagSpec.color);
+				const color = toColor(tagSpec) ?? (tagSpec.color && this.parseColorLiteral(tagSpec.color));
 				if (tag in c4Specification.tags) {
 					this.logError(`Tag ${tag} is already defined, skipping duplicate`, tagSpec, "specification");
 					continue;
@@ -6239,28 +6400,32 @@ function ViewsParser(B) {
 		parseElementView(astNode, additionalStyles) {
 			const body = astNode.body;
 			invariant$1(body, "ElementView body is not defined");
+			const props = body.props.filter(this.isValid);
 			const astPath = this.getAstNodePath(astNode);
 			let viewOf = null;
-			if ("viewOf" in astNode) {
-				const viewOfEl = elementRef(astNode.viewOf);
-				const _viewOf = viewOfEl && safeCall(() => this.resolveFqn(viewOfEl));
+			const viewOfNode = astNode.viewOf;
+			if (viewOfNode) {
+				const _viewOf = safeCall(() => this.parseModelElementRef(viewOfNode, "Invalid reference to viewOf"));
 				if (!_viewOf) {
 					const viewId = astNode.name ?? "unnamed";
-					const msg = astNode.viewOf.$cstNode?.text ?? "<unknown>";
-					this.logError(`viewOf ${viewId} not resolved ${msg}`, astNode.viewOf);
+					const msg = viewOfNode.$cstNode?.text ?? "<unknown>";
+					this.logError(`viewOf ${viewId} not resolved ${msg}`, viewOfNode);
 				} else viewOf = _viewOf;
 			}
 			let id = astNode.name;
 			if (!id) id = "view_" + stringHash$1(this.doc.uri.toString(), astPath, viewOf ?? "");
-			const { title = null, description = null } = this.parseBaseProps(pipe(body.props, filter((p) => this.isValid(p)), filter(isViewStringProperty), mapToObj((p) => [p.key, p.value])));
+			const viewBodyProps = pipe(props, filter(isViewStringProperty), mapToObj((p) => [p.key, p.value]));
+			const { title = null, description = null } = this.parseBaseProps(viewBodyProps, { title: parseTitleKeepingEscapedSlash(viewBodyProps.title) });
 			const tags = this.convertTags(body);
 			const links = this.convertLinks(body);
+			const order = parseViewOrder(props.find(isViewOrderProperty));
 			const view = {
 				[c4._type]: "element",
 				id,
 				astPath,
 				title: toSingleLine(title) ?? null,
 				description,
+				...order !== void 0 && { order },
 				tags,
 				links: isNonEmptyArray$1(links) ? links : null,
 				rules: [...additionalStyles, ...this.tryMap("views", body.rules, (r) => this.parseElementViewRule(r))],
@@ -6313,6 +6478,10 @@ function ViewsParser(B) {
 					groupRules.push(this.parseViewRulePredicate(rule));
 					continue;
 				}
+				if (isViewRuleGlobalPredicateRef(rule)) {
+					groupRules.push(this.parseViewRuleGlobalPredicateRef(rule));
+					continue;
+				}
 				if (isViewRuleGroup(rule)) {
 					groupRules.push(this.parseViewRuleGroup(rule));
 					continue;
@@ -6355,9 +6524,11 @@ function ViewsParser(B) {
 			const astPath = this.getAstNodePath(astNode);
 			let id = astNode.name;
 			if (!id) id = "dynamic_" + stringHash$1(this.doc.uri.toString(), astPath);
-			const { title = null, description = null } = this.parseBaseProps(pipe(props, filter(isViewStringProperty), mapToObj((p) => [p.key, p.value])));
+			const dynamicViewBodyProps = pipe(props, filter(isViewStringProperty), mapToObj((p) => [p.key, p.value]));
+			const { title = null, description = null } = this.parseBaseProps(dynamicViewBodyProps, { title: parseTitleKeepingEscapedSlash(dynamicViewBodyProps.title) });
 			const tags = this.convertTags(body);
 			const links = this.convertLinks(body);
+			const order = parseViewOrder(props.find(isViewOrderProperty));
 			ViewOps.writeId(astNode, id);
 			const variant = find(props, isDynamicViewDisplayVariantProperty)?.value;
 			return {
@@ -6366,6 +6537,7 @@ function ViewsParser(B) {
 				astPath,
 				title: toSingleLine(title) ?? null,
 				description,
+				...order !== void 0 && { order },
 				tags,
 				links: isNonEmptyArray$1(links) ? links : null,
 				variant,
@@ -6481,10 +6653,12 @@ function ViewsParser(B) {
 					}
 					case isRelationStringProperty(prop):
 					case isNotationProperty(prop):
-						if (isDefined(prop.value)) if (prop.key === "description") {
-							const value = removeIndent(prop.value);
-							if (value) step.description = value;
-						} else step[prop.key] = removeIndent(parseMarkdownAsString(prop.value)) ?? "";
+						if (isDefined(prop.value)) {
+							if (prop.key === "description") {
+								const value = removeIndent(prop.value);
+								if (value) step.description = value;
+							} else step[prop.key] = removeIndent(parseMarkdownAsString(prop.value)) ?? "";
+						}
 						break;
 					case isNotesProperty(prop):
 						if (isDefined(prop.value)) step[prop.key] = removeIndent(prop.value);
@@ -6508,11 +6682,14 @@ function ViewsParser(B) {
 			}
 			return step;
 		}
-		parseDynamicStepEndpoint(node, endpoint) {
+		parseModelElementRef(node, errorMessage) {
 			const ref = this.parseFqnRef(node.modelElement);
-			if (!c4.FqnRef.isModelRef(ref)) throw new Error(`Invalid reference to ${endpoint}`);
+			if (!c4.FqnRef.isModelRef(ref)) throw new Error(errorMessage);
 			return c4.FqnRef.flatten(ref);
 		}
+		parseDynamicStepEndpoint(node, endpoint) {
+			return this.parseModelElementRef(node, `Invalid reference to ${endpoint}`);
+		}
 		parseSubflowStep(node) {
 			const kind = node.kind === "parallel" ? "par" : node.kind;
 			switch (kind) {
@@ -6764,10 +6941,14 @@ function changeElementStyle(services, { view, viewAst, targets, style }) {
 		end: insertPos
 	};
 	const includeRange = (range) => {
-		if (range.start.line <= modifiedRange.start.line) if (range.start.line == modifiedRange.start.line) modifiedRange.start.character = Math.min(range.start.character, modifiedRange.start.character);
-		else modifiedRange.start = range.start;
-		if (range.end.line >= modifiedRange.end.line) if (range.end.line == modifiedRange.end.line) modifiedRange.end.character = Math.max(range.end.character, modifiedRange.end.character);
-		else modifiedRange.end = range.end;
+		if (range.start.line <= modifiedRange.start.line) {
+			if (range.start.line == modifiedRange.start.line) modifiedRange.start.character = Math.min(range.start.character, modifiedRange.start.character);
+			else modifiedRange.start = range.start;
+		}
+		if (range.end.line >= modifiedRange.end.line) {
+			if (range.end.line == modifiedRange.end.line) modifiedRange.end.character = Math.max(range.end.character, modifiedRange.end.character);
+			else modifiedRange.end = range.end;
+		}
 	};
 	const edits = [];
 	if (insert.length > 0) {
@@ -7006,11 +7187,9 @@ var LikeC4ModelChanges = class {
 			const project = workspace.ProjectsManager.ensureProject(_projectId);
 			logger$2.debug`Applying model change ${change.op} to view ${viewId} in project ${project.id}`;
 			const lookup = this.locator.locateViewAst(viewId, project.id);
-			if (!lookup) throw new Error(`View ${viewId} not found in project ${project.id}`);
-			const textDocument = {
-				uri: lookup.doc.textDocument.uri,
-				version: lookup.doc.textDocument.version
-			};
+			if (!lookup && (change.op === "save-view-snapshot" || change.op === "reset-manual-layout")) {
+				if (!(await this.services.likec4.ModelBuilder.computeModel(project.id)).findView(viewId)) throw new Error(`View ${viewId} not found in project ${project.id}`);
+			}
 			if (change.op === "save-view-snapshot") {
 				invariant$1(viewId === change.layout.id, "View ID does not match, expected " + viewId + ", got " + change.layout.id);
 				return {
@@ -7022,6 +7201,11 @@ var LikeC4ModelChanges = class {
 				success: true,
 				location: await workspace.ManualLayouts.remove(project, viewId)
 			};
+			if (!lookup) throw new Error(`View ${viewId} not found in project ${project.id}`);
+			const textDocument = {
+				uri: lookup.doc.textDocument.uri,
+				version: lookup.doc.textDocument.version
+			};
 			const { edits, modifiedRange } = this.convertToTextEdit({
 				lookup,
 				change
@@ -7582,7 +7766,8 @@ var Rpc = class extends ADisposable {
 			return { result: reportLayoutDrift((await likec4Services.Views.layoutAllViews(projectId, cancelToken)).map((l) => l.diagram)) };
 		}), connection.onRequest(FetchProjects.req, async () => {
 			logger$1.debug`received request ${"FetchProjects"}`;
-			return { projects: mapValues(LangiumDocuments.groupedByProject(), (docs, projectId) => {
+			const docsByProject = LangiumDocuments.groupedByProject();
+			return { projects: mapValues(docsByProject, (docs, projectId) => {
 				const { folderUri, config: { name, title } } = workspace.ProjectsManager.getProject(projectId);
 				return {
 					folder: folderUri.toString(),
@@ -7812,7 +7997,8 @@ var DefaultLikeC4Views = class extends ADisposable {
 		return this.services.likec4.Layouter;
 	}
 	async computedViews(projectId, cancelToken) {
-		return values((await this.ModelBuilder.computeModel(projectId, cancelToken)).$data.views);
+		const likeC4Model = await this.ModelBuilder.computeModel(projectId, cancelToken);
+		return values(likeC4Model.$data.views);
 	}
 	async _layoutAllViews(likeC4Model, cancelToken) {
 		const views = values(likeC4Model.$data.views);
@@ -7835,8 +8021,10 @@ var DefaultLikeC4Views = class extends ADisposable {
 			}
 			tasks.push(task);
 		}
-		if (results.length > 0) if (tasks.length > 0) logger.trace`cached ${results.length} views, need to layout ${tasks.length} views`;
-		else logger.trace`cached all ${results.length} views`;
+		if (results.length > 0) {
+			if (tasks.length > 0) logger.trace`cached ${results.length} views, need to layout ${tasks.length} views`;
+			else logger.trace`cached all ${results.length} views`;
+		}
 		if (tasks.length > 0) {
 			const m0 = performanceMark();
 			await this.layouter.batchLayout({
@@ -8155,7 +8343,7 @@ function createLikeC4Module(context) {
 }
 function createLanguageServices(context = {}, module, module2, module3) {
 	const shared = createSharedServices(context);
-	const likec4 = inject([
+	const modules = [
 		createDefaultModule({ shared }),
 		LikeC4GeneratedModule,
 		createLikeC4Module({
@@ -8167,7 +8355,8 @@ function createLanguageServices(context = {}, module, module2, module3) {
 		module,
 		module2,
 		module3
-	].reduce(_merge, {}));
+	].reduce(_merge, {});
+	const likec4 = inject(modules);
 	shared.ServiceRegistry.register(likec4);
 	registerValidationChecks(likec4);
 	if (!context.connection) shared.workspace.ConfigurationProvider.initialized({});