@pnp/cli-microsoft365 11.8.0-beta.ae98113 → 11.9.0-beta.0365d84

package/dist/cli/cli.js

@@ -156,13 +156,30 @@ async function execute(rawArgs) {
                 break;
             }
             else {
-                const hasNonRequiredErrors = result.error.issues.some(i => i.code !== 'invalid_type');
                 const shouldPrompt = cli.getSettingWithDefaultValue(settingsNames.prompt, true);
-                if (hasNonRequiredErrors === false &&
-                    shouldPrompt) {
+                if (!shouldPrompt) {
+                    result.error.issues.forEach(e => {
+                        if (e.code === 'invalid_type' &&
+                            e.input === undefined) {
+                            e.message = `Required option not specified`;
+                        }
+                    });
+                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                }
+                const missingRequiredValuesErrors = result.error.issues
+                    .filter(e => (e.code === 'invalid_type' && e.input === undefined) ||
+                    (e.code === 'custom' && e.params?.customCode === 'required'));
+                const optionSetErrors = result.error.issues
+                    .filter(e => e.code === 'custom' && e.params?.customCode === 'optionSet');
+                const otherErrors = result.error.issues
+                    .filter(e => !missingRequiredValuesErrors.includes(e) && !optionSetErrors.includes(e));
+                if (otherErrors.length > 0) {
+                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                }
+                if (missingRequiredValuesErrors.length > 0) {
                     await cli.error('🌶️  Provide values for the following parameters:');
-                    for (const issue of result.error.issues) {
-                        const optionName = issue.path.join('.');
+                    for (const error of missingRequiredValuesErrors) {
+                        const optionName = error.path.join('.');
                         const optionInfo = cli.commandToExecute.options.find(o => o.name === optionName);
                         const answer = await cli.promptForValue(optionInfo);
                         // coerce the answer to the correct type
@@ -174,15 +191,13 @@ async function execute(rawArgs) {
                             return cli.closeWithError(e.message, cli.optionsFromArgs, true);
                         }
                     }
+                    continue;
                 }
-                else {
-                    result.error.issues.forEach(i => {
-                        if (i.code === 'invalid_type' &&
-                            i.input === undefined) {
-                            i.message = `Required option not specified`;
-                        }
-                    });
-                    return cli.closeWithError(result.error, cli.optionsFromArgs, true);
+                if (optionSetErrors.length > 0) {
+                    for (const error of optionSetErrors) {
+                        await promptForOptionSetNameAndValue(cli.optionsFromArgs, error.params?.options);
+                    }
+                    continue;
                 }
             }
         }
@@ -891,6 +906,27 @@ function loadOptionValuesFromFiles(args) {
 function shouldTrimOutput(output) {
     return output === 'text';
 }
+async function promptForOptionSetNameAndValue(args, options) {
+    await cli.error(`🌶️  Please specify one of the following options:`);
+    const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: options.map((choice) => { return { name: choice, value: choice }; }) });
+    const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
+    let coercedValue = optionValue;
+    // Basic type coercion to align with how CLI arguments are typically parsed
+    if (typeof optionValue === 'string') {
+        const trimmed = optionValue.trim();
+        if (trimmed === 'true') {
+            coercedValue = true;
+        }
+        else if (trimmed === 'false') {
+            coercedValue = false;
+        }
+        else if (trimmed !== '' && !isNaN(Number(trimmed))) {
+            coercedValue = Number(trimmed);
+        }
+    }
+    args.options[selectedOptionName] = coercedValue;
+    await cli.error('');
+}
 export const cli = {
     closeWithError,
     commands,

package/dist/index.js

@@ -13,6 +13,14 @@ await (async () => {
         const updateNotifier = await import('update-notifier');
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     }
-    await cli.execute(process.argv.slice(2));
+    try {
+        await cli.execute(process.argv.slice(2));
+    }
+    catch (err) {
+        if (err instanceof Error && err.name === 'ExitPromptError') {
+            process.exit(1);
+        }
+        await cli.closeWithError(err, cli.optionsFromArgs || { options: {} });
+    }
 })();
 //# sourceMappingURL=index.js.map

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -29,7 +29,10 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return schema
             .refine(options => !options.cardData || options.card, {
             error: 'When you specify cardData, you must also specify card.',
-            path: ['cardData']
+            path: ['cardData'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => {
             if (options.card) {

package/dist/m365/app/commands/permission/permission-add.js

@@ -30,7 +30,10 @@ class AppPermissionAddCommand extends AppCommand {
         return schema
             .refine(options => options.applicationPermissions || options.delegatedPermissions, {
             error: 'Specify at least one of applicationPermissions or delegatedPermissions, or both.',
-            path: ['delegatedPermissions']
+            path: ['delegatedPermissions'],
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/booking/commands/business/business-get.js

@@ -23,7 +23,11 @@ class BookingBusinessGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/commands/login.js

@@ -42,19 +42,32 @@ class LoginCommand extends Command {
         return schema
             .refine(options => typeof options.appId !== 'undefined' || cli.getClientId() || options.authType === 'identity' || options.authType === 'federatedIdentity', {
             error: `appId is required. TIP: use the "m365 setup" command to configure the default appId.`,
-            path: ['appId']
+            path: ['appId'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'password' || options.userName, {
             error: 'Username is required when using password authentication.',
-            path: ['userName']
+            path: ['userName'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'password' || options.password, {
             error: 'Password is required when using password authentication.',
-            path: ['password']
+            path: ['password'],
+            params: {
+                customCode: 'required'
+            }
         })
             .refine(options => options.authType !== 'certificate' || !(options.certificateFile && options.certificateBase64Encoded), {
             error: 'Specify either certificateFile or certificateBase64Encoded, but not both.',
-            path: ['certificateBase64Encoded']
+            path: ['certificateBase64Encoded'],
+            params: {
+                customCode: 'optionSet',
+                options: ['certificateFile', 'certificateBase64Encoded']
+            }
         })
             .refine(options => options.authType !== 'certificate' ||
             options.certificateFile ||
@@ -62,13 +75,20 @@ class LoginCommand extends Command {
             cli.getConfig().get(settingsNames.clientCertificateFile) ||
             cli.getConfig().get(settingsNames.clientCertificateBase64Encoded), {
             error: 'Specify either certificateFile or certificateBase64Encoded.',
-            path: ['certificateFile']
+            path: ['certificateFile'],
+            params: {
+                customCode: 'optionSet',
+                options: ['certificateFile', 'certificateBase64Encoded']
+            }
         })
             .refine(options => options.authType !== 'secret' ||
             options.secret ||
             cli.getConfig().get(settingsNames.clientSecret), {
             error: 'Secret is required when using secret authentication.',
-            path: ['secret']
+            path: ['secret'],
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-get.js

@@ -23,7 +23,11 @@ class EntraAdministrativeUnitGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.id, options.displayName].filter(Boolean).length === 1, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/administrativeunit/administrativeunit-remove.js

@@ -24,10 +24,18 @@ class EntraAdministrativeUnitRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => !(options.id && options.displayName), {
-            error: 'Specify either id or displayName but not both'
+            error: 'Specify either id or displayName but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/organization/organization-set.js

@@ -37,16 +37,27 @@ class EntraOrganizationSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.id && options.displayName), {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => [
             options.contactEmail, options.marketingNotificationEmails, options.securityComplianceNotificationMails, options.securityComplianceNotificationPhones,
             options.statementUrl, options.technicalNotificationMails
         ].filter(o => o !== undefined).length > 0, {
-            error: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails'
+            error: 'Specify at least one of the following options: contactEmail, marketingNotificationEmails, securityComplianceNotificationMails, securityComplianceNotificationPhones, statementUrl, or technicalNotificationMails',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/roleassignment/roleassignment-add.js

@@ -44,13 +44,21 @@ class EntraRoleAssignmentAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(o => o !== undefined).length === 1, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName'
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => Object.values([
             options.userId, options.userName, options.administrativeUnitId, options.administrativeUnitName, options.applicationId, options.applicationObjectId, options.applicationName,
             options.servicePrincipalId, options.servicePrincipalName, options.groupId, options.groupName
         ]).filter(v => typeof v !== 'undefined').length < 2, {
-            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName'
+            message: 'Provide value for only one of the following parameters: userId, userName, administrativeUnitId, administrativeUnitName, applicationId, applicationObjectId, applicationName, servicePrincipalId, servicePrincipalName, groupId or groupName',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName', 'administrativeUnitId', 'administrativeUnitName', 'applicationId', 'applicationObjectId', 'applicationName', 'servicePrincipalId', 'servicePrincipalName', 'groupId', 'groupName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/roledefinition/roledefinition-get.js

@@ -23,10 +23,18 @@ class EntraRoleDefinitionGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,

package/dist/m365/entra/commands/roledefinition/roledefinition-remove.js

@@ -25,10 +25,18 @@ class EntraRoleDefinitionRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,

package/dist/m365/entra/commands/roledefinition/roledefinition-set.js

@@ -28,17 +28,28 @@ class EntraRoleDefinitionSetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.displayName, {
-            error: 'Specify either id or displayName, but not both'
+            error: 'Specify either id or displayName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => options.id || options.displayName, {
-            error: 'Specify either id or displayName'
+            error: 'Specify either id or displayName',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'displayName']
+            }
         })
             .refine(options => (!options.id && !options.displayName) || options.displayName || (options.id && validation.isValidGuid(options.id)), {
             error: e => `The '${e.input}' must be a valid GUID`,
             path: ['id']
         })
             .refine(options => Object.values([options.newDisplayName, options.description, options.allowedResourceActions, options.enabled, options.version]).filter(v => typeof v !== 'undefined').length > 0, {
-            error: 'Provide value for at least one of the following parameters: newDisplayName, description, allowedResourceActions, enabled or version'
+            error: 'Provide value for at least one of the following parameters: newDisplayName, description, allowedResourceActions, enabled or version',
+            params: {
+                customCode: 'required'
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/entra/commands/user/user-session-revoke.js

@@ -27,7 +27,11 @@ class EntraUserSessionRevokeCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => [options.userId, options.userName].filter(o => o !== undefined).length === 1, {
-            error: `Specify either 'userId' or 'userName'.`
+            error: `Specify either 'userId' or 'userName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/exo/commands/approleassignment/approleassignment-add.js

@@ -39,20 +39,36 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.roleDefinitionId !== !options.roleDefinitionName, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName, but not both'
+            error: 'Specify either roleDefinitionId or roleDefinitionName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => options.roleDefinitionId || options.roleDefinitionName, {
-            error: 'Specify either roleDefinitionId or roleDefinitionName'
+            error: 'Specify either roleDefinitionId or roleDefinitionName',
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
         })
             .refine(options => (!options.roleDefinitionId && !options.roleDefinitionName) || options.roleDefinitionName || (options.roleDefinitionId && validation.isValidGuid(options.roleDefinitionId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
             path: ['roleDefinitionId']
         })
             .refine(options => !options.principalId !== !options.principalName, {
-            error: 'Specify either principalId or principalName, but not both'
+            error: 'Specify either principalId or principalName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'principalName']
+            }
         })
             .refine(options => options.principalId || options.principalName, {
-            error: 'Specify either principalId or principalName'
+            error: 'Specify either principalId or principalName',
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'principalName']
+            }
         })
             .refine(options => (!options.principalId && !options.principalName) || options.principalName || (options.principalId && validation.isValidGuid(options.principalId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -68,11 +84,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'user' || (!options.userId !== !options.userName), {
             message: "When the scope is set to 'user' specify either userId or userName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => options.scope !== 'user' || (options.userId || options.userName), {
             message: "When the scope is set to 'user' specify either userId or userName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         })
             .refine(options => options.scope !== 'user' || (!options.userId && !options.userName) || options.userName || (options.userId && validation.isValidGuid(options.userId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -88,11 +112,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'group' || (!options.groupId !== !options.groupName), {
             message: "When the scope is set to 'group' specify either groupId or groupName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
         })
             .refine(options => options.scope !== 'group' || (options.groupId || options.groupName), {
             message: "When the scope is set to 'group' specify either groupId or groupName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['groupId', 'groupName']
+            }
         })
             .refine(options => options.scope !== 'group' || (!options.groupId && !options.groupName) || options.groupName || (options.groupId && validation.isValidGuid(options.groupId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -104,11 +136,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'administrativeUnit' || (!options.administrativeUnitId !== !options.administrativeUnitName), {
             message: "When the scope is set to 'administrativeUnit' specify either administrativeUnitId or administrativeUnitName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
         })
             .refine(options => options.scope !== 'administrativeUnit' || (options.administrativeUnitId || options.administrativeUnitName), {
             message: "When the scope is set to 'administrativeUnit' specify either administrativeUnitId or administrativeUnitName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['administrativeUnitId', 'administrativeUnitName']
+            }
         })
             .refine(options => options.scope !== 'administrativeUnit' || (!options.administrativeUnitId && !options.administrativeUnitName) || options.administrativeUnitName || (options.administrativeUnitId && validation.isValidGuid(options.administrativeUnitId)), {
             error: e => `The '${e.input}' must be a valid GUID`,
@@ -120,11 +160,19 @@ class ExoAppRoleAssignmentAddCommand extends GraphCommand {
         })
             .refine(options => options.scope !== 'custom' || (!options.customAppScopeId !== !options.customAppScopeName), {
             message: "When the scope is set to 'custom' specify either customAppScopeId or customAppScopeName, but not both",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['customAppScopeId', 'customAppScopeName']
+            }
         })
             .refine(options => options.scope !== 'custom' || (options.customAppScopeId || options.customAppScopeName), {
             message: "When the scope is set to 'custom' specify either customAppScopeId or customAppScopeName",
-            path: ['scope']
+            path: ['scope'],
+            params: {
+                customCode: 'optionSet',
+                options: ['customAppScopeId', 'customAppScopeName']
+            }
         })
             .refine(options => options.scope !== 'custom' || (!options.customAppScopeId && !options.customAppScopeName) || options.customAppScopeName || (options.customAppScopeId && validation.isValidGuid(options.customAppScopeId)), {
             error: e => `The '${e.input}' must be a valid GUID`,

package/dist/m365/flow/commands/environment/environment-get.js

@@ -22,7 +22,11 @@ class FlowEnvironmentGetCommand extends PowerAutomateCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !!options.name !== !!options.default, {
-            error: `Specify either name or default, but not both.`
+            error: `Specify either name or default, but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['name', 'default']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-add.js

@@ -29,7 +29,11 @@ class GraphDirectoryExtensionAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         })
             .refine(options => (!options.appId && !options.appObjectId && !options.appName) || options.appObjectId || options.appName ||
             (options.appId && validation.isValidGuid(options.appId)), {

package/dist/m365/graph/commands/directoryextension/directoryextension-get.js

@@ -26,13 +26,25 @@ class GraphDirectoryExtensionGetCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.name, {
-            error: 'Specify either id or name, but not both'
+            error: 'Specify either id or name, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-list.js

@@ -27,7 +27,11 @@ class GraphDirectoryExtensionListCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => ([options.appId, options.appObjectId, options.appName].filter(x => x !== undefined).length <= 1), {
-            error: 'Specify either appId, appObjectId, or appName, but not multiple.'
+            error: 'Specify either appId, appObjectId, or appName, but not multiple.',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/graph/commands/directoryextension/directoryextension-remove.js

@@ -28,13 +28,25 @@ class GraphDirectoryExtensionRemoveCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !options.id !== !options.name, {
-            error: 'Specify either id or name, but not both'
+            error: 'Specify either id or name, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => options.id || options.name, {
-            error: 'Specify either id or name'
+            error: 'Specify either id or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'name']
+            }
         })
             .refine(options => Object.values([options.appId, options.appObjectId, options.appName]).filter(v => typeof v !== 'undefined').length === 1, {
-            error: 'Specify either appId, appObjectId or appName, but not multiple'
+            error: 'Specify either appId, appObjectId or appName, but not multiple',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'appObjectId', 'appName']
+            }
         });
     }
     async commandAction(logger, args) {

package/dist/m365/outlook/commands/mail/mail-searchfolder-add.js

@@ -31,7 +31,11 @@ class OutlookMailSearchFolderAddCommand extends GraphCommand {
     getRefinedSchema(schema) {
         return schema
             .refine(options => !(options.userId && options.userName), {
-            error: 'Specify either userId or userName, but not both'
+            error: 'Specify either userId or userName, but not both',
+            params: {
+                customCode: 'optionSet',
+                options: ['userId', 'userName']
+            }
         });
     }
     async commandAction(logger, args) {