@mablhq/mabl-cli 2.73.3 → 2.74.0

package/commands/mcp/mcp_cmds/start.js

@@ -23,12 +23,7 @@ exports.builder = (yargs) => {
         describe: 'API key (found in the mabl web app)',
         type: 'string',
         demand: false,
-    })
-        .option(constants_1.CommandArgWorkspaceId, {
-        alias: constants_1.CommandArgAliases.WorkspaceId,
-        describe: 'Workspace ID (found in the mabl web app)',
-        type: 'string',
-        demand: false,
+        hidden: true,
     })
         .example('$0 mcp start', 'Start the MCP server');
 };
@@ -85,21 +80,26 @@ async function startServer(parsed) {
             const args = request.params.arguments || {};
             if (!mablApiClient) {
                 try {
-                    const maybeApiKey = parsed[constants_1.CommandArgApiKey];
-                    mablApiClient = maybeApiKey
-                        ? await mablApiClientFactory_1.MablApiClientFactory.createApiClientFromOptionalApiKey(maybeApiKey, false)
+                    mablApiClient = process.env.CI
+                        ? await mablApiClientFactory_1.MablApiClientFactory.createApiClientFromOptionalApiKey()
                         : await mablApiClientFactory_1.MablApiClientFactory.createUserApiClient(false);
                 }
                 catch (error) {
+                    const maybeApiKey = parsed[constants_1.CommandArgApiKey];
+                    const errorMessage = maybeApiKey
+                        ? `The mabl MCP no longer supports authentication via apiKey.
+              Please authenticate the CLI by running 'mabl auth login'
+              `
+                        : `
+            The CLI is not authenticated.
+            Please authenticate the CLI by running 'mabl auth login'
+            `;
                     return {
+                        isError: true,
                         content: [
                             {
                                 type: 'text',
-                                text: `
-              The CLI is not authenticated.
-              Please authenticate the CLI by running 'mabl auth login'
-              `,
-                                isError: true,
+                                text: errorMessage,
                             },
                         ],
                     };
@@ -115,7 +115,7 @@ async function startServer(parsed) {
             };
             let workspaceId;
             try {
-                workspaceId = await getWorkspaceId(parsed[constants_1.CommandArgWorkspaceId], parsed[constants_1.CommandArgApiKey], mablApiClient);
+                workspaceId = await getWorkspaceId(mablApiClient);
                 if (!workspaceId) {
                     return invalidWorkspaceResponse;
                 }
@@ -138,14 +138,7 @@ async function startServer(parsed) {
     await server.connect(transport);
     console.error('Mabl MCP Server running on stdio');
 }
-async function getWorkspaceId(workspaceId, apiKey, mablApiClient) {
-    if (workspaceId) {
-        return workspaceId;
-    }
-    if (apiKey) {
-        const apiKeyDetails = await mablApiClient.getApiKeyDetails();
-        return apiKeyDetails.workspace_id;
-    }
+async function getWorkspaceId(mablApiClient) {
     const currentWorkspace = await cliConfigProvider_1.CliConfigProvider.getWorkspace();
     if (currentWorkspace?.id) {
         return currentWorkspace.id;

package/commands/mcp/mcp_cmds/tools/getEnvironments.js

@@ -1,27 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getEnvironmentsOutputSchema = void 0;
 const mcpMablTool_1 = require("./mcpMablTool");
 const zod_1 = require("zod");
+exports.getEnvironmentsOutputSchema = zod_1.z.object({
+    environments: zod_1.z.array(zod_1.z.object({
+        id: zod_1.z.string().optional(),
+        name: zod_1.z.string().optional(),
+    })),
+});
 const getEnvironments = (0, mcpMablTool_1.defineTool)({
     schema: {
         name: 'get_environments',
         title: 'Get all mabl environments',
         description: 'Get all mabl environments. Example: Get my mabl environments',
         inputSchema: zod_1.z.object({}),
+        outputSchema: exports.getEnvironmentsOutputSchema,
         type: 'readOnly',
     },
     handle: async (_, mablApiClient, _server, workspaceId) => {
         const limit = 500;
         const environments = await mablApiClient.getEnvironments(workspaceId, limit);
+        const environmentsResponse = environments.map((env) => ({
+            id: env.id,
+            name: env.name,
+        }));
         return {
             content: [
                 {
                     type: 'text',
-                    text: environments
-                        .map((env) => `Name: ${env.name} ID: ${env.id}`)
-                        .join('\n'),
+                    text: JSON.stringify({ environments: environmentsResponse }, undefined, 2),
                 },
             ],
+            structuredContent: { environments: environmentsResponse },
         };
     },
 });

package/commands/mcp/mcp_cmds/tools/getLatestAuthoredTests.js

@@ -29,30 +29,25 @@ const getLatestAuthoredTests = (0, mcpMablTool_1.defineTool)({
     },
     handle: async (args, mablApiClient, _server, workspaceId) => {
         const limit = args.limit || 10;
-        try {
-            const userInfo = await cliConfigProvider_1.CliConfigProvider.getCliConfig();
-            if (!userInfo.userId) {
-                return (0, common_1.stringToToolResult)('Unable to determine current user information.', true);
-            }
-            const authoredTestsResponse = await mablApiClient.getJourneys({
-                author_id: userInfo.userId,
-                organization_id: workspaceId,
-                limit,
-            });
-            const latestAuthoredTests = authoredTestsResponse.map((test) => (0, testUtils_1.normalizeTest)(test));
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: JSON.stringify({ latestAuthoredTests }, undefined, 2),
-                    },
-                ],
-                structuredContent: { latestAuthoredTests },
-            };
-        }
-        catch (error) {
-            return (0, common_1.stringToToolResult)(`Failed to get latest authored tests: ${error instanceof Error ? error.message : String(error)}`, true);
+        const userInfo = await cliConfigProvider_1.CliConfigProvider.getCliConfig();
+        if (!userInfo.userId) {
+            return (0, common_1.stringToToolResult)('Unable to determine current user information.', true);
         }
+        const authoredTestsResponse = await mablApiClient.getJourneys({
+            author_id: userInfo.userId,
+            organization_id: workspaceId,
+            limit,
+        });
+        const latestAuthoredTests = authoredTestsResponse.map((test) => (0, testUtils_1.normalizeTest)(test));
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: JSON.stringify({ latestAuthoredTests }, undefined, 2),
+                },
+            ],
+            structuredContent: { latestAuthoredTests },
+        };
     },
 });
 exports.default = [getLatestAuthoredTests];

package/commands/mcp/mcp_cmds/tools/mcpMablTool.js

@@ -6,9 +6,23 @@ function defineTool(tool) {
     const originalHandle = tool.handle;
     return {
         ...tool,
-        handle: (params, apiClient, server, workspaceId) => {
+        handle: async (params, apiClient, server, workspaceId) => {
             (0, interceptor_1.mcpToolInterceptor)(tool.schema.name);
-            return originalHandle(params, apiClient, server, workspaceId);
+            try {
+                const toolResult = await originalHandle(params, apiClient, server, workspaceId);
+                return toolResult;
+            }
+            catch (error) {
+                return {
+                    isError: true,
+                    content: [
+                        {
+                            type: 'text',
+                            text: `Failed to execute ${tool.schema.name}: ${error instanceof Error ? error.message : 'Unknown error'}`,
+                        },
+                    ],
+                };
+            }
         },
     };
 }

package/commands/mcp/mcp_cmds/tools/switchWorkspace.js

@@ -15,28 +15,16 @@ const switchWorkspace = (0, mcpMablTool_1.defineTool)({
     },
     handle: async (args, mablApiClient, _server, _currentWorkspaceId) => {
         const { workspaceId: newWorkspaceId } = args;
-        try {
-            const workspace = await mablApiClient.getWorkspace(newWorkspaceId);
-            await cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Successfully switched workspace to "${workspace.name}" (${newWorkspaceId})`,
-                    },
-                ],
-            };
-        }
-        catch (error) {
-            return {
-                content: [
-                    {
-                        type: 'text',
-                        text: `Failed to switch workspace: ${error instanceof Error ? error.message : 'Unknown error'}`,
-                    },
-                ],
-            };
-        }
+        const workspace = await mablApiClient.getWorkspace(newWorkspaceId);
+        await cliConfigProvider_1.CliConfigProvider.setWorkspace(workspace);
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: `Successfully switched workspace to "${workspace.name}" (${newWorkspaceId})`,
+                },
+            ],
+        };
     },
 });
 exports.default = [switchWorkspace];