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

package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js

@@ -8,6 +8,7 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const common_1 = require("../../../../error/common");
 const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
+const telemetry_1 = require("./telemetry");
 const utils_1 = require("./utils");
 const results_1 = require("../results");
 const errors_1 = require("../errors");
@@ -16,23 +17,21 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const PluginManifestUtils_1 = require("./PluginManifestUtils");
 const constant_1 = require("../../../configManager/constant");
 const os_1 = require("os");
-const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
-const ManifestUtils_1 = require("./ManifestUtils");
 class CopilotGptManifestUtils {
     async readCopilotGptManifestFile(path) {
         if (!(await fs_extra_1.default.pathExists(path))) {
-            return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("CopilotGptManifestUtils", path));
+            return teamsfx_api_1.err(new common_1.FileNotFoundError("CopilotGptManifestUtils", path));
         }
         // Be compatible with UTF8-BOM encoding
         // Avoid Unexpected token error at JSON.parse()
         let content = await fs_extra_1.default.readFile(path, { encoding: "utf-8" });
-        content = (0, strip_bom_1.default)(content);
+        content = strip_bom_1.default(content);
         try {
             const manifest = JSON.parse(content);
-            return (0, teamsfx_api_1.ok)(manifest);
+            return teamsfx_api_1.ok(manifest);
         }
         catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.JSONSyntaxError(path, e, "CopilotGptManifestUtils"));
