sysml-v2-lsp 0.35.0 → 0.36.0

package/dist/server/mcpServer.js

@@ -10545,8 +10545,8 @@ var require_main2 = __commonJS({
         }
         uinteger2.is = is;
       })(uinteger || (exports3.uinteger = uinteger = {}));
-      var Position;
-      (function(Position2) {
+      var Position2;
+      (function(Position3) {
         function create(line, character) {
           if (line === Number.MAX_VALUE) {
             line = uinteger.MAX_VALUE;
@@ -10556,31 +10556,31 @@ var require_main2 = __commonJS({
           }
           return { line, character };
         }
-        Position2.create = create;
+        Position3.create = create;
         function is(value) {
           var candidate = value;
           return Is.objectLiteral(candidate) && Is.uinteger(candidate.line) && Is.uinteger(candidate.character);
         }
-        Position2.is = is;
-      })(Position || (exports3.Position = Position = {}));
-      var Range;
-      (function(Range2) {
+        Position3.is = is;
+      })(Position2 || (exports3.Position = Position2 = {}));
+      var Range2;
+      (function(Range3) {
         function create(one, two, three, four) {
           if (Is.uinteger(one) && Is.uinteger(two) && Is.uinteger(three) && Is.uinteger(four)) {
-            return { start: Position.create(one, two), end: Position.create(three, four) };
-          } else if (Position.is(one) && Position.is(two)) {
+            return { start: Position2.create(one, two), end: Position2.create(three, four) };
+          } else if (Position2.is(one) && Position2.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, "]"));
           }
         }
-        Range2.create = create;
+        Range3.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position.is(candidate.start) && Position.is(candidate.end);
+          return Is.objectLiteral(candidate) && Position2.is(candidate.start) && Position2.is(candidate.end);
         }
-        Range2.is = is;
-      })(Range || (exports3.Range = Range = {}));
+        Range3.is = is;
+      })(Range2 || (exports3.Range = Range2 = {}));
       var Location;
       (function(Location2) {
         function create(uri, range) {
@@ -10589,7 +10589,7 @@ var require_main2 = __commonJS({
         Location2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
+          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (Is.string(candidate.uri) || Is.undefined(candidate.uri));
         }
         Location2.is = is;
       })(Location || (exports3.Location = Location = {}));
@@ -10601,7 +10601,7 @@ var require_main2 = __commonJS({
         LocationLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range.is(candidate.targetSelectionRange) && (Range.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
+          return Is.objectLiteral(candidate) && Range2.is(candidate.targetRange) && Is.string(candidate.targetUri) && Range2.is(candidate.targetSelectionRange) && (Range2.is(candidate.originSelectionRange) || Is.undefined(candidate.originSelectionRange));
         }
         LocationLink2.is = is;
       })(LocationLink || (exports3.LocationLink = LocationLink = {}));
@@ -10633,7 +10633,7 @@ var require_main2 = __commonJS({
         ColorInformation2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range.is(candidate.range) && Color.is(candidate.color);
+          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && Color.is(candidate.color);
         }
         ColorInformation2.is = is;
       })(ColorInformation || (exports3.ColorInformation = ColorInformation = {}));
@@ -10744,7 +10744,7 @@ var require_main2 = __commonJS({
         function is(value) {
           var _a3;
           var candidate = value;
-          return Is.defined(candidate) && Range.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((_a3 = candidate.codeDescription) === null || _a3 === void 0 ? void 0 : _a3.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
+          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((_a3 = candidate.codeDescription) === null || _a3 === void 0 ? void 0 : _a3.href)) && (Is.string(candidate.source) || Is.undefined(candidate.source)) && (Is.undefined(candidate.relatedInformation) || Is.typedArray(candidate.relatedInformation, DiagnosticRelatedInformation.is));
         }
         Diagnostic3.is = is;
       })(Diagnostic2 || (exports3.Diagnostic = Diagnostic2 = {}));
@@ -10784,7 +10784,7 @@ var require_main2 = __commonJS({
         TextEdit2.del = del;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range.is(candidate.range);
+          return Is.objectLiteral(candidate) && Is.string(candidate.newText) && Range2.is(candidate.range);
         }
         TextEdit2.is = is;
       })(TextEdit || (exports3.TextEdit = TextEdit = {}));
