sysml-v2-lsp 0.34.0 → 0.36.0

package/dist/server/server.js

@@ -3375,8 +3375,8 @@ var require_main2 = __commonJS({
         }
         uinteger2.is = is;
       })(uinteger || (exports3.uinteger = uinteger = {}));
-      var Position2;
-      (function(Position3) {
+      var Position3;
+      (function(Position4) {
         function create(line, character) {
           if (line === Number.MAX_VALUE) {
             line = uinteger.MAX_VALUE;
@@ -3386,31 +3386,31 @@ var require_main2 = __commonJS({
           }
           return { line, character };
         }
-        Position3.create = create;
+        Position4.create = create;
         function is(value) {
           var candidate = value;
           return Is.objectLiteral(candidate) && Is.uinteger(candidate.line) && Is.uinteger(candidate.character);
         }
-        Position3.is = is;
-      })(Position2 || (exports3.Position = Position2 = {}));
-      var Range2;
-      (function(Range3) {
+        Position4.is = is;
+      })(Position3 || (exports3.Position = Position3 = {}));
+      var Range3;
+      (function(Range4) {
         function create(one, two, three, four) {
           if (Is.uinteger(one) && Is.uinteger(two) && Is.uinteger(three) && Is.uinteger(four)) {
-            return { start: Position2.create(one, two), end: Position2.create(three, four) };
-          } else if (Position2.is(one) && Position2.is(two)) {
+            return { start: Position3.create(one, two), end: Position3.create(three, four) };
+          } else if (Position3.is(one) && Position3.is(two)) {
             return { start: one, end: two };
           } else {
             throw new Error("Range#create called with invalid arguments[".concat(one, ", ").concat(two, ", ").concat(three, ", ").concat(four, "]"));
           }
         }
-        Range3.create = create;
+        Range4.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position2.is(candidate.start) && Position2.is(candidate.end);
+          return Is.objectLiteral(candidate) && Position3.is(candidate.start) && Position3.is(candidate.end);
         }
-        Range3.is = is;
-      })(Range2 || (exports3.Range = Range2 = {}));
+        Range4.is = is;
+      })(Range3 || (exports3.Range = Range3 = {}));
       var Location2;
       (function(Location3) {
         function create(uri, range) {
@@ -3419,7 +3419,7 @@ var require_main2 = __commonJS({
         Location3.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
+          return Is.objectLiteral(candidate) && Range3.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
         }
         Location3.is = is;
       })(Location2 || (exports3.Location = Location2 = {}));
@@ -3431,7 +3431,7 @@ var require_main2 = __commonJS({
         LocationLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range2.is(candidate.targetSelectionRange) && (Range2.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
+          return Is.objectLiteral(candidate) && Range3.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range3.is(candidate.targetSelectionRange) && (Range3.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
         }
         LocationLink2.is = is;
       })(LocationLink || (exports3.LocationLink = LocationLink = {}));
@@ -3463,7 +3463,7 @@ var require_main2 = __commonJS({
         ColorInformation2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && Color.is(candidate.color);
+          return Is.objectLiteral(candidate) && Range3.is(candidate.range) && Color.is(candidate.color);
         }
         ColorInformation2.is = is;
       })(ColorInformation || (exports3.ColorInformation = ColorInformation = {}));
@@ -3574,7 +3574,7 @@ var require_main2 = __commonJS({
         function is(value) {
           var _a;
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && Is.string(candidate.message) && (Is.number(candidate.severity) || Is.undefined(candidate.severity)) && (Is.integer(candidate.code) || Is.string(candidate.code) || Is.undefined(candidate.code)) && (Is.undefined(candidate.codeDescription) || Is.string((_a = candidate.codeDescription) === null || _a === void 0 ? void 0 : _a.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
+          return Is.defined(candidate) && Range3.is(candidate.range) && Is.string(candidate.message) && (Is.number(candidate.severity) || Is.undefined(candidate.severity)) && (Is.integer(candidate.code) || Is.string(candidate.code) || Is.undefined(candidate.code)) && (Is.undefined(candidate.codeDescription) || Is.string((_a = candidate.codeDescription) === null || _a === void 0 ? void 0 : _a.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
         }
         Diagnostic7.is = is;
       })(Diagnostic6 || (exports3.Diagnostic = Diagnostic6 = {}));
@@ -3614,7 +3614,7 @@ var require_main2 = __commonJS({
         TextEdit5.del = del;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range2.is(candidate.range);
+          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range3.is(candidate.range);
         }
         TextEdit5.is = is;
       })(TextEdit4 || (exports3.TextEdit = TextEdit4 = {}));
@@ -4158,7 +4158,7 @@ var require_main2 = __commonJS({
         InsertReplaceEdit2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.newText) && Range2.is(candidate.insert) && Range2.is(candidate.replace);
+          return candidate && Is.string(candidate.newText) && Range3.is(candidate.insert) && Range3.is(candidate.replace);
         }
         InsertReplaceEdit2.is = is;
       })(InsertReplaceEdit || (exports3.InsertReplaceEdit = InsertReplaceEdit = {}));
@@ -4205,7 +4205,7 @@ var require_main2 = __commonJS({
       (function(Hover4) {
         function is(value) {
           var candidate = value;
-          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent2.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range2.is(value.range));
+          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent2.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range3.is(value.range));
         }
         Hover4.is = is;
       })(Hover3 || (exports3.Hover = Hover3 = {}));
@@ -4326,7 +4326,7 @@ var require_main2 = __commonJS({
         DocumentSymbol3.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.name) && Is.number(candidate.kind) && Range2.is(candidate.range) && Range2.is(candidate.selectionRange) && (candidate.detail === void 0 || Is.string(candidate.detail)) && (candidate.deprecated === void 0 || Is.boolean(candidate.deprecated)) && (candidate.children === void 0 || Array.isArray(candidate.children)) && (candidate.tags === void 0 || Array.isArray(candidate.tags));
+          return candidate && Is.string(candidate.name) && Is.number(candidate.kind) && Range3.is(candidate.range) && Range3.is(candidate.selectionRange) && (candidate.detail === void 0 || Is.string(candidate.detail)) && (candidate.deprecated === void 0 || Is.boolean(candidate.deprecated)) && (candidate.children === void 0 || Array.isArray(candidate.children)) && (candidate.tags === void 0 || Array.isArray(candidate.tags));
         }
         DocumentSymbol3.is = is;
       })(DocumentSymbol2 || (exports3.DocumentSymbol = DocumentSymbol2 = {}));
@@ -4403,7 +4403,7 @@ var require_main2 = __commonJS({
         CodeLens2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
+          return Is.defined(candidate) && Range3.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
         }
         CodeLens2.is = is;
       })(CodeLens || (exports3.CodeLens = CodeLens = {}));
@@ -4427,7 +4427,7 @@ var require_main2 = __commonJS({
         DocumentLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
+          return Is.defined(candidate) && Range3.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
         }
         DocumentLink2.is = is;
       })(DocumentLink || (exports3.DocumentLink = DocumentLink = {}));