+            return teamsfx_api_1.err(new common_1.JSONSyntaxError(path, e, "CopilotGptManifestUtils"));
         }
     }
     /**
@@ -43,15 +42,15 @@ class CopilotGptManifestUtils {
     async getManifest(path, context) {
         const manifestRes = await this.readCopilotGptManifestFile(path);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         // Add environment variable keys to telemetry
-        const resolvedManifestRes = await (0, utils_1.getResolvedManifest)(JSON.stringify(manifestRes.value), path, envFunctionUtils_1.ManifestType.DeclarativeCopilotManifest, context);
+        const resolvedManifestRes = utils_1.getResolvedManifest(JSON.stringify(manifestRes.value), path, telemetry_1.TelemetryPropertyKey.customizedCopilotGptKeys, context);
         if (resolvedManifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(resolvedManifestRes.error);
+            return teamsfx_api_1.err(resolvedManifestRes.error);
         }
         const resolvedManifestString = resolvedManifestRes.value;
-        return (0, teamsfx_api_1.ok)(JSON.parse(resolvedManifestString));
+        return teamsfx_api_1.ok(JSON.parse(resolvedManifestString));
     }
     async writeCopilotGptManifestFile(manifest, path) {
         const content = JSON.stringify(manifest, undefined, 4);
@@ -59,15 +58,15 @@ class CopilotGptManifestUtils {
             await fs_extra_1.default.writeFile(path, content);
         }
         catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.WriteFileError(e, "copilotGptManifestUtils"));
+            return teamsfx_api_1.err(new common_1.WriteFileError(e, "copilotGptManifestUtils"));
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     async validateAgainstSchema(declaraitveCopilot, manifestPath, context) {
         var _a;
         const manifestRes = await this.getManifest(manifestPath, context);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         const manifest = manifestRes.value;
         try {
@@ -84,40 +83,26 @@ class CopilotGptManifestUtils {
                     const actionPath = path_1.default.join(path_1.default.dirname(manifestPath), action.file);
                     const actionValidationRes = await PluginManifestUtils_1.pluginManifestUtils.validateAgainstSchema(action, actionPath, context);
                     if (actionValidationRes.isErr()) {
-                        return (0, teamsfx_api_1.err)(actionValidationRes.error);
+                        return teamsfx_api_1.err(actionValidationRes.error);
                     }
                     else {
                         res.actionValidationResult.push(actionValidationRes.value);
                     }
                 }
             }
-            return (0, teamsfx_api_1.ok)(res);
+            return teamsfx_api_1.ok(res);
         }
         catch (e) {
-            return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
-                (0, localizeUtils_1.getLocalizedString)("error.appstudio.validateFetchSchemaFailed", manifestRes.value.$schema, e.message),
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
+                localizeUtils_1.getLocalizedString("error.appstudio.validateFetchSchemaFailed", manifestRes.value.$schema, e.message),
             ])));
         }
     }
-    async getManifestPath(teamsManifestPath) {
-        var _a, _b;
-        const teamsManifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
-        if (teamsManifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(teamsManifestRes.error);
-        }
-        const filePath = (_b = (_a = teamsManifestRes.value.copilotExtensions) === null || _a === void 0 ? void 0 : _a.declarativeCopilots) === null || _b === void 0 ? void 0 : _b[0].file;
-        if (!filePath) {
-            return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("copilotExtensions.declarativeCopilots.file", teamsManifestPath)));
-        }
-        else {
-            return (0, teamsfx_api_1.ok)(path_1.default.resolve(path_1.default.dirname(teamsManifestPath), filePath));
-        }
-    }
     async addAction(copilotGptPath, id, pluginFile) {
         var _a;
         const gptManifestRes = await exports.copilotGptManifestUtils.readCopilotGptManifestFile(copilotGptPath);
         if (gptManifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(gptManifestRes.error);
+            return teamsfx_api_1.err(gptManifestRes.error);
         }
         else {
             const gptManifest = gptManifestRes.value;
@@ -130,46 +115,41 @@ class CopilotGptManifestUtils {
             });
             const updateGptManifestRes = await exports.copilotGptManifestUtils.writeCopilotGptManifestFile(gptManifest, copilotGptPath);
             if (updateGptManifestRes.isErr()) {
-                return (0, teamsfx_api_1.err)(updateGptManifestRes.error);
+                return teamsfx_api_1.err(updateGptManifestRes.error);
             }
             else {
-                return (0, teamsfx_api_1.ok)(gptManifest);
+                return teamsfx_api_1.ok(gptManifest);
             }
         }
     }
     logValidationErrors(validationRes, platform, pluginPath) {
         const validationErrors = validationRes.validationResult;
         const filePath = validationRes.filePath;
-        const hasDeclarativeCopilotError = validationErrors.length > 0;
-        let hasActionError = false;
+        let hasError = validationErrors.length > 0;
         for (const actionValidationRes of validationRes.actionValidationResult) {
             if (actionValidationRes.validationResult.length > 0) {
-                hasActionError = true;
+                hasError = true;
                 break;
             }
         }
-        if (!hasDeclarativeCopilotError && !hasActionError) {
+        if (!hasError) {
             return "";
         }
         if (platform !== teamsfx_api_1.Platform.CLI) {
-            let outputMessage = "";
-            if (hasDeclarativeCopilotError) {
-                const errors = validationErrors
-                    .map((error) => {
-                    return `${constant_1.SummaryConstant.Failed} ${error}`;
-                })
-                    .join(os_1.EOL);
-                outputMessage +=
-                    (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) +
-                        os_1.EOL +
-                        errors;
-            }
+            const errors = validationErrors
+                .map((error) => {
+                return `${constant_1.SummaryConstant.Failed} ${error}`;
+            })
+                .join(os_1.EOL);
+            let outputMessage = localizeUtils_1.getLocalizedString("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) +
+                os_1.EOL +
+                errors;
             for (const actionValidationRes of validationRes.actionValidationResult) {
-                if (!pluginPath || actionValidationRes.filePath !== pluginPath) {
+                if (pluginPath && actionValidationRes.filePath !== pluginPath) {
                     // do not output validation result of the Declarative Copilot if same file has been validated when validating plugin manifest.
                     const actionValidationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(actionValidationRes, platform);
                     if (actionValidationMessage) {
-                        outputMessage += (!outputMessage ? "" : os_1.EOL) + actionValidationMessage;
+                        outputMessage += os_1.EOL + actionValidationMessage;
                     }
                 }
             }
@@ -177,21 +157,19 @@ class CopilotGptManifestUtils {
         }
         else {
             const outputMessage = [];
-            if (hasDeclarativeCopilotError) {
+            outputMessage.push({
+                content: localizeUtils_1.getDefaultString("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) + "\n",
+                color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+            });
+            validationErrors.map((error) => {
+                outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
                 outputMessage.push({
-                    content: (0, localizeUtils_1.getDefaultString)("driver.teamsApp.summary.validateDeclarativeCopilotManifest.checkPath", filePath) + "\n",
+                    content: `${error}\n`,
                     color: teamsfx_api_1.Colors.BRIGHT_WHITE,
                 });
-                validationErrors.map((error) => {
-                    outputMessage.push({ content: `${constant_1.SummaryConstant.Failed} `, color: teamsfx_api_1.Colors.BRIGHT_RED });
-                    outputMessage.push({
-                        content: `${error}\n`,
-                        color: teamsfx_api_1.Colors.BRIGHT_WHITE,
-                    });
-                });
-            }
+            });
             for (const actionValidationRes of validationRes.actionValidationResult) {
-                if (!pluginPath || actionValidationRes.filePath !== pluginPath) {
+                if (pluginPath && actionValidationRes.filePath !== pluginPath) {
                     const actionValidationMessage = PluginManifestUtils_1.pluginManifestUtils.logValidationErrors(actionValidationRes, platform);
                     if (actionValidationMessage) {
                         outputMessage.push(...actionValidationMessage);
@@ -201,15 +179,6 @@ class CopilotGptManifestUtils {
             return outputMessage;
         }
     }
-    async getDefaultNextAvailablePluginManifestPath(folder) {
-        const pluginManifestNamePrefix = teamsfx_api_1.DefaultPluginManifestFileName.split(".")[0];
-        let pluginFileNameSuffix = 1;
-        let pluginManifestName = `${pluginManifestNamePrefix}_${pluginFileNameSuffix}.json`;
-        while (await fs_extra_1.default.pathExists(path_1.default.join(folder, pluginManifestName))) {
-            pluginManifestName = `${pluginManifestNamePrefix}_${++pluginFileNameSuffix}.json`;
-        }
-        return path_1.default.join(folder, pluginManifestName);
-    }
 }
 exports.CopilotGptManifestUtils = CopilotGptManifestUtils;
 exports.copilotGptManifestUtils = new CopilotGptManifestUtils();

package/build/component/driver/teamsApp/utils/CopilotGptManifestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"CopilotGptManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CopilotGptManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/CopilotGptManifestUtils.ts"],"names":[],"mappings":"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"}

package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts

@@ -1,10 +1,9 @@
 /// <reference types="node" />
 import { FxError, InputsWithProjectPath, ManifestCapability, Result, TeamsAppManifest } from "@microsoft/teamsfx-api";
 import "reflect-metadata";
-import { DriverContext } from "../../interface/commonArgs";
+import { WrapDriverContext } from "../../util/wrapUtil";
 export declare class ManifestUtils {
     readAppManifest(projectPath: string): Promise<Result<TeamsAppManifest, FxError>>;
-    readAppManifestSync(projectPath: string): Result<TeamsAppManifest, FxError>;
     _readAppManifest(manifestTemplatePath: string): Promise<Result<TeamsAppManifest, FxError>>;
     _writeAppManifest(appManifest: TeamsAppManifest, manifestTemplatePath: string): Promise<Result<undefined, FxError>>;
     getTeamsAppManifestPath(projectPath: string): string;
@@ -17,7 +16,7 @@ export declare class ManifestUtils {
      */
     getOperationIds(manifest: TeamsAppManifest): string[];
     getPluginFilePath(manifest: TeamsAppManifest, manifestPath: string): Promise<Result<string, FxError>>;
