sysml-v2-lsp 0.34.0 → 0.35.0

package/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 ## [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

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 = [];
@@ -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);
     }
     /**
@@ -132950,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.
      */
@@ -139305,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 */:
@@ -141704,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();
@@ -141715,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;
@@ -141828,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];
@@ -141878,7 +141946,8 @@ ${info.documentation}`);
     if (hasWorkspaceFolderCapability) {
       result.capabilities.workspace = {
         workspaceFolders: {
-          supported: true
+          supported: true,
+          changeNotifications: true
         }
       };
     }
@@ -141890,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)`);
@@ -141907,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();
       });
     }
@@ -141949,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));
   }
@@ -141976,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)));
@@ -141987,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);
@@ -142199,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", () => {

package/dist/server/mcpServer.js

@@ -42741,6 +42741,9 @@ var Protocol = class {
       this.setRequestHandler(GetTaskPayloadRequestSchema, async (request, extra) => {
         const handleTaskResult = async () => {
           const taskId = request.params.taskId;
+          if (!await this._taskStore.getTask(taskId, extra.sessionId)) {
+            throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
+          }
           if (this._taskMessageQueue) {
             let queuedMessage;
             while (queuedMessage = await this._taskMessageQueue.dequeue(taskId, extra.sessionId)) {
@@ -42771,12 +42774,12 @@ var Protocol = class {
             throw new McpError(ErrorCode.InvalidParams, `Task not found: ${taskId}`);
           }
           if (!isTerminal(task.status)) {
-            await this._waitForTaskUpdate(taskId, extra.signal);
+            await this._waitForTaskUpdate(taskId, extra.signal, extra.sessionId);
             return await handleTaskResult();
           }
           if (isTerminal(task.status)) {
             const result = await this._taskStore.getTaskResult(taskId, extra.sessionId);
-            this._clearTaskQueue(taskId);
+            this._clearTaskQueue(taskId, extra.sessionId);
             return {
               ...result,
               _meta: {
@@ -42813,7 +42816,7 @@ var Protocol = class {
             throw new McpError(ErrorCode.InvalidParams, `Cannot cancel task in terminal status: ${task.status}`);
           }
           await this._taskStore.updateTaskStatus(request.params.taskId, "cancelled", "Client cancelled task execution.", extra.sessionId);
-          this._clearTaskQueue(request.params.taskId);
+          this._clearTaskQueue(request.params.taskId, extra.sessionId);
           const cancelledTask = await this._taskStore.getTask(request.params.taskId, extra.sessionId);
           if (!cancelledTask) {
             throw new McpError(ErrorCode.InvalidParams, `Task not found after cancellation: ${request.params.taskId}`);
@@ -42941,6 +42944,19 @@ var Protocol = class {
     const handler = this._requestHandlers.get(request.method) ?? this.fallbackRequestHandler;
     const capturedTransport = this._transport;
     const relatedTaskId = request.params?._meta?.[RELATED_TASK_META_KEY]?.taskId;
+    const sessionId = capturedTransport?.sessionId;
+    const store = this._taskStore;
+    let relatedTaskFound = true;
+    let relatedTaskLookup;
+    if (relatedTaskId && store && this._taskMessageQueue && sessionId !== void 0) {
+      relatedTaskFound = false;
+      relatedTaskLookup = (async () => {
+        if (!await store.getTask(relatedTaskId, sessionId)) {
+          throw new McpError(ErrorCode.InvalidParams, `Task not found: ${relatedTaskId}`);
+        }
+        relatedTaskFound = true;
+      })();
+    }
     if (handler === void 0) {
       const errorResponse = {
         jsonrpc: "2.0",
@@ -42950,7 +42966,10 @@ var Protocol = class {
           message: "Method not found"
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && relatedTaskLookup) {
+        const queuedError = { type: "error", message: errorResponse, timestamp: Date.now() };
+        relatedTaskLookup.then(() => this._enqueueTaskMessage(relatedTaskId, queuedError, sessionId), () => capturedTransport?.send(errorResponse)).catch((error62) => this._onerror(new Error(`Failed to send an error response: ${error62}`)));
+      } else if (relatedTaskId && this._taskMessageQueue) {
         this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -43001,7 +43020,10 @@ var Protocol = class {
       closeSSEStream: extra?.closeSSEStream,
       closeStandaloneSSEStream: extra?.closeStandaloneSSEStream
     };
-    Promise.resolve().then(() => {
+    (relatedTaskLookup ?? Promise.resolve()).then(() => {
+      if (relatedTaskLookup && abortController.signal.aborted) {
+        throw new McpError(ErrorCode.ConnectionClosed, "Request was cancelled");
+      }
       if (taskCreationParams) {
         this.assertTaskHandlerCapability(request.method);
       }
@@ -43036,7 +43058,7 @@ var Protocol = class {
           ...error62["data"] !== void 0 && { data: error62["data"] }
         }
       };
-      if (relatedTaskId && this._taskMessageQueue) {
+      if (relatedTaskId && this._taskMessageQueue && relatedTaskFound) {
         await this._enqueueTaskMessage(relatedTaskId, {
           type: "error",
           message: errorResponse,
@@ -43516,7 +43538,7 @@ var Protocol = class {
       throw new Error("Cannot enqueue task message: taskStore and taskMessageQueue are not configured");
     }
     const maxQueueSize = this._options?.maxTaskQueueSize;
-    await this._taskMessageQueue.enqueue(taskId, message, sessionId, maxQueueSize);
+    await this._taskMessageQueue.enqueue(taskId, message, sessionId ?? this._transport?.sessionId, maxQueueSize);
   }
   /**
    * Clears the message queue for a task and rejects any pending request resolvers.
@@ -43545,12 +43567,13 @@ var Protocol = class {
    * Uses polling to check for updates at the task's configured poll interval.
    * @param taskId The task ID to wait for
    * @param signal Abort signal to cancel the wait
+   * @param sessionId Session of the request that waits, passed to the task store
    * @returns Promise that resolves when an update occurs or rejects if aborted
    */
-  async _waitForTaskUpdate(taskId, signal) {
+  async _waitForTaskUpdate(taskId, signal, sessionId) {
     let interval = this._options?.defaultTaskPollInterval ?? 1e3;
     try {
-      const task = await this._taskStore?.getTask(taskId);
+      const task = await this._taskStore?.getTask(taskId, sessionId);
       if (task?.pollInterval) {
         interval = task.pollInterval;
       }
@@ -44429,6 +44452,42 @@ var ExperimentalMcpServerTasks = class {
 };
 
 // node_modules/@modelcontextprotocol/sdk/dist/esm/server/mcp.js
+function toolInputElementCount(value, max) {
+  let count = 0;
+  const stack = [value];
+  while (stack.length > 0) {
+    const node2 = stack.pop();
+    if (node2 === null || typeof node2 !== "object")
+      continue;
+    if (Array.isArray(node2)) {
+      for (const child of node2) {
+        if (++count > max)
+          return count;
+        if (child !== null && typeof child === "object")
+          stack.push(child);
+      }
+    } else {
+      for (const key in node2) {
+        if (!Object.prototype.hasOwnProperty.call(node2, key))
+          continue;
+        if (++count > max)
+          return count;
+        const child = node2[key];
+        if (child !== null && typeof child === "object")
+          stack.push(child);
+      }
+    }
+  }
+  return count;
+}
+function resolveMaxToolInputElements(value) {
+  if (value === void 0 || value === Infinity)
+    return void 0;
+  if (typeof value !== "number" || Number.isNaN(value) || value < 1) {
+    throw new RangeError(`maxToolInputElements must be a number of at least 1, or Infinity, got ${String(value)}`);
+  }
+  return value;
+}
 var McpServer = class {
   constructor(serverInfo, options) {
     this._registeredResources = {};
@@ -44440,6 +44499,7 @@ var McpServer = class {
     this._resourceHandlersInitialized = false;
     this._promptHandlersInitialized = false;
     this.server = new Server(serverInfo, options);
+    this._maxToolInputElements = resolveMaxToolInputElements(options?.maxToolInputElements);
   }
   /**
    * Access experimental features.
@@ -44570,12 +44630,15 @@ var McpServer = class {
    * Validates tool input arguments against the tool's input schema.
    */
   async validateToolInput(tool, args, toolName) {
+    if (this._maxToolInputElements !== void 0 && toolInputElementCount(args, this._maxToolInputElements) > this._maxToolInputElements) {
+      throw new McpError(ErrorCode.InvalidParams, `Invalid arguments for tool ${toolName}: arguments contain more than the maximum of ${this._maxToolInputElements} elements`);
+    }
     if (!tool.inputSchema) {
       return void 0;
     }
     const inputObj = normalizeObjectSchema(tool.inputSchema);
     const schemaToParse = inputObj ?? tool.inputSchema;
-    const parseResult = await safeParseAsync2(schemaToParse, args);
+    const parseResult = await safeParseAsync2(schemaToParse, args ?? {});
     if (!parseResult.success) {
       const error62 = "error" in parseResult ? parseResult.error : "Unknown error";
       const errorMessage = getParseErrorMessage(error62);
@@ -44813,7 +44876,7 @@ var McpServer = class {
       }
       if (prompt.argsSchema) {
         const argsObj = normalizeObjectSchema(prompt.argsSchema);
-        const parseResult = await safeParseAsync2(argsObj, request.params.arguments);
+        const parseResult = await safeParseAsync2(argsObj, request.params.arguments ?? {});
         if (!parseResult.success) {
           const error62 = "error" in parseResult ? parseResult.error : "Unknown error";
           const errorMessage = getParseErrorMessage(error62);
@@ -45355,6 +45418,8 @@ var SysMLElementKind = /* @__PURE__ */ ((SysMLElementKind2) => {
   SysMLElementKind2["TransitionUsage"] = "transition";
   SysMLElementKind2["RequirementDef"] = "requirement def";
   SysMLElementKind2["RequirementUsage"] = "requirement";
+  SysMLElementKind2["ConcernDef"] = "concern def";
+  SysMLElementKind2["ConcernUsage"] = "concern";
   SysMLElementKind2["ConstraintDef"] = "constraint def";
   SysMLElementKind2["ConstraintUsage"] = "constraint";
   SysMLElementKind2["ItemDef"] = "item def";
@@ -45466,6 +45531,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 */:
@@ -158884,6 +158953,10 @@ function getLibraryPackageNames() {
 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);
 }
@@ -159474,6 +159547,7 @@ var NAMESPACE_URL = v5_default.URL;
 var DEFAULT_URL_PREFIX = "https://github.com/daltskin/sysml-v2-lsp/";
 var PROJECT_ID_ENV_VAR = "SYSML_PROJECT_ID";
 var urlPrefix = DEFAULT_URL_PREFIX;
+var folderPrefixes = [];
 function setProjectId(projectId2) {
   if (projectId2 === void 0) {
     urlPrefix = DEFAULT_URL_PREFIX;
@@ -159483,8 +159557,9 @@ function setProjectId(projectId2) {
   urlPrefix = `urn:uuid:${projectId2.toLowerCase()}/`;
   return true;
 }
-function getUrlPrefix() {
-  return urlPrefix;
+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);
@@ -159544,7 +159619,7 @@ var IdRegistry = class {
     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);
@@ -159729,6 +159804,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 */],
@@ -159801,6 +159882,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 */],
@@ -159924,8 +160009,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,
@@ -160550,7 +160637,7 @@ var SymbolTable = class {
     const shortName = transition || isFlowUsage(kind) && !declaredName ? void 0 : this.extractShortName(ctx2);
     const qualifiedName = anonymous || owner && owner.qualifiedName === void 0 ? void 0 : owner ? `${owner.qualifiedName}::${name}` : name;
     const selectionRange = anonymous ? ctx2.start ? tokenToRange(ctx2.start) : range : this.extractNameRange(ctx2) ?? range;
-    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx2) : this.extractTypeNames(ctx2);
+    const typeNames = isFlowUsage(kind) ? this.extractFlowTypeNames(ctx2) : transition ? this.extractTransitionTypeNames(ctx2) : this.extractTypeNames(ctx2);
     const specializationNames = this.extractSpecializationNames(ctx2);
     const typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx2);
@@ -160665,6 +160752,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(ctx2) {
+    const names = [];
+    this.collectTypeNamesFromTree(ctx2, names, 0);
+    const trigger = this.findOwnHeaderRule(ctx2, 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(ctx2, ruleIndex) {
     const matches = [];
@@ -160790,7 +160896,7 @@ var SymbolTable = class {
    */
   anonymousDeclaration(ctx2, kind, transition) {
     if (!isDefinition(kind) && !isUsage(kind)) return void 0;
-    if (transition && !(transition.source && transition.target) && this.extractTypeNames(ctx2).length === 0) return void 0;
+    if (transition && !(transition.source && transition.target) && this.extractTransitionTypeNames(ctx2).length === 0) return void 0;
     return this.declarationText(ctx2);
   }
   /**

package/dist/server/server.js

@@ -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,7 +122987,7 @@ 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 typeName = typeNames[0];
     const documentation = this.extractDocumentation(ctx);
@@ -123075,6 +123102,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 +123246,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);
   }
   /**
@@ -124280,6 +124326,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.
    */
@@ -128273,6 +128330,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 */:
@@ -130666,6 +130725,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 +130740,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 +130857,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 +130908,8 @@ connection.onInitialize((params) => {
   if (hasWorkspaceFolderCapability) {
     result.capabilities.workspace = {
       workspaceFolders: {
-        supported: true
+        supported: true,
+        changeNotifications: true
       }
     };
   }
@@ -130852,8 +130921,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 +130947,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 +130988,79 @@ 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";
+    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((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 +131085,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 +131106,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 +131319,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", () => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "sysml-v2-lsp",
   "displayName": "SysML v2 Language Server",
   "description": "Language Server Protocol implementation for SysML v2, powered by ANTLR4",
-  "version": "0.34.0",
+  "version": "0.35.0",
   "publisher": "JamieD",
   "license": "MIT",
   "repository": {