@smartbear/mcp 0.23.0 → 0.25.0

package/README.md

@@ -107,7 +107,8 @@ Alternatively, you can use `npx` (or globally install) the `@smartbear/mcp` pack
         "COLLABORATOR_USERNAME": "${input:collab_username}",
         "COLLABORATOR_LOGIN_TICKET": "${input:collab_login_ticket}",
         "QTM4J_API_KEY": "${input:qtm4j_api_key}",
-        "QTM4J_BASE_URL": "${input:qtm4j_base_url}"
+        "QTM4J_BASE_URL": "${input:qtm4j_base_url}",
+        "QTM4J_AUTOMATION_API_KEY": "${input:qtm4j_automation_api_key}"
       }
     }
   },
@@ -243,6 +244,12 @@ Alternatively, you can use `npx` (or globally install) the `@smartbear/mcp` pack
           "type": "promptString",
           "description": "US region (default): https://qtmcloud.qmetry.com. Australia region: https://syd-qtmcloud.qmetry.com.",
           "password": false
+    },
+    {
+          "id": "qtm4j_automation_api_key",
+          "type": "promptString",
+          "description": "QTM4J Automation API Key - required for automation tools, leave blank to disable them",
+          "password": true
     }
   ]
 }
@@ -283,7 +290,8 @@ Add the following configuration to your `claude_desktop_config.json` to launch t
         "COLLABORATOR_USERNAME": "your collab user name",
         "COLLABORATOR_LOGIN_TICKET": "your collab login ticket",
         "QTM4J_API_KEY": "your_qtm4j_key",
-        "QTM4J_BASE_URL": "https://qtmcloud.qmetry.com"
+        "QTM4J_BASE_URL": "https://qtmcloud.qmetry.com",
+        "QTM4J_AUTOMATION_API_KEY": "your_qtm4j_automation_api_key"
       }
     }
   }

package/dist/bearq/client.js

@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from "../common/info.js";
-import { getRequestHeader } from "../common/request-context.js";
 import { ToolError } from "../common/tools.js";
 import { DEFAULT_API_BASE_URL, AUTHORIZATION_HEADER } from "./config/constants.js";
 import { ChatWithQaLead } from "./tool/tasks/chat-with-qa-lead.js";
@@ -16,33 +15,33 @@ import { RunTestsInFunctionalAreas } from "./tool/tasks/run-tests-in-functional-
 import { StopTask } from "./tool/tasks/stop-task.js";
 import { WaitForTask } from "./tool/tasks/wait-for-task.js";
 const ConfigurationSchema = z.object({
-  api_token: z.string().describe("BearQ workspace API token (Bearer)."),
   api_base_url: z.string().optional().describe(
     "Override the BearQ public API base URL. Defaults to https://api.bearq.smartbear.com"
   )
 });