-    getManifestV3(manifestTemplatePath: string, context: DriverContext, generateIdIfNotResolved?: boolean): Promise<Result<TeamsAppManifest, FxError>>;
+    getManifestV3(manifestTemplatePath: string, context?: WrapDriverContext, generateIdIfNotResolved?: boolean): Promise<Result<TeamsAppManifest, FxError>>;
     extractManifestFromArchivedFile(archivedFile: Buffer): Result<TeamsAppManifest, FxError>;
 }
 export declare const manifestUtils: ManifestUtils;

package/build/component/driver/teamsApp/utils/ManifestUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAGA,OAAO,EAEL,OAAO,EAGP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;AAgC1B,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAE3D,qBAAa,aAAa;IAClB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAKtF,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC;IAwBrE,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAiB1F,iBAAiB,CACrB,WAAW,EAAE,gBAAgB,EAC7B,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAOtC,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAK9C,eAAe,CACnB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IA2JtC,sBAAsB,CACpB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO;IAkBH,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAI5D;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAU/C,iBAAiB,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAoB7B,aAAa,CACjB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,EAAE,aAAa,EACtB,uBAAuB,UAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAwC7C,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC;CAezF;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}
+{"version":3,"file":"ManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/ManifestUtils.ts"],"names":[],"mappings":";AAEA,OAAO,EACL,OAAO,EACP,qBAAqB,EACrB,kBAAkB,EAClB,MAAM,EACN,gBAAgB,EAKjB,MAAM,wBAAwB,CAAC;AAKhC,OAAO,kBAAkB,CAAC;AAgC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAMxD,qBAAa,aAAa;IAClB,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAKhF,gBAAgB,CAAC,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAiB1F,iBAAiB,CACrB,WAAW,EAAE,gBAAgB,EAC7B,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAOtC,uBAAuB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM;IAK9C,eAAe,CACnB,MAAM,EAAE,qBAAqB,EAC7B,YAAY,EAAE,kBAAkB,EAAE,EAClC,MAAM,UAAQ,GACb,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAyItC,sBAAsB,CACpB,QAAQ,EAAE,gBAAgB,EAC1B,UAAU,EAAE,WAAW,GAAG,iBAAiB,GAAG,KAAK,GAAG,kBAAkB,GAAG,oBAAoB,GAC9F,OAAO;IAkBH,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAI5D;;;OAGG;IACI,eAAe,CAAC,QAAQ,EAAE,gBAAgB,GAAG,MAAM,EAAE;IAU/C,iBAAiB,CAC5B,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAoB7B,aAAa,CACjB,oBAAoB,EAAE,MAAM,EAC5B,OAAO,CAAC,EAAE,iBAAiB,EAC3B,uBAAuB,UAAO,GAC7B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAwC7C,+BAA+B,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC;CAezF;AAED,eAAO,MAAM,aAAa,eAAsB,CAAC"}

