@microsoft/teamsfx-core 2.0.0-alpha.2c2e7a109.0 → 2.0.0-alpha.34e31d6eb.0

package/build/core/question.js

@@ -1,26 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.confirmManifestNode = exports.selectEnvNode = exports.selectTeamsAppPackageQuestion = exports.selectTeamsAppManifestQuestion = exports.selectAadAppManifestQuestion = exports.createCapabilityForOfficeAddin = exports.CreateNewOfficeAddinOption = exports.botOptionItem = exports.BotIdsQuestion = exports.tabWebsiteUrlOptionItem = exports.tabContentUrlOptionItem = exports.tabsWebsitetUrlQuestion = exports.tabsContentUrlQuestion = exports.defaultTabLocalHostUrl = exports.ExistingTabEndpointQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.getRuntimeQuestion = exports.ScratchOptionNo = exports.ScratchOptionYes = exports.RuntimeOptionDotNet = exports.RuntimeOptionNodeJs = exports.ScratchOptionNoVSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.QuestionNewResourceGroupName = exports.newResourceGroupNameQuestion = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.QuestionSelectTargetEnvironment = exports.onChangeSelectionForCapabilities = exports.validateCapabilities = exports.createCapabilityQuestionPreview = exports.createCapabilityForDotNet = exports.createCapabilityQuestion = exports.validateConflict = exports.handleSelectionConflict = exports.ProgrammingLanguageQuestion = exports.ProgrammingLanguageQuestionForDotNet = exports.QuestionRootFolder = exports.DefaultAppNameFunc = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
+exports.confirmManifestNode = exports.selectEnvNode = exports.selectTeamsAppPackageQuestion = exports.selectTeamsAppManifestQuestion = exports.selectAadAppManifestQuestion = exports.createCapabilityForOfficeAddin = exports.CreateNewOfficeAddinOption = exports.botOptionItem = exports.BotIdsQuestion = exports.tabWebsiteUrlOptionItem = exports.tabContentUrlOptionItem = exports.tabsWebsitetUrlQuestion = exports.tabsContentUrlQuestion = exports.defaultTabLocalHostUrl = exports.ExistingTabEndpointQuestion = exports.SampleSelect = exports.getCreateNewOrFromSampleQuestion = exports.getRuntimeQuestion = exports.ScratchOptionNo = exports.ScratchOptionYes = exports.RuntimeOptionDotNet = exports.RuntimeOptionNodeJs = exports.ScratchOptionNoVSC = exports.ScratchOptionYesVSC = exports.QuestionNewResourceGroupLocation = exports.QuestionNewResourceGroupName = exports.newResourceGroupNameQuestion = exports.QuestionSelectResourceGroup = exports.QuestionSelectSourceEnvironment = exports.getQuestionNewTargetEnvironmentName = exports.QuestionSelectTargetEnvironment = exports.onChangeSelectionForCapabilities = exports.validateCapabilities = exports.getOutlookAddinTypeProjectQuestionNode = exports.getMessageExtensionTypeProjectQuestionNode = exports.getTabTypeProjectQuestionNode = exports.getBotProjectQuestionNode = exports.createNewProjectQuestionWith2Layers = exports.createCapabilityQuestionPreview = exports.createCapabilityForDotNet = exports.createCapabilityQuestion = exports.validateConflict = exports.handleSelectionConflict = exports.ProgrammingLanguageQuestion = exports.ProgrammingLanguageQuestionForDotNet = exports.QuestionRootFolder = exports.DefaultAppNameFunc = exports.createAppNameQuestion = exports.ProjectNamePattern = exports.CoreQuestionNames = void 0;
+exports.selectM365HostQuestion = exports.validateAadManifestContainsPlaceholder = exports.getQuestionForDeployAadManifest = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
+const fs = tslib_1.__importStar(require("fs-extra"));
+const jsonschema = tslib_1.__importStar(require("jsonschema"));
+const os = tslib_1.__importStar(require("os"));
+const path = tslib_1.__importStar(require("path"));
 /**
  * @author Huajie Zhang <zhjay23@qq.com>
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const jsonschema = tslib_1.__importStar(require("jsonschema"));
-const path = tslib_1.__importStar(require("path"));
-const fs = tslib_1.__importStar(require("fs-extra"));
-const os = tslib_1.__importStar(require("os"));
-const environment_1 = require("./environment");
 const constants_1 = require("../common/constants");
-const samples_1 = require("../common/samples");
-const tools_1 = require("../common/tools");
 const featureFlags_1 = require("../common/featureFlags");
 const localizeUtils_1 = require("../common/localizeUtils");
-const constants_2 = require("../component/constants");
+const constants_2 = require("../common/m365/constants");
+const samples_1 = require("../common/samples");
+const tools_1 = require("../common/tools");
+const constants_3 = require("../component/constants");
 const developerPortalScaffoldUtils_1 = require("../component/developerPortalScaffoldUtils");
 const question_1 = require("../component/generator/officeAddin/question");
+const environment_1 = require("./environment");
 var CoreQuestionNames;
 (function (CoreQuestionNames) {
     CoreQuestionNames["AppName"] = "app-name";
@@ -28,6 +30,7 @@ var CoreQuestionNames;
     CoreQuestionNames["Folder"] = "folder";
     CoreQuestionNames["ProjectPath"] = "projectPath";
     CoreQuestionNames["ProgrammingLanguage"] = "programming-language";
+    CoreQuestionNames["ProjectType"] = "project-type";
     CoreQuestionNames["Capabilities"] = "capabilities";
     CoreQuestionNames["Features"] = "features";
     CoreQuestionNames["Solution"] = "solution";
@@ -51,9 +54,12 @@ var CoreQuestionNames;
     CoreQuestionNames["TeamsAppManifestFilePath"] = "manifest-path";
     CoreQuestionNames["LocalTeamsAppManifestFilePath"] = "local-manifest-path";
     CoreQuestionNames["AadAppManifestFilePath"] = "aadAppManifestFilePath";
-    CoreQuestionNames["TeamsAppPackageFilePath"] = "teamsAppPackageFilePath";
+    CoreQuestionNames["TeamsAppPackageFilePath"] = "app-package-file-path";
     CoreQuestionNames["ConfirmManifest"] = "confirmManifest";
     CoreQuestionNames["ConfirmLocalManifest"] = "confirmLocalManifest";
+    CoreQuestionNames["OutputZipPathParamName"] = "output-zip-path";
+    CoreQuestionNames["OutputManifestParamName"] = "output-manifest-path";
+    CoreQuestionNames["M365Host"] = "m365-host";
 })(CoreQuestionNames = exports.CoreQuestionNames || (exports.CoreQuestionNames = {}));
 exports.ProjectNamePattern = '^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^"<>:\\?/*&|\u0000-\u001F]*[^"\\s.<>:\\?/*&|\u0000-\u001F]$';
 function createAppNameQuestion(defaultAppName, validateProjectPathExistence = true) {
@@ -142,7 +148,7 @@ exports.ProgrammingLanguageQuestion = {
             return [{ id: "csharp", label: "C#" }];
         }
         const capabilities = inputs[CoreQuestionNames.Capabilities];
-        if (capabilities && capabilities.includes && capabilities.includes(constants_2.TabSPFxItem().id))
+        if (capabilities && capabilities.includes && capabilities.includes(constants_3.TabSPFxItem().id))
             return [{ id: "typescript", label: "TypeScript" }];
         return [
             { id: "javascript", label: "JavaScript" },
@@ -153,17 +159,17 @@ exports.ProgrammingLanguageQuestion = {
     default: (inputs) => {
         if (featureFlags_1.isPreviewFeaturesEnabled()) {
             const capability = inputs[CoreQuestionNames.Capabilities];
-            if (capability && capability === constants_2.TabSPFxItem().id) {
+            if (capability && capability === constants_3.TabSPFxItem().id) {
                 return "typescript";
             }
             const feature = inputs[CoreQuestionNames.Features];
-            if (feature && feature === constants_2.TabSPFxItem().id) {
+            if (feature && feature === constants_3.TabSPFxItem().id) {
                 return "typescript";
             }
         }
         else {
             const capabilities = inputs[CoreQuestionNames.Capabilities];
-            if (capabilities && capabilities.includes && capabilities.includes(constants_2.TabSPFxItem().id))
+            if (capabilities && capabilities.includes && capabilities.includes(constants_3.TabSPFxItem().id))
                 return "typescript";
         }
         return "javascript";
@@ -171,17 +177,17 @@ exports.ProgrammingLanguageQuestion = {
     placeholder: (inputs) => {
         if (featureFlags_1.isPreviewFeaturesEnabled()) {
             const capability = inputs[CoreQuestionNames.Capabilities];
-            if (capability && capability === constants_2.TabSPFxItem().id) {
+            if (capability && capability === constants_3.TabSPFxItem().id) {
                 return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
             }
             const feature = inputs[CoreQuestionNames.Features];
-            if (feature && feature === constants_2.TabSPFxItem().id) {
+            if (feature && feature === constants_3.TabSPFxItem().id) {
                 return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
             }
         }
         else {
             const capabilities = inputs[CoreQuestionNames.Capabilities];
-            if (capabilities && capabilities.includes && capabilities.includes(constants_2.TabSPFxItem().id))
+            if (capabilities && capabilities.includes && capabilities.includes(constants_3.TabSPFxItem().id))
                 return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
         }
         return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder");
@@ -238,24 +244,24 @@ function createCapabilityQuestion() {
     if (featureFlags_1.isBotNotificationEnabled()) {
         // new capabilities question order
         const newBots = [
-            constants_2.NotificationOptionItem(),
-            constants_2.CommandAndResponseOptionItem(),
-            constants_2.WorkflowOptionItem(),
+            constants_3.NotificationOptionItem(),
+            constants_3.CommandAndResponseOptionItem(),
+            constants_3.WorkflowOptionItem(),
         ];
         staticOptions = [
             ...newBots,
-            ...(tools_1.isExistingTabAppEnabled() ? [constants_2.ExistingTabOptionItem()] : []),
-            ...(tools_1.isAadManifestEnabled() ? [constants_2.TabNonSsoItem()] : []),
-            ...[constants_2.TabNewUIOptionItem(), constants_2.TabSPFxNewUIItem(), constants_2.MessageExtensionNewUIItem()],
-            ...(tools_1.isM365AppEnabled() ? [constants_2.M365SsoLaunchPageOptionItem(), constants_2.M365SearchAppOptionItem()] : []),
+            ...(tools_1.isExistingTabAppEnabled() ? [constants_3.ExistingTabOptionItem()] : []),
+            ...(tools_1.isAadManifestEnabled() ? [constants_3.TabNonSsoItem()] : []),
+            ...[constants_3.TabNewUIOptionItem(), constants_3.TabSPFxNewUIItem(), constants_3.MessageExtensionNewUIItem()],
+            ...(tools_1.isM365AppEnabled() ? [constants_3.M365SsoLaunchPageOptionItem(), constants_3.M365SearchAppOptionItem()] : []),
         ];
     }
     else {
         staticOptions = [
-            ...[constants_2.TabOptionItem(), constants_2.BotOptionItem(), constants_2.MessageExtensionItem(), constants_2.TabSPFxItem()],
-            ...(tools_1.isAadManifestEnabled() ? [constants_2.TabNonSsoItem()] : []),
-            ...(tools_1.isExistingTabAppEnabled() ? [constants_2.ExistingTabOptionItem()] : []),
-            ...(tools_1.isM365AppEnabled() ? [constants_2.M365SsoLaunchPageOptionItem(), constants_2.M365SearchAppOptionItem()] : []),
+            ...[constants_3.TabOptionItem(), constants_3.BotOptionItem(), constants_3.MessageExtensionItem(), constants_3.TabSPFxItem()],
+            ...(tools_1.isAadManifestEnabled() ? [constants_3.TabNonSsoItem()] : []),
+            ...(tools_1.isExistingTabAppEnabled() ? [constants_3.ExistingTabOptionItem()] : []),
+            ...(tools_1.isM365AppEnabled() ? [constants_3.M365SsoLaunchPageOptionItem(), constants_3.M365SearchAppOptionItem()] : []),
         ];
     }
     return {
@@ -266,8 +272,8 @@ function createCapabilityQuestion() {
         type: "multiSelect",
         staticOptions: staticOptions,
         default: featureFlags_1.isBotNotificationEnabled()
-            ? [constants_2.CommandAndResponseOptionItem().id]
-            : [constants_2.TabOptionItem().id],
+            ? [constants_3.CommandAndResponseOptionItem().id]
+            : [constants_3.TabOptionItem().id],
         placeholder: localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder"),
         validation: {
             validFunc: validateCapabilities,
@@ -278,10 +284,10 @@ function createCapabilityQuestion() {
 exports.createCapabilityQuestion = createCapabilityQuestion;
 function createCapabilityForDotNet() {
     const staticOptions = [
-        constants_2.NotificationOptionItem(),
-        constants_2.CommandAndResponseOptionItem(),
-        constants_2.TabOptionItem(),
-        constants_2.MessageExtensionItem(),
+        constants_3.NotificationOptionItem(),
+        constants_3.CommandAndResponseOptionItem(),
+        constants_3.TabOptionItem(),
+        constants_3.MessageExtensionItem(),
     ];
     return {
         name: CoreQuestionNames.Capabilities,
@@ -294,10 +300,10 @@ function createCapabilityForDotNet() {
 exports.createCapabilityForDotNet = createCapabilityForDotNet;
 function createCapabilityQuestionPreview(inputs) {
     // AB test for notification/command/workflow bot, dashboard tab template naming
-    const notificationOptionItem = constants_2.NotificationOptionItem();
-    const commandAndResponseOptionItem = constants_2.CommandAndResponseOptionItem();
-    const workflowOptionItem = constants_2.WorkflowOptionItem();
-    const dashboardOptionItem = constants_2.DashboardOptionItem();
+    const notificationOptionItem = constants_3.NotificationOptionItem();
+    const commandAndResponseOptionItem = constants_3.CommandAndResponseOptionItem();
+    const workflowOptionItem = constants_3.WorkflowOptionItem();
+    const dashboardOptionItem = constants_3.DashboardOptionItem();
     // AB test for in product doc
     if (inputs === null || inputs === void 0 ? void 0 : inputs.inProductDoc) {
         workflowOptionItem.data = "cardActionResponse";
@@ -315,16 +321,16 @@ function createCapabilityQuestionPreview(inputs) {
     const staticOptions = [
         ...newBots,
         ...newTabs,
-        constants_2.TabNewUIOptionItem(),
-        constants_2.TabSPFxNewUIItem(),
-        constants_2.TabNonSsoItem(),
-        constants_2.BotNewUIOptionItem(),
-        constants_2.MessageExtensionNewUIItem(),
-        constants_2.M365SsoLaunchPageOptionItem(),
-        constants_2.M365SearchAppOptionItem(),
+        constants_3.TabNewUIOptionItem(),
+        constants_3.TabSPFxNewUIItem(),
+        constants_3.TabNonSsoItem(),
+        constants_3.BotNewUIOptionItem(),
+        constants_3.MessageExtensionNewUIItem(),
+        constants_3.M365SsoLaunchPageOptionItem(),
+        constants_3.M365SearchAppOptionItem(),
     ];
     if (tools_1.isExistingTabAppEnabled()) {
-        staticOptions.splice(newBots.length, 0, constants_2.ExistingTabOptionItem());
+        staticOptions.splice(newBots.length, 0, constants_3.ExistingTabOptionItem());
     }
     return {
         name: CoreQuestionNames.Capabilities,
@@ -336,6 +342,92 @@ function createCapabilityQuestionPreview(inputs) {
     };
 }
 exports.createCapabilityQuestionPreview = createCapabilityQuestionPreview;
+function createNewProjectQuestionWith2Layers(inputs) {
+    const staticOptions = [
+        constants_3.NewProjectTypeBotOptionItem(),
+        constants_3.NewProjectTypeTabOptionItem(),
+        constants_3.NewProjectTypeMessageExtensionOptionItem(),
+        constants_3.NewProjectTypeOutlookAddinOptionItem(),
+    ];
+    return {
+        name: CoreQuestionNames.ProjectType,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.title"),
+        type: "singleSelect",
+        staticOptions: staticOptions,
+        placeholder: localizeUtils_1.getLocalizedString("core.getCreateNewOrFromSampleQuestion.placeholder"),
+        forgetLastValue: true,
+    };
+}
+exports.createNewProjectQuestionWith2Layers = createNewProjectQuestionWith2Layers;
+function getBotProjectQuestionNode(inputs) {
+    const staticOptions = [
+        constants_3.BotNewUIOptionItem(),
+        constants_3.NotificationOptionItem(),
+        constants_3.CommandAndResponseOptionItem(),
+        constants_3.WorkflowOptionItem(),
+    ];
+    // AB test for in product doc
+    if (inputs === null || inputs === void 0 ? void 0 : inputs.inProductDoc) {
+        staticOptions[3].data = "cardActionResponse";
+        staticOptions[3].buttons = [
+            {
+                iconPath: "file-code",
+                tooltip: localizeUtils_1.getLocalizedString("core.option.inProduct"),
+                command: "fx-extension.openTutorial",
+            },
+        ];
+    }
+    return {
+        name: CoreQuestionNames.Capabilities,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.bot.title"),
+        type: "singleSelect",
+        staticOptions: staticOptions,
+        placeholder: localizeUtils_1.getLocalizedString("core.getCreateNewOrFromSampleQuestion.placeholder"),
+        forgetLastValue: true,
+    };
+}
+exports.getBotProjectQuestionNode = getBotProjectQuestionNode;
+function getTabTypeProjectQuestionNode(inputs) {
+    const staticOptions = [
+        constants_3.TabNonSsoItem(),
+        constants_3.M365SsoLaunchPageOptionItem(),
+        constants_3.DashboardOptionItem(),
+        constants_3.TabSPFxNewUIItem(),
+    ];
+    return {
+        name: CoreQuestionNames.Capabilities,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.tab.title"),
+        type: "singleSelect",
+        staticOptions: staticOptions,
+        placeholder: localizeUtils_1.getLocalizedString("core.getCreateNewOrFromSampleQuestion.placeholder"),
+        forgetLastValue: true,
+    };
+}
+exports.getTabTypeProjectQuestionNode = getTabTypeProjectQuestionNode;
+function getMessageExtensionTypeProjectQuestionNode(inputs) {
+    const staticOptions = [constants_3.M365SearchAppOptionItem(), constants_3.MessageExtensionNewUIItem()];
+    return {
+        name: CoreQuestionNames.Capabilities,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.title"),
+        type: "singleSelect",
+        staticOptions: staticOptions,
+        placeholder: localizeUtils_1.getLocalizedString("core.getCreateNewOrFromSampleQuestion.placeholder"),
+        forgetLastValue: true,
+    };
+}
+exports.getMessageExtensionTypeProjectQuestionNode = getMessageExtensionTypeProjectQuestionNode;
+function getOutlookAddinTypeProjectQuestionNode(inputs) {
+    const staticOptions = [...question_1.OfficeAddinItems(), question_1.ImportAddinProjectItem()];
+    return {
+        name: CoreQuestionNames.Capabilities,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title"),
+        type: "singleSelect",
+        staticOptions: staticOptions,
+        placeholder: localizeUtils_1.getLocalizedString("core.getCreateNewOrFromSampleQuestion.placeholder"),
+        forgetLastValue: true,
+    };
+}
+exports.getOutlookAddinTypeProjectQuestionNode = getOutlookAddinTypeProjectQuestionNode;
 function validateCapabilities(inputs) {
     if (inputs.length === 0) {
         return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder");
@@ -343,71 +435,71 @@ function validateCapabilities(inputs) {
     const set = new Set();
     inputs.forEach((i) => set.add(i));
     let result = validateConflict([
-        new Set([constants_2.BotOptionItem().id, constants_2.MessageExtensionItem().id]),
-        new Set([constants_2.NotificationOptionItem().id]),
-        new Set([constants_2.CommandAndResponseOptionItem().id]),
-        new Set([constants_2.WorkflowOptionItem().id]),
+        new Set([constants_3.BotOptionItem().id, constants_3.MessageExtensionItem().id]),
+        new Set([constants_3.NotificationOptionItem().id]),
+        new Set([constants_3.CommandAndResponseOptionItem().id]),
+        new Set([constants_3.WorkflowOptionItem().id]),
     ], set);
     if (result)
         return result;
     result = validateConflict([
         new Set([
-            constants_2.TabOptionItem().id,
-            constants_2.TabNonSsoItem().id,
-            constants_2.BotOptionItem().id,
-            constants_2.MessageExtensionItem().id,
-            constants_2.NotificationOptionItem().id,
-            constants_2.CommandAndResponseOptionItem().id,
-            constants_2.WorkflowOptionItem().id,
+            constants_3.TabOptionItem().id,
+            constants_3.TabNonSsoItem().id,
+            constants_3.BotOptionItem().id,
+            constants_3.MessageExtensionItem().id,
+            constants_3.NotificationOptionItem().id,
+            constants_3.CommandAndResponseOptionItem().id,
+            constants_3.WorkflowOptionItem().id,
         ]),
-        new Set([constants_2.TabSPFxItem().id]),
+        new Set([constants_3.TabSPFxItem().id]),
     ], set);
     if (result)
         return result;
-    result = validateConflict([new Set([constants_2.TabOptionItem().id]), new Set([constants_2.TabNonSsoItem().id])], set);
+    result = validateConflict([new Set([constants_3.TabOptionItem().id]), new Set([constants_3.TabNonSsoItem().id])], set);
     if (result)
         return result;
     result = validateConflict([
         new Set([
-            constants_2.TabOptionItem().id,
-            constants_2.TabNonSsoItem().id,
-            constants_2.TabSPFxItem().id,
-            constants_2.BotOptionItem().id,
-            constants_2.MessageExtensionItem().id,
-            constants_2.NotificationOptionItem().id,
-            constants_2.CommandAndResponseOptionItem().id,
-            constants_2.WorkflowOptionItem().id,
-            constants_2.ExistingTabOptionItem().id,
+            constants_3.TabOptionItem().id,
+            constants_3.TabNonSsoItem().id,
+            constants_3.TabSPFxItem().id,
+            constants_3.BotOptionItem().id,
+            constants_3.MessageExtensionItem().id,
+            constants_3.NotificationOptionItem().id,
+            constants_3.CommandAndResponseOptionItem().id,
+            constants_3.WorkflowOptionItem().id,
+            constants_3.ExistingTabOptionItem().id,
         ]),
-        new Set([constants_2.M365SsoLaunchPageOptionItem().id]),
-        new Set([constants_2.M365SearchAppOptionItem().id]),
+        new Set([constants_3.M365SsoLaunchPageOptionItem().id]),
+        new Set([constants_3.M365SearchAppOptionItem().id]),
     ], set);
     return result;
 }
 exports.validateCapabilities = validateCapabilities;
 async function onChangeSelectionForCapabilities(currentSelectedIds, previousSelectedIds) {
     let result = handleSelectionConflict([
-        new Set([constants_2.BotOptionItem().id, constants_2.MessageExtensionItem().id]),
-        new Set([constants_2.NotificationOptionItem().id]),
-        new Set([constants_2.CommandAndResponseOptionItem().id]),
-        new Set([constants_2.WorkflowOptionItem().id]),
+        new Set([constants_3.BotOptionItem().id, constants_3.MessageExtensionItem().id]),
+        new Set([constants_3.NotificationOptionItem().id]),
+        new Set([constants_3.CommandAndResponseOptionItem().id]),
+        new Set([constants_3.WorkflowOptionItem().id]),
     ], previousSelectedIds, currentSelectedIds);
     result = handleSelectionConflict([
         new Set([
-            constants_2.TabOptionItem().id,
-            constants_2.TabNonSsoItem().id,
-            constants_2.BotOptionItem().id,
-            constants_2.MessageExtensionItem().id,
-            constants_2.NotificationOptionItem().id,
-            constants_2.CommandAndResponseOptionItem().id,
-            constants_2.WorkflowOptionItem().id,
+            constants_3.TabOptionItem().id,
+            constants_3.TabNonSsoItem().id,
+            constants_3.BotOptionItem().id,
+            constants_3.MessageExtensionItem().id,
+            constants_3.NotificationOptionItem().id,
+            constants_3.CommandAndResponseOptionItem().id,
+            constants_3.WorkflowOptionItem().id,
         ]),
-        new Set([constants_2.TabSPFxItem().id]),
-        new Set([constants_2.ExistingTabOptionItem().id]),
-        new Set([constants_2.M365SsoLaunchPageOptionItem().id]),
-        new Set([constants_2.M365SearchAppOptionItem().id]),
+        new Set([constants_3.TabSPFxItem().id]),
+        new Set([constants_3.ExistingTabOptionItem().id]),
+        new Set([constants_3.M365SsoLaunchPageOptionItem().id]),
+        new Set([constants_3.M365SearchAppOptionItem().id]),
     ], previousSelectedIds, result);
-    result = handleSelectionConflict([new Set([constants_2.TabOptionItem().id]), new Set([constants_2.TabNonSsoItem().id])], previousSelectedIds, result);
+    result = handleSelectionConflict([new Set([constants_3.TabOptionItem().id]), new Set([constants_3.TabNonSsoItem().id])], previousSelectedIds, result);
     return result;
 }
 exports.onChangeSelectionForCapabilities = onChangeSelectionForCapabilities;
@@ -799,7 +891,9 @@ function selectTeamsAppManifestQuestion(inputs, isLocal = false) {
         },
     };
     const res = new teamsfx_api_1.QTreeNode(teamsAppManifestNode);
-    if (inputs.platform !== teamsfx_api_1.Platform.CLI_HELP) {
+    if (inputs.platform !== teamsfx_api_1.Platform.CLI_HELP &&
+        inputs.platform !== teamsfx_api_1.Platform.CLI &&
+        inputs.platform !== teamsfx_api_1.Platform.VS) {
         const manifestPath = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, isLocal ? "manifest.local.json" : "manifest.json");
         const confirmNode = confirmManifestNode(manifestPath, true, isLocal);
         res.addChild(confirmNode);
@@ -813,7 +907,7 @@ function selectTeamsAppPackageQuestion() {
         title: localizeUtils_1.getLocalizedString("core.selectTeamsAppPackageQuestion.title"),
         type: "singleFile",
         default: (inputs) => {
-            const appPackagePath = path.join(inputs.projectPath, teamsfx_api_1.BuildFolderName, teamsfx_api_1.AppPackageFolderName, "appPackage.dev.zip");
+            const appPackagePath = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.BuildFolderName, "appPackage.dev.zip");
             if (fs.pathExistsSync(appPackagePath)) {
                 return appPackagePath;
             }
@@ -824,8 +918,10 @@ function selectTeamsAppPackageQuestion() {
     };
 }
 exports.selectTeamsAppPackageQuestion = selectTeamsAppPackageQuestion;
-async function selectEnvNode(inputs) {
-    const envProfilesResult = await environment_1.environmentManager.listRemoteEnvConfigs(inputs.projectPath, true);
+async function selectEnvNode(inputs, isRemote = true) {
+    const envProfilesResult = isRemote
+        ? await environment_1.environmentManager.listRemoteEnvConfigs(inputs.projectPath, true)
+        : await environment_1.environmentManager.listAllEnvConfigs(inputs.projectPath);
     if (envProfilesResult.isErr()) {
         // If failed to load env, return undefined
         return undefined;
@@ -854,11 +950,16 @@ function confirmManifestNode(defaultManifestFilePath, isTeamsApp = true, isLocal
         return [
             {
                 id: "manifest",
-                label: isTeamsApp
+                label: `$(file) ${path.basename(isTeamsApp
                     ? inputs[isLocal
                         ? CoreQuestionNames.LocalTeamsAppManifestFilePath
                         : CoreQuestionNames.TeamsAppManifestFilePath]
-                    : inputs[CoreQuestionNames.AadAppManifestFilePath],
+                    : inputs[CoreQuestionNames.AadAppManifestFilePath])}`,
+                description: path.dirname(isTeamsApp
+                    ? inputs[isLocal
+                        ? CoreQuestionNames.LocalTeamsAppManifestFilePath
+                        : CoreQuestionNames.TeamsAppManifestFilePath]
+                    : inputs[CoreQuestionNames.AadAppManifestFilePath]),
             },
         ];
     };
@@ -869,4 +970,57 @@ function confirmManifestNode(defaultManifestFilePath, isTeamsApp = true, isLocal
     return confirmManifestNode;
 }
 exports.confirmManifestNode = confirmManifestNode;
+async function getQuestionForDeployAadManifest(inputs) {
+    const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
+    if (isDynamicQuestion) {
+        const root = await getUpdateAadManifestQuestion(inputs);
+        return teamsfx_api_1.ok(root);
+    }
+    return teamsfx_api_1.ok(undefined);
+}
+exports.getQuestionForDeployAadManifest = getQuestionForDeployAadManifest;
+async function getUpdateAadManifestQuestion(inputs) {
+    // Teams app manifest select node
+    const aadAppSelectNode = selectAadAppManifestQuestion(inputs);
+    // Env select node
+    const envNode = await selectEnvNode(inputs, false);
+    if (!envNode) {
+        return aadAppSelectNode;
+    }
+    envNode.data.name = "env";
+    aadAppSelectNode.addChild(envNode);
+    envNode.condition = {
+        validFunc: validateAadManifestContainsPlaceholder,
+    };
+    return aadAppSelectNode;
+}
+async function validateAadManifestContainsPlaceholder(input, inputs) {
+    const aadManifestPath = inputs === null || inputs === void 0 ? void 0 : inputs[CoreQuestionNames.AadAppManifestFilePath];
+    const placeholderRegex = /\$\{\{ *[a-zA-Z0-9_.-]* *\}\}/g;
+    const regexObj = new RegExp(placeholderRegex);
+    try {
+        if (!aadManifestPath || !(await fs.pathExists(aadManifestPath))) {
+            return "Skip Current Question";
+        }
+        const manifest = await fs.readFile(aadManifestPath, constants_1.ConstantString.UTF8Encoding);
+        if (regexObj.test(manifest)) {
+            return undefined;
+        }
+    }
+    catch (e) {
+        return "Skip Current Question";
+    }
+    return "Skip Current Question";
+}
+exports.validateAadManifestContainsPlaceholder = validateAadManifestContainsPlaceholder;
+function selectM365HostQuestion() {
+    return new teamsfx_api_1.QTreeNode({
+        name: CoreQuestionNames.M365Host,
+        title: localizeUtils_1.getLocalizedString("core.M365HostQuestion.title"),
+        type: "singleSelect",
+        staticOptions: [constants_2.Hub.teams, constants_2.Hub.outlook, constants_2.Hub.office],
+        placeholder: localizeUtils_1.getLocalizedString("core.M365HostQuestion.placeholder"),
+    });
+}
+exports.selectM365HostQuestion = selectM365HostQuestion;
 //# sourceMappingURL=question.js.map