@microsoft/teamsfx-core 2.0.7 → 2.0.8-alpha.18377bc6e.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.apiMessageExtensionAuthQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.ApiMessageExtensionAuthOptions = 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.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;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -11,6 +11,7 @@ const lodash_1 = require("lodash");
 const os = tslib_1.__importStar(require("os"));
 const path = tslib_1.__importStar(require("path"));
 const constants_1 = require("../common/constants");
+const correlator_1 = require("../common/correlator");
 const featureFlags_1 = require("../common/featureFlags");
 const localizeUtils_1 = require("../common/localizeUtils");
 const samples_1 = require("../common/samples");
@@ -18,17 +19,16 @@ const utils_1 = require("../common/utils");
 const developerPortalScaffoldUtils_1 = require("../component/developerPortalScaffoldUtils");
 const utils_2 = require("../component/driver/teamsApp/utils/utils");
 const helper_1 = require("../component/generator/copilotPlugin/helper");
-const projectsJsonData_1 = tslib_1.__importDefault(require("../component/generator/officeAddin/config/projectsJsonData"));
+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");
 const error_2 = require("../error");
+const constants_3 = require("./constants");
 const questionNames_1 = require("./questionNames");
 const util_1 = require("./util");
-const constants_3 = require("./constants");
-const correlator_1 = require("../common/correlator");
 class ScratchOptions {
     static yes() {
         return {
@@ -80,13 +80,41 @@ 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 ? "$(teamsfx-m365) " : ""}${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 officeAddinAllIds(platform) {
+        return [
+            ProjectTypeOptions.officeAddin(platform).id,
+            ProjectTypeOptions.officeXMLAddin(platform).id,
+            ProjectTypeOptions.outlookAddin(platform).id,
+        ];
+    }
     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,6 +122,8 @@ function projectTypeQuestion() {
         ProjectTypeOptions.bot(teamsfx_api_1.Platform.CLI),
         ProjectTypeOptions.tab(teamsfx_api_1.Platform.CLI),
         ProjectTypeOptions.me(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.officeXMLAddin(teamsfx_api_1.Platform.CLI),
+        ProjectTypeOptions.officeAddin(teamsfx_api_1.Platform.CLI),
         ProjectTypeOptions.outlookAddin(teamsfx_api_1.Platform.CLI),
     ];
     return {
@@ -103,22 +133,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 +146,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 +159,49 @@ function projectTypeQuestion() {
         skipSingleOption: true,
     };
 }
+class OfficeAddinHostOptions {
+    static all(platform) {
+        return [
+            OfficeAddinHostOptions.outlook(platform),
+            OfficeAddinHostOptions.word(),
+            OfficeAddinHostOptions.excel(),
+            OfficeAddinHostOptions.powerpoint(),
+        ];
+    }
+    static outlook(platform) {
+        return {
+            id: "outlook",
+            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"),
+            data: "Outlook",
+        };
+    }
+    static word() {
+        return {
+            id: "word",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.detail"),
+            data: "Word",
+        };
+    }
+    static excel() {
+        return {
+            id: "excel",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.detail"),
+            data: "Excel",
+        };
+    }
+    static powerpoint() {
+        return {
+            id: "powerpoint",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.title"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.detail"),
+            data: "PowerPoint",
+        };
+    }
+}
+exports.OfficeAddinHostOptions = OfficeAddinHostOptions;
 class CapabilityOptions {
     // bot
     static basicBot() {
@@ -292,11 +359,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 +386,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 +423,82 @@ class CapabilityOptions {
                 CapabilityOptions.linkUnfurling(),
             ];
     }
+    static officeAddinStaticCapabilities(host) {
+        const items = [];
+        for (const h of Object.keys(projectConfig_1.OfficeAddinProjectConfig)) {
+            if (host && h !== host)
+                continue;
+            const hostValue = projectConfig_1.OfficeAddinProjectConfig[h];
+            for (const capability of Object.keys(hostValue)) {
+                const capabilityValue = hostValue[capability];
+                items.push({
+                    id: capability,
+                    label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                    detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+                });
+            }
+        }
+        return items;
+    }
+    static officeAddinDynamicCapabilities(projectType, host) {
+        const items = [];
+        const isOutlookAddin = projectType === ProjectTypeOptions.outlookAddin().id;
+        const isOfficeAddin = projectType === ProjectTypeOptions.officeAddin().id;
+        const isOfficeXMLAddinForOutlook = projectType === ProjectTypeOptions.officeXMLAddin().id &&
+            host === OfficeAddinHostOptions.outlook().id;
+        const pushToItems = (option) => {
+            const capabilityValue = projectConfig_1.OfficeAddinProjectConfig.json[option];
+            items.push({
+                id: option,
+                label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+            });
+        };
+        if (isOutlookAddin || isOfficeAddin || isOfficeXMLAddinForOutlook) {
+            pushToItems("json-taskpane");
+            if (isOutlookAddin || isOfficeXMLAddinForOutlook) {
+                items.push(CapabilityOptions.outlookAddinImport());
+            }
+            else if (isOfficeAddin) {
+                items.push(CapabilityOptions.officeContentAddin());
+                items.push(CapabilityOptions.officeAddinImport());
+            }
+        }
+        else {
+            if (host) {
+                const hostValue = projectConfig_1.OfficeAddinProjectConfig[host];
+                for (const capability of Object.keys(hostValue)) {
+                    const capabilityValue = hostValue[capability];
+                    items.push({
+                        id: capability,
+                        label: localizeUtils_1.getLocalizedString(capabilityValue.title),
+                        detail: localizeUtils_1.getLocalizedString(capabilityValue.detail),
+                    });
+                }
+            }
+        }
+        return items;
+    }
     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 +506,14 @@ class CapabilityOptions {
      */
     static staticAll(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs, true),
+            ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
             ...CapabilityOptions.collectMECaps(),
             ...CapabilityOptions.copilotPlugins(),
+            ...CapabilityOptions.customCopilots(),
+            ...CapabilityOptions.tdpIntegrationCapabilities(),
         ];
+        capabilityOptions.push(...CapabilityOptions.officeAddinStaticCapabilities());
         return capabilityOptions;
     }
     /**
@@ -368,31 +521,78 @@ class CapabilityOptions {
      */
     static all(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs, true),
+            ...CapabilityOptions.bots(inputs),
             ...CapabilityOptions.tabs(),
             ...CapabilityOptions.collectMECaps(),
         ];
         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());
+        }
+        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 officeAddinImport() {
+    static outlookAddinImport() {
         return {
-            id: "import",
+            id: "outlook-addin-import",
             label: localizeUtils_1.getLocalizedString("core.importAddin.label"),
             detail: localizeUtils_1.getLocalizedString("core.importAddin.detail"),
-            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 officeAddinImport() {
+        return {
+            id: "office-addin-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 officeContentAddin() {
+        return {
+            id: "office-content-addin",
+            label: localizeUtils_1.getLocalizedString("core.officeContentAddin.label"),
+            detail: localizeUtils_1.getLocalizedString("core.officeContentAddin.detail"),
+        };
     }
+    // static officeXMLAddinHostOptionItems(host: string): OptionItem[] {
+    //   return getOfficeXMLAddinHostProjectOptions(host).map((x) => ({
+    //     id: x.proj,
+    //     label: getLocalizedString(x.title),
+    //     detail: getLocalizedString(x.detail),
+    //   }));
+    // }
+    // static jsonAddinTaskpane(): OptionItem {
+    //   return {
+    //     id: "json-taskpane",
+    //     label: getLocalizedString("core.newTaskpaneAddin.label"),
+    //     detail: getLocalizedString("core.newTaskpaneAddin.detail"),
+    //     description: getLocalizedString(
+    //       "core.createProjectQuestion.option.description.previewOnWindow"
+    //     ),
+    //   };
+    // }
+    // static officeAddinItems(): OptionItem[] {
+    //   return officeAddinJsonData.getProjectTemplateNames().map((template) => ({
+    //     id: template,
+    //     label: getLocalizedString(officeAddinJsonData.getProjectDisplayName(template)),
+    //     detail: getLocalizedString(officeAddinJsonData.getProjectDetails(template)),
+    //   }));
+    // }
     static nonSsoTabAndBot() {
         return {
             id: "TabNonSsoAndBot",
@@ -442,6 +642,28 @@ 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() {
@@ -457,9 +679,24 @@ function capabilityQuestion() {
                 case ProjectTypeOptions.me().id:
                     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:
+                case ProjectTypeOptions.officeXMLAddin().id: {
+                    switch (inputs[questionNames_1.QuestionNames.OfficeAddinHost]) {
+                        case OfficeAddinHostOptions.outlook().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.outlookAddin.title");
+                        case OfficeAddinHostOptions.word().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.word.create.title");
+                        case OfficeAddinHostOptions.excel().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.excel.create.title");
+                        case OfficeAddinHostOptions.powerpoint().id:
+                            return localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.powerpoint.create.title");
+                    }
+                    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");
             }
@@ -490,7 +727,7 @@ function capabilityQuestion() {
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             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 +735,15 @@ function capabilityQuestion() {
             else if (projectType === ProjectTypeOptions.me().id) {
                 return CapabilityOptions.mes();
             }
-            else if (projectType === ProjectTypeOptions.outlookAddin().id) {
-                return [...CapabilityOptions.officeAddinItems(), CapabilityOptions.officeAddinImport()];
+            else if (ProjectTypeOptions.officeAddinAllIds().includes(projectType)) {
+                return CapabilityOptions.officeAddinDynamicCapabilities(projectType, inputs[questionNames_1.QuestionNames.OfficeAddinHost]);
             }
             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 +752,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 +783,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() {
@@ -874,65 +1117,127 @@ function SPFxImportFolderQuestion(hasDefaultFunc = false) {
     };
 }
 exports.SPFxImportFolderQuestion = SPFxImportFolderQuestion;
-const getTemplate = (inputs) => {
-    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
-    const templates = officeAddinJsonData.getProjectTemplateNames();
-    const foundTemplate = templates.find((template) => {
-        return capabilities && capabilities.includes(template);
-    });
-    return foundTemplate !== null && foundTemplate !== void 0 ? foundTemplate : "";
-};
-exports.getTemplate = getTemplate;
 function officeAddinHostingQuestion() {
-    const OfficeHostQuestion = {
-        type: "singleSelect",
+    return {
         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" }];
-        },
-        default: (inputs) => {
-            const template = exports.getTemplate(inputs);
-            const options = officeAddinJsonData.getHostTemplateNames(template);
-            return options[0] || "No Options";
-        },
-        skipSingleOption: true,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.officeXMLAddin.create.title"),
+        type: "singleSelect",
+        staticOptions: OfficeAddinHostOptions.all(),
     };
-    return OfficeHostQuestion;
 }
 exports.officeAddinHostingQuestion = officeAddinHostingQuestion;
-const officeAddinJsonData = new projectsJsonData_1.default();
+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"),
+        dynamicOptions: getAddinFrameworkOptions,
+        staticOptions: [
+            { id: "default", label: "Default" },
+            { id: "react", label: "React" },
+        ],
+        placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.officeAddin.framework.placeholder"),
+        skipSingleOption: true,
+    };
+}
+exports.officeAddinFrameworkQuestion = officeAddinFrameworkQuestion;
+function getAddinFrameworkOptions(inputs) {
+    const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
+    const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
+    if (projectType === ProjectTypeOptions.outlookAddin().id ||
+        (projectType === ProjectTypeOptions.officeXMLAddin().id &&
+            host === OfficeAddinHostOptions.outlook().id)) {
+        return [{ id: "default", label: "Default" }];
+    }
+    else if ((projectType === ProjectTypeOptions.officeAddin().id &&
+        capabilities === CapabilityOptions.officeContentAddin().id) ||
+        capabilities === CapabilityOptions.officeAddinImport().id) {
+        return [{ id: "default", label: "Default" }];
+    }
+    else {
+        return [
+            { id: "default", label: "Default" },
+            { id: "react", label: "React" },
+        ];
+    }
+}
+exports.getAddinFrameworkOptions = getAddinFrameworkOptions;
+/**
+ * when project-type=office-addin-type(office-addin-framework-type=default or react), use selected value;
+ * when project-type=outlook-addin-type, no framework to select, office-addin-framework-type=default_old
+ * when project-type=office-xml-addin-type, no framework to select, office-addin-framework-type=default_old
+ */
+function getOfficeAddinFramework(inputs) {
+    const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+    if (projectType === ProjectTypeOptions.officeAddin().id &&
+        inputs[questionNames_1.QuestionNames.OfficeAddinFramework]) {
+        return inputs[questionNames_1.QuestionNames.OfficeAddinFramework];
+    }
+    else if ((projectType === ProjectTypeOptions.officeXMLAddin().id &&
+        inputs[questionNames_1.QuestionNames.OfficeAddinHost] === OfficeAddinHostOptions.outlook().id) ||
+        projectType === ProjectTypeOptions.outlookAddin().id) {
+        return "default_old";
+    }
+    else {
+        return "default";
+    }
+}
+exports.getOfficeAddinFramework = getOfficeAddinFramework;
 function getLanguageOptions(inputs) {
     const runtime = getRuntime(inputs);
     // dotnet runtime only supports C#
     if (runtime === RuntimeOptions.DotNet().id) {
-        return [{ id: "csharp", label: "C#" }];
+        return [{ id: ProgrammingLanguage.CSharp, label: "C#" }];
     }
+    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
+    const host = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
     // office addin supports language defined in officeAddinJsonData
     const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-    if (projectType === 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 (ProjectTypeOptions.officeAddinAllIds().includes(projectType)) {
+        if (capabilities.endsWith("-manifest")) {
+            return [{ id: ProgrammingLanguage.JS, label: "JavaScript" }];
+        }
+        if (projectType === ProjectTypeOptions.outlookAddin().id ||
+            (projectType === ProjectTypeOptions.officeXMLAddin().id &&
+                host === OfficeAddinHostOptions.outlook().id)) {
+            return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
+        }
+        const officeXMLAddinLangConfig = projectConfig_1.getOfficeAddinTemplateConfig(projectType, host)[capabilities]
+            .framework["default"];
+        const officeXMLAddinLangOptions = [];
+        if (!!officeXMLAddinLangConfig.typescript)
+            officeXMLAddinLangOptions.push({ id: ProgrammingLanguage.TS, label: "TypeScript" });
+        if (!!officeXMLAddinLangConfig.javascript)
+            officeXMLAddinLangOptions.push({ id: ProgrammingLanguage.JS, label: "JavaScript" });
+        return officeXMLAddinLangOptions;
     }
-    const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
-    // SPFx only supports typescript
     if (capabilities === CapabilityOptions.SPFxTab().id) {
-        return [{ id: "typescript", label: "TypeScript" }];
+        // SPFx only supports typescript
+        return [{ id: ProgrammingLanguage.TS, label: "TypeScript" }];
+    }
+    else if (constants_3.capabilitiesHavePythonOption.includes(capabilities)) {
+        // support python language
+        return [
+            { id: ProgrammingLanguage.JS, label: "JavaScript" },
+            { id: ProgrammingLanguage.TS, label: "TypeScript" },
+            {
+                id: ProgrammingLanguage.PY,
+                label: "Python",
+                detail: "",
+                description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
+            },
+        ];
+    }
+    else {
+        // other cases
+        return [
+            { id: ProgrammingLanguage.JS, label: "JavaScript" },
+            { id: ProgrammingLanguage.TS, label: "TypeScript" },
+        ];
     }
-    // other case
-    return [
-        { id: "javascript", label: "JavaScript" },
-        { id: "typescript", label: "TypeScript" },
-    ];
 }
 exports.getLanguageOptions = getLanguageOptions;
 var ProgrammingLanguage;
@@ -940,17 +1245,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) => {
@@ -962,14 +1269,14 @@ function programmingLanguageQuestion() {
             if (runtime === RuntimeOptions.DotNet().id) {
                 return "";
             }
-            // office addin
-            const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
-            if (projectType === ProjectTypeOptions.outlookAddin().id) {
-                const template = exports.getTemplate(inputs);
-                const options = officeAddinJsonData.getSupportedScriptTypes(template);
-                return options[0] || "No Options";
-            }
             const capabilities = inputs[questionNames_1.QuestionNames.Capabilities];
+            // // office addin
+            // const projectType = inputs[QuestionNames.ProjectType];
+            // if (projectType === ProjectTypeOptions.outlookAddin().id) {
+            //   const template = getTemplate(inputs);
+            //   const options = officeAddinJsonData.getSupportedScriptTypesNew(template);
+            //   return options[0] || "No Options";
+            // }
             // SPFx
             if (capabilities === CapabilityOptions.SPFxTab().id) {
                 return localizeUtils_1.getLocalizedString("core.ProgrammingLanguageQuestion.placeholder.spfx");
@@ -1004,7 +1311,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;
@@ -1058,7 +1365,7 @@ function appNameQuestion() {
                 return undefined;
             },
         },
-        placeholder: "Application name",
+        placeholder: localizeUtils_1.getLocalizedString("core.question.appName.placeholder"),
     };
     return question;
 }
@@ -1264,8 +1571,18 @@ class ApiMessageExtensionAuthOptions {
             label: "API Key",
         };
     }
+    static microsoftEntra() {
+        return {
+            id: "microsoft-entra",
+            label: "Microsoft Entra",
+        };
+    }
     static all() {
-        return [ApiMessageExtensionAuthOptions.none(), ApiMessageExtensionAuthOptions.apiKey()];
+        return [
+            ApiMessageExtensionAuthOptions.none(),
+            ApiMessageExtensionAuthOptions.apiKey(),
+            ApiMessageExtensionAuthOptions.microsoftEntra(),
+        ];
     }
 }
 exports.ApiMessageExtensionAuthOptions = ApiMessageExtensionAuthOptions;
@@ -1289,14 +1606,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;
             }
@@ -1363,7 +1680,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,
@@ -1398,7 +1715,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;
                     }
@@ -1433,28 +1750,59 @@ 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;
+        },
         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: {
             validFunc: (input, inputs) => {
-                if (input.length < 1 || input.length > 10) {
+                if (input.length < 1 ||
+                    (input.length > 10 &&
+                        (inputs === null || inputs === void 0 ? void 0 : 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;
@@ -1487,6 +1835,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(),
@@ -1517,8 +2013,13 @@ function capabilitySubTree() {
                 ],
             },
             {
-                // office addin import sub-tree
-                condition: { equals: CapabilityOptions.officeAddinImport().id },
+                // office addin import sub-tree (capabilities=office-addin-import | outlook-addin-import)
+                condition: {
+                    enum: [
+                        CapabilityOptions.outlookAddinImport().id,
+                        CapabilityOptions.officeAddinImport().id,
+                    ],
+                },
                 data: { type: "group", name: questionNames_1.QuestionNames.OfficeAddinImport },
                 children: [
                     {
@@ -1537,13 +2038,6 @@ function capabilitySubTree() {
                     },
                 ],
             },
-            {
-                // office addin other items sub-tree
-                condition: {
-                    enum: CapabilityOptions.officeAddinItems().map((i) => i.id),
-                },
-                data: officeAddinHostingQuestion(),
-            },
             {
                 // Search ME sub-tree
                 condition: { equals: CapabilityOptions.m365SearchMe().id },
@@ -1567,22 +2061,47 @@ 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() || featureFlags_1.isApiMeSSOEnabled()) &&
+                        inputs[questionNames_1.QuestionNames.MeArchitectureType] == MeArchitectureOptions.newApi().id);
+                },
+                data: apiMessageExtensionAuthQuestion(),
+            },
+            {
+                condition: (inputs) => {
+                    return inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.customCopilotRag().id;
+                },
+                data: customCopilotRagQuestion(),
+                children: [
                     {
+                        condition: (inputs) => {
+                            return (inputs[questionNames_1.QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id);
+                        },
+                        data: apiSpecLocationQuestion(),
+                    },
+                    {
+                        condition: (inputs) => {
+                            return (inputs[questionNames_1.QuestionNames.CustomCopilotRag] === CustomCopilotRagOptions.customApi().id);
+                        },
                         data: apiOperationQuestion(),
                     },
                 ],
             },
             {
                 condition: (inputs) => {
-                    return (featureFlags_1.isApiKeyEnabled() &&
-                        (inputs[questionNames_1.QuestionNames.MeArchitectureType] == MeArchitectureOptions.newApi().id ||
-                            inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.copilotPluginNewApi().id));
+                    return (inputs[questionNames_1.QuestionNames.Capabilities] == CapabilityOptions.customCopilotAssistant().id);
                 },
-                data: apiMessageExtensionAuthQuestion(),
+                data: customCopilotAssistantQuestion(),
             },
             {
                 // programming language
@@ -1592,7 +2111,44 @@ function capabilitySubTree() {
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !==
                             CapabilityOptions.copilotPluginOpenAIPlugin().id &&
-                        inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().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);
+                },
+            },
+            {
+                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(),
+                    },
+                ],
+            },
+            {
+                // Office addin framework for json manifest
+                data: officeAddinFrameworkQuestion(),
+                condition: (inputs) => {
+                    return (inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeAddin().id &&
+                        inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.officeAddinImport().id);
                 },
             },
             {
@@ -1621,6 +2177,10 @@ function createProjectQuestionNode() {
                 data: projectTypeQuestion(),
                 cliOptionDisabled: "self",
             },
+            {
+                condition: (inputs) => inputs[questionNames_1.QuestionNames.ProjectType] === ProjectTypeOptions.officeXMLAddin().id,
+                data: officeAddinHostingQuestion(),
+            },
             capabilitySubTree(),
             {
                 condition: (inputs) => inputs.teamsAppFromTdp && utils_2.isPersonalApp(inputs.teamsAppFromTdp),
@@ -1684,9 +2244,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;
 }