@@ -4439,7 +4439,7 @@ var require_main2 = __commonJS({
         SelectionRange2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
+          return Is.objectLiteral(candidate) && Range3.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
         }
         SelectionRange2.is = is;
       })(SelectionRange || (exports3.SelectionRange = SelectionRange = {}));
@@ -4498,7 +4498,7 @@ var require_main2 = __commonJS({
         InlineValueText2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.string(candidate.text);
+          return candidate !== void 0 && candidate !== null && Range3.is(candidate.range) && Is.string(candidate.text);
         }
         InlineValueText2.is = is;
       })(InlineValueText || (exports3.InlineValueText = InlineValueText = {}));
@@ -4510,7 +4510,7 @@ var require_main2 = __commonJS({
         InlineValueVariableLookup2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
+          return candidate !== void 0 && candidate !== null && Range3.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
         }
         InlineValueVariableLookup2.is = is;
       })(InlineValueVariableLookup || (exports3.InlineValueVariableLookup = InlineValueVariableLookup = {}));
@@ -4522,7 +4522,7 @@ var require_main2 = __commonJS({
         InlineValueEvaluatableExpression2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
+          return candidate !== void 0 && candidate !== null && Range3.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
         }
         InlineValueEvaluatableExpression2.is = is;
       })(InlineValueEvaluatableExpression || (exports3.InlineValueEvaluatableExpression = InlineValueEvaluatableExpression = {}));
@@ -4534,7 +4534,7 @@ var require_main2 = __commonJS({
         InlineValueContext2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range2.is(value.stoppedLocation);
+          return Is.defined(candidate) && Range3.is(value.stoppedLocation);
         }
         InlineValueContext2.is = is;
       })(InlineValueContext || (exports3.InlineValueContext = InlineValueContext = {}));
@@ -4571,7 +4571,7 @@ var require_main2 = __commonJS({
         InlayHint2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position2.is(candidate.position) && (Is.string(candidate.label) || Is.typedArray(candidate.label, InlayHintLabelPart.is)) && (candidate.kind === void 0 || InlayHintKind.is(candidate.kind)) && candidate.textEdits === void 0 || Is.typedArray(candidate.textEdits, TextEdit4.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.paddingLeft === void 0 || Is.boolean(candidate.paddingLeft)) && (candidate.paddingRight === void 0 || Is.boolean(candidate.paddingRight));
+          return Is.objectLiteral(candidate) && Position3.is(candidate.position) && (Is.string(candidate.label) || Is.typedArray(candidate.label, InlayHintLabelPart.is)) && (candidate.kind === void 0 || InlayHintKind.is(candidate.kind)) && candidate.textEdits === void 0 || Is.typedArray(candidate.textEdits, TextEdit4.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent2.is(candidate.tooltip)) && (candidate.paddingLeft === void 0 || Is.boolean(candidate.paddingLeft)) && (candidate.paddingRight === void 0 || Is.boolean(candidate.paddingRight));
         }
         InlayHint2.is = is;
       })(InlayHint || (exports3.InlayHint = InlayHint = {}));
