sysml-v2-lsp 0.33.0 → 0.35.0

package/CHANGELOG.md

@@ -2,6 +2,36 @@
 
 ## [Unreleased]
 
+## [0.35.0]
+
+### Added
+
+- Add Copilot guidance to check generated and upstream-managed files during changes and reviews, fix their source of truth rather than editing overwritten artifacts, and validate fixes after regeneration.
+- A projectId per workspace folder: before scanning a folder, the server asks the client for its `sysml.project` setting (`workspace/configuration`, scoped to the folder), `{ projectId }`. A top-level element of a document in that folder (the innermost one, if nested) gets the URL `urn:uuid:<projectId>/<name>`, so the same name in two folders with different projectIds gives two symbol IDs (KerML 9.1). A folder without one uses an enclosing folder's projectId, else `initializationOptions.projectId`; one whose `projectId` isn't a UUID is reported and left out. The projectIds are asked for again on `workspace/didChangeConfiguration`, and documents already indexed under another projectId get new symbol IDs. Each folder's prefix, and where it comes from, is logged when it changes (`Folder <uri>: top-level elements' URLs start with urn:uuid:<projectId>/ (its projectId)`).
+- Follow workspace folders added or removed while running (`workspace/didChangeWorkspaceFolders`, now requested): an added folder is scanned, as at start, and the documents scanned from a removed folder are dropped.
+
+### Changed
+
+- `sysml/model` and `sysml/elementLookup` answer only once the server's `initialized` phase is done (settings and each folder's projectId pulled from the client, library indexed, DFA loaded). A request sent earlier now waits, instead of being answered with symbol IDs that might change once the projectIds arrive. A client that declares the `workspace/configuration` capability must answer those requests.
+
+### Fixed
+
+- A transition is typed by the payload its trigger accepts, read from the parse tree. The payload type ran into whatever followed it in the whitespace-free text (`accept cmd : Command if cmd.code == 0 then busy` gave `Commandifcmd`, `accept cmd : Command then busy` gave `Commandthenbusy`), reported as `unresolved-type`.
+- A state's `entry`, `do` and `exit` actions (`exit action leave : WriteSafeState;`, `exit leave;`) get a symbol, as a `perform action` (the `StatePerformActionUsage` production). They had none, so they were missing from the outline, and an action definition that only typed one was reported as `unused-definition`.
+- Concern definitions and usages (`concern def H { ... }`, `concern c : H { ... }`, and a requirement's framed concerns, `frame concern c : H { ... }`) get a symbol, of the new kinds `concern def` and `concern` (metaclasses `ConcernDefinition`, `ConcernUsage`). They had none, so their members were attributed to the enclosing namespace: two concerns, or two framed concerns of one requirement, that each declared `attribute limit` were reported as `ambiguous-namespace-name`, and concerns were missing from the outline and `sysml/model`.
+
+## [0.34.0]
+
+### Added
+
+- Add `.github/copilot-instructions.md` requiring language-affecting changes to be validated against the latest OMG SysML and KerML specifications, with cited clauses or grammar productions and a regression test.
+
+### Fixed
+
+- Report only an element's own multiplicity: a definition or usage no longer takes the multiplicity of a nested element (`part def Car { part : Engine[2]; }` gave `Car` the multiplicity `2`), and a unit in a default value (`default 0 [kg]`) is no longer reported as a multiplicity. SysML definitions cannot declare a multiplicity (`DefinitionDeclaration`); a usage's comes from its own `FeatureSpecializationPart`. `sysml/model` now reads multiplicity from the parse tree, so a usage whose multiplicity follows a specialization (`item :>> edges [3..4]`) reports it correctly.
+- A connection or interface no longer reports the multiplicity of one of its ends (`connection c connect [2] a.p to [1] b.p;`): a `ConnectorEnd`'s cross multiplicity belongs to the end, not the connector.
+- Elements named with an unreserved KerML keyword (`step`, `function`, `type`, `member`, `feature`, `behavior`, `var`, `multiplicity`, ...) keep their name, which the grammar allows (`name : IDENTIFIER | STRING | unreservedKeyword`). They were reported as anonymous, e.g. `perform action step[2];` was shown as `[2]`, and `alias multiplicity for degeneracy;` was named after its target.
+
 ## [0.33.0]
 
 ### Added

package/dist/server/browserServerMain.js

@@ -130252,6 +130252,10 @@ ${JSON.stringify(message, null, 4)}`);
   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);
   }
@@ -130410,6 +130414,7 @@ ${JSON.stringify(message, null, 4)}`);
   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;
@@ -130419,8 +130424,14 @@ ${JSON.stringify(message, null, 4)}`);
     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((f2) => isInFolder(uri, f2.folderUri));
+    return match?.prefix ?? urlPrefix;
   }
   function uuidV5(namespace, name) {
     return v5_default(name, namespace);
@@ -130502,6 +130513,10 @@ ${JSON.stringify(message, null, 4)}`);
         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 */:
@@ -130624,7 +130639,7 @@ ${JSON.stringify(message, null, 4)}`);
       declaration.parentId = owner?.symbolId;
       const path = 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 ? path : getUrlPrefix() + encodeURIComponent(path);
