@mablhq/mabl-cli 2.72.15 → 2.72.26

package/commands/mcp/mcp_cmds/start.js

@@ -11,9 +11,9 @@ const loggingProvider_1 = require("../../../providers/logging/loggingProvider");
 const tools_1 = __importDefault(require("./tools"));
 const constants_1 = require("../../constants");
 const createMablTestForCurrentWork_1 = require("./prompts/createMablTestForCurrentWork");
-const common_1 = require("./tools/common");
 const mablApiClientFactory_1 = require("../../../api/mablApiClientFactory");
 const cliConfigProvider_1 = require("../../../providers/cliConfigProvider");
+const zod_to_json_schema_1 = require("zod-to-json-schema");
 exports.command = 'start [options]';
 exports.describe = 'Start the MCP server';
 exports.builder = (yargs) => {
@@ -48,31 +48,18 @@ async function startServer(parsed) {
         },
     });
     server.setRequestHandler(types_js_1.ListToolsRequestSchema, () => ({
-        tools: tools_1.default.map((tool) => {
-            const inputSchema = tool.schema.inputSchema.safeParse({}).success
-                ? { type: 'object', properties: {} }
-                : {
-                    type: 'object',
-                    properties: Object.fromEntries(Object.entries(tool.schema.inputSchema.shape).map(([key, value]) => {
-                        const description = value._def.description;
-                        return [
-                            key,
-                            {
-                                type: 'string',
-                                description: description || '',
-                            },
-                        ];
-                    })),
-                };
-            return {
-                name: tool.schema.name,
-                description: tool.schema.description,
-                inputSchema,
-                ...(tool.schema.outputSchema
-                    ? { outputSchema: (0, common_1.zodSchemaToOpenApiSchema)(tool.schema.outputSchema) }
-                    : {}),
-            };
-        }),
+        tools: tools_1.default.map((tool) => ({
+            name: tool.schema.name,
+            description: tool.schema.description,
+            inputSchema: (0, zod_to_json_schema_1.zodToJsonSchema)(tool.schema.inputSchema, {
+                strictUnions: true,
+            }),
+            outputSchema: tool.schema.outputSchema
+                ? (0, zod_to_json_schema_1.zodToJsonSchema)(tool.schema.outputSchema, {
+                    strictUnions: true,
+                })
+                : undefined,
+        })),
     }));
     server.setRequestHandler(types_js_1.ListPromptsRequestSchema, () => ({
         prompts: [createMablTestForCurrentWork_1.createMablTestPrompt],
@@ -87,7 +74,6 @@ async function startServer(parsed) {
         throw new Error(`Unknown prompt: ${name}`);
     });
     let mablApiClient;
-    let workspaceId;
     server.setRequestHandler(types_js_1.CallToolRequestSchema, async (request) => {
         const { name } = request.params;
         const tool = tools_1.default.find((t) => t.schema.name === name);
@@ -126,6 +112,7 @@ async function startServer(parsed) {
                     },
                 ],
             };
+            let workspaceId;
             try {
                 workspaceId = await getWorkspaceId(parsed[constants_1.CommandArgWorkspaceId], parsed[constants_1.CommandArgApiKey], mablApiClient);
                 if (!workspaceId) {
@@ -138,6 +125,8 @@ async function startServer(parsed) {
             const result = await tool.handle(args, mablApiClient, server, workspaceId);
             return {
                 content: result.content,
+                structuredContent: result.structuredContent,
+                isError: result.isError,
             };
         }
         catch (error) {
@@ -153,7 +142,14 @@ async function getWorkspaceId(workspaceId, apiKey, mablApiClient) {
         return workspaceId;
     }
     if (apiKey) {
-        return (await mablApiClient.getApiKeyDetails()).workspace_id;
+        const apiKeyDetails = await mablApiClient.getApiKeyDetails();
+        return apiKeyDetails.workspace_id;
+    }
+    const currentWorkspace = await cliConfigProvider_1.CliConfigProvider.getWorkspace();
+    if (currentWorkspace?.id) {
+        return currentWorkspace.id;
     }
-    return (await cliConfigProvider_1.CliConfigProvider.getWorkspace()).id;
+    await mablApiClient.getSelf();
+    const workspace = await cliConfigProvider_1.CliConfigProvider.getWorkspace();
+    return workspace?.id;
 }

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

@@ -1,74 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.stringToToolResult = stringToToolResult;
-exports.zodSchemaToOpenApiSchema = zodSchemaToOpenApiSchema;
-const zod_1 = require("zod");
 function stringToToolResult(value, isError = false) {
     return {
         content: [
             {
                 type: 'text',
                 text: value,
-                isError,
             },
         ],
+        isError,
     };
 }
-function zodSchemaToOpenApiSchema(schema) {
-    if (schema instanceof zod_1.z.ZodArray) {
-        const element = schema.element;
-        if (element instanceof zod_1.z.ZodObject) {
-            const itemShape = element.shape;
-            return {
-                type: 'array',
-                items: {
-                    type: 'object',
-                    properties: Object.fromEntries(Object.entries(itemShape).map(([key, value]) => {
-                        const description = value._def.description;
-                        return [
-                            key,
-                            {
-                                type: (() => {
-                                    if (value instanceof zod_1.z.ZodString) {
-                                        return 'string';
-                                    }
-                                    if (value instanceof zod_1.z.ZodNumber) {
-                                        return 'number';
-                                    }
-                                    if (value instanceof zod_1.z.ZodBoolean) {
-                                        return 'boolean';
-                                    }
-                                    if (value instanceof zod_1.z.ZodArray) {
-                                        return 'array';
-                                    }
-                                    if (value instanceof zod_1.z.ZodObject) {
-                                        return 'object';
-                                    }
-                                    return 'string';
-                                })(),
-                                description: description || '',
-                            },
-                        ];
-                    })),
-                },
-            };
-        }
-    }
-    else if (schema instanceof zod_1.z.ZodObject) {
-        const shape = schema.shape;
-        return {
-            type: 'object',
-            properties: Object.fromEntries(Object.entries(shape).map(([key, value]) => {
-                const description = value._def.description;
-                return [
-                    key,
-                    {
-                        type: 'string',
-                        description: description || '',
-                    },
-                ];
-            })),
-        };
-    }
-    return undefined;
-}

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

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mcpMablTool_1 = require("./mcpMablTool");
+const zod_1 = require("zod");
+const getWorkspaces = (0, mcpMablTool_1.defineTool)({
+    schema: {
+        name: 'get-workspaces',
+        title: 'Get all available workspaces',
+        description: 'Get all workspaces that the user has access to',
+        inputSchema: zod_1.z.object({
+            limit: zod_1.z
+                .number()
+                .optional()
+                .describe('The maximum number of workspaces to return (default: 50)'),
+        }),
+        outputSchema: zod_1.z.object({
+            workspaces: zod_1.z.array(zod_1.z.object({
+                id: zod_1.z.string().describe('The workspace ID'),
+                name: zod_1.z.string().describe('The workspace name'),
+            })),
+            currentWorkspaceId: zod_1.z
+                .string()
+                .describe('The currently active workspace ID'),
+        }),
+        type: 'readOnly',
+    },
+    handle: async (args, mablApiClient, _server, workspaceId) => {
+        const limit = args.limit || 50;
+        const workspaces = await mablApiClient.getWorkspaces(limit);
+        const workspaceList = workspaces.map((workspace) => ({
+            id: workspace.id,
+            name: workspace.name,
+        }));
+        return {
+            content: [
+                {
+                    type: 'text',
+                    text: JSON.stringify({
+                        workspaces: workspaceList,
+                        currentWorkspaceId: workspaceId,
+                    }, undefined, 2),
+                },
+            ],
+            structuredContent: {
+                workspaces: workspaceList,
+                currentWorkspaceId: workspaceId,
+            },
+        };
+    },
+});
+exports.default = [getWorkspaces];

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

@@ -16,6 +16,8 @@ const createTest_1 = __importDefault(require("./createTest"));
 const getPlans_1 = __importDefault(require("./getPlans"));
 const getPlanRunResult_1 = __importDefault(require("./getPlanRunResult"));
 const getLatestPlanRuns_1 = __importDefault(require("./getLatestPlanRuns"));
+const getWorkspaces_1 = __importDefault(require("./getWorkspaces"));
+const switchWorkspace_1 = __importDefault(require("./switchWorkspace"));
 exports.default = [
     ...getApplications_1.default,
     ...getCredentials_1.default,
@@ -30,4 +32,6 @@ exports.default = [
     ...createTest_1.default,
     ...getPlanRunResult_1.default,
     ...getLatestPlanRuns_1.default,
+    ...getWorkspaces_1.default,
+    ...switchWorkspace_1.default,
 ];

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cliConfigProvider_1 = require("../../../../providers/cliConfigProvider");
+const mcpMablTool_1 = require("./mcpMablTool");
+const zod_1 = require("zod");
+const switchWorkspace = (0, mcpMablTool_1.defineTool)({
+    schema: {
+        name: 'switch-workspace',
+        title: 'Switch the current workspace',
+        description: 'Switch to a different workspace by providing a workspace ID',
+        inputSchema: zod_1.z.object({
+            workspaceId: zod_1.z.string().describe('The ID of the workspace to switch to'),
+        }),
+        type: 'destructive',
+    },
+    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'}`,
+                    },
+                ],
+            };
+        }
+    },
+});
+exports.default = [switchWorkspace];