sysml-v2-lsp 0.33.0 → 0.35.0

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 = [];
@@ -160758,7 +160864,7 @@ var SymbolTable = class {
       const child = ctx2.getChild(i);
       if (child instanceof TerminalNode) {
         const token = child.symbol;
-        if (this.isIdentifierToken(token)) {
+        if (this.isNameTerminal(child)) {
           return this.unquoteName(token.text ?? "");
         }
       }
@@ -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);
   }
   /**
@@ -160810,14 +160916,15 @@ var SymbolTable = class {
   /**
    * 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(ctx2, ruleIndex) {
     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 (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;
     }
@@ -160981,7 +161088,7 @@ var SymbolTable = class {
   extractNameRange(ctx2) {
     for (let i = 0; i < ctx2.getChildCount(); i++) {
       const child = ctx2.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) {
@@ -161166,12 +161273,12 @@ var SymbolTable = class {
     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(ctx2) {
-    const multCtx = this.findMultiplicityBounds(ctx2);
+    const multCtx = this.findOwnHeaderRule(ctx2, SysMLv2Parser.RULE_multiplicityBounds);
     if (!multCtx) {
       return {};
     }
@@ -161225,24 +161332,6 @@ var SymbolTable = class {
       multiplicityRange: { lower, upper }
     };
   }
-  /**
-   * Recursively search for a MultiplicityBoundsContext in the subtree.
-   */
-  findMultiplicityBounds(ctx2) {
-    if (ctx2.ruleIndex === SysMLv2Parser.RULE_multiplicityBounds) {
-      return ctx2;
-    }
-    for (let i = 0; i < ctx2.getChildCount(); i++) {
-      const child = ctx2.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
@@ -161284,6 +161373,14 @@ var SymbolTable = class {
     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(node2) {
+    return this.isIdentifierToken(node2.symbol) || node2.parent?.ruleIndex === SysMLv2Parser.RULE_unreservedKeyword;
+  }
   /**
    * Check if text is a SysML quoted name (single-quoted string).
    */
@@ -161653,7 +161750,7 @@ var SymbolTable = class {
       const child = ctx2.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) {
@@ -162080,9 +162177,8 @@ var SysMLModelProvider = class {
     if (direction) {
       attributes["direction"] = direction;
     }
-    const multiplicity = this.extractMultiplicity(symbol2, lines);
-    if (multiplicity) {
-      attributes["multiplicity"] = multiplicity;
+    if (symbol2.multiplicity) {
+      attributes["multiplicity"] = symbol2.multiplicity;
     }
     const modifier = this.extractModifier(symbol2, lines);
     if (modifier) {
@@ -162700,7 +162796,7 @@ var SysMLModelProvider = class {
           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,
@@ -162824,15 +162920,6 @@ var SysMLModelProvider = class {
     if (containsWord(elementText, "out")) return "out";
     return void 0;
   }
-  /** Extract multiplicity (e.g., [4], [0..*]) from source text. */
-  extractMultiplicity(symbol2, lines) {
-    const elementText = this.getElementText(symbol2, lines);
-    const open2 = elementText.indexOf("[");
-    if (open2 < 0) return void 0;
-    const close = elementText.indexOf("]", open2 + 1);
-    if (close < 0) return void 0;
-    return elementText.substring(open2 + 1, close);
-  }
   /** Extract modifiers (abstract, readonly, derived, etc.) from source text. */
   extractModifier(symbol2, lines) {
     const elementText = this.getElementText(symbol2, lines);