@@ -11328,7 +11328,7 @@ var require_main2 = __commonJS({
         InsertReplaceEdit2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.newText) && Range.is(candidate.insert) && Range.is(candidate.replace);
+          return candidate && Is.string(candidate.newText) && Range2.is(candidate.insert) && Range2.is(candidate.replace);
         }
         InsertReplaceEdit2.is = is;
       })(InsertReplaceEdit || (exports3.InsertReplaceEdit = InsertReplaceEdit = {}));
@@ -11375,7 +11375,7 @@ var require_main2 = __commonJS({
       (function(Hover2) {
         function is(value) {
           var candidate = value;
-          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range.is(value.range));
+          return !!candidate && Is.objectLiteral(candidate) && (MarkupContent.is(candidate.contents) || MarkedString.is(candidate.contents) || Is.typedArray(candidate.contents, MarkedString.is)) && (value.range === void 0 || Range2.is(value.range));
         }
         Hover2.is = is;
       })(Hover || (exports3.Hover = Hover = {}));
@@ -11496,7 +11496,7 @@ var require_main2 = __commonJS({
         DocumentSymbol2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate && Is.string(candidate.name) && Is.number(candidate.kind) && Range.is(candidate.range) && Range.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) && 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));
         }
         DocumentSymbol2.is = is;
       })(DocumentSymbol || (exports3.DocumentSymbol = DocumentSymbol = {}));
@@ -11573,7 +11573,7 @@ var require_main2 = __commonJS({
         CodeLens2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
+          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.command) || Command.is(candidate.command));
         }
         CodeLens2.is = is;
       })(CodeLens || (exports3.CodeLens = CodeLens = {}));
@@ -11597,7 +11597,7 @@ var require_main2 = __commonJS({
         DocumentLink2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
+          return Is.defined(candidate) && Range2.is(candidate.range) && (Is.undefined(candidate.target) || Is.string(candidate.target));
         }
         DocumentLink2.is = is;
       })(DocumentLink || (exports3.DocumentLink = DocumentLink = {}));
@@ -11609,7 +11609,7 @@ var require_main2 = __commonJS({
         SelectionRange2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Range.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
+          return Is.objectLiteral(candidate) && Range2.is(candidate.range) && (candidate.parent === void 0 || SelectionRange2.is(candidate.parent));
         }
         SelectionRange2.is = is;
       })(SelectionRange || (exports3.SelectionRange = SelectionRange = {}));
@@ -11668,7 +11668,7 @@ var require_main2 = __commonJS({
         InlineValueText2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range.is(candidate.range) && Is.string(candidate.text);
+          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.string(candidate.text);
         }
         InlineValueText2.is = is;
       })(InlineValueText || (exports3.InlineValueText = InlineValueText = {}));
@@ -11680,7 +11680,7 @@ var require_main2 = __commonJS({
         InlineValueVariableLookup2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
+          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && Is.boolean(candidate.caseSensitiveLookup) && (Is.string(candidate.variableName) || candidate.variableName === void 0);
         }
         InlineValueVariableLookup2.is = is;
       })(InlineValueVariableLookup || (exports3.InlineValueVariableLookup = InlineValueVariableLookup = {}));
