@microsoft/teamsfx-core 2.0.5 → 2.0.6-alpha.1e1beaa82.0

package/build/question/create.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.apiOperationQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
+exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.apiOperationQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -28,6 +28,7 @@ const error_2 = require("../error");
 const questionNames_1 = require("./questionNames");
 const util_1 = require("./util");
 const constants_3 = require("./constants");
+const correlator_1 = require("../common/correlator");
 class ScratchOptions {
     static yes() {
         return {
@@ -49,38 +50,38 @@ class ScratchOptions {
 }
 exports.ScratchOptions = ScratchOptions;
 class ProjectTypeOptions {
-    static tab() {
+    static tab(platform) {
         return {
             id: "tab-type",
-            label: `$(browser) ${localizeUtils_1.getLocalizedString("core.TabOption.label")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(browser) " : ""}${localizeUtils_1.getLocalizedString("core.TabOption.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.tab.detail"),
         };
     }
-    static bot() {
+    static bot(platform) {
         return {
             id: "bot-type",
-            label: `$(hubot) ${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.bot.label")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(hubot) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.bot.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.bot.detail"),
         };
     }
-    static me() {
+    static me(platform) {
         return {
             id: "me-type",
-            label: `$(symbol-keyword) ${localizeUtils_1.getLocalizedString("core.MessageExtensionOption.label")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(symbol-keyword) " : ""}${localizeUtils_1.getLocalizedString("core.MessageExtensionOption.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.detail"),
         };
     }
-    static outlookAddin() {
+    static outlookAddin(platform) {
         return {
             id: "outlook-addin-type",
-            label: `$(mail) ${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.label")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(mail) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.detail"),
         };
     }
-    static copilotPlugin() {
+    static copilotPlugin(platform) {
         return {
             id: "copilot-plugin-type",
-            label: `$(sparkle) ${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(sparkle) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.detail"),
         };
     }
@@ -88,10 +89,10 @@ class ProjectTypeOptions {
 exports.ProjectTypeOptions = ProjectTypeOptions;
 function projectTypeQuestion() {
     const staticOptions = [
-        ProjectTypeOptions.bot(),
-        ProjectTypeOptions.tab(),
-        ProjectTypeOptions.me(),
-        ProjectTypeOptions.outlookAddin(),
+        ProjectTypeOptions.bot(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.tab(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.me(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.outlookAddin(teamsfx_api_1.Platform.CLI),
     ];
     return {
         name: questionNames_1.QuestionNames.ProjectType,
@@ -101,19 +102,19 @@ function projectTypeQuestion() {
         dynamicOptions: (inputs) => {
             var _a;
             let staticOptions;
-            if (featureFlags_1.isCopilotPluginEnabled()) {
+            if (featureFlags_1.isApiCopilotPluginEnabled()) {
                 staticOptions = [
-                    ProjectTypeOptions.copilotPlugin(),
-                    ProjectTypeOptions.bot(),
-                    ProjectTypeOptions.tab(),
-                    ProjectTypeOptions.me(),
+                    ProjectTypeOptions.copilotPlugin(inputs.platform),
+                    ProjectTypeOptions.bot(inputs.platform),
+                    ProjectTypeOptions.tab(inputs.platform),
+                    ProjectTypeOptions.me(inputs.platform),
                 ];
             }
             else {
                 staticOptions = [
-                    ProjectTypeOptions.bot(),
-                    ProjectTypeOptions.tab(),
-                    ProjectTypeOptions.me(),
+                    ProjectTypeOptions.bot(inputs.platform),
+                    ProjectTypeOptions.tab(inputs.platform),
+                    ProjectTypeOptions.me(inputs.platform),
                 ];
             }
             if (developerPortalScaffoldUtils_1.isFromDevPortal(inputs)) {
@@ -123,7 +124,7 @@ function projectTypeQuestion() {
                 }
             }
             else {
-                staticOptions.push(ProjectTypeOptions.outlookAddin());
+                staticOptions.push(ProjectTypeOptions.outlookAddin(inputs.platform));
             }
             return staticOptions;
         },
@@ -266,6 +267,21 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlook"),
         };
     }
+    static copilotM365SearchMe() {
+        return {
+            id: "search-me-copilot",
+            label: `${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
+            detail: localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlookCopilot"),
+        };
+    }
+    static SearchMe() {
+        return {
+            id: "search-message-extension",
+            label: `${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
+            detail: localizeUtils_1.getLocalizedString("core.SearchAppOptionItem.detail"),
+        };
+    }
     static collectFormMe() {
         return {
             id: "collect-form-message-extension",
@@ -282,21 +298,13 @@ class CapabilityOptions {
         };
     }
     static bots(inputs) {
-        return inputs !== undefined && getRuntime(inputs) === RuntimeOptions.DotNet().id
-            ? // currently no ai bot for dotnet
-                [
-                    CapabilityOptions.basicBot(),
-                    CapabilityOptions.notificationBot(),
-                    CapabilityOptions.commandBot(),
-                    CapabilityOptions.workflowBot(inputs),
-                ]
-            : [
-                CapabilityOptions.basicBot(),
-                CapabilityOptions.aiBot(),
-                CapabilityOptions.notificationBot(),
-                CapabilityOptions.commandBot(),
-                CapabilityOptions.workflowBot(inputs),
-            ];
+        return [
+            CapabilityOptions.basicBot(),
+            CapabilityOptions.aiBot(),
+            CapabilityOptions.notificationBot(),
+            CapabilityOptions.commandBot(),
+            CapabilityOptions.workflowBot(inputs),
+        ];
     }
     static tabs() {
         return [
@@ -312,15 +320,47 @@ class CapabilityOptions {
             ...CapabilityOptions.bots(inputs),
             CapabilityOptions.nonSsoTab(),
             CapabilityOptions.tab(),
-            ...CapabilityOptions.mes(),
+            ...CapabilityOptions.mes(inputs),
         ];
     }
-    static mes() {
-        return [
-            CapabilityOptions.linkUnfurling(),
-            CapabilityOptions.m365SearchMe(),
-            CapabilityOptions.collectFormMe(),
-        ];
+    /**
+     * Collect all capabilities for message extension, including dotnet and nodejs.
+     * @param filterByFeatureFlag true: filter capabilities by feature flag, false: return all capabilities
+     * @returns OptionItem[] capability list
+     */
+    static collectMECaps(filterByFeatureFlag) {
+        return filterByFeatureFlag
+            ? [
+                CapabilityOptions.linkUnfurling(),
+                ...(featureFlags_1.isCopilotPluginEnabled()
+                    ? [CapabilityOptions.copilotM365SearchMe()]
+                    : [CapabilityOptions.m365SearchMe(), CapabilityOptions.SearchMe()]),
+                CapabilityOptions.collectFormMe(),
+            ]
+            : [
+                CapabilityOptions.linkUnfurling(),
+                CapabilityOptions.m365SearchMe(),
+                CapabilityOptions.collectFormMe(),
+                CapabilityOptions.copilotM365SearchMe(),
+                CapabilityOptions.SearchMe(),
+            ];
+    }
+    static mes(inputs) {
+        return inputs !== undefined && getRuntime(inputs) === RuntimeOptions.DotNet().id
+            ? [
+                CapabilityOptions.linkUnfurling(),
+                featureFlags_1.isCopilotPluginEnabled()
+                    ? CapabilityOptions.copilotM365SearchMe()
+                    : CapabilityOptions.SearchMe(),
+                CapabilityOptions.collectFormMe(),
+            ]
+            : [
+                CapabilityOptions.linkUnfurling(),
+                featureFlags_1.isCopilotPluginEnabled()
+                    ? CapabilityOptions.copilotM365SearchMe()
+                    : CapabilityOptions.m365SearchMe(),
+                CapabilityOptions.collectFormMe(),
+            ];
     }
     static copilotPlugins() {
         return [
@@ -329,29 +369,36 @@ class CapabilityOptions {
             CapabilityOptions.copilotPluginOpenAIPlugin(),
         ];
     }
-    static copilotPluginCli() {
-        return {
-            id: "copilot-plugin-capability",
-            label: `${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.detail"),
-        };
+    /**
+     * static capability list, which does not depend on any feature flags
+     */
+    static staticAll(inputs) {
+        const capabilityOptions = [
+            ...CapabilityOptions.bots(inputs),
+            ...CapabilityOptions.tabs(),
+            ...CapabilityOptions.collectMECaps(false),
+            ...CapabilityOptions.copilotPlugins(),
+        ];
+        return capabilityOptions;
     }
+    /**
+     * dynamic capability list, which depends on feature flags
+     */
     static all(inputs) {
         const capabilityOptions = [
             ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
-            ...CapabilityOptions.mes(),
+            ...CapabilityOptions.collectMECaps(true),
         ];
-        if (featureFlags_1.isCopilotPluginEnabled()) {
-            capabilityOptions.push(CapabilityOptions.copilotPluginCli());
+        if (featureFlags_1.isApiCopilotPluginEnabled()) {
+            capabilityOptions.push(...CapabilityOptions.copilotPlugins());
         }
         return capabilityOptions;
     }
     static officeAddinImport() {
         return {
-            id: "import-addin-project",
+            id: "import",
             label: localizeUtils_1.getLocalizedString("core.importAddin.label"),
-            cliName: "import",
             detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
         };
@@ -379,7 +426,7 @@ class CapabilityOptions {
     // copilot plugin
     static copilotPluginNewApi() {
         return {
-            id: "copilot-new-api",
+            id: constants_3.copilotPluginNewApiOptionId,
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.label"),
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.detail"),
         };
@@ -428,12 +475,12 @@ function capabilityQuestion() {
                     return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.titleNew");
             }
         },
-        cliDescription: "Specifies the Teams App capability.",
-        cliName: "capability",
+        cliDescription: "Specifies the Microsoft Teams App capability.",
+        cliName: questionNames_1.CliQuestionName.Capability,
         cliShortName: "c",
-        cliChoiceListCommand: "teamsfx list capabilities",
+        cliChoiceListCommand: "teamsfx list templates",
         type: "singleSelect",
-        staticOptions: CapabilityOptions.all(),
+        staticOptions: CapabilityOptions.staticAll(),
         dynamicOptions: (inputs) => {
             var _a;
             // from dev portal
@@ -447,6 +494,10 @@ function capabilityQuestion() {
             if (getRuntime(inputs) === RuntimeOptions.DotNet().id) {
                 return CapabilityOptions.dotnetCaps(inputs);
             }
+            if (inputs.nonInteractive && inputs.platform === teamsfx_api_1.Platform.CLI) {
+                //cli non-interactive mode the choice list is the same as staticOptions
+                return CapabilityOptions.all(inputs);
+            }
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             if (projectType === ProjectTypeOptions.bot().id) {
@@ -465,15 +516,7 @@ function capabilityQuestion() {
                 return CapabilityOptions.copilotPlugins();
             }
             else {
-                const capabilityOptions = [
-                    ...CapabilityOptions.bots(inputs),
-                    ...CapabilityOptions.tabs(),
-                    ...CapabilityOptions.mes(),
-                ];
-                if (featureFlags_1.isCopilotPluginEnabled()) {
-                    capabilityOptions.push(CapabilityOptions.copilotPluginCli());
-                }
-                return capabilityOptions;
+                return CapabilityOptions.all(inputs);
             }
         },
         placeholder: (inputs) => {
@@ -486,6 +529,7 @@ function capabilityQuestion() {
         skipSingleOption: true,
     };
 }
+exports.capabilityQuestion = capabilityQuestion;
 var HostType;
 (function (HostType) {
     HostType["AppService"] = "app-service";
@@ -501,7 +545,6 @@ class NotificationTriggerOptions {
             id: "http-restify",
             hostType: HostType.AppService,
             label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-restify.label"),
-            cliName: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-restify.cliName"),
             description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-restify.description"),
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-restify.detail"),
         };
@@ -511,7 +554,6 @@ class NotificationTriggerOptions {
             id: "http-webapi",
             hostType: HostType.AppService,
             label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-webapi.label"),
-            cliName: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-webapi.cliName"),
             description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-webapi.description"),
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-webapi.detail"),
         };
@@ -523,7 +565,6 @@ class NotificationTriggerOptions {
             hostType: HostType.Functions,
             triggers: [NotificationTriggers.TIMER],
             label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.label"),
-            cliName: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.cliName"),
             description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.description"),
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.detail"),
         };
@@ -534,7 +575,6 @@ class NotificationTriggerOptions {
             hostType: HostType.Functions,
             triggers: [NotificationTriggers.HTTP, NotificationTriggers.TIMER],
             label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.label"),
-            cliName: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.cliName"),
             description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.description"),
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.detail"),
         };
@@ -545,7 +585,6 @@ class NotificationTriggerOptions {
             hostType: HostType.Functions,
             triggers: [NotificationTriggers.HTTP],
             label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.label"),
-            cliName: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.cliName"),
             description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.description"),
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.detail"),
         };
@@ -606,22 +645,13 @@ function botTriggerQuestion() {
         placeholder: localizeUtils_1.getLocalizedString("plugins.bot.questionHostTypeTrigger.placeholder"),
     };
 }
-function copilotPluginDevelopmentQuestion() {
-    return {
-        name: questionNames_1.QuestionNames.CopilotPluginDevelopment,
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.title"),
-        type: "singleSelect",
-        staticOptions: CapabilityOptions.copilotPlugins(),
-        cliShortName: "cp",
-    };
-}
 function SPFxSolutionQuestion() {
     return {
         type: "singleSelect",
         name: questionNames_1.QuestionNames.SPFxSolution,
         title: localizeUtils_1.getLocalizedString("plugins.spfx.questions.spfxSolution.title"),
         cliDescription: "Create a new or import an existing SharePoint Framework solution.",
-        cliShortName: "ss",
+        cliShortName: "s",
         staticOptions: [
             {
                 id: "new",
@@ -672,19 +702,18 @@ function SPFxPackageSelectQuestion() {
         },
         default: SPFxVersionOptionIds.installLocally,
         validation: {
-            validFunc: async (input, previousInputs) => {
+            validFunc: (input, previousInputs) => {
                 if (input === SPFxVersionOptionIds.globalPackage) {
                     const hasPackagesInstalled = !!previousInputs &&
                         !!previousInputs.globalSpfxPackageVersion &&
                         !!previousInputs.globalYeomanPackageVersion;
                     if (!hasPackagesInstalled) {
-                        throw error_1.DevEnvironmentSetupError();
+                        return Promise.reject(error_1.DevEnvironmentSetupError());
                     }
                 }
-                return undefined;
+                return Promise.resolve(undefined);
             },
         },
-        cliShortName: "sp",
         isBoolean: true,
     };
 }
@@ -693,7 +722,8 @@ function SPFxFrameworkQuestion() {
     return {
         type: "singleSelect",
         name: questionNames_1.QuestionNames.SPFxFramework,
-        cliShortName: "sfk",
+        cliShortName: "k",
+        cliDescription: "Framework.",
         title: localizeUtils_1.getLocalizedString("plugins.spfx.questions.framework.title"),
         staticOptions: [
             { id: "react", label: "React" },
@@ -708,8 +738,9 @@ function SPFxWebpartNameQuestion() {
     return {
         type: "text",
         name: questionNames_1.QuestionNames.SPFxWebpartName,
-        cliShortName: "sw",
-        title: "Name for SharePoint Framework Web Part.",
+        cliShortName: "w",
+        cliDescription: "Name for SharePoint Framework Web Part.",
+        title: localizeUtils_1.getLocalizedString("plugins.spfx.questions.webpartName"),
         default: constants_2.Constants.DEFAULT_WEBPART_NAME,
         validation: {
             validFunc: async (input, previousInputs) => {
@@ -744,7 +775,6 @@ function SPFxImportFolderQuestion(hasDefaultFunc = false) {
     return {
         type: "folder",
         name: questionNames_1.QuestionNames.SPFxFolder,
-        cliShortName: "sf",
         title: localizeUtils_1.getLocalizedString("core.spfxFolder.title"),
         cliDescription: "Directory or Path that contains the existing SharePoint Framework solution.",
         placeholder: localizeUtils_1.getLocalizedString("core.spfxFolder.placeholder"),
@@ -773,7 +803,7 @@ function officeAddinHostingQuestion() {
         name: questionNames_1.QuestionNames.OfficeAddinHost,
         title: "Add-in Host",
         staticOptions: [],
-        dynamicOptions: async (inputs) => {
+        dynamicOptions: (inputs) => {
             const template = exports.getTemplate(inputs);
             const getHostTemplateNames = officeAddinJsonData.getHostTemplateNames(template);
             const options = getHostTemplateNames.map((host) => ({
@@ -782,7 +812,7 @@ function officeAddinHostingQuestion() {
             }));
             return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
         },
-        default: async (inputs) => {
+        default: (inputs) => {
             const template = exports.getTemplate(inputs);
             const options = officeAddinJsonData.getHostTemplateNames(template);
             return options[0] || "No Options";
@@ -791,6 +821,7 @@ function officeAddinHostingQuestion() {
     };
     return OfficeHostQuestion;
 }
+exports.officeAddinHostingQuestion = officeAddinHostingQuestion;
 const officeAddinJsonData = new projectsJsonData_1.default();
 function getLanguageOptions(inputs) {
     const runtime = getRuntime(inputs);
@@ -865,17 +896,22 @@ function programmingLanguageQuestion() {
     return programmingLanguageQuestion;
 }
 exports.programmingLanguageQuestion = programmingLanguageQuestion;
-function rootFolderQuestion() {
+function folderQuestion() {
     return {
         type: "folder",
         name: questionNames_1.QuestionNames.Folder,
         cliShortName: "f",
-        title: localizeUtils_1.getLocalizedString("core.question.workspaceFolder.title"),
-        cliDescription: "Root folder of the project.",
+        title: (inputs) => teamsfx_api_1.CLIPlatforms.includes(inputs.platform)
+            ? "Directory where the project folder will be created in"
+            : localizeUtils_1.getLocalizedString("core.question.workspaceFolder.title"),
+        cliDescription: "Directory where the project folder will be created in.",
         placeholder: localizeUtils_1.getLocalizedString("core.question.workspaceFolder.placeholder"),
-        default: path.join(os.homedir(), constants_1.ConstantString.RootFolder),
+        default: (inputs) => teamsfx_api_1.CLIPlatforms.includes(inputs.platform)
+            ? "./"
+            : path.join(os.homedir(), constants_1.ConstantString.RootFolder),
     };
 }
+exports.folderQuestion = folderQuestion;
 exports.AppNamePattern = '^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^"<>:\\?/*&|\u0000-\u001F]*[^"\\s.<>:\\?/*&|\u0000-\u001F]$';
 function appNameQuestion() {
     const question = {
@@ -936,8 +972,9 @@ function sampleSelectQuestion() {
         type: "singleSelect",
         name: questionNames_1.QuestionNames.Samples,
         cliName: "sample-name",
-        cliDescription: "Specifies the Teams App sample name.",
+        cliDescription: "Specifies the Microsoft Teams App sample name.",
         cliChoiceListCommand: "teamsfx list samples",
+        skipValidation: true,
         cliType: "argument",
         title: localizeUtils_1.getLocalizedString("core.SampleSelect.title"),
         staticOptions: samples_1.sampleProvider.SampleCollection.samples.map((sample) => {
@@ -994,6 +1031,7 @@ function runtimeQuestion() {
         staticOptions: [RuntimeOptions.NodeJS(), RuntimeOptions.DotNet()],
         default: RuntimeOptions.NodeJS().id,
         placeholder: localizeUtils_1.getLocalizedString("core.getRuntimeQuestion.placeholder"),
+        cliHidden: true,
     };
 }
 const defaultTabLocalHostUrl = "https://localhost:53000/index.html#/tab";
@@ -1117,23 +1155,28 @@ function selectBotIdsQuestion() {
 }
 const maximumLengthOfDetailsErrorMessageInInputBox = 90;
 function apiSpecLocationQuestion(includeExistingAPIs = true) {
+    const correlationId = correlator_1.Correlator.getId(); // This is a workaround for VSCode which will loose correlation id when user accepts the value.
     const validationOnAccept = async (input, inputs) => {
         try {
+            if (!inputs) {
+                throw new Error("inputs is undefined"); // should never happen
+            }
             const context = utils_4.createContextV3();
-            const res = await helper_1.listOperations(context, undefined, input, inputs[questionNames_1.QuestionNames.ManifestPath], includeExistingAPIs, false);
+            const res = await helper_1.listOperations(context, undefined, input.trim(), inputs[questionNames_1.QuestionNames.ManifestPath], includeExistingAPIs, false, inputs.platform === teamsfx_api_1.Platform.VSCode ? correlationId : undefined);
             if (res.isOk()) {
                 inputs.supportedApisFromApiSpec = res.value;
             }
             else {
                 const errors = res.error;
+                if (inputs.platform === teamsfx_api_1.Platform.CLI) {
+                    return errors.map((e) => e.content).join("\n");
+                }
                 if (errors.length === 1 &&
                     errors[0].content.length <= maximumLengthOfDetailsErrorMessageInInputBox) {
                     return errors[0].content;
                 }
                 else {
-                    return inputs.platform === teamsfx_api_1.Platform.VSCode
-                        ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message")
-                        : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.message");
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.multipleValidationErrors.vscode.message");
                 }
             }
         }
@@ -1145,20 +1188,26 @@ function apiSpecLocationQuestion(includeExistingAPIs = true) {
     return {
         type: "singleFileOrText",
         name: questionNames_1.QuestionNames.ApiSpecLocation,
-        cliShortName: "oapi",
+        cliShortName: "a",
+        cliDescription: "OpenAPI specification file location.",
         title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.title"),
         forgetLastValue: true,
         inputBoxConfig: {
+            type: "innerText",
             title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.title"),
             placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.placeholder"),
             name: "input-api-spec-url",
             step: 2,
-            validation: async (input) => {
-                return util_1.isValidHttpUrl(input)
-                    ? undefined
-                    : localizeUtils_1.getLocalizedString("core.createProjectQuestion.invalidUrl.message");
+            validation: {
+                validFunc: (input, inputs) => {
+                    const result = util_1.isValidHttpUrl(input)
+                        ? undefined
+                        : (inputs === null || inputs === void 0 ? void 0 : inputs.platform) === teamsfx_api_1.Platform.CLI
+                            ? "Please enter a valid URL or local path of your API Specification"
+                            : localizeUtils_1.getLocalizedString("core.createProjectQuestion.invalidUrl.message");
+                    return Promise.resolve(result);
+                },
             },
-            additionalValidationOnAccept: validationOnAccept,
         },
         inputOptionItem: {
             id: "input",
@@ -1169,8 +1218,8 @@ function apiSpecLocationQuestion(includeExistingAPIs = true) {
         },
         validation: {
             validFunc: async (input, inputs) => {
-                if (input === "input") {
-                    return undefined;
+                if (!util_1.isValidHttpUrl(input) && !(await fs_extra_1.default.pathExists(input))) {
+                    return "Please enter a valid URL or local path of your API Specification";
                 }
                 return await validationOnAccept(input, inputs);
             },
@@ -1180,24 +1229,30 @@ function apiSpecLocationQuestion(includeExistingAPIs = true) {
 exports.apiSpecLocationQuestion = apiSpecLocationQuestion;
 function openAIPluginManifestLocationQuestion() {
     // export for unit test
+    const correlationId = correlator_1.Correlator.getId(); // This is a workaround for VSCode which will loose correlation id when user accepts the value.
     return {
         type: "text",
-        name: questionNames_1.QuestionNames.OpenAIPluginManifestLocation,
-        cliShortName: "oai",
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.AIPluginManifest.title"),
-        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.AIPluginManifest.placeholder"),
+        name: questionNames_1.QuestionNames.OpenAIPluginManifest,
+        cliShortName: "m",
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.OpenAIPluginDomain"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.OpenAIPluginDomain.placeholder"),
+        cliDescription: "OpenAI plugin website domain or manifest URL.",
         forgetLastValue: true,
         validation: {
-            validFunc: async (input) => {
-                const pattern = /(https?:\/\/)?([a-z0-9-]+(\.[a-z0-9-]+)*)(:[0-9]{1,5})?$/i;
+            validFunc: (input) => {
+                const pattern = /(https?:\/\/)?([a-z0-9-]+(\.[a-z0-9-]+)*)(:[0-9]{1,5})?(\/)?$/i;
                 const match = pattern.test(input);
-                return match
+                const result = match
                     ? undefined
-                    : localizeUtils_1.getLocalizedString("core.createProjectQuestion.invalidDomain.message");
+                    : localizeUtils_1.getLocalizedString("core.createProjectQuestion.invalidUrl.message");
+                return Promise.resolve(result);
             },
         },
         additionalValidationOnAccept: {
             validFunc: async (input, inputs) => {
+                if (!inputs) {
+                    throw new Error("inputs is undefined"); // should never happen
+                }
                 let manifest;
                 try {
                     manifest = await helper_1.OpenAIPluginManifestHelper.loadOpenAIPluginManifest(input);
@@ -1209,20 +1264,21 @@ function openAIPluginManifestLocationQuestion() {
                 }
                 const context = utils_4.createContextV3();
                 try {
-                    const res = await helper_1.listOperations(context, manifest, inputs[questionNames_1.QuestionNames.ApiSpecLocation], undefined, true, true);
+                    const res = await helper_1.listOperations(context, manifest, inputs[questionNames_1.QuestionNames.ApiSpecLocation], undefined, true, true, inputs.platform === teamsfx_api_1.Platform.VSCode ? correlationId : undefined);
                     if (res.isOk()) {
                         inputs.supportedApisFromApiSpec = res.value;
                     }
                     else {
                         const errors = res.error;
+                        if (inputs.platform === teamsfx_api_1.Platform.CLI) {
+                            return errors.map((e) => e.content).join("\n");
+                        }
                         if (errors.length === 1 &&
                             errors[0].content.length <= maximumLengthOfDetailsErrorMessageInInputBox) {
                             return errors[0].content;
                         }
                         else {
-                            return inputs.platform === teamsfx_api_1.Platform.VSCode
-                                ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.vscode.message")
-                                : localizeUtils_1.getLocalizedString("core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.message");
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.openAiPluginManifest.multipleValidationErrors.vscode.message");
                         }
                     }
                 }
@@ -1241,18 +1297,23 @@ function apiOperationQuestion(includeExistingAPIs = true) {
         type: "multiSelect",
         name: questionNames_1.QuestionNames.ApiOperation,
         title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.title"),
-        cliShortName: "api",
+        cliDescription: "Specifies API(s) to be used in Copilot plugin.",
+        cliShortName: "o",
         placeholder: includeExistingAPIs
             ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder")
             : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting"),
         forgetLastValue: true,
         staticOptions: [],
         validation: {
-            minItems: 1,
+            validFunc: (input) => {
+                if (input.length < 1 || input.length > 10) {
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.invalidMessage", input.length, 10);
+                }
+            },
         },
-        dynamicOptions: async (inputs) => {
+        dynamicOptions: (inputs) => {
             if (!inputs.supportedApisFromApiSpec) {
-                throw new error_2.EmptyOptionError();
+                throw new error_2.EmptyOptionError(questionNames_1.QuestionNames.ApiOperation, "question");
             }
             const operations = inputs.supportedApisFromApiSpec;
             return operations;
@@ -1260,14 +1321,6 @@ function apiOperationQuestion(includeExistingAPIs = true) {
     };
 }
 exports.apiOperationQuestion = apiOperationQuestion;
-function getCopilotPluginFeatureId(inputs) {
-    if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform)) {
-        return inputs[questionNames_1.QuestionNames.CopilotPluginDevelopment];
-    }
-    else {
-        return inputs[questionNames_1.QuestionNames.Capabilities];
-    }
-}
 function capabilitySubTree() {
     const node = {
         data: capabilityQuestion(),
@@ -1325,32 +1378,22 @@ function capabilitySubTree() {
                 },
                 data: officeAddinHostingQuestion(),
             },
-            {
-                // Copilot plugin sub-tree (will show in CLI only)
-                condition: (inputs) => {
-                    return (teamsfx_api_1.CLIPlatforms.includes(inputs.platform) &&
-                        inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginCli().id);
-                },
-                data: copilotPluginDevelopmentQuestion(),
-            },
             {
                 // Copilot plugin from API spec or AI Plugin
-                condition: (inputs) => {
-                    return constants_3.copilotPluginExistingApiOptionIds.includes(getCopilotPluginFeatureId(inputs));
+                condition: {
+                    enum: [
+                        CapabilityOptions.copilotPluginApiSpec().id,
+                        CapabilityOptions.copilotPluginOpenAIPlugin().id,
+                    ],
                 },
                 data: { type: "group", name: questionNames_1.QuestionNames.CopilotPluginExistingApi },
                 children: [
                     {
-                        condition: (inputs) => {
-                            return (getCopilotPluginFeatureId(inputs) === CapabilityOptions.copilotPluginApiSpec().id);
-                        },
+                        condition: { equals: CapabilityOptions.copilotPluginApiSpec().id },
                         data: apiSpecLocationQuestion(),
                     },
                     {
-                        condition: (inputs) => {
-                            return (getCopilotPluginFeatureId(inputs) ===
-                                CapabilityOptions.copilotPluginOpenAIPlugin().id);
-                        },
+                        condition: { equals: CapabilityOptions.copilotPluginOpenAIPlugin().id },
                         data: openAIPluginManifestLocationQuestion(),
                     },
                     {
@@ -1361,19 +1404,16 @@ function capabilitySubTree() {
             {
                 // programming language
                 data: programmingLanguageQuestion(),
-                condition: (inputs) => {
-                    const copilotFeature = getCopilotPluginFeatureId(inputs);
-                    if (copilotFeature) {
-                        return !constants_3.copilotPluginExistingApiOptionIds.includes(getCopilotPluginFeatureId(inputs));
-                    }
-                    else {
-                        return !!inputs[questionNames_1.QuestionNames.Capabilities];
-                    }
+                condition: {
+                    excludesEnum: [
+                        CapabilityOptions.copilotPluginApiSpec().id,
+                        CapabilityOptions.copilotPluginOpenAIPlugin().id,
+                    ],
                 },
             },
             {
                 // root folder
-                data: rootFolderQuestion(),
+                data: folderQuestion(),
             },
             {
                 // app name
@@ -1388,24 +1428,21 @@ function createProjectQuestionNode() {
     const createProjectQuestion = {
         data: { type: "group" },
         children: [
-            ...(featureFlags_1.isCLIDotNetEnabled()
-                ? [
-                    {
-                        condition: (inputs) => teamsfx_api_1.CLIPlatforms.includes(inputs.platform),
-                        data: runtimeQuestion(),
-                    },
-                ]
-                : []),
             {
-                condition: (inputs) => inputs.platform === teamsfx_api_1.Platform.VSCode,
+                condition: (inputs) => featureFlags_1.isCLIDotNetEnabled() && teamsfx_api_1.CLIPlatforms.includes(inputs.platform),
+                data: runtimeQuestion(),
+            },
+            {
+                condition: (inputs) => inputs.platform === teamsfx_api_1.Platform.VSCode || inputs.platform === teamsfx_api_1.Platform.CLI,
                 data: projectTypeQuestion(),
-                interactiveOnly: "self",
+                cliOptionDisabled: "self",
             },
             capabilitySubTree(),
             {
                 condition: (inputs) => inputs.teamsAppFromTdp && utils_2.isPersonalApp(inputs.teamsAppFromTdp),
                 data: { type: "group", name: questionNames_1.QuestionNames.RepalceTabUrl },
-                interactiveOnly: "all",
+                cliOptionDisabled: "all",
+                inputsDisabled: "all",
                 children: [
                     {
                         condition: (inputs) => {
@@ -1431,7 +1468,8 @@ function createProjectQuestionNode() {
                     return appDef && utils_2.needBotCode(appDef);
                 },
                 data: selectBotIdsQuestion(),
-                interactiveOnly: "all", //CLI non interactive mode will ignore this option
+                cliOptionDisabled: "all",
+                inputsDisabled: "all",
             },
         ],
     };
@@ -1443,7 +1481,7 @@ function createSampleProjectQuestionNode() {
         data: sampleSelectQuestion(),
         children: [
             {
-                data: rootFolderQuestion(),
+                data: folderQuestion(),
             },
         ],
     };
@@ -1462,9 +1500,8 @@ function createProjectCliHelpNode() {
     if (!featureFlags_1.isCLIDotNetEnabled()) {
         deleteNames.push(questionNames_1.QuestionNames.Runtime);
     }
-    if (!featureFlags_1.isCopilotPluginEnabled()) {
+    if (!featureFlags_1.isApiCopilotPluginEnabled()) {
         deleteNames.push(questionNames_1.QuestionNames.CopilotPluginExistingApi);
-        deleteNames.push(questionNames_1.QuestionNames.CopilotPluginDevelopment);
     }
     trimQuestionTreeForCliHelp(node, deleteNames);
     return node;