+      const key = owner ? path : getUrlPrefix(declaration.uri) + encodeURIComponent(path);
       const groupId = this.uuidOf(namespace, key);
       this.groupKeys.set(groupId, { namespace, key, path });
       this.groupOf.set(declaration, groupId);
@@ -130809,6 +130824,12 @@ ${JSON.stringify(message, null, 4)}`);
     // 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 */],
@@ -130881,6 +130902,10 @@ ${JSON.stringify(message, null, 4)}`);
     // 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 */],
@@ -131004,8 +131029,10 @@ ${JSON.stringify(message, null, 4)}`);
     // 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,
@@ -131630,7 +131657,7 @@ ${JSON.stringify(message, null, 4)}`);
       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 typeName = typeNames[0];
       const documentation = this.extractDocumentation(ctx);
@@ -131745,6 +131772,25 @@ ${JSON.stringify(message, null, 4)}`);
       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 = [];
@@ -131838,7 +131884,7 @@ ${JSON.stringify(message, null, 4)}`);
         const child = ctx.getChild(i);
         if (child instanceof TerminalNode) {
           const token = child.symbol;
-          if (this.isIdentifierToken(token)) {
+          if (this.isNameTerminal(child)) {
             return this.unquoteName(token.text ?? "");
           }
         }
@@ -131870,7 +131916,7 @@ ${JSON.stringify(message, null, 4)}`);
      */
     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);
     }
     /**
@@ -131890,14 +131936,15 @@ ${JSON.stringify(message, null, 4)}`);
     /**
      * The first node of rule `ruleIndex` in `ctx`'s own declaration: never
      * inside a nested element, its body, its value, a flow's payload or ends,
-     * or a prefix such as `#metadata`.
+     * a connector end's own multiplicity (`connect [2] a to b`), or a prefix
+     * such as `#metadata`.
      */
     findOwnHeaderRule(ctx, ruleIndex) {
       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 (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) || this.isPrefixOrExtensionContext(child)) 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;
       }
@@ -132061,7 +132108,7 @@ ${JSON.stringify(message, null, 4)}`);
     extractNameRange(ctx) {
       for (let i = 0; i < ctx.getChildCount(); i++) {
         const child = ctx.getChild(i);
-        if (child instanceof TerminalNode && this.isIdentifierToken(child.symbol)) {
+        if (child instanceof TerminalNode && this.isNameTerminal(child)) {
           return tokenToRange(child.symbol);
         }
         if (child instanceof ParserRuleContext) {
@@ -132246,12 +132293,12 @@ ${JSON.stringify(message, null, 4)}`);
       return lines.join("\n").trim();
     }
     /**
-     * Extract multiplicity from a context.
-     * Looks for MultiplicityBoundsContext in the subtree.
+     * Extract multiplicity from a context's own declaration, never from a
+     * nested element or its body.
      * Returns { multiplicity: "1..5", multiplicityRange: { lower: 1, upper: 5 } }
      */
     extractMultiplicity(ctx) {
-      const multCtx = this.findMultiplicityBounds(ctx);
+      const multCtx = this.findOwnHeaderRule(ctx, SysMLv2Parser.RULE_multiplicityBounds);
       if (!multCtx) {
         return {};
       }
@@ -132305,24 +132352,6 @@ ${JSON.stringify(message, null, 4)}`);
         multiplicityRange: { lower, upper }
       };
     }
-    /**
-     * Recursively search for a MultiplicityBoundsContext in the subtree.
-     */
-    findMultiplicityBounds(ctx) {
-      if (ctx.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-        return ctx;
-      }
-      for (let i = 0; i < ctx.getChildCount(); i++) {
-        const child = ctx.getChild(i);
-        if (child instanceof ParserRuleContext) {
-          const result = this.findMultiplicityBounds(child);
-          if (result) {
-            return result;
-          }
-        }
-      }
-      return void 0;
-    }
     /**
      * Whether a context is a prefix metadata or definition/usage prefix rule.
      * These contain annotation identifiers (e.g. from `#product`) that should
@@ -132364,6 +132393,14 @@ ${JSON.stringify(message, null, 4)}`);
       if (this.isQuotedName(text)) return true;
       return /^[a-zA-Z_]/.test(text) && !this.isKeyword(text);
     }
+    /**
+     * Whether a terminal is (part of) a name: an identifier, a quoted name, or
+     * a KerML keyword such as `step` or `function` that the grammar parsed as a
+     * name (`name : IDENTIFIER | STRING | unreservedKeyword`).
+     */
+    isNameTerminal(node) {
+      return this.isIdentifierToken(node.symbol) || node.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+    }
     /**
      * Check if text is a SysML quoted name (single-quoted string).
      */
@@ -132733,7 +132770,7 @@ ${JSON.stringify(message, null, 4)}`);
         const child = ctx.getChild(i);
         if (child instanceof TerminalNode) {
           const text = child.symbol.text;
-          if (text && this.isIdentifierToken(child.symbol)) {
+          if (text && this.isNameTerminal(child)) {
             parts.push(this.unquoteName(text));
           }
         } else if (child instanceof ParserRuleContext) {
@@ -132959,6 +132996,17 @@ ${JSON.stringify(message, null, 4)}`);
       }
       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.
      */
@@ -137049,9 +137097,8 @@ ${JSON.stringify(message, null, 4)}`);
       if (direction) {
         attributes["direction"] = direction;
       }
-      const multiplicity = this.extractMultiplicity(symbol, lines);
-      if (multiplicity) {
-        attributes["multiplicity"] = multiplicity;
+      if (symbol.multiplicity) {
+        attributes["multiplicity"] = symbol.multiplicity;
       }
       const modifier = this.extractModifier(symbol, lines);
       if (modifier) {
@@ -137669,7 +137716,7 @@ ${JSON.stringify(message, null, 4)}`);
             name: c.name,
             kind: toMetaclassName(c.kind),
             type: c.typeNames.join(", ") || void 0,
-            multiplicity: c.multiplicity ?? this.extractMultiplicity(c, lines),
+            multiplicity: c.multiplicity,
             direction,
             visibility: c.visibility,
             isDerived: modifier?.split(", ").includes("derived") ?? false,
@@ -137793,15 +137840,6 @@ ${JSON.stringify(message, null, 4)}`);
       if (containsWord(elementText, "out")) return "out";
       return void 0;
     }
-    /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-    extractMultiplicity(symbol, lines) {
-      const elementText = this.getElementText(symbol, lines);
-      const open = elementText.indexOf("[");
-      if (open < 0) return void 0;
-      const close = elementText.indexOf("]", open + 1);
-      if (close < 0) return void 0;
-      return elementText.substring(open + 1, close);
-    }
     /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
     extractModifier(symbol, lines) {
       const elementText = this.getElementText(symbol, lines);
@@ -139324,6 +139362,8 @@ ${childIndent}item def ${unresolvedType};
       // 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 */:
@@ -141723,6 +141763,10 @@ ${info.documentation}`);
   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();
@@ -141734,6 +141778,10 @@ ${info.documentation}`);
   }
   var skipDirs = new Set(DEFAULT_SKIP_DIRS);
   var serverReady = false;
