@microsoft/teamsfx-core 2.0.7-alpha.a10762b45.0 → 2.0.7-alpha.a372ccf67.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.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = 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.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.OfficeAddinFrameworkQuestion = exports.getAddinHostOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.OfficeAddinCapabilityOptions = 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"));
@@ -29,6 +29,7 @@ const questionNames_1 = require("./questionNames");
 const util_1 = require("./util");
 const constants_3 = require("./constants");
 const correlator_1 = require("../common/correlator");
+const projectConfig_1 = require("../component/generator/officeXMLAddin/projectConfig");
 class ScratchOptions {
     static yes() {
         return {
@@ -80,13 +81,34 @@ class ProjectTypeOptions {
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.detail"),
         };
     }
+    static officeXMLAddin(platform) {
+        return {
+            id: "office-xml-addin-type",
+            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(inbox) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.title")}`,
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.mainEntry.detail"),
+        };
+    }
+    static officeAddin(platform) {
+        return {
+            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"),
+        };
+    }
     static copilotPlugin(platform) {
         return {
             id: "copilot-plugin-type",
-            label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(sparkle) " : ""}${localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.label")}`,
+            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"),
         };
     }
+    static customCopilot(platform) {
+        return {
+            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"),
+        };
+    }
 }
 exports.ProjectTypeOptions = ProjectTypeOptions;
 function projectTypeQuestion() {
@@ -94,7 +116,10 @@ function projectTypeQuestion() {
         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),
+        featureFlags_1.isOfficeXMLAddinEnabled()
+            ? ProjectTypeOptions.officeXMLAddin(teamsfx_api_1.Platform.CLI)
+            : ProjectTypeOptions.outlookAddin(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.officeAddin(teamsfx_api_1.Platform.CLI),
     ];
     return {
         name: questionNames_1.QuestionNames.ProjectType,
@@ -103,22 +128,12 @@ function projectTypeQuestion() {
         staticOptions: staticOptions,
         dynamicOptions: (inputs) => {
             var _a;
-            let staticOptions;
+            const staticOptions = [];
             if (featureFlags_1.isApiCopilotPluginEnabled()) {
-                staticOptions = [
-                    ProjectTypeOptions.copilotPlugin(inputs.platform),
-                    ProjectTypeOptions.bot(inputs.platform),
-                    ProjectTypeOptions.tab(inputs.platform),
-                    ProjectTypeOptions.me(inputs.platform),
-                ];
-            }
-            else {
-                staticOptions = [
-                    ProjectTypeOptions.bot(inputs.platform),
-                    ProjectTypeOptions.tab(inputs.platform),
-                    ProjectTypeOptions.me(inputs.platform),
-                ];
+                staticOptions.push(ProjectTypeOptions.copilotPlugin(inputs.platform));
             }
+            staticOptions.push(ProjectTypeOptions.customCopilot(inputs.platform));
+            staticOptions.push(ProjectTypeOptions.bot(inputs.platform), ProjectTypeOptions.tab(inputs.platform), ProjectTypeOptions.me(inputs.platform));
             if (developerPortalScaffoldUtils_1.isFromDevPortal(inputs)) {
                 const projectType = (_a = developerPortalScaffoldUtils_1.getProjectTypeAndCapability(inputs.teamsAppFromTdp)) === null || _a === void 0 ? void 0 : _a.projectType;
                 if (projectType) {
@@ -126,7 +141,11 @@ function projectTypeQuestion() {
                 }
             }
             else {
-                staticOptions.push(ProjectTypeOptions.outlookAddin(inputs.platform));
+                staticOptions.push(featureFlags_1.isOfficeXMLAddinEnabled() && !featureFlags_1.isOfficeJSONAddinEnabled()
+                    ? ProjectTypeOptions.officeXMLAddin(inputs.platform)
+                    : featureFlags_1.isOfficeJSONAddinEnabled()
+                        ? ProjectTypeOptions.officeAddin(inputs.platform)
+                        : ProjectTypeOptions.outlookAddin(inputs.platform));
             }
             return staticOptions;
         },
@@ -135,6 +154,30 @@ function projectTypeQuestion() {
         skipSingleOption: true,
     };
 }
+class OfficeAddinCapabilityOptions {
+    static word() {
+        return {
+            id: "word",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.detail"),
+        };
+    }
+    static excel() {
+        return {
+            id: "excel",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.detail"),
+        };
+    }
+    static powerpoint() {
+        return {
+            id: "powerpoint",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.detail"),
+        };
+    }
+}
+exports.OfficeAddinCapabilityOptions = OfficeAddinCapabilityOptions;
 class CapabilityOptions {
     // bot
     static basicBot() {
@@ -292,11 +335,19 @@ class CapabilityOptions {
             detail: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.detail"),
         };
     }
-    static bots(inputs, includeAssistant) {
+    static bots(inputs) {
+        if ((inputs === null || inputs === void 0 ? void 0 : inputs.platform) === teamsfx_api_1.Platform.VS) {
+            return [
+                CapabilityOptions.basicBot(),
+                CapabilityOptions.aiBot(),
+                CapabilityOptions.aiAssistantBot(),
+                CapabilityOptions.notificationBot(),
+                CapabilityOptions.commandBot(),
+                CapabilityOptions.workflowBot(inputs),
+            ];
+        }
         return [
             CapabilityOptions.basicBot(),
-            CapabilityOptions.aiBot(),
-            ...(includeAssistant === true ? [CapabilityOptions.aiAssistantBot()] : []),
             CapabilityOptions.notificationBot(),
             CapabilityOptions.commandBot(),
             CapabilityOptions.workflowBot(inputs),
@@ -311,13 +362,17 @@ class CapabilityOptions {
         ];
     }
     static dotnetCaps(inputs) {
-        return [
+        const capabilities = [
             ...CapabilityOptions.copilotPlugins(),
-            ...CapabilityOptions.bots(inputs, true),
+            ...CapabilityOptions.bots(inputs),
             CapabilityOptions.nonSsoTab(),
             CapabilityOptions.tab(),
             ...CapabilityOptions.collectMECaps(),
         ];
+        if (featureFlags_1.isTdpTemplateCliTestEnabled()) {
+            capabilities.push(CapabilityOptions.me());
+        }
+        return capabilities;
     }
     /**
      * Collect all capabilities for message extension, including dotnet and nodejs.
@@ -344,11 +399,29 @@ class CapabilityOptions {
                 CapabilityOptions.linkUnfurling(),
             ];
     }
+    static officeAll() {
+        return [...CapabilityOptions.officeAddinItems(), CapabilityOptions.officeAddinImport()];
+    }
     static copilotPlugins() {
         return [
             CapabilityOptions.copilotPluginNewApi(),
             CapabilityOptions.copilotPluginApiSpec(),
-            CapabilityOptions.copilotPluginOpenAIPlugin(),
+            // CapabilityOptions.copilotPluginOpenAIPlugin(),
+        ];
+    }
+    static customCopilots() {
+        return [
+            CapabilityOptions.customCopilotBasic(),
+            // CapabilityOptions.customCopilotRag(),
+            CapabilityOptions.customCopilotAssistant(),
+        ];
+    }
+    static tdpIntegrationCapabilities() {
+        // templates that are used by TDP integration only
+        return [
+            CapabilityOptions.me(),
+            CapabilityOptions.botAndMe(),
+            CapabilityOptions.nonSsoTabAndBot(),
         ];
     }
     /**
@@ -356,11 +429,23 @@ class CapabilityOptions {
      */
     static staticAll(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs, true),
+            ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
             ...CapabilityOptions.collectMECaps(),
             ...CapabilityOptions.copilotPlugins(),
+            ...CapabilityOptions.customCopilots(),
+            ...CapabilityOptions.tdpIntegrationCapabilities(),
         ];
+        if (featureFlags_1.isOfficeXMLAddinEnabled()) {
+            capabilityOptions.push(...[
+                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.word().id),
+                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.excel().id),
+                ...CapabilityOptions.officeXMLAddinHostOptionItems(OfficeAddinCapabilityOptions.powerpoint().id),
+            ]);
+        }
+        else {
+            capabilityOptions.push(...CapabilityOptions.outlookAddinItems());
+        }
         return capabilityOptions;
     }
     /**
@@ -368,24 +453,44 @@ class CapabilityOptions {
      */
     static all(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs, true),
+            ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
             ...CapabilityOptions.collectMECaps(),
+            ...CapabilityOptions.outlookAddinItems(),
         ];
         if (featureFlags_1.isApiCopilotPluginEnabled()) {
             capabilityOptions.push(...CapabilityOptions.copilotPlugins());
         }
+        capabilityOptions.push(...CapabilityOptions.customCopilots());
+        if (featureFlags_1.isTdpTemplateCliTestEnabled()) {
+            // test templates that are used by TDP integration only
+            capabilityOptions.push(...CapabilityOptions.tdpIntegrationCapabilities());
+        }
         return capabilityOptions;
     }
-    static officeAddinImport() {
+    static outlookAddinImport() {
         return {
             id: "import",
             label: localizeUtils_1.getLocalizedString("core.importAddin.label"),
             detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
+        };
+    }
+    static officeAddinImport() {
+        return {
+            id: "import",
+            label: localizeUtils_1.getLocalizedString("core.importOfficeAddin.label"),
+            detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
         };
     }
-    static officeAddinItems() {
+    static officeXMLAddinHostOptionItems(host) {
+        return projectConfig_1.getOfficeXMLAddinHostProjectOptions(host).map((x) => ({
+            id: x.proj,
+            label: localizeUtils_1.getLocalizedString(x.title),
+            detail: localizeUtils_1.getLocalizedString(x.detail),
+        }));
+    }
+    static outlookAddinItems() {
         return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
             id: template,
             label: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
@@ -393,6 +498,13 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.previewOnWindow"),
         }));
     }
+    static officeAddinItems() {
+        return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
+            id: template,
+            label: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
+            detail: localizeUtils_1.getLocalizedString(officeAddinJsonData.getProjectDetails(template)),
+        }));
+    }
     static nonSsoTabAndBot() {
         return {
             id: "TabNonSsoAndBot",
@@ -442,12 +554,47 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
         };
     }
+    // custom copilot
+    static customCopilotBasic() {
+        return {
+            id: "custom-copilot-basic",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotBasicOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotBasicOption.detail"),
+        };
+    }
+    static customCopilotRag() {
+        return {
+            id: "custom-copilot-rag",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagOption.detail"),
+        };
+    }
+    static customCopilotAssistant() {
+        return {
+            id: "custom-copilot-agent",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantOption.detail"),
+        };
+    }
 }
 exports.CapabilityOptions = CapabilityOptions;
 function capabilityQuestion() {
     return {
         name: questionNames_1.QuestionNames.Capabilities,
         title: (inputs) => {
+            // Office Add-in Capability
+            if (featureFlags_1.isOfficeXMLAddinEnabled()) {
+                switch (inputs[questionNames_1.QuestionNames.OfficeAddinCapability]) {
+                    case ProjectTypeOptions.outlookAddin().id:
+                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
+                    case OfficeAddinCapabilityOptions.word().id:
+                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.create.title");
+                    case OfficeAddinCapabilityOptions.excel().id:
+                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.create.title");
+                    case OfficeAddinCapabilityOptions.powerpoint().id:
+                        return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.create.title");
+                }
+            }
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             switch (projectType) {
                 case ProjectTypeOptions.bot().id:
@@ -458,8 +605,12 @@ function capabilityQuestion() {
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.title");
                 case ProjectTypeOptions.outlookAddin().id:
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
+                case ProjectTypeOptions.officeAddin().id:
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.title");
                 case ProjectTypeOptions.copilotPlugin().id:
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.title");
+                case ProjectTypeOptions.customCopilot().id:
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.customCopilot.title");
                 default:
                     return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.titleNew");
             }
@@ -489,8 +640,9 @@ function capabilityQuestion() {
             }
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+            const officeHost = inputs[questionNames_1.QuestionNames.OfficeAddinCapability];
             if (projectType === ProjectTypeOptions.bot().id) {
-                return CapabilityOptions.bots(inputs, true);
+                return CapabilityOptions.bots(inputs);
             }
             else if (projectType === ProjectTypeOptions.tab().id) {
                 return CapabilityOptions.tabs();
@@ -498,12 +650,25 @@ function capabilityQuestion() {
             else if (projectType === ProjectTypeOptions.me().id) {
                 return CapabilityOptions.mes();
             }
-            else if (projectType === ProjectTypeOptions.outlookAddin().id) {
-                return [...CapabilityOptions.officeAddinItems(), CapabilityOptions.officeAddinImport()];
+            else if ((!featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.outlookAddin().id) ||
+                (featureFlags_1.isOfficeXMLAddinEnabled() &&
+                    projectType === ProjectTypeOptions.officeXMLAddin().id &&
+                    officeHost === ProjectTypeOptions.outlookAddin().id)) {
+                return [...CapabilityOptions.outlookAddinItems(), CapabilityOptions.outlookAddinImport()];
+            }
+            else if (featureFlags_1.isOfficeXMLAddinEnabled() &&
+                projectType === ProjectTypeOptions.officeXMLAddin().id) {
+                return CapabilityOptions.officeXMLAddinHostOptionItems(officeHost);
+            }
+            else if (projectType === ProjectTypeOptions.officeAddin().id) {
+                return CapabilityOptions.officeAll();
             }
             else if (projectType === ProjectTypeOptions.copilotPlugin().id) {
                 return CapabilityOptions.copilotPlugins();
             }
+            else if (projectType === ProjectTypeOptions.customCopilot().id) {
+                return CapabilityOptions.customCopilots();
+            }
             else {
                 return CapabilityOptions.all(inputs);
             }
@@ -512,6 +677,9 @@ function capabilityQuestion() {
             if (inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.copilotPlugin().id) {
                 return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.placeholder");
             }
+            else if (inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.customCopilot().id) {
+                return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.customCopilot.placeholder");
+            }
             return localizeUtils_1.getLocalizedString("core.createCapabilityQuestion.placeholder");
         },
         forgetLastValue: true,
@@ -540,14 +708,14 @@ class MeArchitectureOptions {
         return {
             id: "new-api",
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.label"),
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginNewApiOption.detail"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.messageExtensionNewApiOption.detail"),
         };
     }
     static apiSpec() {
         return {
             id: "api-spec",
             label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginApiSpecOption.label"),
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginApiSpecOption.detail"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.messageExtensionApiSpecOption.detail"),
         };
     }
     static all() {
@@ -624,6 +792,16 @@ class NotificationTriggerOptions {
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.detail"),
         };
     }
+    static functionsTimerTriggerIsolated() {
+        return {
+            id: "timer-functions-isolated",
+            hostType: HostType.Functions,
+            triggers: [NotificationTriggers.TIMER],
+            label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.label"),
+            description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.description"),
+            detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.timer-functions.detail"),
+        };
+    }
     static functionsHttpAndTimerTrigger() {
         return {
             id: "http-and-timer-functions",
@@ -634,6 +812,16 @@ class NotificationTriggerOptions {
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.detail"),
         };
     }
+    static functionsHttpAndTimerTriggerIsolated() {
+        return {
+            id: "http-and-timer-functions-isolated",
+            hostType: HostType.Functions,
+            triggers: [NotificationTriggers.HTTP, NotificationTriggers.TIMER],
+            label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.label"),
+            description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.description"),
+            detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-and-timer-functions.detail"),
+        };
+    }
     static functionsHttpTrigger() {
         return {
             id: "http-functions",
@@ -644,6 +832,16 @@ class NotificationTriggerOptions {
             detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.detail"),
         };
     }
+    static functionsHttpTriggerIsolated() {
+        return {
+            id: "http-functions-isolated",
+            hostType: HostType.Functions,
+            triggers: [NotificationTriggers.HTTP],
+            label: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.label"),
+            description: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.description"),
+            detail: localizeUtils_1.getLocalizedString("plugins.bot.triggers.http-functions.detail"),
+        };
+    }
     static functionsTriggers() {
         return [
             NotificationTriggerOptions.functionsHttpAndTimerTrigger(),
@@ -859,15 +1057,7 @@ function officeAddinHostingQuestion() {
         name: questionNames_1.QuestionNames.OfficeAddinHost,
         title: "Add-in Host",
         staticOptions: [],
-        dynamicOptions: (inputs) => {
-            const template = exports.getTemplate(inputs);
-            const getHostTemplateNames = officeAddinJsonData.getHostTemplateNames(template);
-            const options = getHostTemplateNames.map((host) => ({
-                label: officeAddinJsonData.getHostDisplayName(host),
-                id: host,
-            }));
-            return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
-        },
+        dynamicOptions: getAddinHostOptions,
         default: (inputs) => {
             const template = exports.getTemplate(inputs);
             const options = officeAddinJsonData.getHostTemplateNames(template);
@@ -878,6 +1068,41 @@ function officeAddinHostingQuestion() {
     return OfficeHostQuestion;
 }
 exports.officeAddinHostingQuestion = officeAddinHostingQuestion;
+function getAddinHostOptions(inputs) {
+    // office addin supports host defined in officeAddinJsonData
+    const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+    const template = exports.getTemplate(inputs);
+    const hostTypes = officeAddinJsonData.getHostTemplateNames(template);
+    const options = [];
+    hostTypes.forEach((host) => {
+        options.push({ label: officeAddinJsonData.getHostDisplayName(host), id: host });
+    });
+    // Outlook addin only supports outlook
+    if (projectType === ProjectTypeOptions.outlookAddin().id) {
+        return [options[0] || { label: "No Options", id: "No Options" }];
+    }
+    else if (projectType === ProjectTypeOptions.officeAddin().id) {
+        return options;
+    }
+    return options || "No Options";
+}
+exports.getAddinHostOptions = getAddinHostOptions;
+function OfficeAddinFrameworkQuestion() {
+    return {
+        type: "singleSelect",
+        name: questionNames_1.QuestionNames.OfficeAddinFramework,
+        cliShortName: "f",
+        cliDescription: "Framework for WXP extension.",
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.framework.title"),
+        staticOptions: [
+            { id: "default", label: "Default" },
+            { id: "react", label: "React" },
+        ],
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.framework.placeholder"),
+        default: "default",
+    };
+}
+exports.OfficeAddinFrameworkQuestion = OfficeAddinFrameworkQuestion;
 const officeAddinJsonData = new projectsJsonData_1.default();
 function getLanguageOptions(inputs) {
     const runtime = getRuntime(inputs);
@@ -887,22 +1112,56 @@ function getLanguageOptions(inputs) {
     }
     // office addin supports language defined in officeAddinJsonData
     const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-    if (projectType === ProjectTypeOptions.outlookAddin().id) {
+    const officeHost = inputs[questionNames_1.QuestionNames.OfficeAddinCapability];
+    if ((!featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.outlookAddin().id) ||
+        (featureFlags_1.isOfficeXMLAddinEnabled() &&
+            projectType === ProjectTypeOptions.officeXMLAddin().id &&
+            officeHost === ProjectTypeOptions.outlookAddin().id)) {
         const template = exports.getTemplate(inputs);
         const supportedTypes = officeAddinJsonData.getSupportedScriptTypes(template);
         const options = supportedTypes.map((language) => ({ label: language, id: language }));
         return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
     }
+    if (featureFlags_1.isOfficeXMLAddinEnabled() && projectType === ProjectTypeOptions.officeXMLAddin().id) {
+        const officeProject = inputs[questionNames_1.QuestionNames.Capabilities];
+        return officeProject !== "manifest"
+            ? projectConfig_1.getOfficeXMLAddinHostProjectLangOptions(officeHost, officeProject)
+            : [{ id: "javascript", label: "JavaScript" }];
+    }
+    if (projectType === ProjectTypeOptions.officeAddin().id) {
+        const template = exports.getTemplate(inputs);
+        const supportedTypes = officeAddinJsonData.getSupportedScriptTypesNew(template);
+        const options = [];
+        supportedTypes.forEach((language) => {
+            if (language === "TypeScript") {
+                options.push({ label: "TypeScript", id: "typescript" });
+            }
+            else if (language === "JavaScript") {
+                options.push({ label: "JavaScript", id: "javascript" });
+            }
+        });
+        return options.length > 0 ? options : [{ label: "No Options", id: "No Options" }];
+    }
     const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
-    // SPFx only supports typescript
     if (capabilities === CapabilityOptions.SPFxTab().id) {
+        // SPFx only supports typescript
         return [{ id: "typescript", label: "TypeScript" }];
     }
-    // other case
-    return [
-        { id: "javascript", label: "JavaScript" },
-        { id: "typescript", label: "TypeScript" },
-    ];
+    else if (constants_3.capabilitiesHavePythonOption.includes(capabilities)) {
+        // support python language
+        return [
+            { id: "javascript", label: "JavaScript" },
+            { id: "typescript", label: "TypeScript" },
+            { id: "python", label: "Python" },
+        ];
+    }
+    else {
+        // other cases
+        return [
+            { id: "javascript", label: "JavaScript" },
+            { id: "typescript", label: "TypeScript" },
+        ];
+    }
 }
 exports.getLanguageOptions = getLanguageOptions;
 var ProgrammingLanguage;
@@ -910,17 +1169,19 @@ var ProgrammingLanguage;
     ProgrammingLanguage["JS"] = "javascript";
     ProgrammingLanguage["TS"] = "typescript";
     ProgrammingLanguage["CSharp"] = "csharp";
+    ProgrammingLanguage["PY"] = "python";
 })(ProgrammingLanguage = exports.ProgrammingLanguage || (exports.ProgrammingLanguage = {}));
 function programmingLanguageQuestion() {
     const programmingLanguageQuestion = {
         name: questionNames_1.QuestionNames.ProgrammingLanguage,
         cliShortName: "l",
-        title: "Programming Language",
+        title: localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.title"),
         type: "singleSelect",
         staticOptions: [
             { id: ProgrammingLanguage.JS, label: "JavaScript" },
             { id: ProgrammingLanguage.TS, label: "TypeScript" },
             { id: ProgrammingLanguage.CSharp, label: "C#" },
+            { id: ProgrammingLanguage.PY, label: "Python" },
         ],
         dynamicOptions: getLanguageOptions,
         default: (inputs) => {
@@ -936,7 +1197,7 @@ function programmingLanguageQuestion() {
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             if (projectType === ProjectTypeOptions.outlookAddin().id) {
                 const template = exports.getTemplate(inputs);
-                const options = officeAddinJsonData.getSupportedScriptTypes(template);
+                const options = officeAddinJsonData.getSupportedScriptTypesNew(template);
                 return options[0] || "No Options";
             }
             const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
@@ -974,7 +1235,7 @@ function appNameQuestion() {
         type: "text",
         name: questionNames_1.QuestionNames.AppName,
         cliShortName: "n",
-        title: "Application name",
+        title: localizeUtils_1.getLocalizedString("core.question.appName.title"),
         required: true,
         default: async (inputs) => {
             var _a, _b;
@@ -1028,7 +1289,7 @@ function appNameQuestion() {
                 return undefined;
             },
         },
-        placeholder: "Application name",
+        placeholder: localizeUtils_1.getLocalizedString("core.question.appName.placeholder"),
     };
     return question;
 }
@@ -1221,6 +1482,24 @@ function getBotOptions(inputs) {
     }
     return options;
 }
+class ApiMessageExtensionAuthOptions {
+    static none() {
+        return {
+            id: "none",
+            label: "None",
+        };
+    }
+    static apiKey() {
+        return {
+            id: "api-key",
+            label: "API Key",
+        };
+    }
+    static all() {
+        return [ApiMessageExtensionAuthOptions.none(), ApiMessageExtensionAuthOptions.apiKey()];
+    }
+}
+exports.ApiMessageExtensionAuthOptions = ApiMessageExtensionAuthOptions;
 function selectBotIdsQuestion() {
     // const statcOptions: OptionItem[] = [];
     // statcOptions.push(botOptionItem(false, "000000-0000-0000"));
@@ -1241,14 +1520,14 @@ 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 correlationId = correlator_1.Correlator.getId(); // This is a workaround for VSCode which will lose 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.trim(), inputs[questionNames_1.QuestionNames.ManifestPath], includeExistingAPIs, false, inputs.platform === teamsfx_api_1.Platform.VSCode ? correlationId : undefined);
+            const res = await helper_1.listOperations(context, undefined, input.trim(), inputs, includeExistingAPIs, false, inputs.platform === teamsfx_api_1.Platform.VSCode ? correlationId : undefined);
             if (res.isOk()) {
                 inputs.supportedApisFromApiSpec = res.value;
             }
@@ -1315,7 +1594,7 @@ 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.
+    const correlationId = correlator_1.Correlator.getId(); // This is a workaround for VSCode which will lose correlation id when user accepts the value.
     return {
         type: "text",
         name: questionNames_1.QuestionNames.OpenAIPluginManifest,
@@ -1350,7 +1629,7 @@ function openAIPluginManifestLocationQuestion() {
                 }
                 const context = utils_4.createContextV3();
                 try {
-                    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);
+                    const res = await helper_1.listOperations(context, manifest, inputs[questionNames_1.QuestionNames.ApiSpecLocation], inputs, true, true, inputs.platform === teamsfx_api_1.Platform.VSCode ? correlationId : undefined);
                     if (res.isOk()) {
                         inputs.supportedApisFromApiSpec = res.value;
                     }
@@ -1377,19 +1656,50 @@ function openAIPluginManifestLocationQuestion() {
     };
 }
 exports.openAIPluginManifestLocationQuestion = openAIPluginManifestLocationQuestion;
+function apiMessageExtensionAuthQuestion() {
+    return {
+        type: "singleSelect",
+        name: questionNames_1.QuestionNames.ApiMEAuth,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiMessageExtensionAuth.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiMessageExtensionAuth.placeholder"),
+        cliDescription: "The authentication type for the API.",
+        staticOptions: ApiMessageExtensionAuthOptions.all(),
+        default: ApiMessageExtensionAuthOptions.none().id,
+    };
+}
+exports.apiMessageExtensionAuthQuestion = apiMessageExtensionAuthQuestion;
 function apiOperationQuestion(includeExistingAPIs = true) {
     // export for unit test
+    let placeholder = "";
+    const isPlugin = (inputs) => {
+        return (!!inputs && inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id);
+    };
     return {
         type: "multiSelect",
         name: questionNames_1.QuestionNames.ApiOperation,
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.title"),
+        title: (inputs) => {
+            return isPlugin(inputs)
+                ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.copilotOperation.title")
+                : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.title");
+        },
         cliDescription: "Select Operation(s) Teams Can Interact with.",
         cliShortName: "o",
-        placeholder: includeExistingAPIs
-            ? featureFlags_1.isApiKeyEnabled()
-                ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.apikey.placeholder")
-                : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder")
-            : localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting"),
+        placeholder: (inputs) => {
+            const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id;
+            if (!includeExistingAPIs) {
+                placeholder = localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder.skipExisting");
+            }
+            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");
+            }
+            return placeholder;
+        },
         forgetLastValue: true,
         staticOptions: [],
         validation: {
@@ -1427,6 +1737,154 @@ function apiOperationQuestion(includeExistingAPIs = true) {
     };
 }
 exports.apiOperationQuestion = apiOperationQuestion;
+class CustomCopilotRagOptions {
+    static customize() {
+        return {
+            id: "custom-copilot-rag-customize",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagCustomizeOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagCustomizeOption.detail"),
+        };
+    }
+    static azureAISearch() {
+        return {
+            id: "custom-copilot-rag-azureAISearch",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagAzureAISearchOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagAzureAISearchOption.detail"),
+        };
+    }
+    static customApi() {
+        return {
+            id: "custom-copilot-rag-customApi",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagCustomApiOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagCustomApiOption.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
+        };
+    }
+    static microsoft365() {
+        return {
+            id: "custom-copilot-rag-microsoft365",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagMicrosoft365Option.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRagMicrosoft365Option.detail"),
+        };
+    }
+    static all() {
+        return [
+            CustomCopilotRagOptions.customize(),
+            CustomCopilotRagOptions.azureAISearch(),
+            CustomCopilotRagOptions.customApi(),
+            CustomCopilotRagOptions.microsoft365(),
+        ];
+    }
+}
+exports.CustomCopilotRagOptions = CustomCopilotRagOptions;
+class CustomCopilotAssistantOptions {
+    static new() {
+        return {
+            id: "custom-copilot-agent-new",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantNewOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantNewOption.detail"),
+        };
+    }
+    static assistantsApi() {
+        return {
+            id: "custom-copilot-agent-assistants-api",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantAssistantsApiOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistantAssistantsApiOption.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
+        };
+    }
+    static all() {
+        return [CustomCopilotAssistantOptions.new(), CustomCopilotAssistantOptions.assistantsApi()];
+    }
+}
+exports.CustomCopilotAssistantOptions = CustomCopilotAssistantOptions;
+function customCopilotRagQuestion() {
+    return {
+        type: "singleSelect",
+        name: questionNames_1.QuestionNames.CustomCopilotRag,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRag.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotRag.placeholder"),
+        staticOptions: CustomCopilotRagOptions.all(),
+        dynamicOptions: () => CustomCopilotRagOptions.all(),
+        default: CustomCopilotRagOptions.customize().id,
+    };
+}
+function customCopilotAssistantQuestion() {
+    return {
+        type: "singleSelect",
+        name: questionNames_1.QuestionNames.CustomCopilotAssistant,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistant.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.customCopilotAssistant.placeholder"),
+        staticOptions: CustomCopilotAssistantOptions.all(),
+        dynamicOptions: () => CustomCopilotAssistantOptions.all(),
+        default: CustomCopilotAssistantOptions.new().id,
+    };
+}
+function llmServiceQuestion() {
+    return {
+        type: "singleSelect",
+        name: questionNames_1.QuestionNames.LLMService,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.placeholder"),
+        staticOptions: [
+            {
+                id: "llm-service-azure-openai",
+                cliName: "azure-openai",
+                label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceAzureOpenAIOption.label"),
+                detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceAzureOpenAIOption.detail"),
+            },
+            {
+                id: "llm-service-openai",
+                label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceOpenAIOption.label"),
+                detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceOpenAIOption.detail"),
+            },
+        ],
+        dynamicOptions: (inputs) => {
+            const options = [];
+            if (inputs[questionNames_1.QuestionNames.CustomCopilotAssistant] !== "custom-copilot-agent-assistants-api") {
+                options.push({
+                    id: "llm-service-azure-openai",
+                    label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceAzureOpenAIOption.label"),
+                    detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceAzureOpenAIOption.detail"),
+                });
+            }
+            options.push({
+                id: "llm-service-openai",
+                label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceOpenAIOption.label"),
+                detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmServiceOpenAIOption.detail"),
+            });
+            return options;
+        },
+        skipSingleOption: true,
+        default: "llm-service-azure-openai",
+    };
+}
+function openAIKeyQuestion() {
+    return {
+        type: "text",
+        password: true,
+        name: questionNames_1.QuestionNames.OpenAIKey,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.openAIKey.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.openAIKey.placeholder"),
+    };
+}
+function azureOpenAIKeyQuestion() {
+    return {
+        type: "text",
+        password: true,
+        name: questionNames_1.QuestionNames.AzureOpenAIKey,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIKey.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIKey.placeholder"),
+    };
+}
+function azureOpenAIEndpointQuestion() {
+    return {
+        type: "text",
+        name: questionNames_1.QuestionNames.AzureOpenAIEndpoint,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIEndpoint.title"),
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.llmService.azureOpenAIEndpoint.placeholder"),
+    };
+}
 function capabilitySubTree() {
     const node = {
         data: capabilityQuestion(),
@@ -1458,7 +1916,7 @@ function capabilitySubTree() {
             },
             {
                 // office addin import sub-tree
-                condition: { equals: CapabilityOptions.officeAddinImport().id },
+                condition: { equals: CapabilityOptions.outlookAddinImport().id },
                 data: { type: "group", name: questionNames_1.QuestionNames.OfficeAddinImport },
                 children: [
                     {
@@ -1479,9 +1937,11 @@ function capabilitySubTree() {
             },
             {
                 // office addin other items sub-tree
-                condition: {
-                    enum: CapabilityOptions.officeAddinItems().map((i) => i.id),
-                },
+                condition: (inputs) => featureFlags_1.isOfficeXMLAddinEnabled()
+                    ? false
+                    : CapabilityOptions.outlookAddinItems()
+                        .map((i) => i.id)
+                        .includes(inputs[questionNames_1.QuestionNames.Capabilities]),
                 data: officeAddinHostingQuestion(),
             },
             {
@@ -1507,15 +1967,55 @@ function capabilitySubTree() {
                         },
                         data: apiSpecLocationQuestion(),
                     },
-                    {
-                        condition: { equals: CapabilityOptions.copilotPluginOpenAIPlugin().id },
-                        data: openAIPluginManifestLocationQuestion(),
-                    },
+                    // {
+                    //   condition: { equals: CapabilityOptions.copilotPluginOpenAIPlugin().id },
+                    //   data: openAIPluginManifestLocationQuestion(),
+                    // },
                     {
                         data: apiOperationQuestion(),
                     },
                 ],
             },
+            {
+                condition: (inputs) => {
+                    return (featureFlags_1.isApiKeyEnabled() &&
+                        (inputs[questionNames_1.QuestionNames.MeArchitectureType] == MeArchitectureOptions.newApi().id ||
+                            inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.copilotPluginNewApi().id));
+                },
+                data: apiMessageExtensionAuthQuestion(),
+            },
+            /*
+            {
+              condition: (inputs: Inputs) => {
+                return inputs[QuestionNames.Capabilities] == CapabilityOptions.customCopilotRag().id;
+              },
+              data: customCopilotRagQuestion(),
+              children: [
+                {
+                  condition: (inputs: Inputs) => {
+                    return (
+                      inputs[QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id
+                    );
+                  },
+                  data: apiSpecLocationQuestion(),
+                },
+                {
+                  condition: (inputs: Inputs) => {
+                    return (
+                      inputs[QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id
+                    );
+                  },
+                  data: apiOperationQuestion(),
+                },
+              ],
+            },
+            */
+            {
+                condition: (inputs) => {
+                    return (inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.customCopilotAssistant().id);
+                },
+                data: customCopilotAssistantQuestion(),
+            },
             {
                 // programming language
                 data: programmingLanguageQuestion(),
@@ -1527,6 +2027,40 @@ function capabilitySubTree() {
                         inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id);
                 },
             },
+            {
+                condition: (inputs) => {
+                    return (inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.customCopilotBasic().id ||
+                        inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.customCopilotRag().id ||
+                        inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.customCopilotAssistant().id);
+                },
+                data: llmServiceQuestion(),
+                children: [
+                    {
+                        condition: { equals: "llm-service-azure-openai" },
+                        data: azureOpenAIKeyQuestion(),
+                        children: [
+                            {
+                                condition: (inputs) => {
+                                    var _a;
+                                    return ((_a = inputs[questionNames_1.QuestionNames.AzureOpenAIKey]) === null || _a === void 0 ? void 0 : _a.length) > 0;
+                                },
+                                data: azureOpenAIEndpointQuestion(),
+                            },
+                        ],
+                    },
+                    {
+                        condition: { equals: "llm-service-openai" },
+                        data: openAIKeyQuestion(),
+                    },
+                ],
+            },
+            {
+                // WXP addin framework
+                condition: (inputs) => {
+                    return inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeAddin().id;
+                },
+                data: OfficeAddinFrameworkQuestion(),
+            },
             {
                 // root folder
                 data: folderQuestion(),
@@ -1553,6 +2087,21 @@ function createProjectQuestionNode() {
                 data: projectTypeQuestion(),
                 cliOptionDisabled: "self",
             },
+            {
+                condition: (inputs) => featureFlags_1.isOfficeXMLAddinEnabled() &&
+                    inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeXMLAddin().id,
+                data: {
+                    name: questionNames_1.QuestionNames.OfficeAddinCapability,
+                    title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.create.title"),
+                    type: "singleSelect",
+                    staticOptions: [
+                        ProjectTypeOptions.outlookAddin(),
+                        OfficeAddinCapabilityOptions.word(),
+                        OfficeAddinCapabilityOptions.excel(),
+                        OfficeAddinCapabilityOptions.powerpoint(),
+                    ],
+                },
+            },
             capabilitySubTree(),
             {
                 condition: (inputs) => inputs.teamsAppFromTdp && utils_2.isPersonalApp(inputs.teamsAppFromTdp),
@@ -1616,9 +2165,6 @@ function createProjectCliHelpNode() {
     if (!featureFlags_1.isCLIDotNetEnabled()) {
         deleteNames.push(questionNames_1.QuestionNames.Runtime);
     }
-    if (!featureFlags_1.isApiCopilotPluginEnabled()) {
-        deleteNames.push(questionNames_1.QuestionNames.CopilotPluginExistingApi);
-    }
     trimQuestionTreeForCliHelp(node, deleteNames);
     return node;
 }