@microsoft/teamsfx-core 2.0.6-alpha.da822cd72.0 → 2.0.6-alpha.dc4264a43.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.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.apiMeQuestion = exports.ApiMeOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
+exports.createProjectCliHelpNode = exports.createSampleProjectQuestionNode = exports.createProjectQuestionNode = exports.capabilitySubTree = exports.apiOperationQuestion = exports.openAIPluginManifestLocationQuestion = exports.apiSpecLocationQuestion = exports.RuntimeOptions = exports.appNameQuestion = exports.AppNamePattern = exports.folderQuestion = exports.programmingLanguageQuestion = exports.ProgrammingLanguage = exports.getLanguageOptions = exports.officeAddinHostingQuestion = exports.getTemplate = exports.SPFxImportFolderQuestion = exports.SPFxVersionOptionIds = exports.SPFxWebpartNameQuestion = exports.SPFxFrameworkQuestion = exports.SPFxPackageSelectQuestion = exports.NotificationTriggerOptions = exports.meArchitectureQuestion = exports.MeArchitectureOptions = exports.capabilityQuestion = exports.CapabilityOptions = exports.ProjectTypeOptions = exports.ScratchOptions = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -68,7 +68,9 @@ class ProjectTypeOptions {
         return {
             id: "me-type",
             label: `${platform === teamsfx_api_1.Platform.VSCode ? "$(symbol-keyword) " : ""}${localizeUtils_1.getLocalizedString("core.MessageExtensionOption.label")}`,
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.detail"),
+            detail: featureFlags_1.isCopilotPluginEnabled()
+                ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.copilotEnabled.detail")
+                : localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.messageExtension.detail"),
         };
     }
     static outlookAddin(platform) {
@@ -263,16 +265,9 @@ class CapabilityOptions {
         return {
             id: "search-app",
             label: `${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
-            detail: localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
-            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlook"),
-        };
-    }
-    static copilotM365SearchMe() {
-        return {
-            id: "search-me-copilot",
-            label: `${localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.label")}`,
-            detail: localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
-            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlookCopilot"),
+            detail: featureFlags_1.isCopilotPluginEnabled()
+                ? localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.copilot.detail")
+                : localizeUtils_1.getLocalizedString("core.M365SearchAppOptionItem.detail"),
         };
     }
     static SearchMe() {
@@ -297,10 +292,11 @@ class CapabilityOptions {
             detail: localizeUtils_1.getLocalizedString("core.MessageExtensionOption.detail"),
         };
     }
-    static bots(inputs) {
+    static bots(inputs, includeAssistant) {
         return [
             CapabilityOptions.basicBot(),
             CapabilityOptions.aiBot(),
+            ...(includeAssistant === true ? [CapabilityOptions.aiAssistantBot()] : []),
             CapabilityOptions.notificationBot(),
             CapabilityOptions.commandBot(),
             CapabilityOptions.workflowBot(inputs),
@@ -317,52 +313,35 @@ class CapabilityOptions {
     static dotnetCaps(inputs) {
         return [
             ...CapabilityOptions.copilotPlugins(),
-            ...CapabilityOptions.bots(inputs),
+            ...CapabilityOptions.bots(),
             CapabilityOptions.nonSsoTab(),
             CapabilityOptions.tab(),
-            ...CapabilityOptions.mes(inputs),
+            ...CapabilityOptions.collectMECaps(),
         ];
     }
     /**
      * Collect all capabilities for message extension, including dotnet and nodejs.
-     * @param filterByFeatureFlag true: filter capabilities by feature flag, false: return all capabilities
      * @returns OptionItem[] capability list
      */
-    static collectMECaps(filterByFeatureFlag) {
-        return filterByFeatureFlag
-            ? [
-                CapabilityOptions.apiMe(),
-                CapabilityOptions.linkUnfurling(),
-                ...(featureFlags_1.isCopilotPluginEnabled()
-                    ? [CapabilityOptions.copilotM365SearchMe()]
-                    : [CapabilityOptions.m365SearchMe(), CapabilityOptions.SearchMe()]),
-                CapabilityOptions.collectFormMe(),
-            ]
-            : [
-                CapabilityOptions.apiMe(),
-                CapabilityOptions.linkUnfurling(),
-                CapabilityOptions.m365SearchMe(),
-                CapabilityOptions.collectFormMe(),
-                CapabilityOptions.copilotM365SearchMe(),
-                CapabilityOptions.SearchMe(),
-            ];
+    static collectMECaps() {
+        return [
+            CapabilityOptions.m365SearchMe(),
+            CapabilityOptions.collectFormMe(),
+            CapabilityOptions.SearchMe(),
+            CapabilityOptions.linkUnfurling(),
+        ];
     }
     static mes(inputs) {
         return inputs !== undefined && getRuntime(inputs) === RuntimeOptions.DotNet().id
             ? [
-                CapabilityOptions.linkUnfurling(),
-                featureFlags_1.isCopilotPluginEnabled()
-                    ? CapabilityOptions.copilotM365SearchMe()
-                    : CapabilityOptions.SearchMe(),
+                CapabilityOptions.SearchMe(),
                 CapabilityOptions.collectFormMe(),
+                CapabilityOptions.linkUnfurling(),
             ]
             : [
-                CapabilityOptions.apiMe(),
-                CapabilityOptions.linkUnfurling(),
-                featureFlags_1.isCopilotPluginEnabled()
-                    ? CapabilityOptions.copilotM365SearchMe()
-                    : CapabilityOptions.m365SearchMe(),
+                CapabilityOptions.m365SearchMe(),
                 CapabilityOptions.collectFormMe(),
+                CapabilityOptions.linkUnfurling(),
             ];
     }
     static copilotPlugins() {
@@ -377,9 +356,9 @@ class CapabilityOptions {
      */
     static staticAll(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs),
+            ...CapabilityOptions.bots(inputs, true),
             ...CapabilityOptions.tabs(),
-            ...CapabilityOptions.collectMECaps(false),
+            ...CapabilityOptions.collectMECaps(),
             ...CapabilityOptions.copilotPlugins(),
         ];
         return capabilityOptions;
@@ -389,9 +368,9 @@ class CapabilityOptions {
      */
     static all(inputs) {
         const capabilityOptions = [
-            ...CapabilityOptions.bots(inputs),
+            ...CapabilityOptions.bots(inputs, true),
             ...CapabilityOptions.tabs(),
-            ...CapabilityOptions.collectMECaps(true),
+            ...CapabilityOptions.collectMECaps(),
         ];
         if (featureFlags_1.isApiCopilotPluginEnabled()) {
             capabilityOptions.push(...CapabilityOptions.copilotPlugins());
@@ -448,14 +427,6 @@ class CapabilityOptions {
             detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.copilotPluginAIPluginOption.detail"),
         };
     }
-    //API ME
-    static apiMe() {
-        return {
-            id: "api-me",
-            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.apiMe.label"),
-            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.apiMe.detail"),
-        };
-    }
     static aiBot() {
         return {
             id: "ai-bot",
@@ -464,6 +435,14 @@ class CapabilityOptions {
             description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
         };
     }
+    static aiAssistantBot() {
+        return {
+            id: "ai-assistant-bot",
+            label: localizeUtils_1.getLocalizedString("core.aiAssistantBotOption.label"),
+            detail: localizeUtils_1.getLocalizedString("core.aiAssistantBotOption.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.preview"),
+        };
+    }
 }
 exports.CapabilityOptions = CapabilityOptions;
 function capabilityQuestion() {
@@ -489,7 +468,7 @@ function capabilityQuestion() {
         cliDescription: "Specifies the Microsoft Teams App capability.",
         cliName: questionNames_1.CliQuestionName.Capability,
         cliShortName: "c",
-        cliChoiceListCommand: "teamsfx list templates",
+        cliChoiceListCommand: "teamsapp list templates",
         type: "singleSelect",
         staticOptions: CapabilityOptions.staticAll(),
         dynamicOptions: (inputs) => {
@@ -512,7 +491,7 @@ function capabilityQuestion() {
             // nodejs capabilities
             const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
             if (projectType === ProjectTypeOptions.bot().id) {
-                return CapabilityOptions.bots(inputs);
+                return CapabilityOptions.bots(inputs, true);
             }
             else if (projectType === ProjectTypeOptions.tab().id) {
                 return CapabilityOptions.tabs();
@@ -541,7 +520,23 @@ function capabilityQuestion() {
     };
 }
 exports.capabilityQuestion = capabilityQuestion;
-class ApiMeOptions {
+class MeArchitectureOptions {
+    static botMe() {
+        return {
+            id: "bot",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.botMessageExtension.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.botMessageExtension.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlook"),
+        };
+    }
+    static botPlugin() {
+        return {
+            id: "bot-plugin",
+            label: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.botMessageExtension.label"),
+            detail: localizeUtils_1.getLocalizedString("core.createProjectQuestion.capability.botMessageExtension.detail"),
+            description: localizeUtils_1.getLocalizedString("core.createProjectQuestion.option.description.worksInOutlookCopilot"),
+        };
+    }
     static newApi() {
         return {
             id: "new-api",
@@ -557,23 +552,40 @@ class ApiMeOptions {
         };
     }
     static all() {
-        return [ApiMeOptions.newApi(), ApiMeOptions.apiSpec()];
+        return [
+            MeArchitectureOptions.newApi(),
+            MeArchitectureOptions.apiSpec(),
+            featureFlags_1.isCopilotPluginEnabled() ? MeArchitectureOptions.botPlugin() : MeArchitectureOptions.botMe(),
+        ];
+    }
+    static staticAll() {
+        return [
+            MeArchitectureOptions.newApi(),
+            MeArchitectureOptions.apiSpec(),
+            MeArchitectureOptions.botPlugin(),
+            MeArchitectureOptions.botMe(),
+        ];
     }
 }
-exports.ApiMeOptions = ApiMeOptions;
-function apiMeQuestion() {
+exports.MeArchitectureOptions = MeArchitectureOptions;
+function meArchitectureQuestion() {
     return {
-        name: questionNames_1.QuestionNames.ApiMeType,
-        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiMeQuestion.title"),
+        name: questionNames_1.QuestionNames.MeArchitectureType,
+        title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.meArchitecture.title"),
+        cliDescription: "Architecture of Search Based Message Extension.",
+        cliShortName: "m",
         type: "singleSelect",
-        staticOptions: ApiMeOptions.all(),
-        default: ApiMeOptions.newApi().id,
+        staticOptions: MeArchitectureOptions.staticAll(),
+        dynamicOptions: (inputs) => {
+            return MeArchitectureOptions.all();
+        },
+        default: MeArchitectureOptions.newApi().id,
         placeholder: localizeUtils_1.getLocalizedString("core.createProjectQuestion.projectType.copilotPlugin.placeholder"),
         forgetLastValue: true,
         skipSingleOption: true,
     };
 }
-exports.apiMeQuestion = apiMeQuestion;
+exports.meArchitectureQuestion = meArchitectureQuestion;
 var HostType;
 (function (HostType) {
     HostType["AppService"] = "app-service";
@@ -778,6 +790,7 @@ function SPFxFrameworkQuestion() {
         default: "react",
     };
 }
+exports.SPFxFrameworkQuestion = SPFxFrameworkQuestion;
 function SPFxWebpartNameQuestion() {
     return {
         type: "text",
@@ -903,7 +916,7 @@ function programmingLanguageQuestion() {
     const programmingLanguageQuestion = {
         name: questionNames_1.QuestionNames.ProgrammingLanguage,
         cliShortName: "l",
-        title: "Programming Language.",
+        title: "Programming Language",
         type: "singleSelect",
         staticOptions: [
             { id: ProgrammingLanguage.JS, label: "JavaScript" },
@@ -1017,21 +1030,41 @@ function sampleSelectQuestion() {
         name: questionNames_1.QuestionNames.Samples,
         cliName: "sample-name",
         cliDescription: "Specifies the Microsoft Teams App sample name.",
-        cliChoiceListCommand: "teamsfx list samples",
+        cliChoiceListCommand: "teamsapp list samples",
         skipValidation: true,
         cliType: "argument",
         title: localizeUtils_1.getLocalizedString("core.SampleSelect.title"),
-        staticOptions: samples_1.sampleProvider.SampleCollection.samples.map((sample) => {
-            return {
-                id: sample.id,
-                label: sample.title,
-                description: `${sample.time} • ${sample.configuration}`,
-                detail: sample.shortDescription,
-            };
-        }),
+        staticOptions: [
+            "hello-world-tab-with-backend",
+            "graph-toolkit-contact-exporter",
+            "bot-sso",
+            "todo-list-SPFx",
+            "hello-world-in-meeting",
+            "todo-list-with-Azure-backend-M365",
+            "NPM-search-connector-M365",
+            "bot-proactive-messaging-teamsfx",
+            "adaptive-card-notification",
+            "incoming-webhook-notification",
+            "stocks-update-notification-bot",
+            "query-org-user-with-message-extension-sso",
+            "team-central-dashboard",
+            "graph-connector-app",
+            "graph-toolkit-one-productivity-hub",
+            "todo-list-with-Azure-backend",
+            "share-now",
+            "hello-world-teams-tab-and-outlook-add-in",
+            "outlook-add-in-set-signature",
+            "developer-assist-dashboard",
+            "live-share-dice-roller",
+            "teams-chef-bot",
+            "spfx-productivity-dashboard",
+            "react-retail-dashboard",
+            "sso-enabled-tab-via-apim-proxy",
+            "large-scale-notification",
+            "graph-connector-bot",
+        ],
         dynamicOptions: async () => {
-            await samples_1.sampleProvider.fetchSampleConfig();
-            return samples_1.sampleProvider.SampleCollection.samples.map((sample) => {
+            return (await samples_1.sampleProvider.SampleCollection).samples.map((sample) => {
                 return {
                     id: sample.id,
                     label: sample.title,
@@ -1244,10 +1277,10 @@ function apiSpecLocationQuestion(includeExistingAPIs = true) {
             step: 2,
             validation: {
                 validFunc: (input, inputs) => {
-                    const result = util_1.isValidHttpUrl(input)
+                    const result = util_1.isValidHttpUrl(input.trim())
                         ? undefined
                         : (inputs === null || inputs === void 0 ? void 0 : inputs.platform) === teamsfx_api_1.Platform.CLI
-                            ? "Please enter a valid URL or local path of your API Specification"
+                            ? "Please enter a valid HTTP URL without authentication to access your OpenAPI description document or enter a file path of your local OpenAPI description document."
                             : localizeUtils_1.getLocalizedString("core.createProjectQuestion.invalidUrl.message");
                     return Promise.resolve(result);
                 },
@@ -1262,8 +1295,8 @@ function apiSpecLocationQuestion(includeExistingAPIs = true) {
         },
         validation: {
             validFunc: async (input, inputs) => {
-                if (!util_1.isValidHttpUrl(input) && !(await fs_extra_1.default.pathExists(input))) {
-                    return "Please enter a valid URL or local path of your API Specification";
+                if (!util_1.isValidHttpUrl(input.trim()) && !(await fs_extra_1.default.pathExists(input.trim()))) {
+                    return "Please enter a valid HTTP URL without authentication to access your OpenAPI description document or enter a file path of your local OpenAPI description document.";
                 }
                 return await validationOnAccept(input, inputs);
             },
@@ -1341,18 +1374,38 @@ function apiOperationQuestion(includeExistingAPIs = true) {
         type: "multiSelect",
         name: questionNames_1.QuestionNames.ApiOperation,
         title: localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.title"),
-        cliDescription: "Specifies API(s) to be used in Copilot plugin.",
+        cliDescription: "Select Operation(s) Teams Can Interact with.",
         cliShortName: "o",
         placeholder: includeExistingAPIs
-            ? localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.placeholder")
+            ? 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"),
         forgetLastValue: true,
         staticOptions: [],
         validation: {
-            validFunc: (input) => {
+            validFunc: (input, inputs) => {
                 if (input.length < 1 || input.length > 10) {
                     return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.invalidMessage", input.length, 10);
                 }
+                const operations = inputs === null || inputs === void 0 ? void 0 : inputs.supportedApisFromApiSpec;
+                const authNames = new Set();
+                const serverUrls = new Set();
+                for (const inputItem of input) {
+                    const operation = operations.find((op) => op.id === inputItem);
+                    if (operation) {
+                        if (operation.data.authName) {
+                            authNames.add(operation.data.authName);
+                            serverUrls.add(operation.data.serverUrl);
+                        }
+                    }
+                }
+                if (authNames.size > 1) {
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.multipleAuth", Array.from(authNames).join(", "));
+                }
+                if (serverUrls.size > 1) {
+                    return localizeUtils_1.getLocalizedString("core.createProjectQuestion.apiSpec.operation.multipleServer", Array.from(serverUrls).join(", "));
+                }
             },
         },
         dynamicOptions: (inputs) => {
@@ -1423,9 +1476,9 @@ function capabilitySubTree() {
                 data: officeAddinHostingQuestion(),
             },
             {
-                // API ME sub-tree
-                condition: { equals: CapabilityOptions.apiMe().id },
-                data: apiMeQuestion(),
+                // Search ME sub-tree
+                condition: { equals: CapabilityOptions.m365SearchMe().id },
+                data: meArchitectureQuestion(),
             },
             {
                 // API ME from API Spec or Copilot plugin from API spec or AI Plugin
@@ -1433,7 +1486,7 @@ function capabilitySubTree() {
                     return (inputs[questionNames_1.QuestionNames.Capabilities] === CapabilityOptions.copilotPluginApiSpec().id ||
                         inputs[questionNames_1.QuestionNames.Capabilities] ===
                             CapabilityOptions.copilotPluginOpenAIPlugin().id ||
-                        inputs[questionNames_1.QuestionNames.ApiMeType] === ApiMeOptions.apiSpec().id);
+                        inputs[questionNames_1.QuestionNames.MeArchitectureType] === MeArchitectureOptions.apiSpec().id);
                 },
                 data: { type: "group", name: questionNames_1.QuestionNames.CopilotPluginExistingApi },
                 children: [
@@ -1441,7 +1494,7 @@ function capabilitySubTree() {
                         condition: (inputs) => {
                             return (inputs[questionNames_1.QuestionNames.Capabilities] ===
                                 CapabilityOptions.copilotPluginApiSpec().id ||
-                                inputs[questionNames_1.QuestionNames.ApiMeType] === ApiMeOptions.apiSpec().id);
+                                inputs[questionNames_1.QuestionNames.MeArchitectureType] === MeArchitectureOptions.apiSpec().id);
                         },
                         data: apiSpecLocationQuestion(),
                     },
@@ -1462,7 +1515,7 @@ function capabilitySubTree() {
                         inputs[questionNames_1.QuestionNames.Capabilities] !== CapabilityOptions.copilotPluginApiSpec().id &&
                         inputs[questionNames_1.QuestionNames.Capabilities] !==
                             CapabilityOptions.copilotPluginOpenAIPlugin().id &&
-                        inputs[questionNames_1.QuestionNames.ApiMeType] !== ApiMeOptions.apiSpec().id);
+                        inputs[questionNames_1.QuestionNames.MeArchitectureType] !== MeArchitectureOptions.apiSpec().id);
                 },
             },
             {