@microsoft/teamsfx-core 2.0.8-alpha.87f45d762.0 → 2.0.8-alpha.8da24c130.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.CustomCopilotAssistantOptions = exports.CustomCopilotRagOptions = exports.apiOperationQuestion = exports.apiMessageExtensionAuthQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.ApiMessageExtensionAuthOptions = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.getOfficeAddinFramework = exports.getAddinFrameworkOptions = exports.officeAddinFrameworkQuestion = exports.officeAddinHostingQuestion = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.OfficeAddinHostOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
+exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.CustomCopilotAssistantOptions = exports.CustomCopilotRagOptions = exports.apiOperationQuestion = exports.apiMessageExtensionAuthQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.ApiMessageExtensionAuthOptions = exports.RuntimeOptions = exports.appNameQuestion = exports.getSolutionName = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.getOfficeAddinFramework = exports.getAddinFrameworkOptions = exports.officeAddinFrameworkQuestion = exports.officeAddinHostingQuestion = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.OfficeAddinHostOptions = exports.projectTypeQuestion = 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"));
@@ -21,7 +21,6 @@ const utils_2 = require("../component/driver/teamsApp/utils/utils");
 const helper_1 = require("../component/generator/copilotPlugin/helper");
 const projectConfig_1 = require("../component/generator/officeXMLAddin/projectConfig");
 const error_1 = require("../component/generator/spfx/error");
-const spfxGenerator_1 = require("../component/generator/spfx/spfxGenerator");
 const constants_2 = require("../component/generator/spfx/utils/constants");
 const utils_3 = require("../component/generator/spfx/utils/utils");
 const utils_4 = require("../component/utils");