@@ -11692,7 +11692,7 @@ var require_main2 = __commonJS({
         InlineValueEvaluatableExpression2.create = create;
         function is(value) {
           var candidate = value;
-          return candidate !== void 0 && candidate !== null && Range.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
+          return candidate !== void 0 && candidate !== null && Range2.is(candidate.range) && (Is.string(candidate.expression) || candidate.expression === void 0);
         }
         InlineValueEvaluatableExpression2.is = is;
       })(InlineValueEvaluatableExpression || (exports3.InlineValueEvaluatableExpression = InlineValueEvaluatableExpression = {}));
@@ -11704,7 +11704,7 @@ var require_main2 = __commonJS({
         InlineValueContext2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.defined(candidate) && Range.is(value.stoppedLocation);
+          return Is.defined(candidate) && Range2.is(value.stoppedLocation);
         }
         InlineValueContext2.is = is;
       })(InlineValueContext || (exports3.InlineValueContext = InlineValueContext = {}));
@@ -11741,7 +11741,7 @@ var require_main2 = __commonJS({
         InlayHint2.create = create;
         function is(value) {
           var candidate = value;
-          return Is.objectLiteral(candidate) && Position.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, TextEdit.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent.is(candidate.tooltip)) && (candidate.paddingLeft === void 0 || Is.boolean(candidate.paddingLeft)) && (candidate.paddingRight === void 0 || Is.boolean(candidate.paddingRight));
+          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, TextEdit.is) && (candidate.tooltip === void 0 || Is.string(candidate.tooltip) || MarkupContent.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 = {}));
@@ -11930,7 +11930,7 @@ var require_main2 = __commonJS({
             var lineOffsets = this.getLineOffsets();
             var low = 0, high = lineOffsets.length;
             if (high === 0) {
-              return Position.create(0, offset);
+              return Position2.create(0, offset);
             }
             while (low < high) {
               var mid = Math.floor((low + high) / 2);
@@ -11941,7 +11941,7 @@ var require_main2 = __commonJS({
               }
             }
             var line = low - 1;
-            return Position.create(line, offset - lineOffsets[line]);
+            return Position2.create(line, offset - lineOffsets[line]);
           };
           FullTextDocument2.prototype.offsetAt = function(position) {
             var lineOffsets = this.getLineOffsets();
@@ -159135,14 +159135,21 @@ var NamespaceResolver = class {
    * namespace.
    */
   isLocallyVisible(symbol2, name, indexes) {
-    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol2, indexes.byId), name, indexes) !== void 0;
+    return this.resolveNameFrom(symbol2, name, indexes) !== void 0;
+  }
+  /**
+   * Resolve a (possibly qualified) name from the namespace containing
+   * `symbol`, respecting namespace membership and visibility.
+   */
+  resolveNameFrom(symbol2, name, indexes) {
+    return this.resolveQualifiedNameFrom(ownerKeyOf(symbol2, 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).
@@ -160639,6 +160646,7 @@ var SymbolTable = class {
     const selectionRange = anonymous ? ctx2.start ? tokenToRange(ctx2.start) : range : this.extractNameRange(ctx2) ?? range;
     const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx2) : transition ? this.extractTransitionTypeNames(ctx2) : this.extractTypeNames(ctx2);
     const specializationNames = this.extractSpecializationNames(ctx2);
+    const redefinedFeatureTargets = this.extractRedefinedFeatureTargets(ctx2);
     const typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx2);
     const visibility = this.extractVisibility(ctx2);
@@ -160669,6 +160677,7 @@ var SymbolTable = class {
       typeName,
       typeNames,
       specializationNames,
+      redefinedFeatureTargets: redefinedFeatureTargets.length > 0 ? redefinedFeatureTargets : void 0,
       documentation,
       visibility,
       source: transition?.source,
@@ -160920,15 +160929,28 @@ var SymbolTable = class {
    * such as `#metadata`.
    */
   findOwnHeaderRule(ctx2, ruleIndex) {
+    const matches = [];
+    this.findOwnHeaderRules(ctx2, ruleIndex, matches, true);
+    return matches[0];
+  }
+  findOwnHeaderRules(ctx2, ruleIndex, matches, firstOnly = false) {
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.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(ctx2) {
+    const targets = [];
+    this.findOwnHeaderRules(ctx2, SysMLv2Parser.RULE_ownedRedefinition, targets);
+    return targets.map((target) => target.getText());
   }
   /**
    * A connection, interface or allocation usage's end reference paths, in
@@ -160956,13 +160978,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(ctx2) {
+  declarationTokens(ctx2) {
     const tokens = [];
     const visit2 = (node2) => {
       for (let i = 0; i < node2.getChildCount(); i++) {
@@ -160977,6 +160993,16 @@ var SymbolTable = class {
       return false;
     };
     visit2(ctx2);
+    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(ctx2) {
+    const tokens = this.declarationTokens(ctx2);
     let text = "";
     tokens.forEach((token, i) => {
       if (i > 0 && token.start > tokens[i - 1].stop + 1) text += " ";
@@ -161117,17 +161143,16 @@ var SymbolTable = class {
     const names = [];
     this.collectTypeNamesFromTree(ctx2, names, 0);
     if (names.length > 0) return names;
-    const fullText = ctx2.getText();
-    const braceIdx = fullText.indexOf("{");
-    let text = braceIdx >= 0 ? fullText.substring(0, braceIdx) : fullText;
+    const { text: declarationText, quotedName } = this.maskedDeclaration(ctx2);
+    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);
@@ -161148,9 +161173,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);
@@ -161160,6 +161185,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(ctx2) {
+    const quoted = [];
+    const masked = this.declarationTokens(ctx2).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
@@ -161170,17 +161217,15 @@ var SymbolTable = class {
     const names = [];
     this.collectNamesFromTree(ctx2, names, 0, TYPE_SPECIALIZATION_RULE_INDICES);
     if (names.length > 0) return names;
-    const fullText = ctx2.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(ctx2);
+    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);
@@ -163359,6 +163404,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(documentManager) {
     this.documentManager = documentManager;
@@ -163435,7 +163487,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));
@@ -163656,7 +163708,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);
@@ -164019,17 +164071,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;
@@ -164079,6 +164134,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 = ownerOf2(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(path, scope, indexes) {
+    let feature;
+    for (let namespace = scope; namespace && !feature; namespace = ownerOf2(namespace, indexes)) {
+      feature = this.findFeature(namespace, path[0], indexes);
+    }
+    for (const name of path.slice(1)) {
+      feature = feature && this.findFeature(feature, name, indexes);
+    }
+    if (feature) return feature.kind === "port" /* PortUsage */ ? feature : void 0;
+    const sameName = indexes.portsByName.get(path[path.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 own2 = (indexes.byParent.get(namespaceKeyOf(owner)) ?? []).find((s) => s.name === name);
+    if (own2) return own2;
+    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).
@@ -164126,7 +164230,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;
@@ -164185,18 +164289,135 @@ var SemanticValidator = class _SemanticValidator {
     const root = parentMembers.find((s) => s.name === path[0]);
     if (!root) return false;
     if (path.length === 1) return true;
-    let typeName = root.typeNames[0] ?? root.typeName;
+    let current = root;
     for (let i = 1; i < path.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 === path[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 === path[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 = ownerOf2(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 = ownerOf2(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 anchor2 of anchors) {
+        let frontier = [anchor2];
+        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);
@@ -164207,7 +164428,7 @@ var SemanticValidator = class _SemanticValidator {
   findConstraintScopeSymbol(symbolsInUri, indexes, line) {
     let scope = this.findContainingSymbolByLine(symbolsInUri, line);
     while (scope) {
-      const members2 = indexes.byParent.get(namespaceKeyOf(scope)) ?? [];
+      const members2 = this.getConstraintScopeMembers(scope, indexes);
       if (members2.length > 0) return scope;
       if (!scope.parentId) return scope;
       scope = ownerOf2(scope, indexes);