@workglow/util 0.0.117 → 0.0.119

package/dist/mcp/McpClientUtil.node.d.ts

@@ -9,104 +9,197 @@
 import { Client } from "@modelcontextprotocol/sdk/client";
 import type { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import type { McpAuthConfig } from "./McpAuthTypes";
+import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
 export declare const mcpTransportTypes: readonly ["stdio", "sse", "streamable-http"];
 export declare const mcpServerConfigSchema: {
-    readonly auth_type: {
-        readonly type: "string";
-        readonly enum: readonly ["none", "bearer", "client_credentials", "private_key_jwt", "static_private_key_jwt", "authorization_code"];
-        readonly title: "Auth Type";
-        readonly description: "Authentication method for connecting to the MCP server";
-        readonly default: "none";
-    };
-    readonly auth_token: {
-        readonly type: "string";
-        readonly format: "credential";
-        readonly title: "Bearer Token";
-        readonly description: "Static bearer token or API key (for bearer auth)";
-    };
-    readonly auth_client_id: {
-        readonly type: "string";
-        readonly title: "Client ID";
-        readonly description: "OAuth client ID (for OAuth auth types)";
-    };
-    readonly auth_client_secret: {
-        readonly type: "string";
-        readonly format: "credential";
-        readonly title: "Client Secret";
-        readonly description: "OAuth client secret (for client_credentials auth)";
-    };
-    readonly auth_private_key: {
-        readonly type: "string";
-        readonly format: "credential";
-        readonly title: "Private Key";
-        readonly description: "PEM or JWK private key (for private_key_jwt auth)";
-    };
-    readonly auth_algorithm: {
-        readonly type: "string";
-        readonly title: "Algorithm";
-        readonly description: "JWT signing algorithm, e.g. RS256, ES256 (for private_key_jwt auth)";
-    };
-    readonly auth_jwt_bearer_assertion: {
-        readonly type: "string";
-        readonly format: "credential";
-        readonly title: "JWT Assertion";
-        readonly description: "Pre-built JWT assertion (for static_private_key_jwt auth)";
-    };
-    readonly auth_redirect_url: {
-        readonly type: "string";
-        readonly format: "uri";
-        readonly title: "Redirect URL";
-        readonly description: "OAuth redirect URL (for authorization_code auth)";
-    };
-    readonly auth_scope: {
-        readonly type: "string";
-        readonly title: "Scope";
-        readonly description: "OAuth scope (space-separated)";
-    };
-    readonly auth_client_name: {
-        readonly type: "string";
-        readonly title: "Client Name";
-        readonly description: "Optional OAuth client display name";
-    };
-    readonly auth_jwt_lifetime_seconds: {
-        readonly type: "number";
-        readonly title: "JWT Lifetime";
-        readonly description: "JWT lifetime in seconds (default: 300)";
-        readonly minimum: 1;
-    };
-    readonly transport: {
-        readonly type: "string";
-        readonly enum: readonly ["stdio", "sse", "streamable-http"];
-        readonly title: "Transport";
-        readonly description: "The transport type to use for connecting to the MCP server";
-    };
-    readonly server_url: {
-        readonly type: "string";
-        readonly format: "string:uri";
-        readonly title: "Server URL";
-        readonly description: "The URL of the MCP server (for sse and streamable-http transports)";
-    };
-    readonly command: {
-        readonly type: "string";
-        readonly title: "Command";
-        readonly description: "The command to run (for stdio transport)";
-    };
-    readonly args: {
-        readonly type: "array";
-        readonly items: {
+    readonly properties: {
+        readonly auth_type: {
             readonly type: "string";
+            readonly enum: readonly ["none", "bearer", "client_credentials", "private_key_jwt", "static_private_key_jwt", "authorization_code"];
+            readonly title: "Auth Type";
+            readonly description: "Authentication method for connecting to the MCP server";
+            readonly default: "none";
         };
-        readonly title: "Arguments";
-        readonly description: "Command arguments (for stdio transport)";
-    };
-    readonly env: {
-        readonly type: "object";
-        readonly additionalProperties: {
+        readonly auth_token: {
+            readonly type: "string";
+            readonly format: "credential";
+            readonly title: "Bearer Token";
+            readonly description: "Static bearer token or API key (for bearer auth)";
+        };
+        readonly auth_client_id: {
+            readonly type: "string";
+            readonly title: "Client ID";
+            readonly description: "OAuth client ID (for OAuth auth types)";
+        };
+        readonly auth_client_secret: {
+            readonly type: "string";
+            readonly format: "credential";
+            readonly title: "Client Secret";
+            readonly description: "OAuth client secret (for client_credentials auth)";
+        };
+        readonly auth_private_key: {
+            readonly type: "string";
+            readonly format: "credential";
+            readonly title: "Private Key";
+            readonly description: "PEM or JWK private key (for private_key_jwt auth)";
+        };
+        readonly auth_algorithm: {
+            readonly type: "string";
+            readonly title: "Algorithm";
+            readonly description: "JWT signing algorithm, e.g. RS256, ES256 (for private_key_jwt auth)";
+        };
+        readonly auth_jwt_bearer_assertion: {
             readonly type: "string";
+            readonly format: "credential";
+            readonly title: "JWT Assertion";
+            readonly description: "Pre-built JWT assertion (for static_private_key_jwt auth)";
+        };
+        readonly auth_redirect_url: {
+            readonly type: "string";
+            readonly format: "uri";
+            readonly title: "Redirect URL";
+            readonly description: "OAuth redirect URL (for authorization_code auth)";
+        };
+        readonly auth_scope: {
+            readonly type: "string";
+            readonly title: "Scope";
+            readonly description: "OAuth scope (space-separated)";
+        };
+        readonly auth_client_name: {
+            readonly type: "string";
+            readonly title: "Client Name";
+            readonly description: "Optional OAuth client display name";
+        };
+        readonly auth_jwt_lifetime_seconds: {
+            readonly type: "number";
+            readonly title: "JWT Lifetime";
+            readonly description: "JWT lifetime in seconds (default: 300)";
+            readonly minimum: 1;
+        };
+        readonly transport: {
+            readonly type: "string";
+            readonly enum: readonly ["stdio", "sse", "streamable-http"];
+            readonly title: "Transport";
+            readonly description: "The transport type to use for connecting to the MCP server";
+        };
+        readonly server_url: {
+            readonly type: "string";
+            readonly format: "string:uri";
+            readonly title: "Server URL";
+            readonly description: "The URL of the MCP server (for sse and streamable-http transports)";
+        };
+        readonly command: {
+            readonly type: "string";
+            readonly title: "Command";
+            readonly description: "The command to run (for stdio transport)";
+        };
+        readonly args: {
+            readonly type: "array";
+            readonly items: {
+                readonly type: "string";
+            };
+            readonly title: "Arguments";
+            readonly description: "Command arguments (for stdio transport)";
+        };
+        readonly env: {
+            readonly type: "object";
+            readonly additionalProperties: {
+                readonly type: "string";
+            };
+            readonly title: "Environment";
+            readonly description: "Environment variables (for stdio transport)";
         };
-        readonly title: "Environment";
-        readonly description: "Environment variables (for stdio transport)";
     };
+    readonly allOf: readonly [{
+        readonly if: {
+            readonly properties: {
+                readonly auth_type: {
+                    readonly const: "bearer";
+                };
+            };
+            readonly required: readonly ["auth_type"];
+        };
+        readonly then: {
+            readonly required: readonly ["auth_token"];
+            readonly properties: {
+                readonly auth_token: true;
+            };
+        };
+    }, {
+        readonly if: {
+            readonly properties: {
+                readonly auth_type: {
+                    readonly const: "client_credentials";
+                };
+            };
+            readonly required: readonly ["auth_type"];
+        };
+        readonly then: {
+            readonly required: readonly ["auth_client_id", "auth_client_secret"];
+            readonly properties: {
+                readonly auth_client_id: true;
+                readonly auth_client_secret: true;
+                readonly auth_client_name: true;
+                readonly auth_scope: true;
+            };
+        };
+    }, {
+        readonly if: {
+            readonly properties: {
+                readonly auth_type: {
+                    readonly const: "private_key_jwt";
+                };
+            };
+            readonly required: readonly ["auth_type"];
+        };
+        readonly then: {
+            readonly required: readonly ["auth_client_id", "auth_private_key", "auth_algorithm"];
+            readonly properties: {
+                readonly auth_client_id: true;
+                readonly auth_private_key: true;
+                readonly auth_algorithm: true;
+                readonly auth_client_name: true;
+                readonly auth_jwt_lifetime_seconds: true;
+                readonly auth_scope: true;
+            };
+        };
+    }, {
+        readonly if: {
+            readonly properties: {
+                readonly auth_type: {
+                    readonly const: "static_private_key_jwt";
+                };
+            };
+            readonly required: readonly ["auth_type"];
+        };
+        readonly then: {
+            readonly required: readonly ["auth_client_id", "auth_jwt_bearer_assertion"];
+            readonly properties: {
+                readonly auth_client_id: true;
+                readonly auth_jwt_bearer_assertion: true;
+                readonly auth_client_name: true;
+                readonly auth_scope: true;
+            };
+        };
+    }, {
+        readonly if: {
+            readonly properties: {
+                readonly auth_type: {
+                    readonly const: "authorization_code";
+                };
+            };
+            readonly required: readonly ["auth_type"];
+        };
+        readonly then: {
+            readonly required: readonly ["auth_client_id", "auth_redirect_url"];
+            readonly properties: {
+                readonly auth_client_id: true;
+                readonly auth_client_secret: true;
+                readonly auth_redirect_url: true;
+                readonly auth_scope: true;
+            };
+        };
+    }];
 };
 export type McpTransportType = (typeof mcpTransportTypes)[number];
 export interface McpServerConfig {
@@ -117,6 +210,7 @@ export interface McpServerConfig {
     env?: Record<string, string>;
     auth?: McpAuthConfig;
     auth_type?: string;
+    authProvider?: OAuthClientProvider;
 }
 export declare function createMcpClient(config: McpServerConfig, signal?: AbortSignal): Promise<{
     client: Client;

package/dist/mcp/McpClientUtil.node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"McpClientUtil.node.d.ts","sourceRoot":"","sources":["../../src/mcp/McpClientUtil.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAM/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAEpD,eAAO,MAAM,iBAAiB,8CAA+C,CAAC;AAE9E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+BqB,CAAC;AAExD,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,aAAa,CAAC;IAErB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC,CAuGnD;AAED,eAAO,MAAM,gBAAgB;;CAE5B,CAAC"}
+{"version":3,"file":"McpClientUtil.node.d.ts","sourceRoot":"","sources":["../../src/mcp/McpClientUtil.node.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,MAAM,EAAE,MAAM,kCAAkC,CAAC;AAK1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAK/E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAEpF,eAAO,MAAM,iBAAiB,8CAA+C,CAAC;AAE9E,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkCxB,CAAC;AAEX,MAAM,MAAM,gBAAgB,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAElE,MAAM,WAAW,eAAe;IAC9B,SAAS,EAAE,gBAAgB,CAAC;IAC5B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,EAAE,aAAa,CAAC;IAErB,SAAS,CAAC,EAAE,MAAM,CAAC;IAEnB,YAAY,CAAC,EAAE,mBAAmB,CAAC;CACpC;AAED,wBAAsB,eAAe,CACnC,MAAM,EAAE,eAAe,EACvB,MAAM,CAAC,EAAE,WAAW,GACnB,OAAO,CAAC;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,SAAS,CAAA;CAAE,CAAC,CAwGnD;AAED,eAAO,MAAM,gBAAgB;;CAE5B,CAAC"}

package/dist/node.js

@@ -2579,69 +2579,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);
@@ -2734,6 +2801,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);
@@ -3192,36 +3260,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;
@@ -3229,7 +3300,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}` } : {}
   };
@@ -3404,6 +3475,7 @@ export {
   Worker,
   WORKER_SERVER,
   WORKER_MANAGER,
+  UnauthorizedError,
   TypedArraySchema,
   TensorType,
   TensorSchema,
@@ -3434,4 +3506,4 @@ export {
   BaseError
 };
 
-//# debugId=9CE6923D9740B9B864756E2164756E21
+//# debugId=C39DB93A7008D84764756E2164756E21