@@ -55,6 +54,7 @@ class ProjectTypeOptions {
             id: "tab-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(browser) " : ""}${localizeUtils_1.getLocalizedString("core.TabOption.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.tab.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static bot(platform) {
@@ -62,6 +62,7 @@ class ProjectTypeOptions {
             id: "bot-type",
             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"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static me(platform) {
@@ -71,6 +72,7 @@ class ProjectTypeOptions {
             detail: featureFlags_1.isCopilotPluginEnabled()
                 ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.copilotEnabled.detail")
                 : localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static outlookAddin(platform) {
@@ -78,6 +80,7 @@ class ProjectTypeOptions {
             id: "outlook-addin-type",
             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"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static officeXMLAddin(platform) {
@@ -85,6 +88,7 @@ class ProjectTypeOptions {
             id: "office-xml-addin-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(teamsfx-m365) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.title")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static officeAddin(platform) {
@@ -92,6 +96,7 @@ class ProjectTypeOptions {
             id: "office-addin-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(extensions) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static officeAddinAllIds(platform) {
@@ -106,6 +111,7 @@ class ProjectTypeOptions {
             id: "copilot-plugin-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(teamsfx-copilot-plugin) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
     static customCopilot(platform) {
@@ -113,6 +119,23 @@ class ProjectTypeOptions {
             id: "custom-copilot-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(teamsfx-custom-copilot) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.customCopilot.label")}`,
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.customCopilot.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
+        };
+    }
+    static startWithGithubCopilot() {
+        return {
+            id: "start-with-github-copilot",
+            label: `$(comment-discussion) ${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotHelp.label")}`,
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotHelp.detail"),
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotGroup.title"),
+        };
+    }
+    static customizeGpt() {
+        return {
+            id: "customize-gpt-type",
+            label: "Declarative Copilot",
+            detail: "Author a Declarative Copilot",
+            groupName: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.createGroup.title"),
         };
     }
 }
@@ -134,6 +157,11 @@ function projectTypeQuestion() {
         dynamicOptions: (inputs) => {
             var _a;
             const staticOptions = [];
+            if (teamsfx_api_1.CLIPlatforms.includes(inputs.platform) &&
+                featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.CustomizeGpt)) {
+                // Show in CLI only
+                staticOptions.push(ProjectTypeOptions.customizeGpt());
+            }
             if (featureFlags_1.isApiCopilotPluginEnabled()) {
                 staticOptions.push(ProjectTypeOptions.copilotPlugin(inputs.platform));
             }
@@ -146,11 +174,23 @@ function projectTypeQuestion() {
                 }
             }
             else {
-                staticOptions.push(featureFlags_1.isOfficeXMLAddinEnabled() && !featureFlags_1.isOfficeJSONAddinEnabled()
-                    ? ProjectTypeOptions.officeXMLAddin(inputs.platform)
-                    : featureFlags_1.isOfficeJSONAddinEnabled()
-                        ? ProjectTypeOptions.officeAddin(inputs.platform)
-                        : ProjectTypeOptions.outlookAddin(inputs.platform));
+                if (inputs.agent === "office") {
+                    //only for @office agent, officeXMLAddin are supported
+                    staticOptions.push(ProjectTypeOptions.officeXMLAddin(inputs.platform));
+                }
+                else {
+                    if (featureFlags_1.isOfficeJSONAddinEnabled()) {
+                        staticOptions.push(ProjectTypeOptions.officeAddin(inputs.platform));
+                    }
+                    else {
+                        staticOptions.push(ProjectTypeOptions.outlookAddin(inputs.platform));
+                    }
+                }
+            }
+            if (inputs.platform === teamsfx_api_1.Platform.VSCode &&
+                featureFlags_1.isChatParticipantEnabled() &&
+                !inputs.teamsAppFromTdp) {
+                staticOptions.push(ProjectTypeOptions.startWithGithubCopilot());
             }
             return staticOptions;
         },
@@ -159,6 +199,7 @@ function projectTypeQuestion() {
         skipSingleOption: true,
     };
 }
+exports.projectTypeQuestion = projectTypeQuestion;
 class OfficeAddinHostOptions {
     static all(platform) {
         return [
@@ -501,6 +542,9 @@ class CapabilityOptions {
             CapabilityOptions.nonSsoTabAndBot(),
         ];
     }
+    static customizeGptOptions() {
+        return [CapabilityOptions.customizeGptBasic(), CapabilityOptions.customizeGptWithPlugin()];
+    }
     /**
      * static capability list, which does not depend on any feature flags
      */
@@ -512,6 +556,7 @@ class CapabilityOptions {
             ...CapabilityOptions.copilotPlugins(),
             ...CapabilityOptions.customCopilots(),
             ...CapabilityOptions.tdpIntegrationCapabilities(),
+            ...CapabilityOptions.customizeGptOptions(),
         ];
         capabilityOptions.push(...CapabilityOptions.officeAddinStaticCapabilities());
         return capabilityOptions;
@@ -528,23 +573,15 @@ class CapabilityOptions {
         if (featureFlags_1.isApiCopilotPluginEnabled()) {
             capabilityOptions.push(...CapabilityOptions.copilotPlugins());
         }
+        if (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.CustomizeGpt)) {
+            capabilityOptions.push(...CapabilityOptions.customizeGptOptions());
+        }
         capabilityOptions.push(...CapabilityOptions.customCopilots());
         if (featureFlags_1.isTdpTemplateCliTestEnabled()) {
             // test templates that are used by TDP integration only
             capabilityOptions.push(...CapabilityOptions.tdpIntegrationCapabilities());
         }
         capabilityOptions.push(...CapabilityOptions.officeAddinDynamicCapabilities(inputs === null || inputs === void 0 ? void 0 : inputs.projectType, inputs === null || inputs === void 0 ? void 0 : inputs.host));
-        // if (isOfficeXMLAddinEnabled()) {
-        //   capabilityOptions.push(
-        //     ...[
-        //       ...CapabilityOptions.officeAddinStaticCapabilities("word"),
-        //       ...CapabilityOptions.officeAddinStaticCapabilities("excel"),
-        //       ...CapabilityOptions.officeAddinStaticCapabilities("powerpoint"),
-        //     ]
-        //   );
-        // } else {
-        //   capabilityOptions.push(...CapabilityOptions.officeAddinStaticCapabilities("json"));
-        // }
         return capabilityOptions;
     }
     static outlookAddinImport() {
@@ -664,6 +701,21 @@ class CapabilityOptions {
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantOption.detail"),
         };
     }
+    // customize GPT
+    static customizeGptBasic() {
+        return {
+            id: "basic-declarative-copilot",
+            label: "Basic Declarative Copilot",
+            detail: "A declarative Copilot skeleton you can author without any plugin",
+        };
+    }
+    static customizeGptWithPlugin() {
+        return {
+            id: "declarative-copilot-with-plugin-from-scratch",
+            label: "Declarative Copilot with a plugin using Azure Functions",
+            detail: "A declarative Copilot containing a Copilot plugin with a new API from Azure Functions",
+        };
+    }
 }
 exports.CapabilityOptions = CapabilityOptions;
 function capabilityQuestion() {
@@ -697,6 +749,8 @@ function capabilityQuestion() {
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.title");
                 case ProjectTypeOptions.customCopilot().id:
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.customCopilot.title");
+                case ProjectTypeOptions.customizeGpt().id:
+                    return "Choose Declarative Copilot type";
                 default:
                     return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.titleNew");
             }
@@ -744,6 +798,9 @@ function capabilityQuestion() {
             else if (projectType === ProjectTypeOptions.customCopilot().id) {
                 return CapabilityOptions.customCopilots();
             }
+            else if (projectType === ProjectTypeOptions.customizeGpt().id) {
+                return CapabilityOptions.customizeGptOptions();
+            }
             else {
                 return CapabilityOptions.all(inputs);
             }
@@ -1218,9 +1275,11 @@ function getLanguageOptions(inputs) {
         // SPFx only supports typescript
         return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
     }
-    else if (constants_3.capabilitiesHavePythonOption.includes(capabilities) &&
+    else if (constants_3.capabilitiesHavePythonOption.includes(inputs[capabilities] ? inputs[capabilities] : capabilities) &&
         !(capabilities == CapabilityOptions.customCopilotRag().id &&
-            inputs[CapabilityOptions.customCopilotRag().id] == CustomCopilotRagOptions.microsoft365().id)) {
+            (inputs[CapabilityOptions.customCopilotRag().id] ==
+                CustomCopilotRagOptions.microsoft365().id ||
+                inputs[CapabilityOptions.customCopilotRag().id] == CustomCopilotRagOptions.customApi().id))) {
         // support python language
         return [
             { id: ProgrammingLanguage.JS, label: "JavaScript" },
@@ -1308,6 +1367,22 @@ function folderQuestion() {
 }
 exports.folderQuestion = folderQuestion;
 exports.AppNamePattern = '^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^"<>:\\?/*&|\u0000-\u001F]*[^"\\s.<>:\\?/*&|\u0000-\u001F]$';
+async function getSolutionName(spfxFolder) {
+    const yoInfoPath = path.join(spfxFolder, constants_2.Constants.YO_RC_FILE);
+    if (await fs_extra_1.default.pathExists(yoInfoPath)) {
+        const yoInfo = await fs_extra_1.default.readJson(yoInfoPath);
+        if (yoInfo["@microsoft/generator-sharepoint"]) {
+            return yoInfo["@microsoft/generator-sharepoint"][constants_2.Constants.YO_RC_SOLUTION_NAME];
+        }
+        else {
+            return undefined;
+        }
+    }
+    else {
+        throw new error_2.FileNotFoundError(constants_2.Constants.PLUGIN_NAME, yoInfoPath, constants_2.Constants.IMPORT_HELP_LINK);
+    }
+}
+exports.getSolutionName = getSolutionName;
 function appNameQuestion() {
     const question = {
         type: "text",
@@ -1322,7 +1397,7 @@ function appNameQuestion() {
                 defaultName = utils_1.convertToAlphanumericOnly((_b = inputs.teamsAppFromTdp) === null || _b === void 0 ? void 0 : _b.appName);
             }
             else if (inputs[questionNames_1.QuestionNames.SPFxSolution] == "import") {
-                defaultName = await spfxGenerator_1.SPFxGenerator.getSolutionName(inputs[questionNames_1.QuestionNames.SPFxFolder]);
+                defaultName = await getSolutionName(inputs[questionNames_1.QuestionNames.SPFxFolder]);
             }
             else if (inputs.openAIPluginManifest) {
                 defaultName = inputs.openAIPluginManifest.name_for_human;
@@ -1752,25 +1827,18 @@ function apiMessageExtensionAuthQuestion() {
         placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiMessageExtensionAuth.placeholder"),
         cliDescription: "The authentication type for the API.",
         staticOptions: ApiMessageExtensionAuthOptions.all(),
-        dynamicOptions: () => {
-            const options = [ApiMessageExtensionAuthOptions.none()];
-            if (featureFlags_1.isApiKeyEnabled()) {
-                options.push(ApiMessageExtensionAuthOptions.apiKey());
-            }
-            if (featureFlags_1.isApiMeSSOEnabled()) {
-                options.push(ApiMessageExtensionAuthOptions.microsoftEntra());
-            }
-            return options;
-        },
+        dynamicOptions: () => ApiMessageExtensionAuthOptions.all(),
         default: ApiMessageExtensionAuthOptions.none().id,
     };
 }
 exports.apiMessageExtensionAuthQuestion = apiMessageExtensionAuthQuestion;
-function apiOperationQuestion(includeExistingAPIs = true) {
+function apiOperationQuestion(includeExistingAPIs = true, isAddPlugin = false) {
     // export for unit test
     let placeholder = "";
     const isPlugin = (inputs) => {
-        return (!!inputs && inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id);
+        return (isAddPlugin ||
+            (!!inputs &&
+                inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id));
     };
     return {
         type: "multiSelect",
@@ -1780,7 +1848,9 @@ function apiOperationQuestion(includeExistingAPIs = true) {
                 ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.copilotOperation.title")
                 : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.title");
         },
-        cliDescription: "Select Operation(s) Teams Can Interact with.",
+        cliDescription: isAddPlugin
+            ? "Select operation(s) Copilot can interact with."
+            : "Select operation(s) Teams can interact with.",
         cliShortName: "o",
         placeholder: (inputs) => {
             const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id;
@@ -1790,11 +1860,8 @@ function apiOperationQuestion(includeExistingAPIs = true) {
             else if (isPlugin) {
                 placeholder = ""; // TODO: add placeholder for api plugin
             }
-            else if (featureFlags_1.isApiKeyEnabled()) {
-                placeholder = localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.apikey.placeholder");
-            }
             else {
-                placeholder = localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder");
+                placeholder = localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.apikey.placeholder");
             }
             return placeholder;
         },
@@ -1802,12 +1869,15 @@ function apiOperationQuestion(includeExistingAPIs = true) {
         staticOptions: [],
         validation: {
             validFunc: (input, inputs) => {
+                if (!inputs) {
+                    throw new Error("inputs is undefined"); // should never happen
+                }
                 if (input.length < 1 ||
                     (input.length > 10 &&
-                        (inputs === null || inputs === void 0 ? void 0 : inputs[questionNames_1.QuestionNames.CustomCopilotRag]) != CustomCopilotRagOptions.customApi().id)) {
+                        inputs[questionNames_1.QuestionNames.CustomCopilotRag] != CustomCopilotRagOptions.customApi().id)) {
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.invalidMessage", input.length, 10);
                 }
-                const operations = inputs === null || inputs === void 0 ? void 0 : inputs.supportedApisFromApiSpec;
+                const operations = inputs.supportedApisFromApiSpec;
                 const authNames = new Set();
                 const serverUrls = new Set();
                 for (const inputItem of input) {
@@ -1825,6 +1895,10 @@ function apiOperationQuestion(includeExistingAPIs = true) {
                 if (serverUrls.size > 1) {
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.multipleServer", Array.from(serverUrls).join(", "));
                 }
+                const authApi = operations.find((api) => !!api.data.authName && input.includes(api.id));
+                if (authApi) {
+                    inputs.apiAuthData = authApi.data;
+                }
             },
         },
         dynamicOptions: (inputs) => {
@@ -1871,7 +1945,7 @@ class CustomCopilotRagOptions {
         return [
             CustomCopilotRagOptions.customize(),
             CustomCopilotRagOptions.azureAISearch(),
-            // CustomCopilotRagOptions.customApi(),
+            CustomCopilotRagOptions.customApi(),
             CustomCopilotRagOptions.microsoft365(),
         ];
     }
@@ -1985,6 +2059,14 @@ function azureOpenAIEndpointQuestion() {
         placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIEndpoint.placeholder"),
     };
 }
+function azureOpenAIDeploymentNameQuestion() {
+    return {
+        type: "text",
+        name: questionNames_1.QuestionNames.AzureOpenAIDeploymentName,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIDeploymentName.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIDeploymentName.placeholder"),
+    };
+}
 function capabilitySubTree() {
     const node = {
         data: capabilityQuestion(),
@@ -2056,11 +2138,6 @@ function capabilitySubTree() {
                 data: { type: "group", name: questionNames_1.QuestionNames.CopilotPluginExistingApi },
                 children: [
                     {
-                        condition: (inputs) => {
-                            return (inputs[questionNames_1.QuestionNames.Capabilities] ===
-                                CapabilityOptions.copilotPluginApiSpec().id ||
-                                inputs[questionNames_1.QuestionNames.MeArchitectureType] === MeArchitectureOptions.apiSpec().id);
-                        },
                         data: apiSpecLocationQuestion(),
                     },
                     // {
@@ -2074,8 +2151,7 @@ function capabilitySubTree() {
             },
             {
                 condition: (inputs) => {
-                    return ((featureFlags_1.isApiKeyEnabled() || featureFlags_1.isApiMeSSOEnabled()) &&
-                        inputs[questionNames_1.QuestionNames.MeArchitectureType] == MeArchitectureOptions.newApi().id);
+                    return inputs[questionNames_1.QuestionNames.MeArchitectureType] == MeArchitectureOptions.newApi().id;
                 },
                 data: apiMessageExtensionAuthQuestion(),
             },
@@ -2113,6 +2189,7 @@ function capabilitySubTree() {
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !==
                             CapabilityOptions.copilotPluginOpenAIPlugin().id &&
+                        inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.customizeGptBasic().id &&
                         inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.outlookAddinImport().id);
@@ -2136,6 +2213,15 @@ function capabilitySubTree() {
                                     return ((_a = inputs[questionNames_1.QuestionNames.AzureOpenAIKey]) === null || _a === void 0 ? void 0 : _a.length) > 0;
                                 },
                                 data: azureOpenAIEndpointQuestion(),
+                                children: [
+                                    {
+                                        condition: (inputs) => {
+                                            var _a;
+                                            return ((_a = inputs[questionNames_1.QuestionNames.AzureOpenAIEndpoint]) === null || _a === void 0 ? void 0 : _a.length) > 0;
+                                        },
+                                        data: azureOpenAIDeploymentNameQuestion(),
+                                    },
+                                ],
                             },
                         ],
                     },
@@ -2162,6 +2248,9 @@ function capabilitySubTree() {
                 data: appNameQuestion(),
             },
         ],
+        condition: (inputs) => {
+            return inputs[questionNames_1.QuestionNames.ProjectType] !== ProjectTypeOptions.startWithGithubCopilot().id;
+        },
     };
     return node;
 }