@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/component/coordinator/index.js

@@ -14,24 +14,30 @@ const os_1 = require("os");
 const path = tslib_1.__importStar(require("path"));
 const uuid = tslib_1.__importStar(require("uuid"));
 const xml2js = tslib_1.__importStar(require("xml2js"));
-const constants_1 = require("../../common/constants");
-const globalVars_1 = require("../../common/globalVars");
+const featureFlags_1 = require("../../common/featureFlags");
 const localizeUtils_1 = require("../../common/localizeUtils");
-const stringUtils_1 = require("../../common/stringUtils");
 const telemetry_1 = require("../../common/telemetry");
+const tools_1 = require("../../common/tools");
+const utils_1 = require("../../common/utils");
 const versionMetadata_1 = require("../../common/versionMetadata");
 const environmentName_1 = require("../../core/environmentName");
+const error_1 = require("../../core/error");
+const globalVars_1 = require("../../core/globalVars");
 const azure_1 = require("../../error/azure");
 const common_1 = require("../../error/common");
 const yml_1 = require("../../error/yml");
-const constants_2 = require("../../question/constants");
-const constants_3 = require("../constants");
+const create_1 = require("../../question/create");
+const questionNames_1 = require("../../question/questionNames");
+const constants_1 = require("../constants");
 const deployUtils_1 = require("../deployUtils");
 const developerPortalScaffoldUtils_1 = require("../developerPortalScaffoldUtils");
 const appStudio_1 = require("../driver/teamsApp/appStudio");
-const constants_4 = require("../driver/teamsApp/constants");
-const generator_1 = require("../generator/generator");
-const generatorProvider_1 = require("../generator/generatorProvider");
+const constants_2 = require("../driver/teamsApp/constants");
+const generator_1 = require("../generator/copilotPlugin/generator");
+const generator_2 = require("../generator/generator");
+const generator_3 = require("../generator/officeAddin/generator");
+const generator_4 = require("../generator/officeXMLAddin/generator");
+const spfxGenerator_1 = require("../generator/spfx/spfxGenerator");
 const actionExecutionMW_1 = require("../middleware/actionExecutionMW");
 const provisionUtils_1 = require("../provisionUtils");
 const ResourceGroupHelper_1 = require("../utils/ResourceGroupHelper");
@@ -40,7 +46,9 @@ const metadataUtil_1 = require("../utils/metadataUtil");
 const pathUtils_1 = require("../utils/pathUtils");
 const settingsUtil_1 = require("../utils/settingsUtil");
 const summary_1 = require("./summary");