package/build/component/driver/teamsApp/utils/ManifestUtils.js

@@ -4,7 +4,6 @@ exports.manifestUtils = exports.ManifestUtils = void 0;
 const tslib_1 = require("tslib");
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
-const hooks_1 = require("@feathersjs/hooks");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
@@ -14,69 +13,46 @@ require("reflect-metadata");
 const strip_bom_1 = tslib_1.__importDefault(require("strip-bom"));
 const uuid_1 = require("uuid");
 const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
-const projectTypeChecker_1 = require("../../../../common/projectTypeChecker");
-const globalVars_1 = require("../../../../common/globalVars");
 const common_1 = require("../../../../error/common");
-const constants_1 = require("../../../../question/constants");
-const constants_2 = require("../../../constants");
+const create_1 = require("../../../../question/create");
+const constants_1 = require("../../../constants");
 const migrate_1 = require("../../../migrate");
 const common_2 = require("../../../utils/common");
-const constants_3 = require("../constants");
+const constants_2 = require("../constants");
 const errors_1 = require("../errors");
 const results_1 = require("../results");
+const telemetry_1 = require("./telemetry");
+const hooks_1 = require("@feathersjs/hooks");
+const globalVars_1 = require("../../../../core/globalVars");
+const projectTypeChecker_1 = require("../../../../common/projectTypeChecker");
 const utils_1 = require("./utils");
-const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
 class ManifestUtils {
     async readAppManifest(projectPath) {
         const filePath = this.getTeamsAppManifestPath(projectPath);
         return await this._readAppManifest(filePath);
     }
-    readAppManifestSync(projectPath) {
-        const filePath = this.getTeamsAppManifestPath(projectPath);
-        if (!fs_extra_1.default.existsSync(filePath)) {
-            return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("teamsApp", filePath));
-        }
-        // Be compatible with UTF8-BOM encoding
-        // Avoid Unexpected token error at JSON.parse()
-        let content;
-        try {
-            content = fs_extra_1.default.readFileSync(filePath, { encoding: "utf-8" });
-        }
-        catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.ReadFileError(e, "ManifestUtils"));
-        }
-        content = (0, strip_bom_1.default)(content);
-        const contentV3 = (0, migrate_1.convertManifestTemplateToV3)(content);
-        try {
-            const manifest = JSON.parse(contentV3);
-            return (0, teamsfx_api_1.ok)(manifest);
-        }
-        catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.JSONSyntaxError(filePath, e, "ManifestUtils"));
-        }
-    }
     async _readAppManifest(manifestTemplatePath) {
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
-            return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("teamsApp", manifestTemplatePath));
+            return teamsfx_api_1.err(new common_1.FileNotFoundError("teamsApp", manifestTemplatePath));
         }
         // Be compatible with UTF8-BOM encoding
         // Avoid Unexpected token error at JSON.parse()
         let content = await fs_extra_1.default.readFile(manifestTemplatePath, { encoding: "utf-8" });