@@ -4760,7 +4760,7 @@ var require_main2 = __commonJS({
             var lineOffsets = this.getLineOffsets();
             var low = 0, high = lineOffsets.length;
             if (high === 0) {
-              return Position2.create(0, offset);
+              return Position3.create(0, offset);
             }
             while (low < high) {
               var mid = Math.floor((low + high) / 2);
@@ -4771,7 +4771,7 @@ var require_main2 = __commonJS({
               }
             }
             var line = low - 1;
-            return Position2.create(line, offset - lineOffsets[line]);
+            return Position3.create(line, offset - lineOffsets[line]);
           };
           FullTextDocument3.prototype.offsetAt = function(position) {
             var lineOffsets = this.getLineOffsets();
@@ -121638,6 +121638,10 @@ var SYSML_KEYWORDS = new Set(SYSML_KEYWORDS_ARRAY);
 function canonicalUri(uri) {
   return uri.replace(/^file:\/\/\/([A-Za-z])(?::|%3[Aa])(?=\/|$)/, (_m, drive) => `file:///${drive.toLowerCase()}:`);
 }
+function isInFolder(uri, folderUri) {
+  const folder = canonicalUri(folderUri);
+  return canonicalUri(uri).startsWith(folder.endsWith("/") ? folder : `${folder}/`);
+}
 function isSameDocumentUri(a, b) {
   return a === b || canonicalUri(a) === canonicalUri(b);
 }
@@ -121740,6 +121744,7 @@ var v5_default = v5;
 var NAMESPACE_URL = v5_default.URL;
 var DEFAULT_URL_PREFIX = "https://github.com/daltskin/sysml-v2-lsp/";
 var urlPrefix = DEFAULT_URL_PREFIX;
+var folderPrefixes = [];
 function setProjectId(projectId) {
   if (projectId === void 0) {
     urlPrefix = DEFAULT_URL_PREFIX;
@@ -121749,8 +121754,14 @@ function setProjectId(projectId) {
   urlPrefix = `urn:uuid:${projectId.toLowerCase()}/`;
   return true;
 }
-function getUrlPrefix() {
-  return urlPrefix;
+function setFolderProjectIds(projectIds) {
+  const rejected = projectIds.filter((p) => !validate_default(p.projectId));
+  folderPrefixes = projectIds.filter((p) => validate_default(p.projectId)).map((p) => ({ folderUri: p.folderUri, prefix: `urn:uuid:${p.projectId.toLowerCase()}/` })).sort((a, b) => b.folderUri.length - a.folderUri.length);
+  return rejected;
+}
+function getUrlPrefix(uri) {
+  const match = uri === void 0 ? void 0 : folderPrefixes.find((f) => isInFolder(uri, f.folderUri));
+  return match?.prefix ?? urlPrefix;
 }
 function uuidV5(namespace, name) {
   return v5_default(name, namespace);
@@ -121832,6 +121843,10 @@ function toMetaclassName(kind) {
       return "RequirementDefinition";
     case "requirement" /* RequirementUsage */:
       return "RequirementUsage";
+    case "concern def" /* ConcernDef */:
+      return "ConcernDefinition";
+    case "concern" /* ConcernUsage */:
+      return "ConcernUsage";
     case "constraint def" /* ConstraintDef */:
       return "ConstraintDefinition";
     case "constraint" /* ConstraintUsage */:
@@ -121954,7 +121969,7 @@ var IdRegistry = class {
     declaration.parentId = owner?.symbolId;
     const path3 = declaration.qualifiedName !== void 0 ? this.qualifiedNameAsWritten(declaration) : owner ? `${this.paths.get(owner)}/${segmentOf(declaration)}` : segmentOf(declaration);
     const namespace = owner ? this.topLevelOf(owner).symbolId : NAMESPACE_URL;
-    const key = owner ? path3 : getUrlPrefix() + encodeURIComponent(path3);
+    const key = owner ? path3 : getUrlPrefix(declaration.uri) + encodeURIComponent(path3);
     const groupId = this.uuidOf(namespace, key);
     this.groupKeys.set(groupId, { namespace, key, path: path3 });
     this.groupOf.set(declaration, groupId);
@@ -122139,6 +122154,12 @@ var RULE_INDEX_TO_KIND = /* @__PURE__ */ new Map([
   // 343
   [SysMLv2Parser.RULE_requirementDefinition, "requirement def" /* RequirementDef */],
   // 384
+  [SysMLv2Parser.RULE_concernDefinition, "concern def" /* ConcernDef */],
+  // 405
+  [SysMLv2Parser.RULE_concernUsage, "concern" /* ConcernUsage */],
+  // 406
+  [SysMLv2Parser.RULE_framedConcernUsage, "concern" /* ConcernUsage */],
+  // 394
   [SysMLv2Parser.RULE_constraintDefinition, "constraint def" /* ConstraintDef */],
   // 380
   [SysMLv2Parser.RULE_itemDefinition, "item def" /* ItemDef */],
@@ -122211,6 +122232,10 @@ var RULE_INDEX_TO_KIND = /* @__PURE__ */ new Map([
   // 268
   [SysMLv2Parser.RULE_performActionUsage, "perform action" /* PerformActionUsage */],
   // 298
+  // A state's `entry`/`do`/`exit` action (`exit action a : A;`, `exit a;`): the
+  // StatePerformActionUsage production, a PerformActionUsage without `perform`.
+  [SysMLv2Parser.RULE_statePerformActionUsage, "perform action" /* PerformActionUsage */],
+  // 352
   [SysMLv2Parser.RULE_exhibitStateUsage, "exhibit state" /* ExhibitStateUsage */],
   // 359
   [SysMLv2Parser.RULE_transitionUsage, "transition" /* TransitionUsage */],
@@ -122334,8 +122359,10 @@ var TYPE_RECURSE_RULE_INDICES = /* @__PURE__ */ new Set([
   // 210
   SysMLv2Parser.RULE_definition,
   // 192
-  SysMLv2Parser.RULE_usage
+  SysMLv2Parser.RULE_usage,
   // 208
+  SysMLv2Parser.RULE_payloadFeatureSpecializationPart
+  // 157
 ]);
 var DOC_RULE_INDICES = /* @__PURE__ */ new Set([
   SysMLv2Parser.RULE_comment,
@@ -122960,8 +122987,9 @@ var SymbolTable = class {
     const shortName = transition || isFlowUsage(kind) && !declaredName ? void 0 : this.extractShortName(ctx);
     const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${name}` : name;
     const selectionRange = anonymous ? ctx.start ? tokenToRange(ctx.start) : range : this.extractNameRange(ctx) ?? range;
-    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx) : this.extractTypeNames(ctx);
+    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx) : transition ? this.extractTransitionTypeNames(ctx) : this.extractTypeNames(ctx);
     const specializationNames = this.extractSpecializationNames(ctx);
+    const redefinedFeatureTargets = this.extractRedefinedFeatureTargets(ctx);
     const typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx);
     const visibility = this.extractVisibility(ctx);
@@ -122992,6 +123020,7 @@ var SymbolTable = class {
       typeName,
       typeNames,
       specializationNames,
+      redefinedFeatureTargets: redefinedFeatureTargets.length > 0 ? redefinedFeatureTargets : void 0,
       documentation,
       visibility,
       source: transition?.source,
@@ -123075,6 +123104,25 @@ var SymbolTable = class {
     const typeDeclaration = declaration && (this.findOwnHeaderRule(declaration, SysMLv2Parser.RULE_featureDeclaration) ?? this.findOwnHeaderRule(declaration, SysMLv2Parser.RULE_usageDeclaration));
     return typeDeclaration ? this.extractTypeNames(typeDeclaration) : [];
   }
+  /**
+   * A transition's own typing, then the types of the payload its trigger
+   * accepts (`accept cmd : Command`, `accept Command`; TriggerAction ->
+   * AcceptParameterPart -> PayloadParameter). Read from the parse tree only:
+   * the regex fallback of `extractTypeNames` runs on whitespace-free text, where
+   * the payload type runs into the guard, effect or target that follows it
+   * (`Commandifcmd`, `Commandthenbusy`).
+   */
+  extractTransitionTypeNames(ctx) {
+    const names = [];
+    this.collectTypeNamesFromTree(ctx, names, 0);
+    const trigger = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_triggerActionMember);
+    const parameter = trigger && this.findRuleContext(trigger, SysMLv2Parser.RULE_payloadParameter);
+    if (parameter) {
+      const payload = this.findRuleContext(parameter, SysMLv2Parser.RULE_payloadFeature) ?? parameter;
+      this.collectTypeNamesFromTree(payload, names, 0);
+    }
+    return names;
+  }
   /** Find the first descendant of `ctx` with rule `ruleIndex`, in source order. */
   findRuleContext(ctx, ruleIndex) {
     const matches = [];
@@ -123200,7 +123248,7 @@ var SymbolTable = class {
    */
   anonymousDeclaration(ctx, kind, transition) {
     if (!isDefinition(kind) && !isUsage(kind)) return void 0;
-    if (transition && !(transition.source && transition.target) && this.extractTypeNames(ctx).length === 0) return void 0;
+    if (transition && !(transition.source && transition.target) && this.extractTransitionTypeNames(ctx).length === 0) return void 0;
     return this.declarationText(ctx);
   }
   /**
@@ -123224,15 +123272,28 @@ var SymbolTable = class {
    * such as `#metadata`.
    */
   findOwnHeaderRule(ctx, ruleIndex) {
+    const matches = [];
+    this.findOwnHeaderRules(ctx, ruleIndex, matches, true);
+    return matches[0];
+  }
+  findOwnHeaderRules(ctx, ruleIndex, matches, firstOnly = false) {
     for (let i = 0; i < ctx.getChildCount(); i++) {
       const child = ctx.getChild(i);
       if (!(child instanceof ParserRuleContext)) continue;
-      if (child.ruleIndex === ruleIndex) return child;
+      if (child.ruleIndex === ruleIndex) {
+        matches.push(child);
+        if (firstOnly) return;
+        continue;
+      }
       if (RULE_INDEX_TO_KIND.has(child.ruleIndex) || BODY_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_valuePart || FLOW_PART_RULE_INDICES.has(child.ruleIndex) || child.ruleIndex === SysMLv2Parser.RULE_ownedCrossMultiplicityMember || this.isPrefixOrExtensionContext(child)) continue;
-      const found = this.findOwnHeaderRule(child, ruleIndex);
-      if (found) return found;
+      this.findOwnHeaderRules(child, ruleIndex, matches, firstOnly);
+      if (firstOnly && matches.length > 0) return;
     }
-    return void 0;
+  }
+  extractRedefinedFeatureTargets(ctx) {
+    const targets = [];
+    this.findOwnHeaderRules(ctx, SysMLv2Parser.RULE_ownedRedefinition, targets);
+    return targets.map((target) => target.getText());
   }
   /**
    * A connection, interface or allocation usage's end reference paths, in
@@ -123260,13 +123321,7 @@ var SymbolTable = class {
     const segment = reference.getText().split(/::|\./).pop();
     return segment ? this.unquoteName(segment) : void 0;
   }
-  /**
-   * An element's declaration as written, without its body: its tokens up to
-   * its body or closing `;`, each exactly as written (a quoted name keeps its
-   * spaces), with one space wherever the source has whitespace or a comment
-   * between two of them (`connect a.p to b.p`, `connection : Conn`).
-   */
-  declarationText(ctx) {
+  declarationTokens(ctx) {
     const tokens = [];
     const visit = (node) => {
       for (let i = 0; i < node.getChildCount(); i++) {
@@ -123281,6 +123336,16 @@ var SymbolTable = class {
       return false;
     };
     visit(ctx);
+    return tokens;
+  }
+  /**
+   * An element's declaration as written, without its body: its tokens up to
+   * its body or closing `;`, each exactly as written (a quoted name keeps its
+   * spaces), with one space wherever the source has whitespace or a comment
+   * between two of them (`connect a.p to b.p`, `connection : Conn`).
+   */
+  declarationText(ctx) {
+    const tokens = this.declarationTokens(ctx);
     let text = "";
     tokens.forEach((token, i) => {
       if (i > 0 && token.start > tokens[i - 1].stop + 1) text += " ";
@@ -123421,17 +123486,16 @@ var SymbolTable = class {
     const names = [];
     this.collectTypeNamesFromTree(ctx, names, 0);
     if (names.length > 0) return names;
-    const fullText = ctx.getText();
-    const braceIdx = fullText.indexOf("{");
-    let text = braceIdx >= 0 ? fullText.substring(0, braceIdx) : fullText;
+    const { text: declarationText, quotedName } = this.maskedDeclaration(ctx);
+    let text = declarationText;
     text = text.replace(RE_KEYWORD_TRUNCATE, "");
     const specMatch = text.match(RE_SPEC);
     if (specMatch) {
       const specStr = text.substring(text.indexOf(specMatch[0]) + specMatch[0].indexOf(specMatch[1]));
       for (const part of specStr.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(quoted);
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -123452,9 +123516,9 @@ var SymbolTable = class {
       const fullMatchIdx = text.indexOf(typingMatch[0]);
       const afterColon = text.substring(fullMatchIdx + 1).trim();
       for (const part of afterColon.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(quoted);
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -123464,6 +123528,28 @@ var SymbolTable = class {
     }
     return names;
   }
+  /**
+   * The declaration tokens before the body, with each lexer STRING token
+   * replaced by a numbered placeholder (`'0'`, `'1'`, ...), and
+   * `quotedName`, which turns a placeholder in a part of that text back into
+   * the name. SysML 2.0 section 7.2.2 permits punctuation in unrestricted
+   * names (the STRING lexer production), so fallback regexes must never see
+   * their `:`, `:>`, `{` or keywords. Documentation is not a name token.
+   */
+  maskedDeclaration(ctx) {
+    const quoted = [];
+    const masked = this.declarationTokens(ctx).map((token) => {
+      const text = token.text ?? "";
+      return token.type === SysMLv2Lexer.STRING ? `'${quoted.push(text.slice(1, -1)) - 1}'` : text;
+    }).join("");
+    return {
+      text: masked,
+      quotedName: (part) => {
+        const qm = part.match(RE_QUOTED_NAME);
+        return qm ? quoted[Number(qm[1])] : void 0;
+      }
+    };
+  }
   /**
    * Extract only the specialization names (:> / specializes / subsets) from a context.
    * Uses the same tree-walk as extractTypeNames but restricted to
@@ -123474,17 +123560,15 @@ var SymbolTable = class {
     const names = [];
     this.collectNamesFromTree(ctx, names, 0, TYPE_SPECIALIZATION_RULE_INDICES);
     if (names.length > 0) return names;
-    const fullText = ctx.getText();
-    const braceIdx = fullText.indexOf("{");
-    let text = braceIdx >= 0 ? fullText.substring(0, braceIdx) : fullText;
-    text = text.replace(RE_KEYWORD_TRUNCATE_SPEC, "");
+    const { text: declarationText, quotedName } = this.maskedDeclaration(ctx);
+    const text = declarationText.replace(RE_KEYWORD_TRUNCATE_SPEC, "");
     const specMatch = text.match(RE_SPEC_WITH_SUBSETS);
     if (specMatch) {
       const specStr = text.substring(text.indexOf(specMatch[0]) + specMatch[0].indexOf(specMatch[1]));
       for (const part of specStr.split(",")) {
-        const qm = part.match(RE_QUOTED_NAME);
-        if (qm) {
-          names.push(qm[1]);
+        const quoted = quotedName(part);
+        if (quoted !== void 0) {
+          names.push(quoted);
           continue;
         }
         const m2 = part.trim().match(RE_IDENT_START);
@@ -124280,6 +124364,17 @@ var DocumentManager = class {
     }
     return this.wsSymbolTable;
   }
+  /**
+   * Rebuild the symbol tables of `uris` on next use, e.g. after their projectId
+   * changed, which changes their symbol IDs (see `setFolderProjectIds`).
+   */
+  invalidateSymbols(uris) {
+    for (const uri of uris) {
+      const cached = this.cache.get(uri);
+      if (cached) cached.symbolTable = void 0;
+      this.wsBuiltVersions.delete(uri);
+    }
+  }
   /**
    * Cache semantic diagnostics for the current document version.
    */
@@ -125319,14 +125414,21 @@ var NamespaceResolver = class {
    * namespace.
    */
   isLocallyVisible(symbol, name, indexes) {
-    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol, indexes.byId), name, indexes) !== void 0;
+    return this.resolveNameFrom(symbol, name, indexes) !== void 0;
+  }
+  /**
+   * Resolve a (possibly qualified) name from the namespace containing
+   * `symbol`, respecting namespace membership and visibility.
+   */
+  resolveNameFrom(symbol, name, indexes) {
+    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol, indexes.byId), name, indexes);
   }
   /**
    * Resolve a (possibly qualified) name to its symbol per §7.5.1, searching
    * outward from namespace `start` and its enclosing namespaces (its own resolved
    * members first, then its parent's, ...). Shared by `isLocallyVisible` (an
-   * ordinary reference resolving relative to its own enclosing namespace) and
-   * import-target resolution (an `import` declaration's target is itself a
+   * ordinary reference resolving relative to its own enclosing namespace),
+   * `resolveNameFrom`, and import-target resolution (an `import` declaration's target is itself a
    * qualifiedName, resolved the same relative way -- not as an absolute/global
    * name -- so a bare `import C;` inside a nested package can pick up a `C`
    * its own enclosing package already imported, per §7.5.1/§7.5.3).
@@ -128273,6 +128375,8 @@ function toSysMLSymbolKind(kind) {
     // Requirements → Object
     case "requirement def" /* RequirementDef */:
     case "requirement" /* RequirementUsage */:
+    case "concern def" /* ConcernDef */:
+    case "concern" /* ConcernUsage */:
     case "actor" /* ActorUsage */:
     case "subject" /* SubjectUsage */:
     case "stakeholder" /* StakeholderUsage */:
@@ -129531,6 +129635,13 @@ var CONSTRAINT_KEYWORDS = /* @__PURE__ */ new Set([
   "assert",
   "assume"
 ]);
+var CONNECTOR_KINDS = /* @__PURE__ */ new Set([
+  "connection" /* ConnectionUsage */,
+  "interface" /* InterfaceUsage */,
+  "allocation" /* AllocationUsage */,
+  "flow" /* FlowUsage */,
+  "succession flow" /* SuccessionFlowUsage */
+]);
 var SemanticValidator = class _SemanticValidator {
   constructor(documentManager2) {
     this.documentManager = documentManager2;
@@ -129607,7 +129718,7 @@ var SemanticValidator = class _SemanticValidator {
     diagnostics.push(...this.checkAmbiguousNamespaceName(symbols, allSymbols));
     diagnostics.push(...this.checkUnusedDefinitions(allSymbols, uri));
     diagnostics.push(...this.checkRedefinitionMultiplicity(symbols, indexes, text));
-    diagnostics.push(...this.checkPortCompatibility(text, uri, indexes));
+    diagnostics.push(...this.checkPortCompatibility(text, uri, symbols, indexes));
     diagnostics.push(...this.checkConstraintBodyReferences(text, uri, symbols, indexes));
     diagnostics.push(...this.checkCircularSpecialization(symbols, indexes));
     diagnostics.push(...this.checkUnsatisfiedRequirements(symbols, indexes));
@@ -129828,7 +129939,7 @@ var SemanticValidator = class _SemanticValidator {
       opts?.text ? [opts.text] : []
     ));
     if (opts?.text && opts.uri) {
-      diagnostics.push(...instance.checkPortCompatibility(opts.text, opts.uri, indexes));
+      diagnostics.push(...instance.checkPortCompatibility(opts.text, opts.uri, symbolsInUri, indexes));
       diagnostics.push(...instance.checkConstraintBodyReferences(opts.text, opts.uri, symbolsInUri, indexes));
     }
     return instance.dedupeDiagnostics(diagnostics);
@@ -130191,17 +130302,20 @@ var SemanticValidator = class _SemanticValidator {
    * - The connection is within an interface usage
    * - Both ports are untyped (empty port defs with no features)
    */
-  checkPortCompatibility(text, uri, indexes) {
+  checkPortCompatibility(text, uri, symbolsInUri, indexes) {
     if (!text) return [];
     const diagnostics = [];
     const lines = text.split("\n");
     const re = /\bconnect\s+([A-Za-z_][\w.]*)\s+to\s+([A-Za-z_][\w.]*)/g;
     let m2;
     while ((m2 = re.exec(text)) !== null) {
-      const left = m2[1].split(".").pop();
-      const right = m2[2].split(".").pop();
-      const lSym = (indexes.portsByName.get(left) ?? [])[0];
-      const rSym = (indexes.portsByName.get(right) ?? [])[0];
+      const leftPath = m2[1].split(".");
+      const rightPath = m2[2].split(".");
+      const left = leftPath[leftPath.length - 1];
+      const right = rightPath[rightPath.length - 1];
+      const scope = this.connectorScope(symbolsInUri, this.indexToRange(text, m2.index, 0).start, indexes);
+      const lSym = this.resolveConnectorEnd(leftPath, scope, indexes);
+      const rSym = this.resolveConnectorEnd(rightPath, scope, indexes);
       if (!lSym || !rSym) continue;
       const lType = lSym.typeNames[0] ?? lSym.typeName;
       const rType = rSym.typeNames[0] ?? rSym.typeName;
@@ -130251,6 +130365,55 @@ var SemanticValidator = class _SemanticValidator {
     }
     return diagnostics;
   }
+  /**
+   * The innermost element around `position` that owns a connector declared
+   * there: the connector's own symbol, when it has one, is skipped.
+   */
+  connectorScope(symbols, position, indexes) {
+    const before = (a, b) => a.line < b.line || a.line === b.line && a.character <= b.character;
+    const size = (r) => (r.end.line - r.start.line) * 1e6 + (r.end.character - r.start.character);
+    let scope;
+    for (const s of symbols) {
+      if (!before(s.range.start, position) || !before(position, s.range.end)) continue;
+      if (!scope || size(s.range) < size(scope.range)) scope = s;
+    }
+    while (scope && CONNECTOR_KINDS.has(scope.kind)) scope = ownerOf(scope, indexes);
+    return scope;
+  }
+  /**
+   * The port that a connector end (`a.p`, `a.p.q`) names, resolved from
+   * `scope` outward: its first segment is a feature of `scope` or of one of
+   * its owners, each next one a feature of the one before. Two parts can each
+   * have a port of the same name, so an end is never matched by its last
+   * segment alone, except when the path does not resolve and the workspace
+   * has only one port of that name.
+   */
+  resolveConnectorEnd(path3, scope, indexes) {
+    let feature;
+    for (let namespace = scope; namespace && !feature; namespace = ownerOf(namespace, indexes)) {
+      feature = this.findFeature(namespace, path3[0], indexes);
+    }
+    for (const name of path3.slice(1)) {
+      feature = feature && this.findFeature(feature, name, indexes);
+    }
+    if (feature) return feature.kind === "port" /* PortUsage */ ? feature : void 0;
+    const sameName = indexes.portsByName.get(path3[path3.length - 1]) ?? [];
+    return sameName.length === 1 ? sameName[0] : void 0;
+  }
+  /** The feature `name` of `owner`: its own member, else a member of one of its types or their supertypes. */
+  findFeature(owner, name, indexes) {
+    const own = (indexes.byParent.get(namespaceKeyOf(owner)) ?? []).find((s) => s.name === name);
+    if (own) return own;
+    for (const typeName of owner.typeNames) {
+      const type = this.namespaceResolver.resolveNameFrom(owner, typeName, indexes);
+      if (!type || !isDefinition(type.kind)) continue;
+      for (const definition of this.getSpecializationHierarchy(type, indexes).flat()) {
+        const member = (indexes.byParent.get(namespaceKeyOf(definition)) ?? []).find((s) => s.name === name);
+        if (member) return member;
+      }
+    }
+    return void 0;
+  }
   /**
    * Resolve the full type hierarchy for a type name by following
    * specialization chains transitively (max depth 10).
@@ -130298,7 +130461,7 @@ var SemanticValidator = class _SemanticValidator {
       }
       const parent = this.findConstraintScopeSymbol(symbolsInUri, indexes, b.startLine);
       if (!parent) continue;
-      const parentMembers = indexes.byParent.get(namespaceKeyOf(parent)) ?? [];
+      const parentMembers = this.getConstraintScopeMembers(parent, indexes);
       if (parentMembers.length === 0) continue;
       const ignoredRanges = this.getIgnoredBodyRanges(b.body);
       const idRe = /\b([A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)*)\b/g;
@@ -130357,18 +130520,135 @@ var SemanticValidator = class _SemanticValidator {
     const root = parentMembers.find((s) => s.name === path3[0]);
     if (!root) return false;
     if (path3.length === 1) return true;
-    let typeName = root.typeNames[0] ?? root.typeName;
+    let current = root;
     for (let i = 1; i < path3.length; i++) {
+      const typeName = current.typeNames[0] ?? current.typeName;
       if (!typeName) return false;
-      const typeDefs = indexes.definitionsByName.get(typeName) ?? [];
-      const typeDef = typeDefs[0];
-      if (!typeDef) return false;
-      const member = (indexes.byParent.get(namespaceKeyOf(typeDef)) ?? []).find((s) => s.name === path3[i]);
+      const typeDef = this.namespaceResolver.resolveNameFrom(current, typeName, indexes);
+      if (!typeDef || !isDefinition(typeDef.kind)) return false;
+      const member = this.getConstraintScopeMembers(typeDef, indexes, true).find((s) => s.name === path3[i]);
       if (!member) return false;
-      typeName = member.typeNames[0] ?? member.typeName;
+      current = member;
     }
     return true;
   }
+  getConstraintScopeMembers(scope, indexes, publicOnly = false) {
+    const hierarchy = [[scope]];
+    const visited = /* @__PURE__ */ new Set([scope]);
+    let frontier = [scope];
+    while (frontier.length > 0) {
+      const next = [];
+      for (const current of frontier) {
+        for (const typeName of current.typeNames) {
+          const supertype = this.namespaceResolver.resolveNameFrom(current, typeName, indexes);
+          if (!supertype || !isDefinition(supertype.kind) || visited.has(supertype)) continue;
+          visited.add(supertype);
+          next.push(supertype);
+        }
+      }
+      if (next.length > 0) hierarchy.push(next);
+      frontier = next;
+    }
+    const membersByLevel = hierarchy.map((level) => level.flatMap((namespace) => indexes.byParent.get(namespaceKeyOf(namespace)) ?? []));
+    const hiddenMembers = /* @__PURE__ */ new Set();
+    for (let level = membersByLevel.length - 1; level >= 0; level--) {
+      for (const redefining of membersByLevel[level]) {
+        for (const target of redefining.redefinedFeatureTargets ?? []) {
+          const owner = ownerOf(redefining, indexes);
+          if (!owner) continue;
+          for (const candidate of this.resolveInheritedRedefinitionTarget(owner, target, hiddenMembers, indexes)) {
+            hiddenMembers.add(candidate.symbolId);
+          }
+        }
+        if (redefining.kind === "subject" /* SubjectUsage */) {
+          const owner = ownerOf(redefining, indexes);
+          if (!owner) continue;
+          for (const ancestor of this.getSpecializationHierarchy(owner, indexes).slice(1).flat()) {
+            for (const candidate of indexes.byParent.get(namespaceKeyOf(ancestor)) ?? []) {
+              if (candidate.kind === "subject" /* SubjectUsage */) hiddenMembers.add(candidate.symbolId);
+            }
+          }
+        }
+      }
+    }
+    const membersByName = /* @__PURE__ */ new Map();
+    for (let level = 0; level < membersByLevel.length; level++) {
+      for (const member of membersByLevel[level]) {
+        if (level > 0 && member.visibility === "private") continue;
+        if (publicOnly && member.visibility !== void 0 && member.visibility !== "public") continue;
+        if (hiddenMembers.has(member.symbolId) || membersByName.has(member.name)) continue;
+        membersByName.set(member.name, member);
+      }
+    }
+    return [...membersByName.values()];
+  }
+  resolveInheritedRedefinitionTarget(owner, target, alreadyRedefined, indexes) {
+    if (target.includes(".")) return [];
+    const segments = target.split("::");
+    const targetName = segments.pop()?.replace(/^'|'$/g, "");
+    if (!targetName) return [];
+    const qualifier = segments.join("::").replace(/^'|'$/g, "");
+    const matches = /* @__PURE__ */ new Map();
+    for (const supertype of this.resolveDirectSupertypes(owner, indexes)) {
+      const branch = this.getSpecializationHierarchy(supertype, indexes);
+      const anchors = qualifier ? branch.flat().filter((type) => this.matchesSpecializationQualifier(type, qualifier)) : [supertype];
+      for (const anchor of anchors) {
+        let frontier = [anchor];
+        const visited = new Set(frontier);
+        const candidates = [];
+        while (frontier.length > 0 && candidates.length === 0) {
+          for (const type of frontier) {
+            for (const member of indexes.byParent.get(namespaceKeyOf(type)) ?? []) {
+              if (member.name === targetName && member.visibility !== "private" && !alreadyRedefined.has(member.symbolId)) {
+                candidates.push(member);
+              }
+            }
+          }
+          if (candidates.length > 0) break;
+          const next = /* @__PURE__ */ new Map();
+          for (const type of frontier) {
+            for (const parent of this.resolveDirectSupertypes(type, indexes)) {
+              if (visited.has(parent)) continue;
+              visited.add(parent);
+              next.set(parent.symbolId, parent);
+            }
+          }
+          frontier = [...next.values()];
+        }
+        for (const candidate of candidates) matches.set(candidate.symbolId, candidate);
+      }
+    }
+    return matches.size === 1 ? [...matches.values()] : [];
+  }
+  resolveDirectSupertypes(scope, indexes) {
+    const supertypes = /* @__PURE__ */ new Map();
+    for (const typeName of scope.typeNames) {
+      const supertype = this.namespaceResolver.resolveNameFrom(scope, typeName, indexes);
+      if (supertype && isDefinition(supertype.kind)) supertypes.set(supertype.symbolId, supertype);
+    }
+    return [...supertypes.values()];
+  }
+  getSpecializationHierarchy(scope, indexes) {
+    const levels = [[scope]];
+    const visited = /* @__PURE__ */ new Set([scope]);
+    let frontier = [scope];
+    while (frontier.length > 0) {
+      const next = [];
+      for (const type of frontier) {
+        for (const parent of this.resolveDirectSupertypes(type, indexes)) {
+          if (visited.has(parent)) continue;
+          visited.add(parent);
+          next.push(parent);
+        }
+      }
+      if (next.length > 0) levels.push(next);
+      frontier = next;
+    }
+    return levels;
+  }
+  matchesSpecializationQualifier(type, qualifier) {
+    return type.name === qualifier || type.qualifiedName === qualifier || type.qualifiedName?.endsWith(`::${qualifier}`) === true;
+  }
   findContainingSymbolByLine(symbols, line) {
     return symbols.filter((s) => s.range.start.line <= line && s.range.end.line >= line).sort((a, b) => {
       const ar = (a.range.end.line - a.range.start.line) * 1e3 + (a.range.end.character - a.range.start.character);
@@ -130379,7 +130659,7 @@ var SemanticValidator = class _SemanticValidator {
   findConstraintScopeSymbol(symbolsInUri, indexes, line) {
     let scope = this.findContainingSymbolByLine(symbolsInUri, line);
     while (scope) {
-      const members = indexes.byParent.get(namespaceKeyOf(scope)) ?? [];
+      const members = this.getConstraintScopeMembers(scope, indexes);
       if (members.length > 0) return scope;
       if (!scope.parentId) return scope;
       scope = ownerOf(scope, indexes);
@@ -130666,6 +130946,10 @@ hoverProvider.setSemanticValidator(semanticValidator);
 var hasConfigurationCapability = false;
 var hasWorkspaceFolderCapability = false;
 var workspaceRoots = [];
+var workspaceFolderUris = [];
+function rootsOf(folderUris) {
+  return folderUris.map((uri) => toFsPath(uri)).filter((p) => p !== void 0);
+}
 var isWorkspaceFile = false;
 var preloadOnOpen = "workspaceOnly";
 var disabledDiagnosticCodes = /* @__PURE__ */ new Set();
@@ -130677,6 +130961,10 @@ function publishDiagnostics(uri, diagnostics) {
 }
 var skipDirs = new Set(DEFAULT_SKIP_DIRS);
 var serverReady = false;
+var resolveInitialization;
+var initialization = new Promise((resolve2) => {
+  resolveInitialization = resolve2;
+});
 var earlyOpenUris = /* @__PURE__ */ new Set();
 var workerRequestId = 0;
 var isBrowserServer = typeof __SYSML_BROWSER_SERVER__ !== "undefined" && __SYSML_BROWSER_SERVER__;
@@ -130790,7 +131078,8 @@ connection.onInitialize((params) => {
     connection.console.warn(`projectId is not a UUID: ${initOpts.projectId}; symbol IDs are unique only within this workspace`);
   }
   if (params.workspaceFolders) {
-    workspaceRoots = params.workspaceFolders.map((f) => toFsPath(f.uri)).filter((p) => p !== void 0);
+    workspaceFolderUris = params.workspaceFolders.map((f) => f.uri);
+    workspaceRoots = rootsOf(workspaceFolderUris);
   } else if (params.rootUri) {
     const root = toFsPath(params.rootUri);
     if (root) workspaceRoots = [root];
@@ -130840,7 +131129,8 @@ connection.onInitialize((params) => {
   if (hasWorkspaceFolderCapability) {
     result.capabilities.workspace = {
       workspaceFolders: {
-        supported: true
+        supported: true,
+        changeNotifications: true
       }
     };
   }
@@ -130852,8 +131142,17 @@ connection.onInitialized(async () => {
       import_node12.DidChangeConfigurationNotification.type,
       void 0
     );
+  }
+  if (hasWorkspaceFolderCapability) {
+    connection.workspace.onDidChangeWorkspaceFolders((event) => {
+      onWorkspaceFoldersChanged(event).catch((e) => connection.console.error(`Workspace folder change failed: ${e}`));
+    });
+  }
+  if (hasConfigurationCapability) {
     await pullSettings().catch(() => {
     });
+    await pullFolderProjectIds().catch(() => {
+    });
   }
   const libCount = initLibraryIndex(__dirname);
   connection.console.log(`SysML v2 Language Server initialized (${libCount} library packages indexed)`);
@@ -130869,14 +131168,13 @@ connection.onInitialized(async () => {
     );
   }
   serverReady = true;
+  resolveInitialization();
   spawnParseWorker();
   if (workspaceRoots.length > 0 && (preloadOnOpen === "always" || preloadOnOpen === "workspaceOnly" && isWorkspaceFile)) {
-    documentManager.setWorkspaceScanComplete(false);
-    scanWorkspaceFoldersAsync(workspaceRoots).then(({ fileCount, scanMs }) => {
+    scanWorkspaceFolders(workspaceRoots).then(({ fileCount, scanMs }) => {
       connection.console.log(
         `Workspace scan: pre-parsed ${fileCount} .sysml files in ${scanMs} ms`
       );
-      documentManager.setWorkspaceScanComplete(true);
       revalidateOpenDocuments();
     });
   }
@@ -130911,9 +131209,80 @@ function applySettings(config) {
   }
 }
 connection.onDidChangeConfiguration((_change) => {
-  pullSettings().then(() => revalidateOpenDocuments()).catch(() => {
+  pullSettings().then(() => pullFolderProjectIds()).then(() => revalidateOpenDocuments()).catch(() => {
+  });
+});
+function latestWins(task) {
+  let calls = 0;
+  let latest = Promise.resolve();
+  return () => {
+    const call = ++calls;
+    const isSuperseded = () => call !== calls;
+    const run = task(isSuperseded).then(() => isSuperseded() ? latest : void 0);
+    latest = run;
+    return run;
+  };
+}
+var pullFolderProjectIds = latestWins(async (isSuperseded) => {
+  if (!hasConfigurationCapability) return;
+  const folderUris = [...workspaceFolderUris];
+  const answers = folderUris.length === 0 ? [] : await connection.workspace.getConfiguration(folderUris.map((scopeUri) => ({ scopeUri, section: "sysml.project" })));
+  if (isSuperseded()) return;
+  const projectIds = folderUris.flatMap((folderUri, i) => {
+    const projectId = answers[i]?.projectId;
+    return typeof projectId === "string" ? [{ folderUri, projectId }] : [];
   });
+  const uris = documentManager.getUris();
+  const prefixBefore = new Map(uris.map((uri) => [uri, getUrlPrefix(uri)]));
+  const rejected = setFolderProjectIds(projectIds);
+  for (const entry of rejected) {
+    connection.console.warn(`projectId of ${entry.folderUri} is not a UUID: ${entry.projectId}; ignored, so its documents use the projectId of an enclosing folder, else initializationOptions.projectId, else the default prefix`);
+  }
+  documentManager.invalidateSymbols(uris.filter((uri) => getUrlPrefix(uri) !== prefixBefore.get(uri)));
+  logFolderPrefixes(new Set(projectIds.filter((p) => !rejected.includes(p)).map((p) => p.folderUri)));
 });
+var loggedFolderPrefixes = /* @__PURE__ */ new Map();
+function logFolderPrefixes(ownProjectIds) {
+  for (const folderUri of workspaceFolderUris) {
+    const prefix = getUrlPrefix(`${folderUri.endsWith("/") ? folderUri : `${folderUri}/`}_.sysml`);
+    if (loggedFolderPrefixes.get(folderUri) === prefix) continue;
+    loggedFolderPrefixes.set(folderUri, prefix);
+    const source = ownProjectIds.has(folderUri) ? "its projectId" : prefix === getUrlPrefix() ? prefix === DEFAULT_URL_PREFIX ? "the default prefix, no projectId" : "initializationOptions.projectId" : "an enclosing folder's projectId";
+    const folderPath = toFsPath(folderUri) ?? folderUri;
+    connection.console.debug(`Folder ${folderPath}: element ID namespace ${prefix} (${source}; ID namespace only, no network access)`);
+  }
+  for (const folderUri of loggedFolderPrefixes.keys()) {
+    if (!workspaceFolderUris.includes(folderUri)) loggedFolderPrefixes.delete(folderUri);
+  }
+}
+async function onWorkspaceFoldersChanged(event) {
+  const initialScanPending = !serverReady;
+  const removed = new Set(event.removed.map((f) => f.uri));
+  workspaceFolderUris = [...workspaceFolderUris.filter((uri) => !removed.has(uri)), ...event.added.map((f) => f.uri)];
+  workspaceRoots = rootsOf(workspaceFolderUris);
+  dropDocumentsOutsideWorkspace(event.removed.map((f) => f.uri));
+  await pullFolderProjectIds().catch(() => {
+  });
+  if (initialScanPending) return;
+  const addedRoots = rootsOf(event.added.map((f) => f.uri).filter((uri) => workspaceFolderUris.includes(uri)));
+  if (addedRoots.length > 0 && (preloadOnOpen === "always" || preloadOnOpen === "workspaceOnly" && isWorkspaceFile)) {
+    const { fileCount, scanMs } = await scanWorkspaceFolders(addedRoots);
+    connection.console.log(`Workspace scan: pre-parsed ${fileCount} .sysml files of ${addedRoots.length} added folder(s) in ${scanMs} ms`);
+  }
+  revalidateOpenDocuments();
+}
+function dropDocumentsOutsideWorkspace(folderUris) {
+  for (const uri of documentManager.getUris()) {
+    if (openDocumentFor(uri)) continue;
+    if (folderUris.some((f) => isInFolder(uri, f)) && !isInWorkspace(uri)) {
+      documentManager.remove(uri);
+      modelProvider.removeUri(uri);
+    }
+  }
+}
+function isInWorkspace(uri) {
+  return workspaceRoots.some((root) => isInFolder(uri, (0, import_node_url2.pathToFileURL)(root).toString()));
+}
 function openDocumentFor(uri) {
   return documents.get(uri) ?? documents.all().find((d) => isSameDocumentUri(d.uri, uri));
 }
@@ -130938,6 +131307,16 @@ function parseWorkspaceFile(filePath, uri = (0, import_node_url2.pathToFileURL)(
   documentManager.parse(doc);
   return true;
 }
+var runningScans = 0;
+async function scanWorkspaceFolders(roots) {
+  runningScans++;
+  documentManager.setWorkspaceScanComplete(false);
+  try {
+    return await scanWorkspaceFoldersAsync(roots);
+  } finally {
+    if (--runningScans === 0) documentManager.setWorkspaceScanComplete(true);
+  }
+}
 async function scanWorkspaceFoldersAsync(roots) {
   const scanT0 = Date.now();
   const fileArrays = await Promise.all(roots.map((r) => findSysMLFilesAsync(r, skipDirs)));
@@ -130949,6 +131328,7 @@ async function scanWorkspaceFoldersAsync(roots) {
     const filePath = allFiles[i];
     const uri = (0, import_node_url2.pathToFileURL)(filePath).toString();
     if (openDocumentFor(uri)) continue;
+    if (!isInWorkspace(uri)) continue;
     const content = fileContents.get(filePath);
     if (content === void 0) continue;
     documentManager.parseBatch(uri, 0, content);
@@ -131161,14 +131541,16 @@ connection.onDocumentRangeFormatting(
     return formattingProvider.provideRangeFormatting(params);
   }
 );
-connection.onRequest("sysml/model", (params) => {
+connection.onRequest("sysml/model", async (params) => {
+  await initialization;
   return modelProvider.getModel(
     params.textDocument.uri,
     documentManager.getVersion(params.textDocument.uri),
     params.scope
   );
 });
-connection.onRequest("sysml/elementLookup", (params) => {
+connection.onRequest("sysml/elementLookup", async (params) => {
+  await initialization;
   return elementLookupProvider.elementLookup(params);
 });
 connection.onRequest("sysml/serverStats", () => {