-const featureFlags_1 = require("../../common/featureFlags");
+const generatorProvider_1 = require("../generator/generatorProvider");
+const templateNames_1 = require("../generator/templates/templateNames");
+const utils_2 = require("../generator/utils");
 const M365Actions = [
     "botAadApp/create",
     "teamsApp/create",
@@ -55,31 +63,19 @@ const needTenantCheckActions = ["botAadApp/create", "aadApp/create", "botFramewo
 class Coordinator {
     async create(context, inputs, actionContext) {
         var _a, _b, _c;
-        // Handle command redirect to Kiota. Only happens in vscode.
-        if (inputs.platform === teamsfx_api_1.Platform.VSCode &&
-            featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaIntegration) &&
-            inputs[constants_2.QuestionNames.ApiPluginType] === constants_2.ApiPluginStartOptions.apiSpec().id &&
-            !inputs[constants_2.QuestionNames.ApiPluginManifestPath] &&
-            (inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.apiPlugin().id ||
-                inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.declarativeCopilot().id)) {
-            const lastCommand = inputs[constants_2.QuestionNames.Capabilities] === constants_2.CapabilityOptions.apiPlugin().id
-                ? constants_3.KiotaLastCommands.createPluginWithManifest
-                : constants_3.KiotaLastCommands.createDeclarativeCopilotWithManifest;
-            return (0, teamsfx_api_1.ok)({ projectPath: "", lastCommand: lastCommand });
-        }
         let folder = inputs["folder"];
         if (!folder) {
-            return (0, teamsfx_api_1.err)(new common_1.MissingRequiredInputError("folder"));
+            return teamsfx_api_1.err(new common_1.MissingRequiredInputError("folder"));
         }
         folder = path.resolve(folder);
-        const scratch = inputs[constants_2.QuestionNames.Scratch];
+        const scratch = inputs[questionNames_1.QuestionNames.Scratch];
         let projectPath = "";
         let warnings = undefined;
-        if (scratch === constants_2.ScratchOptions.no().id) {
+        if (scratch === create_1.ScratchOptions.no().id) {
             // create from sample
-            const sampleId = inputs[constants_2.QuestionNames.Samples];
+            const sampleId = inputs[questionNames_1.QuestionNames.Samples];
             if (!sampleId) {
-                throw new common_1.MissingRequiredInputError(constants_2.QuestionNames.Samples);
+                throw new common_1.MissingRequiredInputError(questionNames_1.QuestionNames.Samples);
             }
             projectPath = path.join(folder, sampleId);
             let suffix = 1;
@@ -88,38 +84,39 @@ class Coordinator {
             }
             inputs.projectPath = projectPath;
             await fs_extra_1.default.ensureDir(projectPath);
-            const res = await generator_1.Generator.generateSample(context, projectPath, sampleId);
+            const res = await generator_2.Generator.generateSample(context, projectPath, sampleId);
             if (res.isErr())
-                return (0, teamsfx_api_1.err)(res.error);
+                return teamsfx_api_1.err(res.error);
             downloadSampleHook(sampleId, projectPath);
         }
-        else if (!scratch || scratch === constants_2.ScratchOptions.yes().id) {
+        else if (!scratch || scratch === create_1.ScratchOptions.yes().id) {
             // create from new
-            const appName = inputs[constants_2.QuestionNames.AppName];
+            const appName = inputs[questionNames_1.QuestionNames.AppName];
             if (undefined === appName)
-                return (0, teamsfx_api_1.err)(new common_1.MissingRequiredInputError(constants_2.QuestionNames.AppName));
+                return teamsfx_api_1.err(new common_1.MissingRequiredInputError(questionNames_1.QuestionNames.AppName));
             const validateResult = jsonschema.validate(appName, {
-                pattern: constants_2.AppNamePattern,
+                pattern: create_1.AppNamePattern,
             });
             if (validateResult.errors && validateResult.errors.length > 0) {
-                return (0, teamsfx_api_1.err)(new common_1.InputValidationError(constants_2.QuestionNames.AppName, validateResult.errors[0].message));
+                return teamsfx_api_1.err(new common_1.InputValidationError(questionNames_1.QuestionNames.AppName, validateResult.errors[0].message));
             }
             projectPath = path.join(folder, appName);
             inputs.projectPath = projectPath;
             await fs_extra_1.default.ensureDir(projectPath);
             // set isVS global var when creating project
-            const language = inputs[constants_2.QuestionNames.ProgrammingLanguage];
+            const language = inputs[questionNames_1.QuestionNames.ProgrammingLanguage];
             globalVars_1.globalVars.isVS = language === "csharp";
             const capability = inputs.capabilities;
-            const projectType = inputs[constants_2.QuestionNames.ProjectType];
+            const projectType = inputs[questionNames_1.QuestionNames.ProjectType];
+            const meArchitecture = inputs[questionNames_1.QuestionNames.MeArchitectureType];
+            const apiMEAuthType = inputs[questionNames_1.QuestionNames.ApiMEAuth];
             delete inputs.folder;
-            (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
                 [telemetry_1.TelemetryProperty.Capabilities]: capability,
                 [telemetry_1.TelemetryProperty.IsFromTdp]: (!!inputs.teamsAppFromTdp).toString(),
             });
-            if (projectType === constants_2.ProjectTypeOptions.customCopilot().id ||
-                (projectType === constants_2.ProjectTypeOptions.bot().id && inputs.platform === teamsfx_api_1.Platform.VS)) {
-                (0, lodash_1.merge)(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
+            if (projectType === create_1.ProjectTypeOptions.customCopilot().id) {
+                lodash_1.merge(actionContext === null || actionContext === void 0 ? void 0 : actionContext.telemetryProps, {
                     [telemetry_1.TelemetryProperty.CustomCopilotRAG]: (_a = inputs["custom-copilot-rag"]) !== null && _a !== void 0 ? _a : "",
                     [telemetry_1.TelemetryProperty.CustomCopilotAgent]: (_b = inputs["custom-copilot-agent"]) !== null && _b !== void 0 ? _b : "",
                     [telemetry_1.TelemetryProperty.LlmService]: (_c = inputs["llm-service"]) !== null && _c !== void 0 ? _c : "",
@@ -133,40 +130,154 @@ class Coordinator {
                     [telemetry_1.TelemetryProperty.HasOpenAIKey]: inputs["openai-key"] ? "true" : "false",
                 });
             }
-            // refactored generator
-            const generator = generatorProvider_1.Generators.find((g) => g.activate(context, inputs));
-            if (!generator) {
-                return (0, teamsfx_api_1.err)(new common_1.MissingRequiredInputError(constants_2.QuestionNames.Capabilities, "coordinator"));
+            if (featureFlags_1.isNewGeneratorEnabled()) {
+                // refactored generator
+                const generator = generatorProvider_1.Generators.find((g) => g.activate(context, inputs));
+                if (!generator) {
+                    return teamsfx_api_1.err(new common_1.MissingRequiredInputError(questionNames_1.QuestionNames.Capabilities, "coordinator"));
+                }
+                const res = await generator.run(context, inputs, projectPath);
+                if (res.isErr())
+                    return teamsfx_api_1.err(res.error);
             }
-            const res = await generator.run(context, inputs, projectPath);
-            if (res.isErr())
-                return (0, teamsfx_api_1.err)(res.error);
             else {
-                warnings = res.value.warnings;
+                // legacy logic
+                if (capability === create_1.CapabilityOptions.SPFxTab().id) {
+                    const res = await spfxGenerator_1.SPFxGenerator.generate(context, inputs, projectPath);
+                    if (res.isErr())
+                        return teamsfx_api_1.err(res.error);
+                }
+                else if (create_1.ProjectTypeOptions.officeAddinAllIds().includes(projectType)) {
+                    const addinHost = inputs[questionNames_1.QuestionNames.OfficeAddinHost];
+                    if (projectType === create_1.ProjectTypeOptions.officeXMLAddin().id &&
+                        addinHost &&
+                        addinHost !== create_1.OfficeAddinHostOptions.outlook().id) {
+                        const res = await generator_4.OfficeXMLAddinGenerator.generate(context, inputs, projectPath);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                    }
+                    else {
+                        const res = await generator_3.OfficeAddinGenerator.generate(context, inputs, projectPath);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                    }
+                }
+                else if (capability === create_1.CapabilityOptions.copilotPluginApiSpec().id) {
+                    const res = await generator_1.CopilotPluginGenerator.generatePluginFromApiSpec(context, inputs, projectPath);
+                    if (res.isErr()) {
+                        return teamsfx_api_1.err(res.error);
+                    }
+                    else {
+                        warnings = res.value.warnings;
+                    }
+                }
+                else if (meArchitecture === create_1.MeArchitectureOptions.apiSpec().id) {
+                    const res = await generator_1.CopilotPluginGenerator.generateMeFromApiSpec(context, inputs, projectPath);
+                    if (res.isErr()) {
+                        return teamsfx_api_1.err(res.error);
+                    }
+                    else {
+                        warnings = res.value.warnings;
+                    }
+                }
+                else if (capability === create_1.CapabilityOptions.copilotPluginOpenAIPlugin().id) {
+                    const res = await generator_1.CopilotPluginGenerator.generateFromOpenAIPlugin(context, inputs, projectPath);
+                    if (res.isErr()) {
+                        return teamsfx_api_1.err(res.error);
+                    }
+                    else {
+                        warnings = res.value.warnings;
+                    }
+                }
+                else {
+                    if (capability === create_1.CapabilityOptions.m365SsoLaunchPage().id ||
+                        capability === create_1.CapabilityOptions.m365SearchMe().id) {
+                        inputs.isM365 = true;
+                    }
+                    const trigger = inputs[questionNames_1.QuestionNames.BotTrigger];
+                    let feature = `${capability}:${trigger}`;
+                    if (language === "csharp" &&
+                        capability === create_1.CapabilityOptions.notificationBot().id &&
+                        inputs.isIsolated === true) {
+                        feature += "-isolated";
+                    }
+                    if (meArchitecture) {
+                        feature = `${feature}:${meArchitecture}`;
+                    }
+                    if (inputs.targetFramework &&
+                        inputs.targetFramework !== "net6.0" &&
+                        inputs.targetFramework !== "net7.0" &&
+                        (capability === create_1.CapabilityOptions.nonSsoTab().id ||
+                            capability === create_1.CapabilityOptions.tab().id)) {
+                        feature = `${capability}:ssr`;
+                    }
+                    if (capability === create_1.CapabilityOptions.m365SearchMe().id &&
+                        meArchitecture === create_1.MeArchitectureOptions.newApi().id) {
+                        feature = `${feature}:${apiMEAuthType}`;
+                    }
+                    if (capability === create_1.CapabilityOptions.customCopilotRag().id) {
+                        feature = `${feature}:${inputs[questionNames_1.QuestionNames.CustomCopilotRag]}`;
+                    }
+                    else if (capability === create_1.CapabilityOptions.customCopilotAssistant().id) {
+                        feature = `${feature}:${inputs[questionNames_1.QuestionNames.CustomCopilotAssistant]}`;
+                    }
+                    const templateName = templateNames_1.Feature2TemplateName[feature];
+                    if (templateName) {
+                        const langKey = utils_2.convertToLangKey(language);
+                        const safeProjectNameFromVS = language === "csharp" ? inputs[questionNames_1.QuestionNames.SafeProjectName] : undefined;
+                        const llmService = inputs[questionNames_1.QuestionNames.LLMService];
+                        const openAIKey = inputs[questionNames_1.QuestionNames.OpenAIKey];
+                        const azureOpenAIKey = inputs[questionNames_1.QuestionNames.AzureOpenAIKey];
+                        const azureOpenAIEndpoint = inputs[questionNames_1.QuestionNames.AzureOpenAIEndpoint];
+                        const azureOpenAIDeploymentName = inputs[questionNames_1.QuestionNames.AzureOpenAIDeploymentName];
+                        context.templateVariables = generator_2.Generator.getDefaultVariables(appName, safeProjectNameFromVS, inputs.targetFramework, inputs.placeProjectFileInSolutionDir === "true", undefined, {
+                            llmService,
+                            openAIKey,
+                            azureOpenAIKey,
+                            azureOpenAIEndpoint,
+                            azureOpenAIDeploymentName,
+                        });
+                        const res = await generator_2.Generator.generateTemplate(context, projectPath, templateName, langKey);
+                        if (res.isErr())
+                            return teamsfx_api_1.err(res.error);
+                        if (inputs[questionNames_1.QuestionNames.CustomCopilotRag] === create_1.CustomCopilotRagOptions.customApi().id) {
+                            const res = await generator_1.CopilotPluginGenerator.generateForCustomCopilotRagCustomApi(context, inputs, projectPath);
+                            if (res.isErr()) {
+                                return teamsfx_api_1.err(res.error);
+                            }
+                            else {
+                                warnings = res.value.warnings;
+                            }
+                        }
+                    }
+                    else {
+                        return teamsfx_api_1.err(new common_1.MissingRequiredInputError(questionNames_1.QuestionNames.Capabilities, "coordinator"));
+                    }
+                }
             }
         }
         // generate unique projectId in teamsapp.yaml (optional)
         const ymlPath = path.join(projectPath, versionMetadata_1.MetadataV3.configFile);
-        if (await fs_extra_1.default.pathExists(ymlPath)) {
+        if (fs_extra_1.default.pathExistsSync(ymlPath)) {
             const ensureRes = await this.ensureTrackingId(projectPath, inputs.projectId);
             if (ensureRes.isErr())
-                return (0, teamsfx_api_1.err)(ensureRes.error);
+                return teamsfx_api_1.err(ensureRes.error);
             inputs.projectId = ensureRes.value;
         }
         context.projectPath = projectPath;
         if (inputs.teamsAppFromTdp) {
             const res = await developerPortalScaffoldUtils_1.developerPortalScaffoldUtils.updateFilesForTdp(context, inputs.teamsAppFromTdp, inputs);
             if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
+                return teamsfx_api_1.err(res.error);
             }
         }
-        return (0, teamsfx_api_1.ok)({ projectPath: projectPath, warnings });
+        return teamsfx_api_1.ok({ projectPath: projectPath, warnings });
     }
     async ensureTeamsFxInCsproj(projectPath) {
         const list = await fs_extra_1.default.readdir(projectPath);
         const csprojFiles = list.filter((fileName) => fileName.endsWith(".csproj"));
         if (csprojFiles.length === 0)
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         const filePath = csprojFiles[0];
         const xmlStringOld = (await fs_extra_1.default.readFile(filePath, { encoding: "utf8" })).toString();
         const jsonObj = await xml2js.parseStringPromise(xmlStringOld);
@@ -197,19 +308,19 @@ class Coordinator {
             const xmlStringNew = builder.buildObject(jsonObj);
             await fs_extra_1.default.writeFile(filePath, xmlStringNew, { encoding: "utf8" });
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     async ensureTrackingId(projectPath, trackingId = undefined) {
         // generate unique trackingId in settings.json
         const settingsRes = await settingsUtil_1.settingsUtil.readSettings(projectPath, false);
         if (settingsRes.isErr())
-            return (0, teamsfx_api_1.err)(settingsRes.error);
+            return teamsfx_api_1.err(settingsRes.error);
         const settings = settingsRes.value;
         if (settings.trackingId && !trackingId)
-            return (0, teamsfx_api_1.ok)(settings.trackingId); // do nothing
+            return teamsfx_api_1.ok(settings.trackingId); // do nothing
         settings.trackingId = trackingId || uuid.v4();
         await settingsUtil_1.settingsUtil.writeSettings(projectPath, settings);
-        return (0, teamsfx_api_1.ok)(settings.trackingId);
+        return teamsfx_api_1.ok(settings.trackingId);
     }
     async preProvisionForVS(ctx, inputs) {
         const res = {
@@ -220,7 +331,7 @@ class Coordinator {
         const templatePath = inputs["workflowFilePath"] || pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         const cycles = [
@@ -253,13 +364,13 @@ class Coordinator {
                     : withObj["resourceGroupName"];
             }
         }
-        return (0, teamsfx_api_1.ok)(res);
+        return teamsfx_api_1.ok(res);
     }
     async preCheckYmlAndEnvForVS(ctx, inputs) {
         const templatePath = inputs["workflowFilePath"] || pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         const cycles = [projectModel.provision].filter((c) => c !== undefined);
@@ -269,9 +380,9 @@ class Coordinator {
             unresolvedPlaceholders = unresolvedPlaceholders.concat(cycle.resolvePlaceholders());
         }
         if (unresolvedPlaceholders.length > 0) {
-            return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError(unresolvedPlaceholders.join(",")));
+            return teamsfx_api_1.err(new yml_1.LifeCycleUndefinedError(unresolvedPlaceholders.join(",")));
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     async provision(ctx, inputs) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
@@ -285,7 +396,7 @@ class Coordinator {
         const templatePath = inputs["workflowFilePath"] || pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         const cycles = [
@@ -294,7 +405,7 @@ class Coordinator {
             // projectModel.configureApp,
         ].filter((c) => c !== undefined);
         if (cycles.length === 0) {
-            return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError("provision"));
+            return teamsfx_api_1.err(new yml_1.LifeCycleUndefinedError("provision"));
         }
         // 2. M365 sign in and tenant check if needed.
         let containsM365 = false;
@@ -318,12 +429,12 @@ class Coordinator {
         if (containsM365) {
             const tenantInfoInTokenRes = await provisionUtils_1.provisionUtils.getM365TenantId(ctx.m365TokenProvider);
             if (tenantInfoInTokenRes.isErr()) {
-                return (0, teamsfx_api_1.err)(tenantInfoInTokenRes.error);
+                return teamsfx_api_1.err(tenantInfoInTokenRes.error);
             }
             m365tenantInfo = tenantInfoInTokenRes.value;
             const checkM365TenatRes = provisionUtils_1.provisionUtils.ensureM365TenantMatchesV3(tenantSwitchCheckActions, m365tenantInfo === null || m365tenantInfo === void 0 ? void 0 : m365tenantInfo.tenantIdInToken);
             if (checkM365TenatRes.isErr()) {
-                return (0, teamsfx_api_1.err)(checkM365TenatRes.error);
+                return teamsfx_api_1.err(checkM365TenatRes.error);
             }
         }
         // We will update targetResourceGroupInfo if creating resource group is needed and create the resource group later after confirming with the user
@@ -375,7 +486,7 @@ class Coordinator {
                 else {
                     const ensureRes = await provisionUtils_1.provisionUtils.ensureSubscription(ctx.azureAccountProvider, undefined);
                     if (ensureRes.isErr())
-                        return (0, teamsfx_api_1.err)(ensureRes.error);
+                        return teamsfx_api_1.err(ensureRes.error);
                     const subInfo = ensureRes.value;
                     if (subInfo && subInfo.subscriptionId) {
                         process.env.AZURE_SUBSCRIPTION_ID = subInfo.subscriptionId;
@@ -395,10 +506,10 @@ class Coordinator {
                     targetResourceGroupInfo.createNewResourceGroup = true; // create resource group if not exists
                 }
                 else {
-                    const defaultRg = `rg-${(0, stringUtils_1.convertToAlphanumericOnly)(folderName)}${process.env.RESOURCE_SUFFIX}-${inputs.env}`;
+                    const defaultRg = `rg-${utils_1.convertToAlphanumericOnly(folderName)}${process.env.RESOURCE_SUFFIX}-${inputs.env}`;
                     const ensureRes = await provisionUtils_1.provisionUtils.ensureResourceGroup(inputs, ctx.azureAccountProvider, resolvedSubscriptionId, undefined, defaultRg);
                     if (ensureRes.isErr())
-                        return (0, teamsfx_api_1.err)(ensureRes.error);
+                        return teamsfx_api_1.err(ensureRes.error);
                     targetResourceGroupInfo = ensureRes.value;
                     if (!targetResourceGroupInfo.createNewResourceGroup) {
                         process.env.AZURE_RESOURCE_GROUP_NAME = targetResourceGroupInfo.name;
@@ -413,22 +524,22 @@ class Coordinator {
                 await ctx.azureAccountProvider.setSubscription(resolvedSubscriptionId); //make sure sub is correctly set if ensureSubscription() is not called.
             }
             catch (e) {
-                return (0, teamsfx_api_1.err)((0, common_1.assembleError)(e));
+                return teamsfx_api_1.err(common_1.assembleError(e));
             }
             azureSubInfo = await ctx.azureAccountProvider.getSelectedSubscription(false);
             if (!azureSubInfo) {
-                return (0, teamsfx_api_1.err)(new azure_1.SelectSubscriptionError());
+                return teamsfx_api_1.err(new azure_1.SelectSubscriptionError());
             }
             const consentRes = await provisionUtils_1.provisionUtils.askForProvisionConsentV3(ctx, m365tenantInfo, azureSubInfo, inputs.env);
             if (consentRes.isErr())
-                return (0, teamsfx_api_1.err)(consentRes.error);
+                return teamsfx_api_1.err(consentRes.error);
             // create resource group if necessary
             if (targetResourceGroupInfo.createNewResourceGroup) {
                 const createRgRes = await ResourceGroupHelper_1.resourceGroupHelper.createNewResourceGroup(targetResourceGroupInfo.name, ctx.azureAccountProvider, resolvedSubscriptionId, targetResourceGroupInfo.location);
                 if (createRgRes.isErr()) {
                     const error = createRgRes.error;
                     if (!(error instanceof azure_1.ResourceGroupConflictError)) {
-                        return (0, teamsfx_api_1.err)(error);
+                        return teamsfx_api_1.err(error);
                     }
                 }
                 process.env.AZURE_RESOURCE_GROUP_NAME = targetResourceGroupInfo.name;
@@ -440,23 +551,23 @@ class Coordinator {
         const steps = cycles.reduce((acc, cur) => acc + cur.driverDefs.length, 0);
         let hasError = false;
         try {
-            ctx.progressBar = (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.createProgressBar((0, localizeUtils_1.getLocalizedString)("core.progress.provision"), steps);
+            ctx.progressBar = (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.createProgressBar(localizeUtils_1.getLocalizedString("core.progress.provision"), steps);
             await ((_d = ctx.progressBar) === null || _d === void 0 ? void 0 : _d.start());
             const maybeDescription = summaryReporter.getLifecycleDescriptions();
             if (maybeDescription.isErr()) {
                 hasError = true;
-                return (0, teamsfx_api_1.err)(maybeDescription.error);
+                return teamsfx_api_1.err(maybeDescription.error);
             }
             ctx.logProvider.info(`Executing provision ${os_1.EOL}${os_1.EOL}${maybeDescription.value}${os_1.EOL}`);
             for (const [index, cycle] of cycles.entries()) {
                 const execRes = await cycle.execute(ctx);
                 summaryReporter.updateLifecycleState(index, execRes);
                 const result = this.convertExecuteResult(execRes.result, templatePath);
-                (0, lodash_1.merge)(output, result[0]);
+                lodash_1.merge(output, result[0]);
                 if (result[1]) {
                     hasError = true;
                     inputs.envVars = output;
-                    return (0, teamsfx_api_1.err)(result[1]);
+                    return teamsfx_api_1.err(result[1]);
                 }
             }
         }
@@ -466,11 +577,11 @@ class Coordinator {
             await ((_e = ctx.progressBar) === null || _e === void 0 ? void 0 : _e.end(!hasError));
         }
         // show provisioned resources
-        const msg = (0, localizeUtils_1.getLocalizedString)("core.common.LifecycleComplete.provision", steps, steps);
+        const msg = localizeUtils_1.getLocalizedString("core.common.LifecycleComplete.provision", steps, steps);
         if (azureSubInfo) {
-            const url = (0, constants_1.getResourceGroupInPortal)(azureSubInfo.subscriptionId, azureSubInfo.tenantId, resolvedResourceGroupName);
+            const url = tools_1.getResourceGroupInPortal(azureSubInfo.subscriptionId, azureSubInfo.tenantId, resolvedResourceGroupName);
             if (url && ctx.platform !== teamsfx_api_1.Platform.CLI) {
-                const title = (0, localizeUtils_1.getLocalizedString)("core.provision.viewResources");
+                const title = localizeUtils_1.getLocalizedString("core.provision.viewResources");
                 (_f = ctx.ui) === null || _f === void 0 ? void 0 : _f.showMessage("info", msg, false, title).then((result) => {
                     var _a;
                     const userSelected = result.isOk() ? result.value : undefined;
@@ -499,16 +610,14 @@ class Coordinator {
         }
         else {
             if (ctx.platform === teamsfx_api_1.Platform.VS) {
-                void ctx.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.common.LifecycleComplete.prepareTeamsApp"), false);
+                void ctx.ui.showMessage("info", localizeUtils_1.getLocalizedString("core.common.LifecycleComplete.prepareTeamsApp"), false);
             }
             else {
                 void ctx.ui.showMessage("info", msg, false);
             }
         }
-        if (ctx.platform !== teamsfx_api_1.Platform.CLI) {
-            ctx.logProvider.info(msg);
-        }
-        return (0, teamsfx_api_1.ok)(output);
+        ctx.logProvider.info(msg);
+        return teamsfx_api_1.ok(output);
     }
     convertExecuteResult(execRes, templatePath) {
         var _a;
@@ -522,20 +631,20 @@ class Coordinator {
             else {
                 const partialOutput = execError.env;
                 const newOutput = envUtil_1.envUtil.map2object(partialOutput);
-                (0, lodash_1.merge)(output, newOutput);
+                lodash_1.merge(output, newOutput);
                 const reason = execError.reason;
                 if (reason.kind === "DriverError") {
                     error = reason.error;
                 }
                 else if (reason.kind === "UnresolvedPlaceholders") {
                     const placeholders = ((_a = reason.unresolvedPlaceHolders) === null || _a === void 0 ? void 0 : _a.join(",")) || "";
-                    error = new common_1.MissingEnvironmentVariablesError((0, lodash_1.camelCase)(reason.failedDriver.uses), placeholders, templatePath);
+                    error = new common_1.MissingEnvironmentVariablesError(lodash_1.camelCase(reason.failedDriver.uses), placeholders, templatePath);
                 }
             }
         }
         else {
             const newOutput = envUtil_1.envUtil.map2object(execRes.value);
-            (0, lodash_1.merge)(output, newOutput);
+            lodash_1.merge(output, newOutput);
         }
         return [output, error];
     }
@@ -545,7 +654,7 @@ class Coordinator {
         const templatePath = inputs["workflowFilePath"] || pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         if (projectModel.deploy) {
@@ -553,32 +662,32 @@ class Coordinator {
                 inputs.env !== environmentName_1.environmentNameManager.getTestToolEnvName()) {
                 const consent = await deployUtils_1.deployUtils.askForDeployConsentV3(ctx);
                 if (consent.isErr()) {
-                    return (0, teamsfx_api_1.err)(consent.error);
+                    return teamsfx_api_1.err(consent.error);
                 }
             }
             const summaryReporter = new summary_1.SummaryReporter([projectModel.deploy], ctx.logProvider);
             let hasError = false;
             try {
                 const steps = projectModel.deploy.driverDefs.length;
-                ctx.progressBar = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar((0, localizeUtils_1.getLocalizedString)("core.progress.deploy"), steps);
+                ctx.progressBar = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("core.progress.deploy"), steps);
                 await ((_b = ctx.progressBar) === null || _b === void 0 ? void 0 : _b.start());
                 const maybeDescription = summaryReporter.getLifecycleDescriptions();
                 if (maybeDescription.isErr()) {
-                    return (0, teamsfx_api_1.err)(maybeDescription.error);
+                    return teamsfx_api_1.err(maybeDescription.error);
                 }
                 ctx.logProvider.info(`Executing deploy ${os_1.EOL}${os_1.EOL}${maybeDescription.value}${os_1.EOL}`);
                 const execRes = await projectModel.deploy.execute(ctx);
                 summaryReporter.updateLifecycleState(0, execRes);
                 const result = this.convertExecuteResult(execRes.result, templatePath);
-                (0, lodash_1.merge)(output, result[0]);
+                lodash_1.merge(output, result[0]);
                 if (result[1]) {
                     hasError = true;
                     inputs.envVars = output;
-                    return (0, teamsfx_api_1.err)(result[1]);
+                    return teamsfx_api_1.err(result[1]);
                 }
                 // show message box after deploy
                 const botTroubleShootMsg = getBotTroubleShootMessage(false);
-                const msg = (0, localizeUtils_1.getLocalizedString)("core.common.LifecycleComplete.deploy", steps, steps) +
+                const msg = localizeUtils_1.getLocalizedString("core.common.LifecycleComplete.deploy", steps, steps) +
                     botTroubleShootMsg.textForLogging;
                 if (ctx.platform !== teamsfx_api_1.Platform.VS) {
                     (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", msg, false);
@@ -591,9 +700,9 @@ class Coordinator {
             }
         }
         else {
-            return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError("deploy"));
+            return teamsfx_api_1.err(new yml_1.LifeCycleUndefinedError("deploy"));
         }
-        return (0, teamsfx_api_1.ok)(output);
+        return teamsfx_api_1.ok(output);
     }
     async publish(ctx, inputs) {
         var _a, _b, _c, _d, _e;
@@ -601,7 +710,7 @@ class Coordinator {
         const templatePath = pathUtils_1.pathUtils.getYmlFilePath(ctx.projectPath, inputs.env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath, inputs.env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         let hasError = false;
@@ -609,30 +718,30 @@ class Coordinator {
             const summaryReporter = new summary_1.SummaryReporter([projectModel.publish], ctx.logProvider);
             try {
                 const steps = projectModel.publish.driverDefs.length;
-                ctx.progressBar = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar((0, localizeUtils_1.getLocalizedString)("core.progress.publish"), steps);
+                ctx.progressBar = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("core.progress.publish"), steps);
                 await ((_b = ctx.progressBar) === null || _b === void 0 ? void 0 : _b.start());
                 const maybeDescription = summaryReporter.getLifecycleDescriptions();
                 if (maybeDescription.isErr()) {
                     hasError = true;
-                    return (0, teamsfx_api_1.err)(maybeDescription.error);
+                    return teamsfx_api_1.err(maybeDescription.error);
                 }
                 ctx.logProvider.info(`Executing publish ${os_1.EOL}${os_1.EOL}${maybeDescription.value}${os_1.EOL}`);
                 const execRes = await projectModel.publish.execute(ctx);
                 const result = this.convertExecuteResult(execRes.result, templatePath);
-                (0, lodash_1.merge)(output, result[0]);
+                lodash_1.merge(output, result[0]);
                 summaryReporter.updateLifecycleState(0, execRes);
                 if (result[1]) {
                     hasError = true;
                     inputs.envVars = output;
-                    return (0, teamsfx_api_1.err)(result[1]);
+                    return teamsfx_api_1.err(result[1]);
                 }
                 else {
-                    const msg = (0, localizeUtils_1.getLocalizedString)("core.common.LifecycleComplete.publish", steps, steps);
-                    const adminPortal = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.adminPortal");
+                    const msg = localizeUtils_1.getLocalizedString("core.common.LifecycleComplete.publish", steps, steps);
+                    const adminPortal = localizeUtils_1.getLocalizedString("plugins.appstudio.adminPortal");
                     if (ctx.platform !== teamsfx_api_1.Platform.CLI) {
                         (_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", msg, false, adminPortal).then((value) => {
                             if (value.isOk() && value.value === adminPortal) {
-                                void ctx.ui.openUrl(constants_4.Constants.TEAMS_ADMIN_PORTAL);
+                                void ctx.ui.openUrl(constants_2.Constants.TEAMS_ADMIN_PORTAL);
                             }
                         });
                     }
@@ -648,41 +757,41 @@ class Coordinator {
             }
         }
         else {
-            return (0, teamsfx_api_1.err)(new yml_1.LifeCycleUndefinedError("publish"));
+            return teamsfx_api_1.err(new yml_1.LifeCycleUndefinedError("publish"));
         }
-        return (0, teamsfx_api_1.ok)(output);
+        return teamsfx_api_1.ok(output);
     }
     async publishInDeveloperPortal(ctx, inputs) {
         // update teams app
         if (!ctx.tokenProvider) {
-            return (0, teamsfx_api_1.err)(new common_1.InputValidationError("tokenProvider", "undefined"));
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("tokenProvider"));
         }
-        if (!inputs[constants_2.QuestionNames.AppPackagePath]) {
-            return (0, teamsfx_api_1.err)(new common_1.InputValidationError("appPackagePath", "undefined"));
+        if (!inputs[questionNames_1.QuestionNames.AppPackagePath]) {
+            return teamsfx_api_1.err(new error_1.ObjectIsUndefinedError("appPackagePath"));
         }
-        const updateRes = await (0, appStudio_1.updateTeamsAppV3ForPublish)(ctx, inputs);
+        const updateRes = await appStudio_1.updateTeamsAppV3ForPublish(ctx, inputs);
         if (updateRes.isErr()) {
-            return (0, teamsfx_api_1.err)(updateRes.error);
+            return teamsfx_api_1.err(updateRes.error);
         }
         let loginHint = "";
         const accountRes = await ctx.tokenProvider.m365TokenProvider.getJsonObject({
-            scopes: constants_1.AppStudioScopes,
+            scopes: constants_2.AppStudioScopes,
         });
         if (accountRes.isOk()) {
             loginHint = accountRes.value.unique_name;
         }
         await ctx.userInteraction.openUrl(`https://dev.teams.microsoft.com/apps/${updateRes.value}/distributions/app-catalog?login_hint=${loginHint}&referrer=teamstoolkit_${inputs.platform}`);
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
 }
 tslib_1.__decorate([
-    (0, lib_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "Coordinator" }),
-        (0, actionExecutionMW_1.ActionExecutionMW)({
+    lib_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "Coordinator" }),
+        actionExecutionMW_1.ActionExecutionMW({
             enableTelemetry: true,
             telemetryEventName: telemetry_1.TelemetryEvent.CreateProject,
             telemetryComponentName: "coordinator",
-            errorSource: constants_3.CoordinatorSource,
+            errorSource: constants_1.CoordinatorSource,
         }),
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -690,37 +799,37 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "create", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "preProvisionForVS", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "preCheckYmlAndEnvForVS", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "provision", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "deploy", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], Coordinator.prototype, "publish", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "Coordinator" })]),
+    lib_1.hooks([globalVars_1.ErrorContextMW({ component: "Coordinator" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
@@ -728,8 +837,8 @@ tslib_1.__decorate([
 exports.coordinator = new Coordinator();
 function getBotTroubleShootMessage(isBot) {
     const botTroubleShootLink = "https://aka.ms/teamsfx-bot-help#how-can-i-troubleshoot-issues-when-teams-bot-isnt-responding-on-azure";
-    const botTroubleShootDesc = (0, localizeUtils_1.getLocalizedString)("core.deploy.botTroubleShoot");
-    const botTroubleShootLearnMore = (0, localizeUtils_1.getLocalizedString)("core.deploy.botTroubleShoot.learnMore");
+    const botTroubleShootDesc = localizeUtils_1.getLocalizedString("core.deploy.botTroubleShoot");
+    const botTroubleShootLearnMore = localizeUtils_1.getLocalizedString("core.deploy.botTroubleShoot.learnMore");
     const botTroubleShootMsg = `${botTroubleShootDesc} ${botTroubleShootLearnMore}: ${botTroubleShootLink}.`;
     return {
         troubleShootLink: botTroubleShootLink,