+  var resolveInitialization;
+  var initialization = new Promise((resolve) => {
+    resolveInitialization = resolve;
+  });
   var earlyOpenUris = /* @__PURE__ */ new Set();
   var workerRequestId = 0;
   var isBrowserServer = true;
@@ -141847,7 +141895,8 @@ ${info.documentation}`);
       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((f2) => toFsPath(f2.uri)).filter((p) => p !== void 0);
+      workspaceFolderUris = params.workspaceFolders.map((f2) => f2.uri);
+      workspaceRoots = rootsOf(workspaceFolderUris);
     } else if (params.rootUri) {
       const root = toFsPath(params.rootUri);
       if (root) workspaceRoots = [root];
@@ -141897,7 +141946,8 @@ ${info.documentation}`);
     if (hasWorkspaceFolderCapability) {
       result.capabilities.workspace = {
         workspaceFolders: {
-          supported: true
+          supported: true,
+          changeNotifications: true
         }
       };
     }
@@ -141909,8 +141959,17 @@ ${info.documentation}`);
         import_node11.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("/");
     connection.console.log(`SysML v2 Language Server initialized (${libCount} library packages indexed)`);
@@ -141926,14 +141985,13 @@ ${info.documentation}`);
       );
     }
     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();
       });
     }
@@ -141968,9 +142026,79 @@ ${info.documentation}`);
     }
   }
   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";
+      connection.console.info(`Folder ${folderUri}: top-level elements' URLs start with ${prefix} (${source})`);
+    }
+    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((f2) => f2.uri));
+    workspaceFolderUris = [...workspaceFolderUris.filter((uri) => !removed.has(uri)), ...event.added.map((f2) => f2.uri)];
+    workspaceRoots = rootsOf(workspaceFolderUris);
+    dropDocumentsOutsideWorkspace(event.removed.map((f2) => f2.uri));
+    await pullFolderProjectIds().catch(() => {
+    });
+    if (initialScanPending) return;
+    const addedRoots = rootsOf(event.added.map((f2) => f2.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((f2) => isInFolder(uri, f2)) && !isInWorkspace(uri)) {
+        documentManager.remove(uri);
+        modelProvider.removeUri(uri);
+      }
+    }
+  }
+  function isInWorkspace(uri) {
+    return workspaceRoots.some((root) => isInFolder(uri, pathToFileURL(root).toString()));
+  }
   function openDocumentFor(uri) {
     return documents.get(uri) ?? documents.all().find((d) => isSameDocumentUri(d.uri, uri));
   }
@@ -141995,6 +142123,16 @@ ${info.documentation}`);
     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)));
@@ -142006,6 +142144,7 @@ ${info.documentation}`);
       const filePath = allFiles[i];
       const uri = 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);
@@ -142218,14 +142357,16 @@ ${info.documentation}`);
       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", () => {