@cloudinary/environment-config-mcp 0.5.0 → 0.6.0

package/src/mcp-server/tools.ts

@@ -3,109 +3,85 @@
  */
 
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
+import {
+  ShapeOutput,
+  ZodRawShapeCompat,
+} from "@modelcontextprotocol/sdk/server/zod-compat.js";
 import { RequestHandlerExtra } from "@modelcontextprotocol/sdk/shared/protocol.js";
 import {
   CallToolResult,
   ServerNotification,
   ServerRequest,
 } from "@modelcontextprotocol/sdk/types.js";
-import { objectOutputType, ZodRawShape, ZodTypeAny } from "zod";
+import * as z from "zod";
 import { CloudinaryEnvConfigCore } from "../core.js";
+import { ServerRegion$zodSchema } from "../lib/config.js";
 import { ConsoleLogger } from "./console-logger.js";
-import { MCPScope } from "./scopes.js";
-import { isAsyncIterable, isBinaryData, valueToBase64 } from "./shared.js";
-
-export type ToolDefinition<Args extends undefined | ZodRawShape = undefined> =
-  Args extends ZodRawShape ? {
-      name: string;
-      description: string;
-      scopes?: MCPScope[];
-      args: Args;
-      annotations: {
-        title: string;
-        destructiveHint: boolean;
-        idempotentHint: boolean;
-        openWorldHint: boolean;
-        readOnlyHint: boolean;
-      };
-      tool: (
-        client: CloudinaryEnvConfigCore,
-        args: objectOutputType<Args, ZodTypeAny>,
-        extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-      ) => CallToolResult | Promise<CallToolResult>;
-    }
-    : {
-      name: string;
-      description: string;
-      scopes?: MCPScope[];
-      args?: undefined;
-      annotations: {
-        title: string;
-        destructiveHint: boolean;
-        idempotentHint: boolean;
-        openWorldHint: boolean;
-        readOnlyHint: boolean;
-      };
-      tool: (
-        client: CloudinaryEnvConfigCore,
-        extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
-      ) => CallToolResult | Promise<CallToolResult>;
+import { MCPServerFlags } from "./flags.js";
+import { MCPScope, mcpScopes } from "./scopes.js";
+import { valueToBase64 } from "./shared.js";
+
+export type ToolDefinition<
+  Args extends undefined | ZodRawShapeCompat = undefined,
+> = Args extends ZodRawShapeCompat ? {
+    name: string;
+    description: string;
+    scopes?: MCPScope[];
+    args: Args;
+    annotations: {
+      title: string;
+      destructiveHint: boolean;
+      idempotentHint: boolean;
+      openWorldHint: boolean;
+      readOnlyHint: boolean;
     };
+    tool: (
+      client: CloudinaryEnvConfigCore,
+      args: ShapeOutput<Args>,
+      extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+    ) => CallToolResult | Promise<CallToolResult>;
+  }
+  : {
+    name: string;
+    description: string;
+    scopes?: MCPScope[];
+    args?: undefined;
+    annotations: {
+      title: string;
+      destructiveHint: boolean;
+      idempotentHint: boolean;
+      openWorldHint: boolean;
+      readOnlyHint: boolean;
+    };
+    tool: (
+      client: CloudinaryEnvConfigCore,
+      extra: RequestHandlerExtra<ServerRequest, ServerNotification>,
+    ) => CallToolResult | Promise<CallToolResult>;
+  };
 
 // Optional function to assist with formatting tool results
 export async function formatResult(
-  value: unknown,
-  init: { response?: Response | undefined },
+  response: Response,
 ): Promise<CallToolResult> {
-  if (typeof value === "undefined") {
-    return { content: [] };
-  }
-
-  const { response } = init;
-  const contentType = response?.headers.get("content-type") ?? "";
   let content: CallToolResult["content"] = [];
+  const contentType = response?.headers.get("content-type") ?? "";
 
-  if (contentType.search(/\bjson\b/g)) {
-    content = [{ type: "text", text: JSON.stringify(value) }];
-  } else if (
-    contentType.startsWith("text/event-stream")
-    && isAsyncIterable(value)
-  ) {
-    content = await consumeSSE(value);
-  } else if (contentType.startsWith("text/") && typeof value === "string") {
-    content = [{ type: "text", text: value }];
-  } else if (isBinaryData(value) && contentType.startsWith("image/")) {
-    const data = await valueToBase64(value);
+  if (contentType.startsWith("image/")) {
+    const data = await valueToBase64(await response.arrayBuffer());
     content = data == null
       ? []
       : [{ type: "image", data, mimeType: contentType }];
+  } else if (contentType.startsWith("audio/")) {
+    const data = await valueToBase64(await response.arrayBuffer());
+    content = data == null
+      ? []
+      : [{ type: "audio", data, mimeType: contentType }];
   } else {
-    return {
-      content: [{
-        type: "text",
-        text: `Unsupported content type: "${contentType}"`,
-      }],
-      isError: true,
-    };
-  }
-
-  return { content };
-}
-
-async function consumeSSE(
-  value: AsyncIterable<unknown>,
-): Promise<CallToolResult["content"]> {
-  const content: CallToolResult["content"] = [];
-
-  for await (const chunk of value) {
-    if (typeof chunk === "string") {
-      content.push({ type: "text", text: chunk });
-    } else {
-      content.push({ type: "text", text: JSON.stringify(chunk) });
-    }
+    const text = await response.text();
+    content = [{ type: "text", text }];
   }
 
-  return content;
+  return response.ok ? { content } : { content, isError: true };
 }
 
 export function createRegisterTool(
@@ -114,8 +90,20 @@ export function createRegisterTool(
   getSDK: () => CloudinaryEnvConfigCore,
   allowedScopes: Set<MCPScope>,
   allowedTools?: Set<string>,
-): <A extends ZodRawShape | undefined>(tool: ToolDefinition<A>) => void {
-  return <A extends ZodRawShape | undefined>(tool: ToolDefinition<A>): void => {
+  dynamic?: boolean,
+): [
+  <A extends ZodRawShapeCompat | undefined>(tool: ToolDefinition<A>) => void,
+  Array<{ name: string; description: string }>,
+  Map<string, ToolDefinition<ZodRawShapeCompat | undefined>>,
+] {
+  const tools: Array<{ name: string; description: string }> = [];
+  const toolMap = new Map<
+    string,
+    ToolDefinition<ZodRawShapeCompat | undefined>
+  >();
+  const registerTool = <A extends ZodRawShapeCompat | undefined>(
+    tool: ToolDefinition<A>,
+  ): void => {
     if (allowedTools && !allowedTools.has(tool.name)) {
       return;
     }
@@ -132,27 +120,348 @@ export function createRegisterTool(
       return;
     }
 
+    toolMap.set(
+      tool.name,
+      tool as ToolDefinition<ZodRawShapeCompat | undefined>,
+    );
+
+    if (dynamic) {
+      logger.debug("Collected tool for dynamic mode", { name: tool.name });
+      tools.push({ name: tool.name, description: tool.description });
+      return;
+    }
+
     if (tool.args) {
-      server.tool(
+      server.registerTool(
         tool.name,
-        tool.description,
-        tool.args,
-        tool.annotations,
+        {
+          description: tool.description,
+          inputSchema: tool.args,
+          annotations: tool.annotations,
+        },
         async (args, ctx) => {
           return tool.tool(getSDK(), args, ctx);
         },
       );
     } else {
-      server.tool(
+      server.registerTool(
         tool.name,
-        tool.description,
-        tool.annotations,
-        async (_, ctx) => {
+        {
+          description: tool.description,
+          annotations: tool.annotations,
+        },
+        async (ctx) => {
           return tool.tool(getSDK(), ctx);
         },
       );
     }
 
     logger.debug("Registered tool", { name: tool.name });
+    tools.push({ name: tool.name, description: tool.description });
+  };
+
+  return [registerTool, tools, toolMap];
+}
+
+function matchesSearchTerms(
+  terms: string[],
+  name: string,
+  def: ToolDefinition<ZodRawShapeCompat | undefined>,
+): boolean {
+  if (terms.length === 0) {
+    return true;
+  }
+
+  const nameLower = name.toLowerCase();
+  const descLower = def.description.toLowerCase();
+  const scopesLower = def.scopes?.flatMap((s: unknown) => {
+    return typeof s === "string" ? [s.toLowerCase()] : [];
+  }) || [];
+
+  return terms.some((term) =>
+    nameLower.includes(term)
+    || descLower.includes(term)
+    || scopesLower.some((s) => s.includes(term))
+  );
+}
+
+export function registerDynamicTools(
+  logger: ConsoleLogger,
+  server: McpServer,
+  getSDK: () => CloudinaryEnvConfigCore,
+  toolMap: Map<string, ToolDefinition<ZodRawShapeCompat | undefined>>,
+  allowedScopes: Set<MCPScope>,
+): void {
+  // 1. list_tools
+  server.registerTool("list_tools", {
+    description:
+      "List available tools. Optionally filter by search terms that match against tool name, description, and scopes.",
+    inputSchema: {
+      search_terms: z.array(z.string()).optional().describe(
+        [
+          "Filter the list of tools.",
+          "Each term is matched case-insensitively as a substring against tool name, description, and scopes.",
+          "Multiple terms are combined with a logical OR: a tool is included if ANY term matches ANY field.",
+          "If not provided, all tools are returned.",
+        ].join("\n"),
+      ),
+    },
+    annotations: {
+      title: "List Tools",
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: false,
+    },
+  }, async (args) => {
+    const terms = (args.search_terms ?? []).map((t) => t.toLowerCase());
+
+    const tools: Array<
+      { name: string; description: string; scopes?: MCPScope[] | undefined }
+    > = [];
+    for (const [name, def] of toolMap) {
+      if (!matchesSearchTerms(terms, name, def)) {
+        continue;
+      }
+
+      tools.push({
+        name: name,
+        description: def.description,
+        scopes: def.scopes,
+      });
+    }
+    return {
+      content: [{ type: "text", text: JSON.stringify(tools, null, 2) }],
+    };
+  });
+  logger.debug("Registered dynamic meta-tool", { name: "list_tools" });
+
+  // 2. describe_tool
+  server.registerTool("describe_tool_input", {
+    description:
+      "Get the input schema for one or more tools. It is a good idea to call this tool first to understand how to successfully call execute_tool.",
+    inputSchema: {
+      tool_names: z.array(z.string()).describe(
+        "The names of the tools to describe",
+      ),
+    },
+    annotations: {
+      title: "Describe Tool",
+      readOnlyHint: true,
+      destructiveHint: false,
+      idempotentHint: true,
+      openWorldHint: false,
+    },
+  }, async (args) => {
+    const parts: string[] = [];
+    const unknown: string[] = [];
+
+    if (args.tool_names.length === 0) {
+      return { content: [{ type: "text", text: "No tool names provided." }] };
+    }
+
+    for (const toolName of args.tool_names) {
+      const def = toolMap.get(toolName);
+      if (!def) {
+        unknown.push(toolName);
+        continue;
+      }
+
+      let schemaText = `<input_schema tool="${toolName}">\n\n`;
+      if (def.args) {
+        const jsonSchema = z.toJSONSchema(z.object(def.args), {
+          target: "draft-2020-12",
+        });
+        schemaText += JSON.stringify(jsonSchema, null, 2);
+      } else {
+        schemaText += "This tool takes no input parameters.";
+      }
+      schemaText += `\n\n</input_schema>`;
+      parts.push(schemaText);
+    }
+
+    if (unknown.length > 0) {
+      parts.push(`Unknown tools: ${unknown.join(", ")}`);
+    }
+
+    return { content: [{ type: "text", text: parts.join("\n\n") }] };
+  });
+  logger.debug("Registered dynamic meta-tool", { name: "describe_tool" });
+
+  // 3. execute_tool
+  server.registerTool("execute_tool", {
+    description:
+      "Execute a tool by name with the provided input parameters. If executing a given tool for the first time, it is recommended to call describe_tool_input first to understand the expected input schema.",
+    inputSchema: {
+      tool_name: z.string().describe("The name of the tool to execute"),
+      input: z.record(z.string(), z.unknown()).optional().describe(
+        "Input parameters for the tool as a JSON object",
+      ),
+    },
+    annotations: {
+      title: "Execute Tool",
+      readOnlyHint: false,
+      destructiveHint: true,
+      idempotentHint: false,
+      openWorldHint: true,
+    },
+  }, async (args, ctx) => {
+    const def = toolMap.get(args.tool_name);
+    if (!def) {
+      return {
+        content: [{ type: "text", text: `Unknown tool: ${args.tool_name}` }],
+        isError: true,
+      };
+    }
+
+    let validatedInput: Record<string, unknown> = {};
+    if (def.args) {
+      const vres = z.object(def.args).safeParse(args.input ?? {});
+      if (vres.success) {
+        validatedInput = vres.data;
+      } else {
+        const issues = z.prettifyError(vres.error);
+
+        return {
+          content: [{
+            type: "text",
+            text:
+              `Invalid input for tool ${args.tool_name}:\n<issues>\n${issues}\n</issues>`,
+          }],
+          isError: true,
+        };
+      }
+    }
+
+    try {
+      if (def.args) {
+        return await def.tool(getSDK(), validatedInput, ctx);
+      } else {
+        return await def.tool(getSDK(), ctx);
+      }
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return {
+        content: [{
+          type: "text",
+          text: `Error executing tool ${args.tool_name}: ${message}`,
+        }],
+        isError: true,
+      };
+    }
+  });
+  logger.debug("Registered dynamic meta-tool", { name: "execute_tool" });
+
+  // 4. list_scopes (only when the server has scopes defined)
+  if (mcpScopes.length > 0) {
+    const scopes = allowedScopes.size > 0
+      ? [...allowedScopes].sort()
+      : [...mcpScopes];
+
+    server.registerTool("list_scopes", {
+      description: [
+        "List the scopes available on this server.",
+        "Scopes are categories that group related tools together.",
+        "They can be used as search terms when filtering the list of tools.",
+      ].join("\n"),
+      annotations: {
+        title: "List Scopes",
+        readOnlyHint: true,
+        destructiveHint: false,
+        idempotentHint: true,
+        openWorldHint: false,
+      },
+    }, async () => {
+      const lines = scopes.map((s) => `- ${s}`);
+      return { content: [{ type: "text", text: lines.join("\n") }] };
+    });
+    logger.debug("Registered dynamic meta-tool", { name: "list_scopes" });
+  }
+}
+function resolveHeader<T>(
+  headers: Headers,
+  headerName: string,
+  schema: z.ZodType<T>,
+  cliFlagValue: T | undefined,
+  disableStaticAuth: boolean,
+): T | undefined {
+  const val = headers.get(headerName);
+  if (val != null) {
+    return schema.parse(val);
+  }
+  return disableStaticAuth ? undefined : schema.parse(cliFlagValue);
+}
+
+export function buildSDK(
+  headers: Headers,
+  cliFlags: MCPServerFlags,
+  disableStaticAuth: boolean,
+  logger: { level: string },
+) {
+  const flags = {
+    ...cliFlags,
+    "api-key": resolveHeader(
+      headers,
+      "api-key",
+      z.string(),
+      cliFlags["api-key"],
+      disableStaticAuth,
+    ),
+    "api-secret": resolveHeader(
+      headers,
+      "api-secret",
+      z.string(),
+      cliFlags["api-secret"],
+      disableStaticAuth,
+    ),
+    "oauth2": resolveHeader(
+      headers,
+      "oauth2",
+      z.string(),
+      cliFlags["oauth2"],
+      disableStaticAuth,
+    ),
   };
+
+  return new CloudinaryEnvConfigCore({
+    security: {
+      cloudinaryAuth: flags["api-key"] != null && flags["api-secret"] != null
+        ? {
+          api_key: flags["api-key"] ?? "",
+          api_secret: flags["api-secret"] ?? "",
+        }
+        : void 0,
+      oauth2: flags.oauth2 ?? "",
+    },
+    serverURL: cliFlags["server-url"],
+    cloud_name: resolveHeader(
+      headers,
+      "cloud-name",
+      z.string(),
+      cliFlags["cloud-name"],
+      disableStaticAuth,
+    ),
+    serverIdx: cliFlags["server-index"],
+    region: resolveHeader(
+      headers,
+      "region",
+      ServerRegion$zodSchema,
+      cliFlags.region,
+      disableStaticAuth,
+    ),
+    host: resolveHeader(
+      headers,
+      "api-host",
+      z.string(),
+      cliFlags["api-host"],
+      disableStaticAuth,
+    ),
+    debugLogger: logger.level === "debug"
+      ? {
+        log: (...args) => console.log(...args),
+        group: (...args) => console.group(...args),
+        groupEnd: (...args) => console.groupEnd(...args),
+      }
+      : undefined,
+  });
 }

package/src/models/accesscontrolitem.ts

@@ -3,17 +3,25 @@
  */
 
 import * as z from "zod";
+import { ClosedEnum } from "../types/enums.js";
 
 /**
  * The type of access control to apply to the asset.
  */
+export const AccessType = {
+  Token: "token",
+  Anonymous: "anonymous",
+} as const;
+/**
+ * The type of access control to apply to the asset.
+ */
+export type AccessType = ClosedEnum<typeof AccessType>;
+
 export const AccessType$zodSchema = z.enum([
   "token",
   "anonymous",
 ]).describe("The type of access control to apply to the asset.");
 
-export type AccessType = z.infer<typeof AccessType$zodSchema>;
-
 /**
  * Access control rule that defines when and how the asset can be accessed.
  */
@@ -24,15 +32,12 @@ export type AccessControlItem = {
   end?: string | undefined;
 };
 
-export const AccessControlItem$zodSchema: z.ZodType<
-  AccessControlItem,
-  z.ZodTypeDef,
-  unknown
-> = z.object({
-  access_type: AccessType$zodSchema,
-  end: z.string().optional(),
-  key: z.string().optional(),
-  start: z.string().optional(),
-}).describe(
-  "Access control rule that defines when and how the asset can be accessed.",
-);
+export const AccessControlItem$zodSchema: z.ZodType<AccessControlItem> = z
+  .object({
+    access_type: AccessType$zodSchema,
+    end: z.string().optional(),
+    key: z.string().optional(),
+    start: z.string().optional(),
+  }).describe(
+    "Access control rule that defines when and how the asset can be accessed.",
+  );

package/src/models/apierror.ts

@@ -6,14 +6,12 @@ import * as z from "zod";
 
 export type ErrorT = { message: string };
 
-export const ErrorT$zodSchema: z.ZodType<ErrorT, z.ZodTypeDef, unknown> = z
-  .object({
-    message: z.string(),
-  });
+export const ErrorT$zodSchema: z.ZodType<ErrorT> = z.object({
+  message: z.string(),
+});
 
 export type ApiError = { error: ErrorT };
 
-export const ApiError$zodSchema: z.ZodType<ApiError, z.ZodTypeDef, unknown> = z
-  .object({
-    error: z.lazy(() => ErrorT$zodSchema),
-  });
+export const ApiError$zodSchema: z.ZodType<ApiError> = z.object({
+  error: z.lazy(() => ErrorT$zodSchema),
+});

package/src/models/createrequest.ts

@@ -9,11 +9,7 @@ export type CreateRequest = {
   allowed_for_strict?: boolean | undefined;
 };
 
-export const CreateRequest$zodSchema: z.ZodType<
-  CreateRequest,
-  z.ZodTypeDef,
-  unknown
-> = z.object({
+export const CreateRequest$zodSchema: z.ZodType<CreateRequest> = z.object({
   allowed_for_strict: z.boolean().optional(),
   transformation: z.string(),
 });

package/src/models/createstreamingprofileop.ts

@@ -12,9 +12,7 @@ import {
 export type CreateStreamingProfileGlobals = { cloud_name?: string | undefined };
 
 export const CreateStreamingProfileGlobals$zodSchema: z.ZodType<
-  CreateStreamingProfileGlobals,
-  z.ZodTypeDef,
-  unknown
+  CreateStreamingProfileGlobals
 > = z.object({
   cloud_name: z.string().describe("The cloud name of your product environment.")
     .optional(),
@@ -26,9 +24,7 @@ export const CreateStreamingProfileGlobals$zodSchema: z.ZodType<
 export type CreateStreamingProfileResponseBody = { data: StreamingProfile };
 
 export const CreateStreamingProfileResponseBody$zodSchema: z.ZodType<
-  CreateStreamingProfileResponseBody,
-  z.ZodTypeDef,
-  unknown
+  CreateStreamingProfileResponseBody
 > = z.object({
   data: StreamingProfile$zodSchema,
 }).describe("Streaming profile created");
@@ -38,9 +34,7 @@ export type CreateStreamingProfileResponse =
   | ApiError;
 
 export const CreateStreamingProfileResponse$zodSchema: z.ZodType<
-  CreateStreamingProfileResponse,
-  z.ZodTypeDef,
-  unknown
+  CreateStreamingProfileResponse
 > = z.union([
   z.lazy(() => CreateStreamingProfileResponseBody$zodSchema),
   ApiError$zodSchema,