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

package/build/core/FxCore.js

@@ -14,14 +14,14 @@ const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
 const typedi_1 = require("typedi");
 const url_1 = require("url");
+const yaml_1 = require("yaml");
 const constants_1 = require("../common/constants");
-const globalVars_1 = require("../common/globalVars");
 const localizeUtils_1 = require("../common/localizeUtils");
+const launchHelper_1 = require("../common/m365/launchHelper");
 const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
 const projectTypeChecker_1 = require("../common/projectTypeChecker");
 const telemetry_1 = require("../common/telemetry");
 const versionMetadata_1 = require("../common/versionMetadata");
-const actionInjector_1 = require("../component/configManager/actionInjector");
 const parser_1 = require("../component/configManager/parser");
 const constants_2 = require("../component/constants");
 const coordinator_1 = require("../component/coordinator");
@@ -29,19 +29,15 @@ const buildAadManifest_1 = require("../component/driver/aad/utility/buildAadMani
 require("../component/driver/index");
 require("../component/driver/script/scriptDriver");
 const appStudio_1 = require("../component/driver/teamsApp/appStudio");
-const errors_1 = require("../component/driver/teamsApp/errors");
-const results_1 = require("../component/driver/teamsApp/results");
 const teamsappMgr_1 = require("../component/driver/teamsApp/teamsappMgr");
-const CopilotGptManifestUtils_1 = require("../component/driver/teamsApp/utils/CopilotGptManifestUtils");
 const ManifestUtils_1 = require("../component/driver/teamsApp/utils/ManifestUtils");
 const PluginManifestUtils_1 = require("../component/driver/teamsApp/utils/PluginManifestUtils");
 const utils_1 = require("../component/driver/teamsApp/utils/utils");
-const utils_2 = require("../component/driver/util/utils");
 require("../component/feature/sso");
-const helper_1 = require("../component/generator/apiSpec/helper");
-const launchHelper_1 = require("../component/m365/launchHelper");
+const helper_1 = require("../component/generator/copilotPlugin/helper");
 const envMW_1 = require("../component/middleware/envMW");
 const questionMW_1 = require("../component/middleware/questionMW");
+const utils_2 = require("../component/utils");
 const common_1 = require("../component/utils/common");
 const envUtil_1 = require("../component/utils/envUtil");
 const metadataUtil_1 = require("../component/utils/metadataUtil");
@@ -50,27 +46,30 @@ const settingsUtil_1 = require("../component/utils/settingsUtil");
 const common_2 = require("../error/common");
 const upgrade_1 = require("../error/upgrade");
 const yml_1 = require("../error/yml");
+const question_1 = require("../question");
 const constants_3 = require("../question/constants");
 const create_1 = require("../question/create");
 const other_1 = require("../question/other");
+const questionNames_1 = require("../question/questionNames");
 const callback_1 = require("./callback");
 const collaborator_1 = require("./collaborator");
 const crypto_1 = require("./crypto");
 const environmentName_1 = require("./environmentName");
+const error_1 = require("./error");
+const globalVars_1 = require("./globalVars");
 const concurrentLocker_1 = require("./middleware/concurrentLocker");
 const contextInjector_1 = require("./middleware/contextInjector");
 const errorHandler_1 = require("./middleware/errorHandler");
 const projectMigratorV3_1 = require("./middleware/projectMigratorV3");
 const v3MigrationUtils_1 = require("./middleware/utils/v3MigrationUtils");
 const telemetry_2 = require("./telemetry");
-const packageService_1 = require("../component/m365/packageService");
-const serviceConstant_1 = require("../component/m365/serviceConstant");
-const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
-const utils_3 = require("../common/utils");
-const helper_2 = require("../component/generator/copilotExtension/helper");
+const results_1 = require("../component/driver/teamsApp/results");
+const errors_1 = require("../component/driver/teamsApp/errors");
+const CopilotGptManifestUtils_1 = require("../component/driver/teamsApp/utils/CopilotGptManifestUtils");
+const actionInjector_1 = require("../component/configManager/actionInjector");
 class FxCore {
     constructor(tools) {
-        (0, globalVars_1.setTools)(tools);
+        globalVars_1.setTools(tools);
     }
     /**
      * @todo this's a really primitive implement. Maybe could use Subscription Model to
@@ -80,19 +79,19 @@ class FxCore {
         return callback_1.CallbackRegistry.set(event, callback);
     }
     async createProject(inputs) {
-        const context = (0, globalVars_1.createContext)();
-        if (inputs[constants_3.QuestionNames.ProjectType] === constants_3.ProjectTypeOptions.startWithGithubCopilot().id) {
-            return (0, teamsfx_api_1.ok)({ projectPath: "", shouldInvokeTeamsAgent: true });
+        const context = utils_2.createContextV3();
+        if (inputs[questionNames_1.QuestionNames.ProjectType] === question_1.ProjectTypeOptions.startWithGithubCopilot().id) {
+            return teamsfx_api_1.ok({ projectPath: "", shouldInvokeTeamsAgent: true });
         }
-        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.yes().id;
+        inputs[questionNames_1.QuestionNames.Scratch] = create_1.ScratchOptions.yes().id;
         if (inputs.teamsAppFromTdp) {
             // should never happen as we do same check on Developer Portal.
-            if ((0, utils_1.containsUnsupportedFeature)(inputs.teamsAppFromTdp)) {
-                return (0, teamsfx_api_1.err)(new common_2.InputValidationError("manifest.json", "Teams app contains unsupported features"));
+            if (utils_1.containsUnsupportedFeature(inputs.teamsAppFromTdp)) {
+                return teamsfx_api_1.err(error_1.InvalidInputError("Teams app contains unsupported features"));
             }
             else {
                 context.telemetryReporter.sendTelemetryEvent(telemetry_2.CoreTelemetryEvent.CreateFromTdpStart, {
-                    [telemetry_2.CoreTelemetryProperty.TdpTeamsAppFeatures]: (0, utils_1.getFeaturesFromAppDefinition)(inputs.teamsAppFromTdp).join(","),
+                    [telemetry_2.CoreTelemetryProperty.TdpTeamsAppFeatures]: utils_1.getFeaturesFromAppDefinition(inputs.teamsAppFromTdp).join(","),
                     [telemetry_2.CoreTelemetryProperty.TdpTeamsAppId]: inputs.teamsAppFromTdp.teamsAppId,
                 });
             }
@@ -105,41 +104,41 @@ class FxCore {
         //1. input validation
         let folder = inputs["folder"];
         if (!folder) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("folder"));
+            return teamsfx_api_1.err(new common_2.MissingRequiredInputError("folder"));
         }
         folder = path.resolve(folder);
         const appName = inputs["app-name"];
         if (undefined === appName)
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError(constants_3.QuestionNames.AppName));
+            return teamsfx_api_1.err(new common_2.MissingRequiredInputError(questionNames_1.QuestionNames.AppName));
         const validateResult = jsonschema.validate(appName, {
-            pattern: constants_3.AppNamePattern,
+            pattern: question_1.AppNamePattern,
         });
         if (validateResult.errors && validateResult.errors.length > 0) {
-            return (0, teamsfx_api_1.err)(new common_2.InputValidationError(constants_3.QuestionNames.AppName, validateResult.errors[0].message));
+            return teamsfx_api_1.err(new common_2.InputValidationError(questionNames_1.QuestionNames.AppName, validateResult.errors[0].message));
         }
         const projectPath = path.join(folder, appName);
         //2. run generator
-        const context = (0, globalVars_1.createContext)();
+        const context = utils_2.createContextV3();
         const genRes = await generator.run(context, inputs, projectPath);
         if (genRes.isErr())
-            return (0, teamsfx_api_1.err)(genRes.error);
+            return teamsfx_api_1.err(genRes.error);
         //3. ensure unique projectId in teamsapp.yaml (optional)
         const ymlPath = path.join(projectPath, versionMetadata_1.MetadataV3.configFile);
         const result = { projectPath: projectPath };
         if (await fs_extra_1.default.pathExists(ymlPath)) {
             const ensureRes = await coordinator_1.coordinator.ensureTrackingId(projectPath, inputs.projectId);
             if (ensureRes.isErr())
-                return (0, teamsfx_api_1.err)(ensureRes.error);
+                return teamsfx_api_1.err(ensureRes.error);
             result.projectId = ensureRes.value;
         }
-        return (0, teamsfx_api_1.ok)(result);
+        return teamsfx_api_1.ok(result);
     }
     /**
      * lifecycle command: create new sample project
      */
     async createSampleProject(inputs) {
-        const context = (0, globalVars_1.createContext)();
-        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.no().id;
+        const context = utils_2.createContextV3();
+        inputs[questionNames_1.QuestionNames.Scratch] = create_1.ScratchOptions.no().id;
         const res = await coordinator_1.coordinator.create(context, inputs);
         inputs.projectPath = context.projectPath;
         return res;
@@ -149,17 +148,17 @@ class FxCore {
      */
     async provisionResources(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.provision;
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         try {
             const res = await coordinator_1.coordinator.provision(context, inputs);
             if (res.isOk()) {
                 ctx.envVars = res.value;
-                return (0, teamsfx_api_1.ok)(undefined);
+                return teamsfx_api_1.ok(undefined);
             }
             else {
                 // for partial success scenario, output is set in inputs object
                 ctx.envVars = inputs.envVars;
-                return (0, teamsfx_api_1.err)(res.error);
+                return teamsfx_api_1.err(res.error);
             }
         }
         finally {
@@ -170,266 +169,21 @@ class FxCore {
             catch (e) { }
         }
     }
-    /**
-     * none lifecycle command, uninstall provisioned resources
-     */
-    async uninstall(inputs) {
-        switch (inputs[constants_3.QuestionNames.UninstallMode]) {
-            case constants_3.QuestionNames.UninstallModeManifestId:
-                return await this.uninstallByManifestId(inputs);
-            case constants_3.QuestionNames.UninstallModeEnv:
-                return await this.uninstallByEnv(inputs);
-            case constants_3.QuestionNames.UninstallModeTitleId:
-                return await this.uninstallByTitleId(inputs);
-            default:
-                return (0, teamsfx_api_1.err)(new common_2.UnhandledError(new Error("Uninstall mode not supported"), "FxCore"));
-        }
-    }
-    /**
-     * uninstall provisioned resources by manifest ID
-     */
-    async uninstallByManifestId(inputs) {
-        const manifestId = inputs[constants_3.QuestionNames.ManifestId];
-        if (!manifestId) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("manifest-id", "FxCore"));
-        }
-        const uninstallOptions = inputs[constants_3.QuestionNames.UninstallOptions];
-        const m356AppOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionM365);
-        const tdpOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionTDP);
-        const botOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionBot);
-        if (m356AppOption) {
-            const res = await this.uninstallM365App(undefined, manifestId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-        }
-        if (botOption) {
-            const res = await this.uninstallBotFrameworRegistration(undefined, manifestId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-        }
-        // App registraion should be the last to remove, because we might need to query some metadata from TDP.
-        if (tdpOption) {
-            const res = await this.uninstallAppRegistration(manifestId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
-    /**
-     * uninstall provisioned resources by a given environment
-     */
-    async uninstallByEnv(inputs, ctx) {
-        var _a, _b, _c, _d, _e;
-        if (!inputs.env) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("env", "FxCore"));
-        }
-        const teamsappYamlPath = pathUtils_1.pathUtils.getYmlFilePath(inputs.projectPath, inputs.env);
-        const yamlProjectModel = await metadataUtil_1.metadataUtil.parse(teamsappYamlPath, inputs.env);
-        if (yamlProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(yamlProjectModel.error);
-        }
-        const projectModel = yamlProjectModel.value;
-        let teamsAppId;
-        let botId;
-        let m365TitleId;
-        let teamsAppIdKeyName = "";
-        let botIdKeyName = "";
-        let m365TitleIdKeyName = "";
-        for (const action of (_b = (_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs) !== null && _b !== void 0 ? _b : []) {
-            if (action.uses === "teamsApp/create") {
-                teamsAppIdKeyName = ((_c = action.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.teamsAppId) || "TEAMS_APP_ID";
-                teamsAppId = process.env[teamsAppIdKeyName];
-            }
-            else if (action.uses === "botFramework/create") {
-                botIdKeyName = ((_d = action.writeToEnvironmentFile) === null || _d === void 0 ? void 0 : _d.botId) || "BOT_ID";
-                botId = process.env[botIdKeyName];
-            }
-            else if (action.uses === "teamsApp/extendToM365") {
-                m365TitleIdKeyName = ((_e = action.writeToEnvironmentFile) === null || _e === void 0 ? void 0 : _e.titleId) || "M365_TITLE_ID";
-                m365TitleId = process.env[m365TitleIdKeyName];
-            }
-        }
-        const uninstallOptions = inputs[constants_3.QuestionNames.UninstallOptions];
-        const m356AppOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionM365);
-        const tdpOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionTDP);
-        const botOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_3.QuestionNames.UninstallOptionBot);
-        if ((teamsAppId || m365TitleId) && m356AppOption) {
-            const res = await this.uninstallM365App(m365TitleId, teamsAppId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-            this.resetEnvVar(teamsAppIdKeyName, ctx);
-            this.resetEnvVar(m365TitleIdKeyName, ctx);
-        }
-        if (botId && botOption) {
-            const res = await this.uninstallBotFrameworRegistration(botId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-            this.resetEnvVar(botIdKeyName, ctx);
-        }
-        // App registraion should be the last to remove, because we might need to query some metadata from TDP.
-        if (teamsAppId && tdpOption) {
-            const res = await this.uninstallAppRegistration(teamsAppId);
-            if (res.isErr()) {
-                return (0, teamsfx_api_1.err)(res.error);
-            }
-            this.resetEnvVar(teamsAppIdKeyName, ctx);
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
-    resetEnvVar(key, ctx, skipIfNotExist = true, resetValue = "") {
-        if (!ctx) {
-            return;
-        }
-        if (!ctx.envVars) {
-            ctx.envVars = {};
-        }
-        if (skipIfNotExist && !ctx.envVars[key]) {
-            return;
-        }
-        ctx.envVars[key] = resetValue;
-        return;
-    }
-    /**
-     * uninstall provisioned resources by title ID. Titlle mode only uninstalls M365 app.
-     */
-    async uninstallByTitleId(inputs) {
-        const titleId = inputs[constants_3.QuestionNames.TitleId];
-        if (!titleId) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("title-id", "FxCore"));
-        }
-        const res = await this.uninstallM365App(titleId);
-        if (res.isErr()) {
-            return (0, teamsfx_api_1.err)(res.error);
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
-    /**
-     * uninstall sideloaded appps in M365
-     */
-    async uninstallM365App(titleId, manifestId) {
-        var _a, _b, _c, _d;
-        if (titleId === undefined && manifestId === undefined) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("title id or manifest id", "FxCore"));
-        }
-        const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.MosServiceEndpoint;
-        const sideloadingServiceScope = (_b = process.env.SIDELOADING_SERVICE_SCOPE) !== null && _b !== void 0 ? _b : serviceConstant_1.MosServiceScope;
-        const sideloadingTokenRes = await globalVars_1.TOOLS.tokenProvider.m365TokenProvider.getAccessToken({
-            scopes: [sideloadingServiceScope],
-        });
-        if (sideloadingTokenRes.isErr()) {
-            return (0, teamsfx_api_1.err)(sideloadingTokenRes.error);
-        }
-        const packageService = new packageService_1.PackageService(sideloadingServiceEndpoint, globalVars_1.TOOLS.logProvider);
-        if (titleId === undefined) {
-            try {
-                titleId = await packageService.retrieveTitleId(sideloadingTokenRes.value, manifestId !== null && manifestId !== void 0 ? manifestId : "");
-            }
-            catch (err) {
-                await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.failed.titleId"), false);
-                throw (0, common_2.assembleError)(err);
-            }
-        }
-        const confirmRes = await ((_d = (_c = globalVars_1.TOOLS.ui).confirm) === null || _d === void 0 ? void 0 : _d.call(_c, {
-            name: "uninstallM365App",
-            title: (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.m365App", titleId),
-            default: true,
-        }));
-        if ((confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) && confirmRes.value.result === true) {
-            await packageService.unacquire(sideloadingTokenRes.value, titleId);
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.success.m365App", titleId), false);
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.success.delayWarning"), false);
-        }
-        else {
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.cancel.m365App"), false);
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError("Uninstall M365 App"));
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
-    /**
-     * uninstall sideloaded apps in Teams Developer Portal
-     */
-    async uninstallAppRegistration(manifestId) {
-        var _a, _b;
-        const appStudioTokenRes = await globalVars_1.TOOLS.tokenProvider.m365TokenProvider.getAccessToken({
-            scopes: constants_1.AppStudioScopes,
-        });
-        if (appStudioTokenRes.isErr()) {
-            return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
-        }
-        const confirmRes = await ((_b = (_a = globalVars_1.TOOLS.ui).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, {
-            name: "uninstallAppRegistration",
-            title: (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.tdp", manifestId),
-            default: true,
-        }));
-        if ((confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) && confirmRes.value.result === true) {
-            const token = appStudioTokenRes.value;
-            await teamsDevPortalClient_1.teamsDevPortalClient.deleteApp(token, manifestId);
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.success.tdp", manifestId), false);
-            return (0, teamsfx_api_1.ok)(undefined);
-        }
-        else {
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.cancel.tdp"), false);
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError("Uninstall App Registration"));
-        }
-    }
-    /**
-     * uninstall bots created in dev.botframework.com
-     */
-    async uninstallBotFrameworRegistration(botId, manifestId) {
-        var _a, _b;
-        if (!botId && !manifestId) {
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("bot id or manifest id", "FxCore"));
-        }
-        const appStudioTokenRes = await globalVars_1.TOOLS.tokenProvider.m365TokenProvider.getAccessToken({
-            scopes: constants_1.AppStudioScopes,
-        });
-        if (appStudioTokenRes.isErr()) {
-            return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
-        }
-        const token = appStudioTokenRes.value;
-        if (!botId) {
-            const botIdRes = await teamsDevPortalClient_1.teamsDevPortalClient.getBotId(token, manifestId);
-            if (!botIdRes) {
-                const msg = (0, localizeUtils_1.getLocalizedString)("core.uninstall.botNotFound", manifestId);
-                return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Uninstall", msg, msg));
-            }
-            botId = botIdRes;
-        }
-        const confirmRes = await ((_b = (_a = globalVars_1.TOOLS.ui).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, {
-            name: "uninstallBotFrameworRegistration",
-            title: (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.bot", botId),
-            default: true,
-        }));
-        if ((confirmRes === null || confirmRes === void 0 ? void 0 : confirmRes.isOk()) && confirmRes.value.result === true) {
-            await teamsDevPortalClient_1.teamsDevPortalClient.deleteBot(token, botId);
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.success.bot", botId), false);
-        }
-        else {
-            await globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.uninstall.confirm.cancel.bot"), false);
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError("Uninstall Bot Framework Registration"));
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
     /**
      * lifecycle commands: deploy
      */
     async deployArtifacts(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.deploy;
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const res = await coordinator_1.coordinator.deploy(context, inputs);
         if (res.isOk()) {
             ctx.envVars = res.value;
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
         else {
             // for partial success scenario, output is set in inputs object
             ctx.envVars = inputs.envVars;
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
     }
     async localDebug(inputs) {
@@ -443,12 +197,12 @@ class FxCore {
         inputs.stage = teamsfx_api_1.Stage.deployAad;
         const updateAadClient = typedi_1.Container.get("aadApp/update");
         // In V3, the aad.template.json exist at .fx folder, and output to root build folder.
-        const manifestTemplatePath = inputs[constants_3.QuestionNames.AadAppManifestFilePath];
+        const manifestTemplatePath = inputs[questionNames_1.QuestionNames.AadAppManifestFilePath];
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
-            return (0, teamsfx_api_1.err)(new common_2.FileNotFoundError("deployAadManifest", manifestTemplatePath));
+            return teamsfx_api_1.err(new common_2.FileNotFoundError("deployAadManifest", manifestTemplatePath));
         }
         let manifestOutputPath = manifestTemplatePath;
-        if (inputs.env && (await (0, other_1.isAadMainifestContainsPlaceholder)(inputs))) {
+        if (inputs.env && (await other_1.isAadMainifestContainsPlaceholder(inputs))) {
             await fs_extra_1.default.ensureDir(path.join(inputs.projectPath, "build"));
             manifestOutputPath = path.join(inputs.projectPath, "build", `aad.manifest.${inputs.env}.json`);
         }
@@ -456,77 +210,77 @@ class FxCore {
             manifestPath: manifestTemplatePath,
             outputFilePath: manifestOutputPath,
         };
-        const Context = (0, utils_2.createDriverContext)(inputs);
-        (0, globalVars_1.setErrorContext)({ component: "aadAppUpdate" });
+        const Context = utils_2.createDriverContext(inputs);
+        globalVars_1.setErrorContext({ component: "aadAppUpdate" });
         const res = await updateAadClient.execute(inputArgs, Context);
         if (res.result.isErr()) {
-            return (0, teamsfx_api_1.err)(res.result.error);
+            return teamsfx_api_1.err(res.result.error);
         }
         if (Context.platform === teamsfx_api_1.Platform.CLI) {
-            const msg = (0, localizeUtils_1.getLocalizedString)("core.deploy.aadManifestOnCLISuccessNotice");
+            const msg = localizeUtils_1.getLocalizedString("core.deploy.aadManifestOnCLISuccessNotice");
             void Context.ui.showMessage("info", msg, false);
         }
         else {
-            const msg = (0, localizeUtils_1.getLocalizedString)("core.deploy.aadManifestSuccessNotice");
-            void Context.ui.showMessage("info", msg, false, (0, localizeUtils_1.getLocalizedString)("core.deploy.aadManifestLearnMore")).then((result) => {
+            const msg = localizeUtils_1.getLocalizedString("core.deploy.aadManifestSuccessNotice");
+            void Context.ui.showMessage("info", msg, false, localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore")).then((result) => {
                 const userSelected = result.isOk() ? result.value : undefined;
-                if (userSelected === (0, localizeUtils_1.getLocalizedString)("core.deploy.aadManifestLearnMore")) {
+                if (userSelected === localizeUtils_1.getLocalizedString("core.deploy.aadManifestLearnMore")) {
                     void Context.ui.openUrl(constants_2.ViewAadAppHelpLinkV5);
                 }
             });
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * none lifecycle command, v3 only
      */
     async addWebpart(inputs) {
-        (0, globalVars_1.setErrorContext)({ component: "spfxAdd", method: "run" });
+        globalVars_1.setErrorContext({ component: "spfxAdd", method: "run" });
         const driver = typedi_1.Container.get("spfx/add");
         const args = {
-            manifestPath: inputs[constants_3.QuestionNames.ManifestPath],
-            localManifestPath: inputs[constants_3.QuestionNames.LocalTeamsAppManifestFilePath],
-            spfxFolder: inputs[constants_3.QuestionNames.SPFxFolder],
-            webpartName: inputs[constants_3.QuestionNames.SPFxWebpartName],
-            framework: inputs[constants_3.QuestionNames.SPFxFramework],
-            spfxPackage: constants_3.SPFxVersionOptionIds.installLocally,
+            manifestPath: inputs[constants_2.SPFxQuestionNames.ManifestPath],
+            localManifestPath: inputs[constants_2.SPFxQuestionNames.LocalManifestPath],
+            spfxFolder: inputs[constants_2.SPFxQuestionNames.SPFxFolder],
+            webpartName: inputs[constants_2.SPFxQuestionNames.WebPartName],
+            framework: inputs[questionNames_1.QuestionNames.SPFxFramework],
+            spfxPackage: create_1.SPFxVersionOptionIds.installLocally,
         };
-        const Context = (0, utils_2.createDriverContext)(inputs);
+        const Context = utils_2.createDriverContext(inputs);
         const res = await driver.run(args, Context);
         if (res.isErr()) {
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * lifecycle command: publish
      */
     async publishApplication(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.publish;
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const res = await coordinator_1.coordinator.publish(context, inputs);
         if (res.isOk()) {
             ctx.envVars = res.value;
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
         else {
             // for partial success scenario, output is set in inputs object
             ctx.envVars = inputs.envVars;
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
     }
     /**
      * most commands will be deprecated in V3
      */
     async executeUserTask(func, inputs) {
-        let res = (0, teamsfx_api_1.ok)(undefined);
-        const context = (0, utils_2.createDriverContext)(inputs);
+        let res = teamsfx_api_1.ok(undefined);
+        const context = utils_2.createDriverContext(inputs);
         if (func.method === "addSso") {
             // used in v3 only in VS
             inputs.stage = teamsfx_api_1.Stage.addFeature;
-            inputs[constants_3.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
+            inputs[questionNames_1.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
             const component = typedi_1.Container.get("sso");
-            (0, globalVars_1.setErrorContext)({ component: "sso", method: "add" });
+            globalVars_1.setErrorContext({ component: "sso", method: "add" });
             res = await component.add(context, inputs);
         }
         return res;
@@ -539,28 +293,28 @@ class FxCore {
             ? inputs.AAD_MANIFEST_FILE
             : path.join(inputs.projectPath, constants_2.AadConstants.DefaultTemplateFileName);
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
-            return (0, teamsfx_api_1.err)(new common_2.FileNotFoundError("buildAadManifest", manifestTemplatePath));
+            return teamsfx_api_1.err(new common_2.FileNotFoundError("buildAadManifest", manifestTemplatePath));
         }
         await fs_extra_1.default.ensureDir(path.join(inputs.projectPath, "build"));
         const manifestOutputPath = path.join(inputs.projectPath, "build", 
         // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
         `aad.${inputs.env}.json`);
-        const Context = (0, utils_2.createDriverContext)(inputs);
-        await (0, buildAadManifest_1.buildAadManifest)(Context, manifestTemplatePath, manifestOutputPath);
-        return (0, teamsfx_api_1.ok)(undefined);
+        const Context = utils_2.createDriverContext(inputs);
+        await buildAadManifest_1.buildAadManifest(Context, manifestTemplatePath, manifestOutputPath);
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * v3 only none lifecycle command
      */
     async deployTeamsManifest(inputs, ctx) {
-        inputs.manifestTemplatePath = inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
-        const context = (0, globalVars_1.createContext)();
-        const res = await (0, appStudio_1.updateManifestV3)(context, inputs);
+        inputs.manifestTemplatePath = inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
+        const context = utils_2.createContextV3();
+        const res = await appStudio_1.updateManifestV3(context, inputs);
         if (res.isOk()) {
             ctx.envVars = envUtil_1.envUtil.map2object(res.value);
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
-        return (0, teamsfx_api_1.err)(res.error);
+        return teamsfx_api_1.err(res.error);
     }
     /******
      * CLI v3 commands
@@ -582,9 +336,9 @@ class FxCore {
     async packageTeamsAppCLIV3(inputs) {
         const res = await teamsappMgr_1.teamsappMgr.packageTeamsApp(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)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     /******
      * CLI v3 commands
@@ -600,7 +354,7 @@ class FxCore {
         if (inputs["manifest-path"]) {
             return await this.validateManifest(inputs);
         }
-        else if (inputs[constants_3.QuestionNames.ValidateMethod] === constants_3.TeamsAppValidationOptions.testCases().id) {
+        else if (inputs[questionNames_1.QuestionNames.ValidateMethod] === other_1.TeamsAppValidationOptions.testCases().id) {
             return await this.validateWithTestCases(inputs);
         }
         else {
@@ -612,7 +366,7 @@ class FxCore {
      */
     async validateManifest(inputs) {
         inputs.stage = teamsfx_api_1.Stage.validateApplication;
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const teamsAppManifestFilePath = inputs["manifest-path"];
         const args = {
             manifestPath: teamsAppManifestFilePath,
@@ -627,7 +381,7 @@ class FxCore {
      */
     async validateAppPackage(inputs) {
         inputs.stage = teamsfx_api_1.Stage.validateApplication;
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const teamsAppPackageFilePath = inputs["app-package-file-path"];
         const args = {
             appPackagePath: teamsAppPackageFilePath,
@@ -637,7 +391,7 @@ class FxCore {
         return (await driver.execute(args, context)).result;
     }
     async validateWithTestCases(inputs) {
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const args = {
             appPackagePath: inputs["app-package-file-path"],
             showMessage: true,
@@ -646,40 +400,25 @@ class FxCore {
         const driver = typedi_1.Container.get("teamsApp/validateWithTestCases");
         return (await driver.execute(args, context)).result;
     }
-    /**
-     * v3 only none lifecycle command
-     */
-    async syncManifest(inputs) {
-        const context = (0, utils_2.createDriverContext)(inputs);
-        const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
-        const env = inputs[constants_3.QuestionNames.Env];
-        const teamsAppId = inputs[constants_3.QuestionNames.TeamsAppId];
-        const args = {
-            projectPath: projectPath,
-            env: env,
-            teamsAppId: teamsAppId,
-        };
-        const driver = typedi_1.Container.get("teamsApp/syncManifest");
-        return (await driver.execute(args, context)).result;
-    }
     /**
      * v3 only none lifecycle command
      */
     async createAppPackage(inputs) {
         var _a, _b, _c;
         inputs.stage = teamsfx_api_1.Stage.createAppPackage;
-        const context = (0, utils_2.createDriverContext)(inputs);
-        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
+        const context = utils_2.createDriverContext(inputs);
+        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
         const driver = typedi_1.Container.get("teamsApp/zipAppPackage");
         const args = {
             manifestPath: teamsAppManifestFilePath,
-            outputZipPath: (_a = inputs[constants_3.QuestionNames.OutputZipPathParamName]) !== null && _a !== void 0 ? _a : 
+            outputZipPath: (_a = inputs[questionNames_1.QuestionNames.OutputZipPathParamName]) !== null && _a !== void 0 ? _a : 
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             `${inputs.projectPath}/${teamsfx_api_1.AppPackageFolderName}/${teamsfx_api_1.BuildFolderName}/appPackage.${process.env
                 .TEAMSFX_ENV}.zip`,
-            outputFolder: (_b = inputs[constants_3.QuestionNames.OutputManifestParamName]) !== null && _b !== void 0 ? _b : 
+            outputJsonPath: (_b = inputs[questionNames_1.QuestionNames.OutputManifestParamName]) !== null && _b !== void 0 ? _b : 
             // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-            `${inputs.projectPath}/${teamsfx_api_1.AppPackageFolderName}/${teamsfx_api_1.BuildFolderName}`,
+            `${inputs.projectPath}/${teamsfx_api_1.AppPackageFolderName}/${teamsfx_api_1.BuildFolderName}/manifest.${process.env
+                .TEAMSFX_ENV}.json`,
         };
         const result = (await driver.execute(args, context)).result;
         if (context.platform === teamsfx_api_1.Platform.VSCode) {
@@ -689,11 +428,11 @@ class FxCore {
                 if (!path.isAbsolute(zipFileName)) {
                     zipFileName = path.join(context.projectPath, zipFileName);
                 }
-                let builtSuccess = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.buildSucceedNotice.fallback", zipFileName);
+                let builtSuccess = localizeUtils_1.getLocalizedString("plugins.appstudio.buildSucceedNotice.fallback", zipFileName);
                 if (isWindows) {
-                    const folderLink = (0, url_1.pathToFileURL)(path.dirname(zipFileName));
+                    const folderLink = url_1.pathToFileURL(path.dirname(zipFileName));
                     const appPackageLink = `${constants_1.VSCodeExtensionCommand.openFolder}?%5B%22${folderLink.toString()}%22%5D`;
-                    builtSuccess = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.buildSucceedNotice", appPackageLink);
+                    builtSuccess = localizeUtils_1.getLocalizedString("plugins.appstudio.buildSucceedNotice", appPackageLink);
                 }
                 (_c = context.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", builtSuccess, false);
             }
@@ -708,17 +447,16 @@ class FxCore {
      */
     async previewWithManifest(inputs) {
         inputs.stage = teamsfx_api_1.Stage.previewWithManifest;
-        const hub = inputs[constants_3.QuestionNames.M365Host];
-        const manifestFilePath = inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
-        const context = (0, globalVars_1.createContext)();
-        const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestFilePath, (0, utils_3.generateDriverContext)(context, inputs), false);
+        const hub = inputs[questionNames_1.QuestionNames.M365Host];
+        const manifestFilePath = inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
+        const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestFilePath, undefined, false);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         const teamsAppId = manifestRes.value.id;
         const properties = teamsfx_api_1.ManifestUtil.parseCommonProperties(manifestRes.value);
         const launchHelper = new launchHelper_1.LaunchHelper(globalVars_1.TOOLS.tokenProvider.m365TokenProvider, globalVars_1.TOOLS.logProvider);
-        const result = await launchHelper.getLaunchUrl(hub, teamsAppId, properties, true);
+        const result = await launchHelper.getLaunchUrl(hub, teamsAppId, properties.capabilities, true);
         return result;
     }
     /**
@@ -726,9 +464,9 @@ class FxCore {
      */
     getQuestions(stage, inputs) {
         if (stage === teamsfx_api_1.Stage.create) {
-            return (0, teamsfx_api_1.ok)((0, create_1.createProjectCliHelpNode)());
+            return teamsfx_api_1.ok(create_1.createProjectCliHelpNode());
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * get all dot envs
@@ -736,17 +474,17 @@ class FxCore {
     async getDotEnvs(inputs) {
         const envListRes = await envUtil_1.envUtil.listEnv(inputs.projectPath);
         if (envListRes.isErr()) {
-            return (0, teamsfx_api_1.err)(envListRes.error);
+            return teamsfx_api_1.err(envListRes.error);
         }
         const res = {};
         for (const env of envListRes.value) {
             const envRes = await envUtil_1.envUtil.readEnv(inputs.projectPath, env, false, false);
             if (envRes.isErr()) {
-                return (0, teamsfx_api_1.err)(envRes.error);
+                return teamsfx_api_1.err(envRes.error);
             }
             res[env] = envRes.value;
         }
-        return (0, teamsfx_api_1.ok)(res);
+        return teamsfx_api_1.ok(res);
     }
     /**
      * given projectPath and filePath, return whether the filePath is a env file
@@ -755,17 +493,17 @@ class FxCore {
         const inputFileName = path.basename(inputFile);
         const envName = envUtil_1.envUtil.extractEnvNameFromFileName(inputFileName);
         if (!envName)
-            return (0, teamsfx_api_1.ok)(false);
+            return teamsfx_api_1.ok(false);
         const folderRes = await pathUtils_1.pathUtils.getEnvFolderPath(projectPath);
         if (folderRes.isErr())
-            return (0, teamsfx_api_1.err)(folderRes.error);
+            return teamsfx_api_1.err(folderRes.error);
         const envFolderPath = folderRes.value;
         if (!envFolderPath)
-            return (0, teamsfx_api_1.ok)(false);
+            return teamsfx_api_1.ok(false);
         const inputFileDir = path.dirname(inputFile);
         if (path.resolve(inputFileDir) !== path.resolve(envFolderPath))
-            return (0, teamsfx_api_1.ok)(false);
-        return (0, teamsfx_api_1.ok)(true);
+            return teamsfx_api_1.ok(false);
+        return teamsfx_api_1.ok(true);
     }
     /**
      * get projectId
@@ -773,18 +511,29 @@ class FxCore {
     async getProjectId(projectPath) {
         const res = await this.getProjectMetadata(projectPath);
         if (res.isErr()) {
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
-        return (0, teamsfx_api_1.ok)(res.value.projectId || "");
+        return teamsfx_api_1.ok(res.value.projectId || "");
     }
     /**
      * @description get projectId and version from yml
      */
     async getProjectMetadata(projectPath) {
-        const res = (0, projectSettingsHelper_1.getProjectMetadata)(projectPath);
-        if (!res)
-            return (0, teamsfx_api_1.ok)({});
-        return Promise.resolve((0, teamsfx_api_1.ok)(res));
+        try {
+            const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
+            if (!ymlPath || !(await fs_extra_1.default.pathExists(ymlPath))) {
+                return teamsfx_api_1.ok({});
+            }
+            const ymlContent = await fs_extra_1.default.readFile(ymlPath, "utf-8");
+            const ymlObject = yaml_1.parse(ymlContent);
+            return teamsfx_api_1.ok({
+                projectId: (ymlObject === null || ymlObject === void 0 ? void 0 : ymlObject.projectId) ? ymlObject.projectId.toString() : "",
+                version: (ymlObject === null || ymlObject === void 0 ? void 0 : ymlObject.version) ? ymlObject.version.toString() : "",
+            });
+        }
+        catch (_a) {
+            return teamsfx_api_1.ok({});
+        }
     }
     /**
      * get Teams App Name from yml
@@ -794,7 +543,7 @@ class FxCore {
         const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(ymlPath, "dev");
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         if (projectModel.provision) {
@@ -802,12 +551,12 @@ class FxCore {
             if (teamsAppCreate) {
                 let name = teamsAppCreate.with.name;
                 if (name) {
-                    name = (0, common_1.expandEnvironmentVariable)(name, { APP_NAME_SUFFIX: "", TEAMSFX_ENV: " " }).trim();
-                    return (0, teamsfx_api_1.ok)(name);
+                    name = common_1.expandEnvironmentVariable(name, { APP_NAME_SUFFIX: "", TEAMSFX_ENV: " " }).trim();
+                    return teamsfx_api_1.ok(name);
                 }
             }
         }
-        return (0, teamsfx_api_1.ok)("");
+        return teamsfx_api_1.ok("");
     }
     /**
      * get project info
@@ -817,12 +566,12 @@ class FxCore {
         const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(ymlPath, env);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         const readEnvRes = await envUtil_1.envUtil.readEnv(projectPath, env, false, true);
         if (readEnvRes.isErr()) {
-            return (0, teamsfx_api_1.err)(readEnvRes.error);
+            return teamsfx_api_1.err(readEnvRes.error);
         }
         const envObject = readEnvRes.value;
         const res = {
@@ -845,13 +594,13 @@ class FxCore {
                 }
             }
         }
-        return (0, teamsfx_api_1.ok)(res);
+        return teamsfx_api_1.ok(res);
     }
     async grantPermission(inputs) {
         inputs.stage = teamsfx_api_1.Stage.grantPermission;
-        const context = (0, globalVars_1.createContext)();
-        (0, globalVars_1.setErrorContext)({ component: "collaborator" });
-        const res = await (0, collaborator_1.grantPermission)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const context = utils_2.createContextV3();
+        globalVars_1.setErrorContext({ component: "collaborator" });
+        const res = await collaborator_1.grantPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     /**
@@ -859,8 +608,8 @@ class FxCore {
      */
     async checkPermission(inputs) {
         inputs.stage = teamsfx_api_1.Stage.checkPermission;
-        const context = (0, globalVars_1.createContext)();
-        const res = await (0, collaborator_1.checkPermission)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const context = utils_2.createContextV3();
+        const res = await collaborator_1.checkPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     /**
@@ -868,21 +617,21 @@ class FxCore {
      */
     async listCollaborator(inputs) {
         inputs.stage = teamsfx_api_1.Stage.listCollaborator;
-        const context = (0, globalVars_1.createContext)();
-        const res = await (0, collaborator_1.listCollaborator)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const context = utils_2.createContextV3();
+        const res = await collaborator_1.listCollaborator(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     getSelectedEnv(inputs) {
-        return Promise.resolve((0, teamsfx_api_1.ok)(inputs.env)); //work for both v2 and v3
+        return Promise.resolve(teamsfx_api_1.ok(inputs.env)); //work for both v2 and v3
     }
     async createLocalCrypto(projectPath) {
         const settingsRes = await settingsUtil_1.settingsUtil.readSettings(projectPath);
         if (settingsRes.isErr()) {
-            return (0, teamsfx_api_1.err)(settingsRes.error);
+            return teamsfx_api_1.err(settingsRes.error);
         }
         const projectId = settingsRes.value.trackingId;
         const cryptoProvider = new crypto_1.LocalCrypto(projectId);
-        return (0, teamsfx_api_1.ok)(cryptoProvider);
+        return teamsfx_api_1.ok(cryptoProvider);
     }
     /**
      * only for vs code extension
@@ -890,7 +639,7 @@ class FxCore {
     async encrypt(plaintext, inputs) {
         const res = await this.createLocalCrypto(inputs.projectPath);
         if (res.isErr()) {
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
         return res.value.encrypt(plaintext);
     }
@@ -900,26 +649,26 @@ class FxCore {
     async decrypt(ciphertext, inputs) {
         const res = await this.createLocalCrypto(inputs.projectPath);
         if (res.isErr()) {
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         }
         return res.value.decrypt(ciphertext);
     }
     async createEnv(inputs) {
-        return this.createEnvCopyV3(inputs[constants_3.QuestionNames.NewTargetEnvName], inputs[constants_3.QuestionNames.SourceEnvName], inputs.projectPath);
+        return this.createEnvCopyV3(inputs[questionNames_1.QuestionNames.NewTargetEnvName], inputs[questionNames_1.QuestionNames.SourceEnvName], inputs.projectPath);
     }
     async createEnvCopyV3(targetEnvName, sourceEnvName, projectPath) {
         let res = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, sourceEnvName);
         if (res.isErr())
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         const sourceDotEnvFile = res.value;
         res = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, targetEnvName);
         if (res.isErr())
-            return (0, teamsfx_api_1.err)(res.error);
+            return teamsfx_api_1.err(res.error);
         const targetDotEnvFile = res.value;
         if (!sourceDotEnvFile || !targetDotEnvFile)
-            return (0, teamsfx_api_1.err)(new yml_1.YamlFieldMissingError("environmentFolderPath"));
+            return teamsfx_api_1.err(new yml_1.YamlFieldMissingError("environmentFolderPath"));
         if (!(await fs_extra_1.default.pathExists(sourceDotEnvFile)))
-            return (0, teamsfx_api_1.err)(new common_2.FileNotFoundError("createEnvCopyV3", sourceDotEnvFile));
+            return teamsfx_api_1.err(new common_2.FileNotFoundError("createEnvCopyV3", sourceDotEnvFile));
         const source = await fs_extra_1.default.readFile(sourceDotEnvFile);
         const writeStream = fs_extra_1.default.createWriteStream(targetDotEnvFile);
         source
@@ -945,48 +694,48 @@ class FxCore {
         });
         writeStream.end();
         globalVars_1.TOOLS.logProvider.info(`env file created: ${targetDotEnvFile}`);
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     // a phantom migration method for V3
     async phantomMigrationV3(inputs) {
         // If the project is invalid or upgraded, the ProjectMigratorMWV3 will not take action.
         // Check invaliad/upgraded project here before call ProjectMigratorMWV3
         const projectPath = inputs.projectPath || "";
-        const version = await (0, v3MigrationUtils_1.getProjectVersionFromPath)(projectPath);
+        const version = await v3MigrationUtils_1.getProjectVersionFromPath(projectPath);
         if (version.source === versionMetadata_1.VersionSource.teamsapp) {
-            return (0, teamsfx_api_1.err)(new upgrade_1.NoNeedUpgradeError());
+            return teamsfx_api_1.err(new upgrade_1.NoNeedUpgradeError());
         }
         else if (version.source === versionMetadata_1.VersionSource.projectSettings) {
-            const isValid = await (0, projectMigratorV3_1.checkActiveResourcePlugins)(projectPath);
+            const isValid = await projectMigratorV3_1.checkActiveResourcePlugins(projectPath);
             if (!isValid) {
-                return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
+                return teamsfx_api_1.err(new common_2.InvalidProjectError());
             }
         }
         if (version.source === versionMetadata_1.VersionSource.unknown) {
-            return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
+            return teamsfx_api_1.err(new common_2.InvalidProjectError());
         }
         return this.innerMigrationV3(inputs);
     }
     innerMigrationV3(inputs) {
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     // a project version check
     async projectVersionCheck(inputs) {
         const projectPath = inputs.projectPath || "";
-        if ((0, projectSettingsHelper_1.isValidProjectV3)(projectPath) || (0, projectSettingsHelper_1.isValidProjectV2)(projectPath)) {
-            const versionInfo = await (0, v3MigrationUtils_1.getProjectVersionFromPath)(projectPath);
+        if (projectSettingsHelper_1.isValidProjectV3(projectPath) || projectSettingsHelper_1.isValidProjectV2(projectPath)) {
+            const versionInfo = await v3MigrationUtils_1.getProjectVersionFromPath(projectPath);
             if (!versionInfo.version) {
-                return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
+                return teamsfx_api_1.err(new common_2.InvalidProjectError());
             }
-            const trackingId = await (0, v3MigrationUtils_1.getTrackingIdFromPath)(projectPath);
-            const isSupport = (0, v3MigrationUtils_1.getVersionState)(versionInfo);
+            const trackingId = await v3MigrationUtils_1.getTrackingIdFromPath(projectPath);
+            const isSupport = v3MigrationUtils_1.getVersionState(versionInfo);
             // if the project is upgradeable, check whether the project is valid and invalid project should not show upgrade option.
             if (isSupport === versionMetadata_1.VersionState.upgradeable) {
-                if (!(await (0, projectMigratorV3_1.checkActiveResourcePlugins)(projectPath))) {
-                    return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
+                if (!(await projectMigratorV3_1.checkActiveResourcePlugins(projectPath))) {
+                    return teamsfx_api_1.err(new common_2.InvalidProjectError());
                 }
             }
-            return (0, teamsfx_api_1.ok)({
+            return teamsfx_api_1.ok({
                 currentVersion: versionInfo.version,
                 trackingId,
                 isSupport,
@@ -994,28 +743,28 @@ class FxCore {
             });
         }
         else {
-            return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
+            return teamsfx_api_1.err(new common_2.InvalidProjectError());
         }
     }
     // apply the given yaml template to current project.
     async apply(inputs, templatePath, lifecycleName) {
         if (!inputs.projectPath) {
-            return (0, teamsfx_api_1.err)(new common_2.InputValidationError("projectPath", "empty", "Core"));
+            return teamsfx_api_1.err(error_1.InvalidInputError("invalid projectPath", inputs));
         }
         const projectPath = inputs.projectPath;
         if (!inputs.env) {
-            return (0, teamsfx_api_1.err)(new common_2.InputValidationError("env", "empty", "Core"));
+            return teamsfx_api_1.err(error_1.InvalidInputError("invalid env", inputs));
         }
         const env = inputs.env;
         const lifecycleName_ = lifecycleName;
         const result = await envUtil_1.envUtil.readEnv(projectPath, env);
         if (result.isErr()) {
-            return (0, teamsfx_api_1.err)(result.error);
+            return teamsfx_api_1.err(result.error);
         }
         const parser = new parser_1.YamlParser();
         const maybeProjectModel = await parser.parse(templatePath);
         if (maybeProjectModel.isErr()) {
-            return (0, teamsfx_api_1.err)(maybeProjectModel.error);
+            return teamsfx_api_1.err(maybeProjectModel.error);
         }
         const projectModel = maybeProjectModel.value;
         const driverContext = {
@@ -1034,7 +783,7 @@ class FxCore {
         }
         else {
             driverContext.logProvider.warning(`No definition found for ${lifecycleName}`);
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
     }
     async runLifecycle(lifecycle, driverContext, env) {
@@ -1049,7 +798,7 @@ class FxCore {
             const error = runResult.error;
             if (error.kind === "Failure") {
                 driverContext.logProvider.error(`Failed to run ${lifecycle.name} due to ${error.error.name}: ${error.error.message}`);
-                return (0, teamsfx_api_1.err)(error.error);
+                return teamsfx_api_1.err(error.error);
             }
             else {
                 try {
@@ -1057,11 +806,11 @@ class FxCore {
                     if (error.reason.kind === "UnresolvedPlaceholders") {
                         const unresolved = error.reason.unresolvedPlaceHolders;
                         driverContext.logProvider.warning(`Unresolved placeholders: ${unresolved.join(",")} for driver ${failedDriver.uses}`);
-                        return (0, teamsfx_api_1.ok)(undefined);
+                        return teamsfx_api_1.ok(undefined);
                     }
                     else {
                         driverContext.logProvider.error(`Failed to run ${lifecycle.name} due to ${error.reason.error.name}: ${error.reason.error.message}. Failed driver: ${failedDriver.uses}`);
-                        return (0, teamsfx_api_1.err)(error.reason.error);
+                        return teamsfx_api_1.err(error.reason.error);
                     }
                 }
                 finally {
@@ -1071,61 +820,67 @@ class FxCore {
         }
     }
     async preProvisionForVS(inputs) {
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         return coordinator_1.coordinator.preProvisionForVS(context, inputs);
     }
     async preCheckYmlAndEnvForVS(inputs) {
-        const context = (0, utils_2.createDriverContext)(inputs);
+        const context = utils_2.createDriverContext(inputs);
         const result = await coordinator_1.coordinator.preCheckYmlAndEnvForVS(context, inputs);
         return result;
     }
     async publishInDeveloperPortal(inputs) {
         inputs.stage = teamsfx_api_1.Stage.publishInDeveloperPortal;
-        const context = (0, globalVars_1.createContext)();
+        const context = utils_2.createContextV3();
         return await coordinator_1.coordinator.publishInDeveloperPortal(context, inputs);
     }
     async copilotPluginAddAPI(inputs) {
-        const newOperations = inputs[constants_3.QuestionNames.ApiOperation];
-        const url = inputs[constants_3.QuestionNames.ApiSpecLocation];
-        const manifestPath = inputs[constants_3.QuestionNames.ManifestPath];
-        const isPlugin = inputs[constants_3.QuestionNames.ApiPluginType] === constants_3.apiPluginApiSpecOptionId;
-        const context = (0, globalVars_1.createContext)();
+        var _a, _b;
+        const newOperations = inputs[questionNames_1.QuestionNames.ApiOperation];
+        const url = (_a = inputs[questionNames_1.QuestionNames.ApiSpecLocation]) !== null && _a !== void 0 ? _a : (_b = inputs.openAIPluginManifest) === null || _b === void 0 ? void 0 : _b.api.url;
+        const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
+        const isPlugin = inputs[questionNames_1.QuestionNames.Capabilities] === constants_3.copilotPluginApiSpecOptionId;
+        const context = utils_2.createContextV3();
         // Get API spec file path from manifest
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
-        const confirmRes = await context.userInteraction.showMessage("warn", (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", teamsfx_api_1.AppPackageFolderName), true, (0, localizeUtils_1.getLocalizedString)("core.addApi.continue"));
+        const confirmRes = await context.userInteraction.showMessage("warn", localizeUtils_1.getLocalizedString("core.addApi.confirm", teamsfx_api_1.AppPackageFolderName), true, localizeUtils_1.getLocalizedString("core.addApi.continue"));
         if (confirmRes.isErr()) {
-            return (0, teamsfx_api_1.err)(confirmRes.error);
+            return teamsfx_api_1.err(confirmRes.error);
         }
-        else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.addApi.continue")) {
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
+        else if (confirmRes.value !== localizeUtils_1.getLocalizedString("core.addApi.continue")) {
+            return teamsfx_api_1.err(new common_2.UserCancelError());
         }
         // Merge existing operations in manifest.json
-        const specParser = new m365_spec_parser_1.SpecParser(url, (0, helper_1.getParserOptions)(isPlugin ? m365_spec_parser_1.ProjectType.Copilot : m365_spec_parser_1.ProjectType.SME));
-        try {
-            const listResult = await specParser.list();
-            const apiResultList = listResult.APIs.filter((value) => value.isValid);
-            let existingOperations;
-            let outputApiSpecPath;
-            if (isPlugin) {
-                if (!inputs[constants_3.QuestionNames.DestinationApiSpecFilePath]) {
-                    return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError(constants_3.QuestionNames.DestinationApiSpecFilePath));
-                }
-                outputApiSpecPath = inputs[constants_3.QuestionNames.DestinationApiSpecFilePath];
-                existingOperations = await (0, helper_1.listPluginExistingOperations)(manifestRes.value, manifestPath, inputs[constants_3.QuestionNames.DestinationApiSpecFilePath]);
-            }
-            else {
-                const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
-                existingOperations = apiResultList
-                    .filter((operation) => existingOperationIds.includes(operation.operationId))
-                    .map((operation) => operation.api);
-                const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
-                outputApiSpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
+        const specParser = new m365_spec_parser_1.SpecParser(url, isPlugin
+            ? helper_1.copilotPluginParserOptions
+            : {
+                allowBearerTokenAuth: true,
+                allowMultipleParameters: true,
+            });
+        const listResult = await specParser.list();
+        const apiResultList = listResult.APIs.filter((value) => value.isValid);
+        let existingOperations;
+        let outputApiSpecPath;
+        if (isPlugin) {
+            if (!inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]) {
+                return teamsfx_api_1.err(new common_2.MissingRequiredInputError(questionNames_1.QuestionNames.DestinationApiSpecFilePath));
             }
-            const operations = [...existingOperations, ...newOperations];
-            const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
+            outputApiSpecPath = inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath];
+            existingOperations = await helper_1.listPluginExistingOperations(manifestRes.value, manifestPath, inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]);
+        }
+        else {
+            const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
+            existingOperations = apiResultList
+                .filter((operation) => existingOperationIds.includes(operation.operationId))
+                .map((operation) => operation.api);
+            const apiSpecificationFile = manifestRes.value.composeExtensions[0].apiSpecificationFile;
+            outputApiSpecPath = path.join(path.dirname(manifestPath), apiSpecificationFile);
+        }
+        const operations = [...existingOperations, ...newOperations];
+        const adaptiveCardFolder = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ResponseTemplatesFolderName);
+        try {
             const authNames = new Set();
             const serverUrls = new Set();
             let authScheme = undefined;
@@ -1164,72 +919,81 @@ class FxCore {
                     }
                 }
             }
-            let pluginPath;
-            if (isPlugin) {
+            let generateResult;
+            if (!isPlugin) {
+                generateResult = await specParser.generate(manifestPath, operations, outputApiSpecPath, adaptiveCardFolder);
+            }
+            else {
                 const pluginPathRes = await ManifestUtils_1.manifestUtils.getPluginFilePath(manifestRes.value, manifestPath);
                 if (pluginPathRes.isErr()) {
-                    return (0, teamsfx_api_1.err)(pluginPathRes.error);
+                    return teamsfx_api_1.err(pluginPathRes.error);
                 }
-                pluginPath = pluginPathRes.value;
+                generateResult = await specParser.generateForCopilot(manifestPath, operations, outputApiSpecPath, pluginPathRes.value);
             }
-            const generateResult = await (0, helper_1.generateFromApiSpec)(specParser, manifestPath, inputs, context, "copilotPluginAddAPI", isPlugin ? m365_spec_parser_1.ProjectType.Copilot : m365_spec_parser_1.ProjectType.SME, {
-                destinationApiSpecFilePath: outputApiSpecPath,
-                responseTemplateFolder: adaptiveCardFolder,
-                pluginManifestFilePath: pluginPath,
+            // Send SpecParser.generate() warnings
+            context.telemetryReporter.sendTelemetryEvent(helper_1.specParserGenerateResultTelemetryEvent, {
+                [helper_1.specParserGenerateResultAllSuccessTelemetryProperty]: generateResult.allSuccess.toString(),
+                [helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
+                    .map((w) => w.type.toString() + ": " + w.content)
+                    .join(";"),
+                [telemetry_2.CoreTelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
             });
-            if (generateResult.isErr()) {
-                return (0, teamsfx_api_1.err)(generateResult.error);
-            }
-            if (generateResult.value.warnings && generateResult.value.warnings.length > 0) {
-                const warnSummary = await (0, helper_1.generateScaffoldingSummary)(generateResult.value.warnings, manifestRes.value, path.relative(inputs.projectPath, outputApiSpecPath), pluginPath === undefined ? undefined : path.relative(inputs.projectPath, pluginPath), inputs.projectPath);
-                if (warnSummary) {
-                    context.logProvider.info(warnSummary);
-                }
+            if (generateResult.warnings && generateResult.warnings.length > 0) {
+                const warnSummary = helper_1.generateScaffoldingSummary(generateResult.warnings, manifestRes.value, path.relative(inputs.projectPath, outputApiSpecPath));
+                context.logProvider.info(warnSummary);
             }
         }
         catch (e) {
             let error;
             if (e instanceof m365_spec_parser_1.SpecParserError) {
-                error = (0, helper_1.convertSpecParserErrorToFxError)(e);
+                error = helper_1.convertSpecParserErrorToFxError(e);
             }
             else {
-                error = (0, common_2.assembleError)(e);
+                error = common_2.assembleError(e);
             }
-            return (0, teamsfx_api_1.err)(error);
+            return teamsfx_api_1.err(error);
         }
-        const message = (0, localizeUtils_1.getLocalizedString)("core.copilot.addAPI.success", newOperations, inputs.projectPath);
+        const message = localizeUtils_1.getLocalizedString("core.copilot.addAPI.success", newOperations, inputs.projectPath);
         if (inputs.platform !== teamsfx_api_1.Platform.VS) {
             void context.userInteraction.showMessage("info", message, false);
         }
-        return (0, teamsfx_api_1.ok)(message);
+        return teamsfx_api_1.ok(message);
     }
     async listPluginApiSpecs(inputs) {
         try {
-            const manifestPath = inputs[constants_3.QuestionNames.ManifestPath];
+            const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
             const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
             if (manifestRes.isErr()) {
-                return (0, teamsfx_api_1.err)(manifestRes.error);
+                return teamsfx_api_1.err(manifestRes.error);
             }
             const res = await PluginManifestUtils_1.pluginManifestUtils.getApiSpecFilePathFromTeamsManifest(manifestRes.value, manifestPath);
             if (res.isOk()) {
-                return (0, teamsfx_api_1.ok)(res.value);
+                return teamsfx_api_1.ok(res.value);
             }
             else {
-                return (0, teamsfx_api_1.err)(res.error);
+                return teamsfx_api_1.err(res.error);
             }
         }
         catch (error) {
-            return (0, teamsfx_api_1.err)(error);
+            return teamsfx_api_1.err(error);
+        }
+    }
+    async copilotPluginLoadOpenAIManifest(inputs) {
+        try {
+            return teamsfx_api_1.ok(await helper_1.OpenAIPluginManifestHelper.loadOpenAIPluginManifest(inputs.domain));
+        }
+        catch (error) {
+            return teamsfx_api_1.err(error);
         }
     }
     async copilotPluginListOperations(inputs) {
-        const res = await (0, helper_1.listOperations)((0, globalVars_1.createContext)(), inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
+        const res = await helper_1.listOperations(utils_2.createContextV3(), inputs.manifest, inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
         if (res.isErr()) {
             const msg = res.error.map((e) => e.content).join("\n");
-            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ListOpenAPISpecOperationsError", msg, msg));
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError("FxCore", "ListOpenAPISpecOperationsError", msg, msg));
         }
         else {
-            return (0, teamsfx_api_1.ok)(res.value);
+            return teamsfx_api_1.ok(res.value);
         }
     }
     /**
@@ -1239,126 +1003,160 @@ class FxCore {
         var _a;
         const projectTypeRes = await projectTypeChecker_1.projectTypeChecker.checkProjectType(projectPath);
         const props = {};
-        telemetry_1.telemetryUtils.fillinProjectTypeProperties(props, projectTypeRes);
+        telemetry_1.fillinProjectTypeProperties(props, projectTypeRes);
         (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.ProjectType, props);
-        return (0, teamsfx_api_1.ok)(projectTypeRes);
+        return teamsfx_api_1.ok(projectTypeRes);
     }
     /**
      * Add plugin
      */
     async addPlugin(inputs) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
-        const context = (0, globalVars_1.createContext)();
-        const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
-        const appPackageFolder = path.dirname(teamsManifestPath);
-        const isGenerateFromApiSpec = inputs[constants_3.QuestionNames.ApiPluginType] === constants_3.ApiPluginStartOptions.apiSpec().id;
+        const operations = inputs[questionNames_1.QuestionNames.ApiOperation];
+        const url = inputs[questionNames_1.QuestionNames.ApiSpecLocation];
+        const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
+        const appPackageFolder = path.dirname(manifestPath);
+        const apiSpecFolder = path.join(appPackageFolder, helper_1.defaultApiSpecFolderName);
+        const needAddAction = inputs[questionNames_1.QuestionNames.PluginAvailability] === other_1.PluginAvailabilityOptions.action().id ||
+            inputs[questionNames_1.QuestionNames.PluginAvailability] ===
+                other_1.PluginAvailabilityOptions.copilotPluginAndAction().id;
+        const needAddCopilotPlugin = inputs[questionNames_1.QuestionNames.PluginAvailability] === other_1.PluginAvailabilityOptions.copilotPlugin().id ||
+            inputs[questionNames_1.QuestionNames.PluginAvailability] ===
+                other_1.PluginAvailabilityOptions.copilotPluginAndAction().id;
         // validate the project is valid for adding plugin
-        const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
+        const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         const teamsManifest = manifestRes.value;
         const declarativeGpt = (_b = (_a = teamsManifest.copilotExtensions) === null || _a === void 0 ? void 0 : _a.declarativeCopilots) === null || _b === void 0 ? void 0 : _b[0];
         if (!(declarativeGpt === null || declarativeGpt === void 0 ? void 0 : declarativeGpt.file)) {
-            return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeCopilots", teamsManifestPath)));
-        }
-        const gptManifestFilePathRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath(teamsManifestPath);
-        if (gptManifestFilePathRes.isErr()) {
-            return (0, teamsfx_api_1.err)(gptManifestFilePathRes.error);
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeCopilots", manifestPath)));
         }
-        const declarativeCopilotManifestPath = gptManifestFilePathRes.value;
-        const declarativeCopilotManifesRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(declarativeCopilotManifestPath);
-        if (declarativeCopilotManifesRes.isErr()) {
-            return (0, teamsfx_api_1.err)(declarativeCopilotManifesRes.error);
+        const gptManifestFilePath = path.join(appPackageFolder, declarativeGpt.file);
+        const gptManifestRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(gptManifestFilePath);
+        if (gptManifestRes.isErr()) {
+            return teamsfx_api_1.err(gptManifestRes.error);
         }
-        const declarativeCopilotManifest = declarativeCopilotManifesRes.value;
+        const gptManifest = gptManifestRes.value;
+        const context = utils_2.createContextV3();
         // confirm
-        const confirmRes = await context.userInteraction.showMessage("warn", (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder)), true, (0, localizeUtils_1.getLocalizedString)("core.addApi.continue"));
+        const confirmRes = await context.userInteraction.showMessage("warn", localizeUtils_1.getLocalizedString("core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder)), true, localizeUtils_1.getLocalizedString("core.addApi.continue"));
         if (confirmRes.isErr()) {
-            return (0, teamsfx_api_1.err)(confirmRes.error);
+            return teamsfx_api_1.err(confirmRes.error);
         }
-        else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.addApi.continue")) {
-            return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
+        else if (confirmRes.value !== localizeUtils_1.getLocalizedString("core.addApi.continue")) {
+            return teamsfx_api_1.err(new common_2.UserCancelError());
         }
-        // find the next available action id
-        let actionId = "";
-        let suffix = 1;
-        actionId = `action_${suffix}`;
-        const existingActionIds = (_c = declarativeCopilotManifest.actions) === null || _c === void 0 ? void 0 : _c.map((action) => action.id);
-        while (existingActionIds === null || existingActionIds === void 0 ? void 0 : existingActionIds.includes(actionId)) {
-            suffix += 1;
-            actionId = `action_${suffix}`;
+        // generate file path
+        let isYaml;
+        try {
+            isYaml = await helper_1.isYamlSpecFile(url);
         }
-        let destinationPluginManifestPath;
-        // generate files
-        if (isGenerateFromApiSpec) {
-            const url = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
-            destinationPluginManifestPath =
-                await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder);
-            const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(url, path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName));
-            const specParser = new m365_spec_parser_1.SpecParser(url, (0, helper_1.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
-            const generateRes = await (0, helper_1.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
-                destinationApiSpecFilePath: destinationApiSpecPath,
-                pluginManifestFilePath: destinationPluginManifestPath,
+        catch (e) {
+            isYaml = false;
+        }
+        await fs_extra_1.default.ensureDir(apiSpecFolder);
+        let openApiSpecFileName = isYaml ? helper_1.defaultApiSpecYamlFileName : helper_1.defaultApiSpecJsonFileName;
+        const openApiSpecFileNamePrefix = openApiSpecFileName.split(".")[0];
+        const openApiSpecFileType = openApiSpecFileName.split(".")[1];
+        let apiSpecFileNameSuffix = 1;
+        while (await fs_extra_1.default.pathExists(path.join(apiSpecFolder, openApiSpecFileName))) {
+            openApiSpecFileName = `${openApiSpecFileNamePrefix}_${apiSpecFileNameSuffix++}.${openApiSpecFileType}`;
+        }
+        const openApiSpecFilePath = path.join(apiSpecFolder, openApiSpecFileName);
+        let pluginManifestName = helper_1.defaultPluginManifestFileName;
+        const pluginManifestNamePrefix = helper_1.defaultPluginManifestFileName.split(".")[0];
+        let pluginFileNameSuffix = 1;
+        while (await fs_extra_1.default.pathExists(path.join(appPackageFolder, pluginManifestName))) {
+            pluginManifestName = `${pluginManifestNamePrefix}_${pluginFileNameSuffix++}.json`;
+        }
+        const pluginManifestFilePath = path.join(appPackageFolder, pluginManifestName);
+        // generate plugin related files
+        const specParser = new m365_spec_parser_1.SpecParser(url, Object.assign(Object.assign({}, helper_1.copilotPluginParserOptions), { isGptPlugin: true }));
+        try {
+            const generateResult = await specParser.generateForCopilot(manifestPath, operations, openApiSpecFilePath, pluginManifestFilePath);
+            // Send SpecParser.generate() warnings
+            context.telemetryReporter.sendTelemetryEvent(helper_1.specParserGenerateResultTelemetryEvent, {
+                [helper_1.specParserGenerateResultAllSuccessTelemetryProperty]: generateResult.allSuccess.toString(),
+                [helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
+                    .map((w) => w.type.toString() + ": " + w.content)
+                    .join(";"),
+                [telemetry_2.CoreTelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
             });
-            if (generateRes.isErr()) {
-                return (0, teamsfx_api_1.err)(generateRes.error);
+            if (generateResult.warnings && generateResult.warnings.length > 0) {
+                const warnSummary = helper_1.generateScaffoldingSummary(generateResult.warnings, manifestRes.value, path.relative(inputs.projectPath, openApiSpecFilePath));
+                context.logProvider.info(warnSummary);
             }
-            const warnings = generateRes.value.warnings;
-            if (warnings && warnings.length > 0) {
-                const warnSummary = await (0, helper_1.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
-                context.logProvider.info(warnSummary + "\n");
+        }
+        catch (e) {
+            let error;
+            if (e instanceof m365_spec_parser_1.SpecParserError) {
+                error = helper_1.convertSpecParserErrorToFxError(e);
             }
-            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_1.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
-            if (addActionRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addActionRes.error);
+            else {
+                error = common_2.assembleError(e);
+            }
+            return teamsfx_api_1.err(error);
+        }
+        // update Teams manifest
+        if (needAddCopilotPlugin) {
+            const plugins = ((_c = teamsManifest.copilotExtensions) === null || _c === void 0 ? void 0 : _c.plugins) || [];
+            plugins.push({
+                id: "plugin_1",
+                file: pluginManifestName,
+            });
+            teamsManifest.copilotExtensions = Object.assign(Object.assign({}, teamsManifest.copilotExtensions), { plugins });
+            const updateManifestRes = await ManifestUtils_1.manifestUtils._writeAppManifest(teamsManifest, manifestPath);
+            if (updateManifestRes.isErr()) {
+                return teamsfx_api_1.err(updateManifestRes.error);
             }
         }
-        else {
-            const addPluginRes = await (0, helper_2.addExistingPlugin)(declarativeCopilotManifestPath, inputs[constants_3.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_3.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
-            if (addPluginRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addPluginRes.error);
+        // update GPT manifest
+        let actionId = "";
+        if (needAddAction) {
+            let suffix = 1;
+            actionId = `action_${suffix}`;
+            const existingActionIds = (_d = gptManifest.actions) === null || _d === void 0 ? void 0 : _d.map((action) => action.id);
+            while (existingActionIds === null || existingActionIds === void 0 ? void 0 : existingActionIds.includes(actionId)) {
+                suffix += 1;
+                actionId = `action_${suffix}`;
+            }
+            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(gptManifestFilePath, actionId, pluginManifestName);
+            if (addActionRes.isErr()) {
+                return teamsfx_api_1.err(addActionRes.error);
             }
-            destinationPluginManifestPath = addPluginRes.value.destinationPluginManifestPath;
-            const warningMessage = (0, common_1.outputScaffoldingWarningMessage)(addPluginRes.value.warnings);
-            context.logProvider.info(warningMessage);
-        }
-        if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
-            const successMessage = (0, localizeUtils_1.getLocalizedString)("core.addPlugin.success.vsc", actionId);
-            const viewPluginManifest = (0, localizeUtils_1.getLocalizedString)("core.addPlugin.success.viewPluginManifest");
-            void context.userInteraction
-                .showMessage("info", successMessage, false, viewPluginManifest)
-                .then((userRes) => {
-                var _a, _b;
-                if (userRes.isOk() && userRes.value === viewPluginManifest) {
-                    context.telemetryReporter.sendTelemetryEvent(telemetry_1.TelemetryEvent.ViewPluginManifestAfterAdded);
-                    void ((_b = (_a = globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.ui) === null || _a === void 0 ? void 0 : _a.openFile) === null || _b === void 0 ? void 0 : _b.call(_a, destinationPluginManifestPath));
-                }
-            });
         }
-        else {
-            const successMessage = (0, localizeUtils_1.getLocalizedString)("core.addPlugin.success", actionId, destinationPluginManifestPath);
-            void context.userInteraction.showMessage("info", successMessage, false);
+        let successMessage = "";
+        if (needAddAction && needAddCopilotPlugin) {
+            successMessage = localizeUtils_1.getLocalizedString("core.addActionAndPlugin.success", actionId, "plugin_1");
+        }
+        else if (needAddAction) {
+            successMessage = localizeUtils_1.getLocalizedString("core.addAction.success", actionId);
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        else if (needAddCopilotPlugin) {
+            successMessage = localizeUtils_1.getLocalizedString("core.addPlugin.success", "plugin_1");
+        }
+        void context.userInteraction.showMessage("info", successMessage, false);
+        return teamsfx_api_1.ok(undefined);
     }
 }
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createProject", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createProject", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("createProject"),
+        questionMW_1.QuestionMW("createProject"),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createProject", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({
             component: "FxCore",
             stage: "createProjectByCustomizedGenerator",
             reset: true,
@@ -1370,21 +1168,21 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createProjectByCustomizedGenerator", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createSampleProject", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createSampleProject", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("createSampleProject"),
+        questionMW_1.QuestionMW("createSampleProject"),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createSampleProject", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "provision", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "provision", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
         envMW_1.EnvWriterMW,
@@ -1394,80 +1192,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "provisionResources", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstall", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "deploy", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("uninstall"),
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstall", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallByManifestId", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallByManifestId", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallByEnv", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-        (0, envMW_1.EnvLoaderMW)(true, true),
-        concurrentLocker_1.ConcurrentLockerMW,
-        contextInjector_1.ContextInjectorMW,
-        envMW_1.EnvWriterMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object, Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallByEnv", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallByTitleId", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallByTitleId", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallM365App", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallM365App", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallAppRegistration", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallAppRegistration", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstallBotFrameworRegistration", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [String, String]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "uninstallBotFrameworRegistration", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deploy", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
         envMW_1.EnvWriterMW,
@@ -1477,18 +1206,18 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "deployArtifacts", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "localDebug", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "localDebug", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "localDebug", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deployAadManifest", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "deployAadManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("deployAadManifest"),
-        (0, envMW_1.EnvLoaderMW)(true, true),
+        questionMW_1.QuestionMW("deployAadManifest"),
+        envMW_1.EnvLoaderMW(true, true),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1497,10 +1226,10 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "deployAadManifest", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "addWebpart", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "addWebpart", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("addWebpart"),
+        questionMW_1.QuestionMW("addWebpart"),
         projectMigratorV3_1.ProjectMigratorMWV3,
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
@@ -1509,11 +1238,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "addWebpart", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "publish", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "publish", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
         envMW_1.EnvWriterMW,
@@ -1523,11 +1252,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "publishApplication", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "executeUserTask", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "executeUserTask", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1535,11 +1264,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "executeUserTask", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "buildAadManifest", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "buildAadManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1547,12 +1276,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "buildAadManifest", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deployTeamsManifest", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "deployTeamsManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("selectTeamsAppManifest"),
-        (0, envMW_1.EnvLoaderMW)(true),
+        questionMW_1.QuestionMW("selectTeamsAppManifest"),
+        envMW_1.EnvLoaderMW(true),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
         envMW_1.EnvWriterMW,
@@ -1562,8 +1291,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "deployTeamsManifest", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "updateTeamsAppCLIV3", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "updateTeamsAppCLIV3", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1571,8 +1300,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "updateTeamsAppCLIV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "validateTeamsAppCLIV3", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateTeamsAppCLIV3", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1580,8 +1309,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "validateTeamsAppCLIV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "packageTeamsAppCLIV3", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "packageTeamsAppCLIV3", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1589,8 +1318,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "packageTeamsAppCLIV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "publishTeamsAppCLIV3", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "publishTeamsAppCLIV3", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1598,19 +1327,19 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "publishTeamsAppCLIV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "validateApplication", reset: true }),
-        (0, questionMW_1.QuestionMW)("validateTeamsApp"),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateApplication", reset: true }),
+        questionMW_1.QuestionMW("validateTeamsApp"),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "validateApplication", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "validateManifest", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, envMW_1.EnvLoaderMW)(true),
+        envMW_1.EnvLoaderMW(true),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1618,8 +1347,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "validateManifest", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "validateAppPackage", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateAppPackage", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
@@ -1628,8 +1357,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "validateAppPackage", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "validateWithTestCases", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "validateWithTestCases", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
@@ -1638,22 +1367,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "validateWithTestCases", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "syncManifest", reset: true }),
-        errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("syncManifest"),
-        concurrentLocker_1.ConcurrentLockerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "syncManifest", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createAppPackage", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createAppPackage", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("selectTeamsAppManifest"),
-        (0, envMW_1.EnvLoaderMW)(true),
+        questionMW_1.QuestionMW("selectTeamsAppManifest"),
+        envMW_1.EnvLoaderMW(true),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1661,11 +1379,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createAppPackage", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "preview", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "preview", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("previewWithTeamsAppManifest"),
-        (0, envMW_1.EnvLoaderMW)(false),
+        questionMW_1.QuestionMW("previewWithTeamsAppManifest"),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1673,8 +1391,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "previewWithManifest", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getDotEnvs", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getDotEnvs", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1682,42 +1400,42 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getDotEnvs", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "isEnvFile", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "isEnvFile", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "isEnvFile", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getProjectId", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getProjectId", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getProjectId", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getProjectMetadata", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getProjectMetadata", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getProjectMetadata", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getTeamsAppName", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getTeamsAppName", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getTeamsAppName", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getProjectInfo", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getProjectInfo", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getProjectInfo", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "grantPermission", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "grantPermission", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("grantPermission"),
-        (0, envMW_1.EnvLoaderMW)(false, true),
+        questionMW_1.QuestionMW("grantPermission"),
+        envMW_1.EnvLoaderMW(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
         envMW_1.EnvWriterMW,
     ]),
@@ -1726,12 +1444,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "grantPermission", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "checkPermission", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "checkPermission", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("listCollaborator"),
-        (0, envMW_1.EnvLoaderMW)(false, true),
+        questionMW_1.QuestionMW("listCollaborator"),
+        envMW_1.EnvLoaderMW(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
         envMW_1.EnvWriterMW,
     ]),
@@ -1740,12 +1458,12 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "checkPermission", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "listCollaborator", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "listCollaborator", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, questionMW_1.QuestionMW)("listCollaborator"),
-        (0, envMW_1.EnvLoaderMW)(false, true),
+        questionMW_1.QuestionMW("listCollaborator"),
+        envMW_1.EnvLoaderMW(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
         envMW_1.EnvWriterMW,
     ]),
@@ -1754,38 +1472,38 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "listCollaborator", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getSelectedEnv", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "getSelectedEnv", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "getSelectedEnv", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createLocalCrypto" })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createLocalCrypto" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createLocalCrypto", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "encrypt", reset: true }), errorHandler_1.ErrorHandlerMW]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "encrypt", reset: true }), errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "encrypt", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "decrypt", reset: true }), errorHandler_1.ErrorHandlerMW]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "decrypt", reset: true }), errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "decrypt", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createEnv", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "createEnv", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("createNewEnv"),
+        questionMW_1.QuestionMW("createNewEnv"),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1793,20 +1511,20 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createEnv", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "phantomMigrationV3", reset: true })]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "phantomMigrationV3", reset: true })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "phantomMigrationV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([errorHandler_1.ErrorHandlerMW, projectMigratorV3_1.ProjectMigratorMWV3]),
+    hooks_1.hooks([errorHandler_1.ErrorHandlerMW, projectMigratorV3_1.ProjectMigratorMWV3]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Object)
 ], FxCore.prototype, "innerMigrationV3", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "projectVersionCheck", reset: true }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "projectVersionCheck", reset: true }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1814,11 +1532,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "projectVersionCheck", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "preProvisionForVS" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "preProvisionForVS" }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1827,11 +1545,11 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "preProvisionForVS", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "preCheckYmlAndEnvForVS" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "preCheckYmlAndEnvForVS" }),
         errorHandler_1.ErrorHandlerMW,
         projectMigratorV3_1.ProjectMigratorMWV3,
-        (0, envMW_1.EnvLoaderMW)(false),
+        envMW_1.EnvLoaderMW(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
     ]),
@@ -1840,8 +1558,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "preCheckYmlAndEnvForVS", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "publishInDeveloperPortal" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "publishInDeveloperPortal" }),
         errorHandler_1.ErrorHandlerMW,
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -1851,10 +1569,10 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "publishInDeveloperPortal", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "copilotPluginAddAPI" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginAddAPI" }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("copilotPluginAddAPI"),
+        questionMW_1.QuestionMW("copilotPluginAddAPI"),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1862,8 +1580,8 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "copilotPluginAddAPI", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "copilotPluginListApiSpecs" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginListApiSpecs" }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1871,8 +1589,17 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "listPluginApiSpecs", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "copilotPluginListOperations" }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginLoadOpenAIManifest" }),
+        errorHandler_1.ErrorHandlerMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "copilotPluginLoadOpenAIManifest", null);
+tslib_1.__decorate([
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "copilotPluginListOperations" }),
         errorHandler_1.ErrorHandlerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -1880,16 +1607,16 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "copilotPluginListOperations", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "checkProjectType" }), errorHandler_1.ErrorHandlerMW]),
+    hooks_1.hooks([globalVars_1.ErrorContextMW({ component: "FxCore", stage: "checkProjectType" }), errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "checkProjectType", null);
 tslib_1.__decorate([
-    (0, hooks_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: teamsfx_api_1.Stage.addPlugin }),
+    hooks_1.hooks([
+        globalVars_1.ErrorContextMW({ component: "FxCore", stage: "addPlugin" }),
         errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("addPlugin"),
+        questionMW_1.QuestionMW("addPlugin"),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),