-        content = (0, strip_bom_1.default)(content);
-        const contentV3 = (0, migrate_1.convertManifestTemplateToV3)(content);
+        content = strip_bom_1.default(content);
+        const contentV3 = migrate_1.convertManifestTemplateToV3(content);
         try {
             const manifest = JSON.parse(contentV3);
-            return (0, teamsfx_api_1.ok)(manifest);
+            return teamsfx_api_1.ok(manifest);
         }
         catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.JSONSyntaxError(manifestTemplatePath, e, "ManifestUtils"));
+            return teamsfx_api_1.err(new common_1.JSONSyntaxError(manifestTemplatePath, e, "ManifestUtils"));
         }
     }
     async _writeAppManifest(appManifest, manifestTemplatePath) {
         const content = JSON.stringify(appManifest, undefined, 4);
-        const contentV2 = (0, migrate_1.convertManifestTemplateToV2)(content);
+        const contentV2 = migrate_1.convertManifestTemplateToV2(content);
         await fs_extra_1.default.writeFile(manifestTemplatePath, contentV2);
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     getTeamsAppManifestPath(projectPath) {
         const filePath = path.join(projectPath, "appPackage", "manifest.json");
@@ -86,13 +62,12 @@ class ManifestUtils {
         var _a, _b, _c, _d;
         const appManifestRes = await this._readAppManifest(inputs["addManifestPath"]);
         if (appManifestRes.isErr())
-            return (0, teamsfx_api_1.err)(appManifestRes.error);
+            return teamsfx_api_1.err(appManifestRes.error);
         const appManifest = appManifestRes.value;
-        const manifestVersion = appManifest.manifestVersion;
         for (const capability of capabilities) {
             const exceedLimit = this._capabilityExceedLimit(appManifest, capability.name);
             if (exceedLimit) {
-                return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.CapabilityExceedLimitError.name, errors_1.AppStudioError.CapabilityExceedLimitError.message(capability.name)));
+                return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.CapabilityExceedLimitError.name, errors_1.AppStudioError.CapabilityExceedLimitError.message(capability.name)));
             }
             let staticTabIndex = (_b = (_a = appManifest.staticTabs) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0;
             switch (capability.name) {
@@ -103,16 +78,16 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            const template = (0, lodash_1.cloneDeep)(constants_3.STATIC_TABS_TPL_EXISTING_APP[0]);
+                            const template = lodash_1.cloneDeep(constants_2.STATIC_TABS_TPL_EXISTING_APP[0]);
                             // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
                             template.entityId = "index" + staticTabIndex;
                             appManifest.staticTabs.push(template);
                         }
                         else {
-                            const tabManifest = inputs.features === constants_1.CapabilityOptions.dashboardTab().id
-                                ? constants_3.STATIC_TABS_TPL_V3[1]
-                                : constants_3.STATIC_TABS_TPL_V3[0];
-                            const template = (0, lodash_1.cloneDeep)(tabManifest);
+                            const tabManifest = inputs.features === create_1.CapabilityOptions.dashboardTab().id
+                                ? constants_2.STATIC_TABS_TPL_V3[1]
+                                : constants_2.STATIC_TABS_TPL_V3[0];
+                            const template = lodash_1.cloneDeep(tabManifest);
                             // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
                             template.entityId = "index" + staticTabIndex;
                             appManifest.staticTabs.push(template);
@@ -127,10 +102,11 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.configurableTabs = appManifest.configurableTabs.concat((0, constants_3.getConfigurableTabsTplExistingAppBasedOnVersion)(manifestVersion));
+                            appManifest.configurableTabs = appManifest.configurableTabs.concat(constants_2.CONFIGURABLE_TABS_TPL_EXISTING_APP);
                         }
                         else {
-                            appManifest.configurableTabs = appManifest.configurableTabs.concat((0, constants_3.getConfigurableTabsTplBasedOnVersion)(manifestVersion));
+                            appManifest.configurableTabs =
+                                appManifest.configurableTabs.concat(constants_2.CONFIGURABLE_TABS_TPL_V3);
                         }
                     }
                     break;