+const AuthenticationSchema = z.object({
+  api_token: z.string().describe("BearQ workspace API token (Bearer).")
+});
 class BearQClient {
-  _apiToken;
+  server;
   _baseUrl = DEFAULT_API_BASE_URL;
   name = "BearQ";
   capabilityPrefix = "bearq";
   configPrefix = "BearQ";
   config = ConfigurationSchema;
-  async configure(_server, config) {
-    this._apiToken = config.api_token;
+  authenticationFields = AuthenticationSchema;
+  async configure(server, config) {
+    this.server = server;
     if (config.api_base_url) this._baseUrl = config.api_base_url;
   }
   getAuthToken() {
-    const contextHeader = getRequestHeader(AUTHORIZATION_HEADER);
-    if (contextHeader) {
-      let token = Array.isArray(contextHeader) ? contextHeader[0] : contextHeader;
-      if (token.startsWith("Bearer ")) token = token.substring(7);
-      return token;
-    }
-    return this._apiToken ?? null;
+    return this.server?.getEnv("api_token", this) || this.server?.getEnv(AUTHORIZATION_HEADER) || null;
   }
   isConfigured() {
-    return true;
+    return this.server !== void 0;
+  }
+  hasAuth() {
+    return this.isConfigured() && !!this.getAuthToken();
   }
   getBaseUrl() {
     return this._baseUrl;

package/dist/bearq/tool/tasks/chat-with-qa-lead.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class ChatWithQaLead extends Tool {
   specification = {
     title: "Chat with QA Lead",
+    toolset: "Tasks",
     summary: "Sends an open-ended instruction to BearQ's QA lead agent. Use this when no other BearQ tool fits — the QA lead can list, create, and update test cases, manage functional areas, and read the application model, and acts as a general-purpose escape hatch.",
     inputSchema
   };

package/dist/bearq/tool/tasks/expand-application-model.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class ExpandApplicationModel extends Tool {
   specification = {
     title: "Expand Application Model",
+    toolset: "Tasks",
     summary: "Explores the live application to discover or update its pages and elements in BearQ's application model. Optionally scope to a single functional area.",
     inputSchema
   };

package/dist/bearq/tool/tasks/get-task-status.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class GetTaskStatus extends Tool {
   specification = {
     title: "Get Task Status",
+    toolset: "Tasks",
     summary: "Retrieves the status of a task (running / complete / error / cancelled). Cheaper than fetching full task details.",
     inputSchema
   };

package/dist/bearq/tool/tasks/get-task.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class GetTask extends Tool {
   specification = {
     title: "Get Task",
+    toolset: "Tasks",
     summary: "Retrieves a task's current state, metadata, and activity log. Returns immediately with whatever's available — does not block on the task completing.",
     inputSchema
   };

package/dist/bearq/tool/tasks/refine-all-draft-tests.js

@@ -4,6 +4,7 @@ const inputSchema = z.object({});
 class RefineAllDraftTests extends Tool {
   specification = {
     title: "Refine All Draft Tests",
+    toolset: "Tasks",
     summary: "Refines every draft test case in the workspace. Use to push an entire draft backlog forward; may take multiple passes before all drafts are ready to be promoted to regression tests.",
     inputSchema
   };

package/dist/bearq/tool/tasks/refine-test-cases.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class RefineTestCases extends Tool {
   specification = {
     title: "Refine Test Cases",
+    toolset: "Tasks",
     summary: "Refines specific BearQ draft test cases — improves their steps so they can eventually be promoted to regression tests. Use when a draft is incomplete or has drifted from its intent.",
     inputSchema
   };

package/dist/bearq/tool/tasks/refine-tests-in-functional-areas.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class RefineTestsInFunctionalAreas extends Tool {
   specification = {
     title: "Refine Tests in Functional Areas",
+    toolset: "Tasks",
     summary: "Refines every draft test case tagged with one or more functional areas. Functional areas can be given by ID or name. May take multiple passes before drafts are ready to be promoted to regression tests.",
     inputSchema
   };

package/dist/bearq/tool/tasks/run-regression-tests.js

@@ -4,6 +4,7 @@ const inputSchema = z.object({});
 class RunRegressionTests extends Tool {
   specification = {
     title: "Run Regression Tests",
+    toolset: "Tasks",
     summary: "Runs the full BearQ regression suite — every regression-ready test case in the workspace. Use for CI/CD or pre-release smoke.",
     inputSchema
   };

package/dist/bearq/tool/tasks/run-test-cases.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class RunTestCases extends Tool {
   specification = {
     title: "Run Test Cases",
+    toolset: "Tasks",
     summary: "Runs specific BearQ regression test cases by ID. Targets only regression-ready cases — drafts will be rejected.",
     inputSchema
   };

package/dist/bearq/tool/tasks/run-tests-in-functional-areas.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class RunTestsInFunctionalAreas extends Tool {
   specification = {
     title: "Run Tests in Functional Areas",
+    toolset: "Tasks",
     summary: "Runs every regression test case tagged with one or more functional areas. Functional areas can be given by ID or name.",
     inputSchema
   };

package/dist/bearq/tool/tasks/stop-task.js

@@ -6,6 +6,7 @@ const inputSchema = z.object({
 class StopTask extends Tool {
   specification = {
     title: "Stop Task",
+    toolset: "Tasks",
     summary: "Cancels a running task.",
     inputSchema
   };

package/dist/bearq/tool/tasks/wait-for-task.js

@@ -17,6 +17,7 @@ function parseFrame(frame) {
 class WaitForTask extends Tool {
   specification = {
     title: "Wait For Task",
+    toolset: "Tasks",
     summary: "Blocks until a BearQ task reaches a terminal state (completed / failed / cancelled) or the stream times out, then returns the full ordered sequence of SSE events from the public API (metadata, activityLogEntries, and a terminal done or timeout event) verbatim. Blocks for the lifetime of the task — for a quick check use bearq_get_task_status instead.",
     inputSchema
   };

package/dist/bugsnag/client.js

@@ -1,6 +1,5 @@
 import { z } from "zod";
 import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from "../common/info.js";
-import { getRequestHeader } from "../common/request-context.js";
 import { ToolError } from "../common/tools.js";
 import { CurrentUserAPI } from "./client/api/CurrentUser.js";
 import { Configuration } from "./client/api/configuration.js";
@@ -40,11 +39,14 @@ const EXCLUDED_EVENT_FIELDS = /* @__PURE__ */ new Set([
   // This is searches multiple fields and is more a convenience for humans, we're removing to avoid over-matching
 ]);
 const ConfigurationSchema = z.object({
-  auth_token: z.string().describe("BugSnag personal access token"),
   project_api_key: z.string().describe("BugSnag project API key").optional(),
-  endpoint: z.string().url().describe("BugSnag endpoint URL").optional()
+  endpoint: z.url().describe("BugSnag endpoint URL").optional()
+});
+const AuthenticationSchema = z.object({
+  auth_token: z.string().describe("BugSnag personal access token").optional()
 });
 class BugsnagClient {
+  server;
   cache;
   _projectApiKey;
   _isConfigured = false;
@@ -52,7 +54,7 @@ class BugsnagClient {
   _errorsApi;
   _projectApi;
   _appEndpoint;
-  _authToken;
+  apiConfig;
   get currentUserApi() {
     if (!this._currentUserApi) throw new Error("Client not configured");
     return this._currentUserApi;
@@ -73,7 +75,10 @@ class BugsnagClient {
   capabilityPrefix = "bugsnag";
   configPrefix = "Bugsnag";
   config = ConfigurationSchema;
+  defaultToolsets = ["Projects"];
+  authenticationFields = AuthenticationSchema;
   async configure(server, config) {
+    this.server = server;
     this.cache = server.getCache();
     this._appEndpoint = this.getEndpoint(
       "app",
@@ -81,45 +86,17 @@ class BugsnagClient {
       config.endpoint
     );
     this._projectApiKey = config.project_api_key;
-    this._authToken = config.auth_token;
-    await this.initializeApis(config);
-  }
-  getAuthToken() {
-    const contextHeader = getRequestHeader("Bugsnag-Auth-Token");
-    if (contextHeader) {
-      let token = Array.isArray(contextHeader) ? contextHeader[0] : contextHeader;
-      if (token.startsWith("token ")) {
-        token = token.substring(6);
-      }
-      return `token ${token}`;
-    }
-    const bearerToken = this.getBearerToken();
-    if (bearerToken) {
-      return bearerToken;
-    }
-    return this._authToken ? `token ${this._authToken}` : null;
-  }
-  getBearerToken() {
-    const contextHeader = getRequestHeader("Authorization");
-    if (contextHeader) {
-      let token = Array.isArray(contextHeader) ? contextHeader[0] : contextHeader;
-      if (token.startsWith("Bearer ")) {
-        token = token.substring(7);
-      }
-      return `Bearer ${token}`;
-    }
-    return null;
-  }
-  async initializeApis(config) {
-    const apiConfig = new Configuration({
-      apiKey: (_name) => {
-        const authToken = this.getAuthToken();
+    this.apiConfig = new Configuration({
+      apiKey: () => {
+        const authToken = this.server?.getEnv("auth_token", this);
         if (authToken) {
-          return authToken;
+          return `token ${authToken}`;
         }
-        throw new Error(
-          "Authentication token not found in request headers or configuration"
-        );
+        const bearerToken = this.server?.getEnv("Authorization");
+        if (bearerToken) {
+          return `Bearer ${bearerToken}`;
+        }
+        return void 0;
       },
       headers: {
         "User-Agent": `${MCP_SERVER_NAME}/${MCP_SERVER_VERSION}`,
@@ -133,14 +110,17 @@ class BugsnagClient {
         config.endpoint
       )
     });
-    this._currentUserApi = new CurrentUserAPI(apiConfig);
-    this._errorsApi = new ErrorAPI(apiConfig);
-    this._projectApi = new ProjectAPI(apiConfig);
+    this._currentUserApi = new CurrentUserAPI(this.apiConfig);
+    this._errorsApi = new ErrorAPI(this.apiConfig);
+    this._projectApi = new ProjectAPI(this.apiConfig);
     this._isConfigured = true;
   }
   isConfigured() {
     return this._isConfigured;
   }
+  hasAuth() {
+    return this.isConfigured() && !!this.apiConfig?.apiKey();
+  }
   // If the endpoint is not provided, it will use the default API endpoint based on the project API key.
   // if the project api key is not provided, the endpoint will be the default API endpoint.
   // if the endpoint is provided, it will be used as is for custom domains, or normalized for known domains.

package/dist/bugsnag/tool/error/get-error.js

@@ -14,6 +14,7 @@ const inputSchema = z.object({
 class GetError extends Tool {
   specification = {
     title: "Get Error",
+    toolset: "Errors",
     summary: "Get full details on an error, including aggregated and summarized data across all events (occurrences) and details of the latest event (occurrence), such as breadcrumbs, metadata and the stacktrace. Use the filters parameter to narrow down the summaries further.",
     purpose: "Retrieve all the information required on a specified error to understand who it is affecting and why.",
     useCases: [

package/dist/bugsnag/tool/error/list-project-errors.js

@@ -14,6 +14,7 @@ const inputSchema = z.object({
 class ListProjectErrors extends Tool {
   specification = {
     title: "List Project Errors",
+    toolset: "Errors",
     summary: "List and search errors in a project using customizable filters and pagination",
     purpose: "Retrieve filtered list of errors from a project for analysis, debugging, and reporting",
     useCases: [

package/dist/bugsnag/tool/error/update-error.js

@@ -51,6 +51,7 @@ class UpdateError extends Tool {
   getInput;
   specification = {
     title: "Update Error",
+    toolset: "Errors",
     summary: "Update the status of an error",
     purpose: "Change an error's workflow state, such as marking it as resolved or ignored",
     useCases: [

package/dist/bugsnag/tool/event/get-event-details-from-dashboard-url.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class GetEventDetailsFromDashboardUrl extends Tool {
   specification = {
     title: "Get Event Details From Dashboard URL",
+    toolset: "Events",
     summary: "Get detailed information about a specific event using its dashboard URL",
     purpose: "Retrieve event details directly from a dashboard URL for quick debugging",
     useCases: [

package/dist/bugsnag/tool/event/get-event.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class GetEvent extends Tool {
   specification = {
     title: "Get Event",
+    toolset: "Events",
     summary: "Get detailed information about a specific event",
     purpose: "Retrieve event details directly from its ID",
     useCases: [

package/dist/bugsnag/tool/event/list-error-events.js

@@ -14,6 +14,7 @@ const inputSchema = z.object({
 class ListErrorEvents extends Tool {
   specification = {
     title: "Get Events on an Error",
+    toolset: "Events",
     summary: "Gets a list of events that have grouped into the specified error",
     purpose: "Show the events that make up an error to see individual occurrences of the error for detailed analysis",
     useCases: [

package/dist/bugsnag/tool/performance/get-network-endpoint-groupings.js

@@ -7,6 +7,7 @@ const inputSchema = z.object({
 class GetNetworkEndpointGroupings extends Tool {
   specification = {
     title: "Get Network Endpoint Groupings",
+    toolset: "Performance",
     summary: "Get the network endpoint grouping rules for a project",
     purpose: "Retrieve the URL patterns used to group network spans for performance monitoring",
     useCases: [

package/dist/bugsnag/tool/performance/get-span-group.js

@@ -9,6 +9,7 @@ const inputSchema = z.object({
 class GetSpanGroup extends Tool {
   specification = {
     title: "Get Span Group",
+    toolset: "Performance",
     summary: "Get detailed performance metrics for a specific span group",
     purpose: "Analyze performance characteristics of a specific operation",
     useCases: [

package/dist/bugsnag/tool/performance/get-trace.js

@@ -13,6 +13,7 @@ const inputSchema = z.object({
 class GetTrace extends Tool {
   specification = {
     title: "Get Trace",
+    toolset: "Performance",
     summary: "Get all spans within a specific trace",
     purpose: "View the complete trace of operations for a request/transaction",
     useCases: [

package/dist/bugsnag/tool/performance/list-span-groups.js

@@ -43,6 +43,7 @@ const inputSchema = z.object({
 class ListSpanGroups extends Tool {
   specification = {
     title: "List Span Groups",
+    toolset: "Performance",
     summary: "List span groups (operations) tracked for performance monitoring",
     purpose: "Discover and analyze different operations being monitored",
     useCases: [

package/dist/bugsnag/tool/performance/list-spans.js

@@ -29,6 +29,7 @@ const inputSchema = z.object({
 class ListSpans extends Tool {
   specification = {
     title: "List Spans",
+    toolset: "Performance",
     summary: "Get individual spans belonging to a span group",
     purpose: "Examine individual operation instances within a span group",
     useCases: [

package/dist/bugsnag/tool/performance/list-trace-fields.js

@@ -7,6 +7,7 @@ const inputSchema = z.object({
 class ListTraceFields extends Tool {
   specification = {
     title: "List Trace Fields",
+    toolset: "Performance",
     summary: "Get available trace fields/attributes for filtering",
     purpose: "Discover what custom attributes are available for filtering",
     useCases: [

package/dist/bugsnag/tool/performance/set-network-endpoint-groupings.js

@@ -10,6 +10,7 @@ const inputSchema = z.object({
 class SetNetworkEndpointGroupings extends Tool {
   specification = {
     title: "Set Network Endpoint Groupings",
+    toolset: "Performance",
     summary: "Set the network endpoint grouping rules for a project",
     purpose: "Configure URL patterns to control how network spans are grouped in performance monitoring",
     useCases: [

package/dist/bugsnag/tool/project/get-current-project.js

@@ -3,6 +3,7 @@ import { toolInputParameters } from "../../input-schemas.js";
 class GetCurrentProject extends Tool {
   specification = {
     title: "Get Current Project",
+    toolset: "Projects",
     summary: "Retrieve the 'current' project on which tools should operate by default. This allows BugSnag tools to be called with no projectId parameter.",
     purpose: "Gets information about the 'current' BugSnag project, including ID and API key",
     useCases: ["Understand if a current project has been set"],

package/dist/bugsnag/tool/project/list-project-event-filters.js

@@ -7,6 +7,7 @@ const inputSchema = z.object({
 class ListProjectEventFilters extends Tool {
   specification = {
     title: "List Project Event Filters",
+    toolset: "Projects",
     summary: "Get available event filter fields for a project",
     purpose: "Discover valid filter field names and options that can be used with the List Errors or Get Error tools",
     useCases: [

package/dist/bugsnag/tool/project/list-projects.js

@@ -5,6 +5,7 @@ const inputSchema = z.object({
 });
 class ListProjects extends Tool {
   specification = {
+    toolset: "Projects",
     title: "List Projects",
     summary: "List all projects in the organization that the current user has access to, or find a project matching an API key.",
     purpose: "Retrieve available projects for browsing and selecting which project to analyze.",

package/dist/bugsnag/tool/release/get-build.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class GetBuild extends Tool {
   specification = {
     title: "Get Build",
+    toolset: "Releases",
     summary: "Get more details for a specific build by its ID",
     purpose: "Retrieve detailed information about a build for analysis and debugging",
     useCases: [

package/dist/bugsnag/tool/release/get-release.js

@@ -8,6 +8,7 @@ const inputSchema = z.object({
 class GetRelease extends Tool {
   specification = {
     title: "Get Release",
+    toolset: "Releases",
     summary: "Get more details for a specific release by its ID, including source control information and associated builds",
     purpose: "Retrieve detailed information about a release for analysis and debugging",
     useCases: [

package/dist/bugsnag/tool/release/list-releases.js

@@ -13,6 +13,7 @@ const inputSchema = z.object({
 class ListReleases extends Tool {
   specification = {
     title: "List Releases",
+    toolset: "Releases",
     summary: "List releases for a project",
     purpose: "Retrieve a list of release summaries to analyze deployment history and associated errors",
     useCases: [

package/dist/collaborator/client.js

@@ -1,26 +1,29 @@
 import { z } from "zod";
-import { getRequestHeader } from "../common/request-context.js";
 const ConfigurationSchema = z.object({
-  base_url: z.url().describe("Collaborator server base URL"),
-  username: z.string().describe("Collaborator username for authentication").optional(),
-  login_ticket: z.string().describe("Collaborator login ticket for authentication").optional()
+  base_url: z.url().describe("Collaborator server base URL")
+});
+const AuthenticationSchema = z.object({
+  login: z.string().describe("Collaborator username for authentication").optional(),
+  ticket: z.string().describe("Collaborator login ticket for authentication").optional()
 });
 class CollaboratorClient {
   name = "Collaborator";
   capabilityPrefix = "collaborator";
   configPrefix = "Collaborator";
   config = ConfigurationSchema;
+  authenticationFields = AuthenticationSchema;
   baseUrl;
-  username;
-  loginTicket;
-  async configure(_server, config, _cache) {
+  server;
+  async configure(server, config) {
     this.baseUrl = config.base_url;
-    this.username = config.username;
-    this.loginTicket = config.login_ticket;
+    this.server = server;
   }
   isConfigured() {
     return this.baseUrl !== void 0;
   }
+  hasAuth() {
+    return this.isConfigured() && this.server?.getEnv("Login", this) !== void 0 && this.server?.getEnv("Ticket", this) !== void 0;
+  }
   /**
    * Calls the Collaborator API with the given commands, prepending authentication automatically.
    * @param commands Array of Collaborator API commands (excluding authentication)
@@ -28,16 +31,8 @@ class CollaboratorClient {
    */
   async call(commands) {
     const url = `${this.baseUrl}/services/json/v1`;
-    let login = this.username;
-    let ticket = this.loginTicket;
-    const contextLogin = getRequestHeader("Collaborator-Login");
-    const contextTicket = getRequestHeader("Collaborator-Ticket");
-    if (contextLogin) {
-      login = Array.isArray(contextLogin) ? contextLogin[0] : contextLogin;
-    }
-    if (contextTicket) {
-      ticket = Array.isArray(contextTicket) ? contextTicket[0] : contextTicket;
-    }
+    const login = this.server?.getEnv("Login", this);
+    const ticket = this.server?.getEnv("Ticket", this);
     const body = [
       {
         command: "SessionService.authenticate",
@@ -64,6 +59,7 @@ class CollaboratorClient {
     register(
       {
         title: "Find Review By ID",
+        toolset: "Review Management",
         summary: "Finds a review in Collaborator by its review ID.",
         inputSchema: z.object({
           reviewId: z.string().describe("The Collaborator review ID to find.")
@@ -86,6 +82,7 @@ class CollaboratorClient {
     register(
       {
         title: "Create Review",
+        toolset: "Review Management",
         summary: "Creates a new review in Collaborator. All parameters are optional.",
         inputSchema: z.object({
           creator: z.string().optional().describe(
@@ -123,6 +120,7 @@ class CollaboratorClient {
     register(
       {
         title: "Reject Review",
+        toolset: "Review Management",
         summary: "Rejects a review in Collaborator by its review ID and reason.",
         inputSchema: z.object({
           reviewId: z.union([z.string(), z.number()]).describe("The Collaborator review ID to reject."),
@@ -149,6 +147,7 @@ class CollaboratorClient {
     register(
       {
         title: "ReviewService Action",
+        toolset: "Review Management",
         summary: "Invoke any ReviewService method by name and arguments. For finishReviewPhase and waitOnPhase, provide reviewId (required) and until (optional, defaults to 'ANY').",
         inputSchema: z.object({
           action: z.enum([
@@ -172,6 +171,7 @@ class CollaboratorClient {
     register(
       {
         title: "Get Reviews",
+        toolset: "Review Management",
         summary: "Retrieves reviews from Collaborator using ReviewService.getReviews. All parameters are optional and only provided ones are sent.",
         inputSchema: z.object({
           login: z.string().optional().describe("Collaborator username to filter reviews."),
@@ -208,6 +208,7 @@ class CollaboratorClient {
     register(
       {
         title: "Create Remote System Configuration",
+        toolset: "Remote System Configuration Management",
         summary: "Creates a remote system configuration in Collaborator (e.g., Bitbucket, GitHub, etc).",
         inputSchema: z.object({
           token: z.string().describe("Remote system token, e.g., BITBUCKET, GITHUB, etc."),
@@ -239,6 +240,7 @@ class CollaboratorClient {
     register(
       {
         title: "Edit Remote System Configuration",
+        toolset: "Remote System Configuration Management",
         summary: "Edits parameters of an existing remote system configuration in Collaborator. Only title and config are editable after creation.",
         inputSchema: z.object({
           id: z.string().describe("ID of the remote system Configuration to edit."),
@@ -272,6 +274,7 @@ class CollaboratorClient {
     register(
       {
         title: "Delete Remote System Configuration",
+        toolset: "Remote System Configuration Management",
         summary: "Deletes a remote system configuration in Collaborator by its ID.",
         inputSchema: z.object({
           id: z.union([z.string(), z.number()]).describe("ID of the remote system Configuration to delete.")
@@ -296,6 +299,7 @@ class CollaboratorClient {
     register(
       {
         title: "Update Remote System Configuration Webhook",
+        toolset: "Remote System Configuration Management",
         summary: "Updates the webhook for a remote system configuration in Collaborator by its ID.",
         inputSchema: z.object({
           id: z.union([z.string(), z.number()]).describe(
@@ -322,6 +326,7 @@ class CollaboratorClient {
     register(
       {
         title: "Test Remote System Configuration Connection",
+        toolset: "Remote System Configuration Management",
         summary: "Tests the connection for a remote system configuration in Collaborator by its ID.",
         inputSchema: z.object({
           id: z.union([z.string(), z.number()]).describe(