@workglow/util 0.0.117 → 0.0.119

package/dist/bun.js

@@ -2580,69 +2580,136 @@ var mcpAuthTypes = [
   "authorization_code"
 ];
 var mcpAuthConfigSchema = {
-  auth_type: {
-    type: "string",
-    enum: mcpAuthTypes,
-    title: "Auth Type",
-    description: "Authentication method for connecting to the MCP server",
-    default: "none"
-  },
-  auth_token: {
-    type: "string",
-    format: "credential",
-    title: "Bearer Token",
-    description: "Static bearer token or API key (for bearer auth)"
-  },
-  auth_client_id: {
-    type: "string",
-    title: "Client ID",
-    description: "OAuth client ID (for OAuth auth types)"
-  },
-  auth_client_secret: {
-    type: "string",
-    format: "credential",
-    title: "Client Secret",
-    description: "OAuth client secret (for client_credentials auth)"
-  },
-  auth_private_key: {
-    type: "string",
-    format: "credential",
-    title: "Private Key",
-    description: "PEM or JWK private key (for private_key_jwt auth)"
-  },
-  auth_algorithm: {
-    type: "string",
-    title: "Algorithm",
-    description: "JWT signing algorithm, e.g. RS256, ES256 (for private_key_jwt auth)"
-  },
-  auth_jwt_bearer_assertion: {
-    type: "string",
-    format: "credential",
-    title: "JWT Assertion",
-    description: "Pre-built JWT assertion (for static_private_key_jwt auth)"
-  },
-  auth_redirect_url: {
-    type: "string",
-    format: "uri",
-    title: "Redirect URL",
-    description: "OAuth redirect URL (for authorization_code auth)"
-  },
-  auth_scope: {
-    type: "string",
-    title: "Scope",
-    description: "OAuth scope (space-separated)"
-  },
-  auth_client_name: {
-    type: "string",
-    title: "Client Name",
-    description: "Optional OAuth client display name"
+  properties: {
+    auth_type: {
+      type: "string",
+      enum: mcpAuthTypes,
+      title: "Auth Type",
+      description: "Authentication method for connecting to the MCP server",
+      default: "none"
+    },
+    auth_token: {
+      type: "string",
+      format: "credential",
+      title: "Bearer Token",
+      description: "Static bearer token or API key (for bearer auth)"
+    },
+    auth_client_id: {
+      type: "string",
+      title: "Client ID",
+      description: "OAuth client ID (for OAuth auth types)"
+    },
+    auth_client_secret: {
+      type: "string",
+      format: "credential",
+      title: "Client Secret",
+      description: "OAuth client secret (for client_credentials auth)"
+    },
+    auth_private_key: {
+      type: "string",
+      format: "credential",
+      title: "Private Key",
+      description: "PEM or JWK private key (for private_key_jwt auth)"
+    },
+    auth_algorithm: {
+      type: "string",
+      title: "Algorithm",
+      description: "JWT signing algorithm, e.g. RS256, ES256 (for private_key_jwt auth)"
+    },
+    auth_jwt_bearer_assertion: {
+      type: "string",
+      format: "credential",
+      title: "JWT Assertion",
+      description: "Pre-built JWT assertion (for static_private_key_jwt auth)"
+    },
+    auth_redirect_url: {
+      type: "string",
+      format: "uri",
+      title: "Redirect URL",
+      description: "OAuth redirect URL (for authorization_code auth)"
+    },
+    auth_scope: {
+      type: "string",
+      title: "Scope",
+      description: "OAuth scope (space-separated)"
+    },
+    auth_client_name: {
+      type: "string",
+      title: "Client Name",
+      description: "Optional OAuth client display name"
+    },
+    auth_jwt_lifetime_seconds: {
+      type: "number",
+      title: "JWT Lifetime",
+      description: "JWT lifetime in seconds (default: 300)",
+      minimum: 1
+    }
   },
-  auth_jwt_lifetime_seconds: {
-    type: "number",
-    title: "JWT Lifetime",
-    description: "JWT lifetime in seconds (default: 300)",
-    minimum: 1
-  }
+  allOf: [
+    {
+      if: { properties: { auth_type: { const: "bearer" } }, required: ["auth_type"] },
+      then: {
+        required: ["auth_token"],
+        properties: { auth_token: true }
+      }
+    },
+    {
+      if: {
+        properties: { auth_type: { const: "client_credentials" } },
+        required: ["auth_type"]
+      },
+      then: {
+        required: ["auth_client_id", "auth_client_secret"],
+        properties: {
+          auth_client_id: true,
+          auth_client_secret: true,
+          auth_client_name: true,
+          auth_scope: true
+        }
+      }
+    },
+    {
+      if: { properties: { auth_type: { const: "private_key_jwt" } }, required: ["auth_type"] },
+      then: {
+        required: ["auth_client_id", "auth_private_key", "auth_algorithm"],
+        properties: {
+          auth_client_id: true,
+          auth_private_key: true,
+          auth_algorithm: true,
+          auth_client_name: true,
+          auth_jwt_lifetime_seconds: true,
+          auth_scope: true
+        }
+      }
+    },
+    {
+      if: {
+        properties: { auth_type: { const: "static_private_key_jwt" } },
+        required: ["auth_type"]
+      },
+      then: {
+        required: ["auth_client_id", "auth_jwt_bearer_assertion"],
+        properties: {
+          auth_client_id: true,
+          auth_jwt_bearer_assertion: true,
+          auth_client_name: true,
+          auth_scope: true
+        }
+      }
+    },
+    {
+      if: { properties: { auth_type: { const: "authorization_code" } }, required: ["auth_type"] },
+      then: {
+        required: ["auth_client_id", "auth_redirect_url"],
+        properties: {
+          auth_client_id: true,
+          auth_client_secret: true,
+          auth_redirect_url: true,
+          auth_scope: true
+        }
+      }
+    }
+  ]
 };
 function isMcpAuthType(value) {
   return typeof value === "string" && mcpAuthTypes.includes(value);
@@ -2735,6 +2802,7 @@ import {
   StaticPrivateKeyJwtProvider,
   createPrivateKeyJwtAuth
 } from "@modelcontextprotocol/sdk/client/auth-extensions.js";
+import { UnauthorizedError } from "@modelcontextprotocol/sdk/client/auth.js";
 function normalizeServerUrl(serverUrl) {
   try {
     const u = new URL(serverUrl);
@@ -3193,36 +3261,39 @@ import { SSEClientTransport } from "@modelcontextprotocol/sdk/client/sse.js";
 import { StreamableHTTPClientTransport } from "@modelcontextprotocol/sdk/client/streamableHttp.js";
 var mcpTransportTypes = ["stdio", "sse", "streamable-http"];
 var mcpServerConfigSchema = {
-  transport: {
-    type: "string",
-    enum: mcpTransportTypes,
-    title: "Transport",
-    description: "The transport type to use for connecting to the MCP server"
-  },
-  server_url: {
-    type: "string",
-    format: "string:uri",
-    title: "Server URL",
-    description: "The URL of the MCP server (for sse and streamable-http transports)"
-  },
-  command: {
-    type: "string",
-    title: "Command",
-    description: "The command to run (for stdio transport)"
-  },
-  args: {
-    type: "array",
-    items: { type: "string" },
-    title: "Arguments",
-    description: "Command arguments (for stdio transport)"
-  },
-  env: {
-    type: "object",
-    additionalProperties: { type: "string" },
-    title: "Environment",
-    description: "Environment variables (for stdio transport)"
+  properties: {
+    transport: {
+      type: "string",
+      enum: mcpTransportTypes,
+      title: "Transport",
+      description: "The transport type to use for connecting to the MCP server"
+    },
+    server_url: {
+      type: "string",
+      format: "string:uri",
+      title: "Server URL",
+      description: "The URL of the MCP server (for sse and streamable-http transports)"
+    },
+    command: {
+      type: "string",
+      title: "Command",
+      description: "The command to run (for stdio transport)"
+    },
+    args: {
+      type: "array",
+      items: { type: "string" },
+      title: "Arguments",
+      description: "Command arguments (for stdio transport)"
+    },
+    env: {
+      type: "object",
+      additionalProperties: { type: "string" },
+      title: "Environment",
+      description: "Environment variables (for stdio transport)"
+    },
+    ...mcpAuthConfigSchema.properties
   },
-  ...mcpAuthConfigSchema
+  allOf: mcpAuthConfigSchema.allOf
 };
 async function createMcpClient(config, signal) {
   let transport;
@@ -3230,7 +3301,7 @@ async function createMcpClient(config, signal) {
   if (auth && auth.type !== "none") {
     auth = await resolveAuthSecrets(auth, getGlobalCredentialStore());
   }
-  const authProvider = auth && auth.type !== "none" && auth.type !== "bearer" ? createAuthProvider(auth, config.server_url ?? "", getGlobalCredentialStore()) : undefined;
+  const authProvider = config.authProvider ?? (auth && auth.type !== "none" && auth.type !== "bearer" ? createAuthProvider(auth, config.server_url ?? "", getGlobalCredentialStore()) : undefined);
   const headers = {
     ...auth?.type === "bearer" ? { Authorization: `Bearer ${auth.token}` } : {}
   };
@@ -3384,6 +3455,7 @@ export {
   Worker,
   WORKER_SERVER,
   WORKER_MANAGER,
+  UnauthorizedError,
   TypedArraySchema,
   TensorType,
   TensorSchema,
@@ -3414,4 +3486,4 @@ export {
   BaseError
 };
 
-//# debugId=8521DA6A86167CBD64756E2164756E21
+//# debugId=0CE726CD0D1049FD64756E2164756E21