@@ -141,46 +117,46 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplExistingAppBasedOnVersion)(manifestVersion));
+                            appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_EXISTING_APP);
                         }
                         else {
-                            // import QuestionNames introduces dependency cycle and breaks the whole program
-                            // inputs[QuestionNames.Features]
+                            // import CoreQuestionNames introduces dependency cycle and breaks the whole program
+                            // inputs[CoreQuestionNames.Features]
                             if (inputs.features) {
                                 const feature = inputs.features;
-                                if (feature === constants_1.CapabilityOptions.commandBot().id ||
-                                    feature == constants_1.CapabilityOptions.workflowBot().id) {
+                                if (feature === create_1.CapabilityOptions.commandBot().id ||
+                                    feature == create_1.CapabilityOptions.workflowBot().id) {
                                     // command and response bot or workflow bot
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplForCommandAndResponseBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
                                 }
-                                else if (feature === constants_1.CapabilityOptions.notificationBot().id) {
+                                else if (feature === create_1.CapabilityOptions.notificationBot().id) {
                                     // notification
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplForNotificationBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_NOTIFICATION_V3);
                                 }
                                 else {
                                     // legacy bot
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                                 }
                             }
                             else if (inputs.scenarios) {
                                 const scenariosRaw = inputs.scenarios;
                                 const scenarios = Array.isArray(scenariosRaw) ? scenariosRaw : [];
-                                if (scenarios.includes(constants_2.BotScenario.CommandAndResponseBot) ||
-                                    scenarios.includes(constants_2.BotScenario.WorkflowBot)) {
+                                if (scenarios.includes(constants_1.BotScenario.CommandAndResponseBot) ||
+                                    scenarios.includes(constants_1.BotScenario.WorkflowBot)) {
                                     // command and response bot or workflow bot
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplForCommandAndResponseBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_COMMAND_AND_RESPONSE_V3);
                                 }
-                                else if (scenarios.includes(constants_2.BotScenario.NotificationBot)) {
+                                else if (scenarios.includes(constants_1.BotScenario.NotificationBot)) {
                                     // notification
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplForNotificationBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_FOR_NOTIFICATION_V3);
                                 }
                                 else {
                                     // legacy bot
-                                    appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplBasedOnVersion)(manifestVersion));
+                                    appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                                 }
                             }
                             else {
-                                appManifest.bots = appManifest.bots.concat((0, constants_3.getBotsTplBasedOnVersion)(manifestVersion));
+                                appManifest.bots = appManifest.bots.concat(constants_2.BOTS_TPL_V3);
                             }
                         }
                     }
@@ -192,10 +168,10 @@ class ManifestUtils {
                     }
                     else {
                         if (capability.existingApp) {
-                            appManifest.composeExtensions = appManifest.composeExtensions.concat(constants_3.COMPOSE_EXTENSIONS_TPL_EXISTING_APP);
+                            appManifest.composeExtensions = appManifest.composeExtensions.concat(constants_2.COMPOSE_EXTENSIONS_TPL_EXISTING_APP);
                         }
                         else {
-                            appManifest.composeExtensions = appManifest.composeExtensions.concat(isM365 ? constants_3.COMPOSE_EXTENSIONS_TPL_M365_V3 : constants_3.COMPOSE_EXTENSIONS_TPL_V3);
+                            appManifest.composeExtensions = appManifest.composeExtensions.concat(isM365 ? constants_2.COMPOSE_EXTENSIONS_TPL_M365_V3 : constants_2.COMPOSE_EXTENSIONS_TPL_V3);
                         }
                     }
                     break;
@@ -204,7 +180,7 @@ class ManifestUtils {
                         appManifest.webApplicationInfo = capability.snippet;
                     }
                     else {
-                        appManifest.webApplicationInfo = constants_3.WEB_APPLICATION_INFO_V3;
+                        appManifest.webApplicationInfo = constants_2.WEB_APPLICATION_INFO_V3;
                     }
                     break;
             }
@@ -213,14 +189,14 @@ class ManifestUtils {
             (_d = appManifest.validDomains) === null || _d === void 0 ? void 0 : _d.push(inputs.validDomain);
         }
         const content = JSON.stringify(appManifest, undefined, 4);
-        const contentV2 = (0, migrate_1.convertManifestTemplateToV2)(content);
+        const contentV2 = migrate_1.convertManifestTemplateToV2(content);
         await fs_extra_1.default.writeFile(inputs["addManifestPath"], contentV2);
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     _capabilityExceedLimit(manifest, capability) {
         switch (capability) {
             case "staticTab":
-                return (manifest.staticTabs !== undefined && manifest.staticTabs.length >= constants_3.STATIC_TABS_MAX_ITEMS);
+                return (manifest.staticTabs !== undefined && manifest.staticTabs.length >= constants_2.STATIC_TABS_MAX_ITEMS);
             case "configurableTab":
                 return manifest.configurableTabs !== undefined && manifest.configurableTabs.length >= 1;
             case "Bot":
@@ -234,7 +210,7 @@ class ManifestUtils {
         }
     }
     getCapabilities(template) {
-        return (0, projectTypeChecker_1.getCapabilities)(template);
+        return projectTypeChecker_1.getCapabilities(template);
     }
     /**
      * Get command id from composeExtensions
@@ -258,59 +234,59 @@ class ManifestUtils {
             const plugin = path.resolve(path.dirname(manifestPath), pluginFile);
             const doesFileExist = await fs_extra_1.default.pathExists(plugin);
             if (doesFileExist) {
-                return (0, teamsfx_api_1.ok)(plugin);
+                return teamsfx_api_1.ok(plugin);
             }
             else {
-                return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError("ManifestUtils", pluginFile));
+                return teamsfx_api_1.err(new common_1.FileNotFoundError("ManifestUtils", pluginFile));
             }
         }
         else {
-            return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("plugins", manifestPath)));
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("plugins", manifestPath)));
         }
     }
     async getManifestV3(manifestTemplatePath, context, generateIdIfNotResolved = true) {
         const manifestRes = await exports.manifestUtils._readAppManifest(manifestTemplatePath);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         let manifest = manifestRes.value;
         let teamsAppId = "";
         if (generateIdIfNotResolved) {
             // Corner Case: Avoid MissingEnvironmentVariablesError for manifest.id
-            teamsAppId = (0, common_2.expandEnvironmentVariable)(manifest.id);
+            teamsAppId = common_2.expandEnvironmentVariable(manifest.id);
             manifest.id = "";
         }
         const manifestTemplateString = JSON.stringify(manifest);
         // Add environment variable keys to telemetry
-        const resolvedManifestRes = await (0, utils_1.getResolvedManifest)(manifestTemplateString, manifestTemplatePath, envFunctionUtils_1.ManifestType.TeamsManifest, context);
+        const resolvedManifestRes = utils_1.getResolvedManifest(manifestTemplateString, manifestTemplatePath, telemetry_1.TelemetryPropertyKey.customizedKeys, context);
         if (resolvedManifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(resolvedManifestRes.error);
+            return teamsfx_api_1.err(resolvedManifestRes.error);
         }
         const resolvedManifestString = resolvedManifestRes.value;
         manifest = JSON.parse(resolvedManifestString);
         if (generateIdIfNotResolved) {
-            if (!(0, isUUID_1.default)(teamsAppId)) {
-                manifest.id = (0, uuid_1.v4)();
+            if (!isUUID_1.default(teamsAppId)) {
+                manifest.id = uuid_1.v4();
             }
             else {
                 manifest.id = teamsAppId;
             }
         }
-        return (0, teamsfx_api_1.ok)(manifest);
+        return teamsfx_api_1.ok(manifest);
     }
     extractManifestFromArchivedFile(archivedFile) {
         const zipEntries = new adm_zip_1.default(archivedFile).getEntries();
-        const manifestFile = zipEntries.find((x) => x.entryName === constants_3.Constants.MANIFEST_FILE);
+        const manifestFile = zipEntries.find((x) => x.entryName === constants_2.Constants.MANIFEST_FILE);
         if (!manifestFile) {
-            return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.FileNotFoundError.name, errors_1.AppStudioError.FileNotFoundError.message(constants_3.Constants.MANIFEST_FILE)));
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.FileNotFoundError.name, errors_1.AppStudioError.FileNotFoundError.message(constants_2.Constants.MANIFEST_FILE)));
         }
         const manifestString = manifestFile.getData().toString();
         const manifest = JSON.parse(manifestString);
-        return (0, teamsfx_api_1.ok)(manifest);
+        return teamsfx_api_1.ok(manifest);
     }
 }
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "ManifestUtils" })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "ManifestUtils" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)