@microsoft/teamsfx-core 3.0.11 → 3.0.12-alpha.0a63a75aae.0

package/build/core/FxCore.js

@@ -44,16 +44,13 @@ const ManifestUtils_1 = require("../component/driver/teamsApp/utils/ManifestUtil
 const PluginManifestUtils_1 = require("../component/driver/teamsApp/utils/PluginManifestUtils");
 const utils_3 = require("../component/driver/teamsApp/utils/utils");
 const utils_4 = require("../component/driver/util/utils");
-require("../component/feature/sso");
-const helper_1 = require("../component/generator/declarativeAgent/helper");
 const oneDriveSharePointHandler_1 = require("../component/generator/declarativeAgent/oneDriveSharePointHandler");
-const helper_2 = require("../component/generator/openApiSpec/helper");
+const helper_1 = require("../component/generator/openApiSpec/helper");
 const templateHelper_1 = require("../component/generator/templateHelper");
 const templateNames_1 = require("../component/generator/templates/templateNames");
 const utils_5 = require("../component/generator/utils");
 const launchHelper_1 = require("../component/m365/launchHelper");
 const packageService_1 = require("../component/m365/packageService");
-const constants_3 = require("../common/constants");
 const envMW_1 = require("../component/middleware/envMW");
 const questionMW_1 = require("../component/middleware/questionMW");
 const common_1 = require("../component/utils/common");
@@ -64,7 +61,7 @@ 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 constants_4 = require("../question/constants");
+const constants_3 = require("../question/constants");
 const other_1 = require("../question/other");
 const ProjectTypeOptions_1 = require("../question/scaffold/vsc/ProjectTypeOptions");
 const share_1 = require("../question/share");
@@ -97,10 +94,10 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async createProject(inputs) {
         const context = (0, globalVars_1.createContext)();
-        if (inputs[constants_4.QuestionNames.ProjectType] === ProjectTypeOptions_1.ProjectTypeOptions.startWithGithubCopilot().id) {
+        if (inputs[constants_3.QuestionNames.ProjectType] === ProjectTypeOptions_1.ProjectTypeOptions.startWithGithubCopilot().id) {
             return (0, teamsfx_api_1.ok)({ projectPath: "", shouldInvokeTeamsAgent: true });
         }
-        inputs[constants_4.QuestionNames.Scratch] = constants_4.ScratchOptions.yes().id;
+        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.yes().id;
         const res = await coordinator_1.coordinator.create(context, inputs);
         if (res.isOk()) {
             inputs.projectPath = res.value.projectPath;
@@ -109,7 +106,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async createProjectFromTdp(inputs) {
         const context = (0, globalVars_1.createContext)();
-        inputs[constants_4.QuestionNames.Scratch] = constants_4.ScratchOptions.yes().id;
+        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.yes().id;
         // should never happen as we do same check on Developer Portal.
         if (inputs.teamsAppFromTdp) {
             if ((0, utils_3.containsUnsupportedFeature)(inputs.teamsAppFromTdp)) {
@@ -135,12 +132,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         folder = path.resolve(folder);
         const appName = inputs["app-name"];
         if (undefined === appName)
-            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError(constants_4.QuestionNames.AppName));
+            return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError(constants_3.QuestionNames.AppName));
         const validateResult = jsonschema.validate(appName, {
-            pattern: constants_4.AppNamePattern,
+            pattern: constants_3.AppNamePattern,
         });
         if (validateResult.errors && validateResult.errors.length > 0) {
-            return (0, teamsfx_api_1.err)(new common_2.InputValidationError(constants_4.QuestionNames.AppName, validateResult.errors[0].message));
+            return (0, teamsfx_api_1.err)(new common_2.InputValidationError(constants_3.QuestionNames.AppName, validateResult.errors[0].message));
         }
         const projectPath = path.join(folder, appName);
         //2. run generator
@@ -164,7 +161,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async createSampleProject(inputs) {
         const context = (0, globalVars_1.createContext)();
-        inputs[constants_4.QuestionNames.Scratch] = constants_4.ScratchOptions.no().id;
+        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.no().id;
         const res = await coordinator_1.coordinator.create(context, inputs);
         inputs.projectPath = context.projectPath;
         return res;
@@ -208,12 +205,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * none lifecycle command, uninstall provisioned resources
      */
     async uninstall(inputs) {
-        switch (inputs[constants_4.QuestionNames.UninstallMode]) {
-            case constants_4.QuestionNames.UninstallModeManifestId:
+        switch (inputs[constants_3.QuestionNames.UninstallMode]) {
+            case constants_3.QuestionNames.UninstallModeManifestId:
                 return await this.uninstallByManifestId(inputs);
-            case constants_4.QuestionNames.UninstallModeEnv:
+            case constants_3.QuestionNames.UninstallModeEnv:
                 return await this.uninstallByEnv(inputs);
-            case constants_4.QuestionNames.UninstallModeTitleId:
+            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"));
@@ -223,14 +220,14 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * uninstall provisioned resources by manifest ID
      */
     async uninstallByManifestId(inputs) {
-        const manifestId = inputs[constants_4.QuestionNames.ManifestId];
+        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_4.QuestionNames.UninstallOptions];
-        const m356AppOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionM365);
-        const tdpOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionTDP);
-        const botOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionBot);
+        const uninstallOptions = inputs[constants_3.QuestionNames.UninstallOptions];
+        const m356AppOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionM365);
+        const tdpOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionTDP);
+        const botOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionBot);
         if (m356AppOption) {
             const res = await this.uninstallM365App(undefined, manifestId);
             if (res.isErr()) {
@@ -256,7 +253,6 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * 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"));
         }
@@ -272,24 +268,24 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         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 : []) {
+        for (const action of projectModel.provision?.driverDefs ?? []) {
             if (action.uses === "teamsApp/create") {
-                teamsAppIdKeyName = ((_c = action.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.teamsAppId) || "TEAMS_APP_ID";
+                teamsAppIdKeyName = action.writeToEnvironmentFile?.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";
+                botIdKeyName = action.writeToEnvironmentFile?.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";
+                m365TitleIdKeyName = action.writeToEnvironmentFile?.titleId || "M365_TITLE_ID";
                 m365TitleId = process.env[m365TitleIdKeyName];
             }
         }
-        const uninstallOptions = inputs[constants_4.QuestionNames.UninstallOptions];
-        const m356AppOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionM365);
-        const tdpOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionTDP);
-        const botOption = uninstallOptions === null || uninstallOptions === void 0 ? void 0 : uninstallOptions.includes(constants_4.QuestionNames.UninstallOptionBot);
+        const uninstallOptions = inputs[constants_3.QuestionNames.UninstallOptions];
+        const m356AppOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionM365);
+        const tdpOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionTDP);
+        const botOption = uninstallOptions?.includes(constants_3.QuestionNames.UninstallOptionBot);
         if ((teamsAppId || m365TitleId) && m356AppOption) {
             const res = await this.uninstallM365App(m365TitleId, teamsAppId);
             if (res.isErr()) {
@@ -332,7 +328,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * uninstall provisioned resources by title ID. Titlle mode only uninstalls M365 app.
      */
     async uninstallByTitleId(inputs) {
-        const titleId = inputs[constants_4.QuestionNames.TitleId];
+        const titleId = inputs[constants_3.QuestionNames.TitleId];
         if (!titleId) {
             return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("title-id", "FxCore"));
         }
@@ -346,13 +342,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * uninstall sideloaded appps in M365
      */
     async uninstallM365App(titleId, manifestId) {
-        var _a, _b;
         if (titleId === undefined && manifestId === undefined) {
             return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("title id or manifest id", "FxCore"));
         }
         const sideloadingServiceEndpoint = (0, constants_1.getResourceServiceEndpoint)(constants_1.ResourceServiceType.MOS3);
         const sideloadingTokenRes = await globalVars_1.TOOLS.tokenProvider.m365TokenProvider.getAccessToken({
-            scopes: (0, constants_3.MosServiceScope)(),
+            scopes: (0, constants_1.MosServiceScope)(),
         });
         if (sideloadingTokenRes.isErr()) {
             return (0, teamsfx_api_1.err)(sideloadingTokenRes.error);
@@ -360,19 +355,19 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         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 : "");
+                titleId = await packageService.retrieveTitleId(sideloadingTokenRes.value, 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 ((_b = (_a = globalVars_1.TOOLS.ui).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, {
+        const confirmRes = await globalVars_1.TOOLS.ui.confirm?.({
             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) {
+        });
+        if (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);
@@ -387,19 +382,18 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * uninstall sideloaded apps in Teams Developer Portal
      */
     async uninstallAppRegistration(manifestId) {
-        var _a, _b;
         const appStudioTokenRes = await globalVars_1.TOOLS.tokenProvider.m365TokenProvider.getAccessToken({
             scopes: (0, 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, {
+        const confirmRes = await globalVars_1.TOOLS.ui.confirm?.({
             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) {
+        });
+        if (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);
@@ -414,7 +408,6 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * 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"));
         }
@@ -433,12 +426,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
             botId = botIdRes;
         }
-        const confirmRes = await ((_b = (_a = globalVars_1.TOOLS.ui).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, {
+        const confirmRes = await globalVars_1.TOOLS.ui.confirm?.({
             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) {
+        });
+        if (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);
         }
@@ -476,7 +469,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         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_4.QuestionNames.AadAppManifestFilePath];
+        const manifestTemplatePath = inputs[constants_3.QuestionNames.AadAppManifestFilePath];
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
             return (0, teamsfx_api_1.err)(new common_2.FileNotFoundError("deployAadManifest", manifestTemplatePath));
         }
@@ -517,12 +510,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         (0, globalVars_1.setErrorContext)({ component: "spfxAdd", method: "run" });
         const driver = typedi_1.Container.get("spfx/add");
         const args = {
-            manifestPath: inputs[constants_4.QuestionNames.ManifestPath],
-            localManifestPath: inputs[constants_4.QuestionNames.LocalTeamsAppManifestFilePath],
-            spfxFolder: inputs[constants_4.QuestionNames.SPFxFolder],
-            webpartName: inputs[constants_4.QuestionNames.SPFxWebpartName],
-            framework: inputs[constants_4.QuestionNames.SPFxFramework],
-            spfxPackage: constants_4.SPFxVersionOptionIds.installLocally,
+            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,
         };
         const Context = (0, utils_4.createDriverContext)(inputs);
         const res = await driver.run(args, Context);
@@ -549,8 +542,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
     async removeSharedAccess(inputs, ctx) {
-        var _a;
-        const emails = inputs[constants_4.QuestionNames.RemoveUsers];
+        const emails = inputs[constants_3.QuestionNames.RemoveUsers];
         if (!emails || emails.length === 0) {
             return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("emails", "FxCore"));
         }
@@ -569,7 +561,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const appStudioToken = appStudioTokenRes.value;
         const mosTokenRes = await tokenProvider.getAccessToken({
-            scopes: (0, constants_3.MosServiceScope)(),
+            scopes: (0, constants_1.MosServiceScope)(),
         });
         if (mosTokenRes.isErr()) {
             return (0, teamsfx_api_1.err)(mosTokenRes.error);
@@ -598,20 +590,20 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
         }
         const msg = (0, localizeUtils_1.getLocalizedString)("core.common.removeOwnership.success", emails);
-        (_a = globalVars_1.TOOLS.ui) === null || _a === void 0 ? void 0 : _a.showMessage("info", msg, false);
+        globalVars_1.TOOLS.ui?.showMessage("info", msg, false);
         return (0, teamsfx_api_1.ok)(undefined);
     }
     /**
      * lifecycle command: share
      */
     async shareApplication(inputs, ctx) {
-        const operation = inputs[constants_4.QuestionNames.ShareOperation];
-        const scope = inputs[constants_4.QuestionNames.ShareScope];
+        const operation = inputs[constants_3.QuestionNames.ShareOperation];
+        const scope = inputs[constants_3.QuestionNames.ShareScope];
         let emails = [];
         if (scope === share_1.ShareScopeOption.ShareAppWithSpecificUsers ||
             operation === share_1.ShareOperationOption.RemoveShareAccessFromUsers) {
-            emails = inputs[constants_4.QuestionNames.UserEmail].split(",").map((e) => e.trim());
-            if (emails.length > constants_4.MAX_EMAIL_NUMBER) {
+            emails = inputs[constants_3.QuestionNames.UserEmail].split(",").map((e) => e.trim());
+            if (emails.length > constants_3.MAX_EMAIL_NUMBER) {
                 return (0, teamsfx_api_1.err)(new common_2.InputValidationError("emails", "Too many emails"));
             }
         }
@@ -622,7 +614,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         const sharedTitleId = parseRes.value.titleId;
         const tokenProvider = globalVars_1.TOOLS.tokenProvider.m365TokenProvider;
         const mosTokenRes = await tokenProvider.getAccessToken({
-            scopes: (0, constants_3.MosServiceScope)(),
+            scopes: (0, constants_1.MosServiceScope)(),
         });
         if (mosTokenRes.isErr()) {
             return (0, teamsfx_api_1.err)(mosTokenRes.error);
@@ -650,7 +642,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         if (func.method === "addSso") {
             // used in v3 only in VS
             inputs.stage = teamsfx_api_1.Stage.addFeature;
-            inputs[constants_4.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
+            inputs[constants_3.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
             const component = typedi_1.Container.get("sso");
             (0, globalVars_1.setErrorContext)({ component: "sso", method: "add" });
             res = await component.add(context, inputs);
@@ -668,23 +660,21 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             return (0, 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 manifestOutputPath = path.join(inputs.projectPath, "build", `aad.${inputs.env}.json`);
         const Context = (0, utils_4.createDriverContext)(inputs);
         await (0, buildAadManifest_1.buildAadManifest)(Context, manifestTemplatePath, manifestOutputPath);
         return (0, teamsfx_api_1.ok)(undefined);
     }
     async convertAadToNewSchema(inputs) {
-        const manifestTemplatePath = inputs[constants_4.QuestionNames.AadAppManifestFilePath];
-        const projectPath = inputs[constants_4.QuestionNames.ProjectPath];
+        const manifestTemplatePath = inputs[constants_3.QuestionNames.AadAppManifestFilePath];
+        const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
         return aadManifestHelper_1.AadManifestHelper.convertManifestToNewSchemaAndOverride(manifestTemplatePath, projectPath);
     }
     /**
      * v3 only none lifecycle command
      */
     async deployTeamsManifest(inputs, ctx) {
-        inputs.manifestTemplatePath = inputs[constants_4.QuestionNames.TeamsAppManifestFilePath];
+        inputs.manifestTemplatePath = inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
         const context = (0, globalVars_1.createContext)();
         const res = await (0, appStudio_1.updateManifestV3)(context, inputs);
         if (res.isOk()) {
@@ -731,7 +721,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         if (inputs["manifest-path"]) {
             return await this.validateManifest(inputs);
         }
-        else if (inputs[constants_4.QuestionNames.ValidateMethod] === constants_4.TeamsAppValidationOptions.testCases().id) {
+        else if (inputs[constants_3.QuestionNames.ValidateMethod] === constants_3.TeamsAppValidationOptions.testCases().id) {
             return await this.validateWithTestCases(inputs);
         }
         else {
@@ -747,7 +737,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         const teamsAppManifestFilePath = inputs["manifest-path"];
         const args = {
             manifestPath: teamsAppManifestFilePath,
-            showMessage: (inputs === null || inputs === void 0 ? void 0 : inputs.showMessage) != undefined ? inputs.showMessage : true,
+            showMessage: inputs?.showMessage != undefined ? inputs.showMessage : true,
         };
         const driver = typedi_1.Container.get("teamsApp/validateManifest");
         const result = await driver.execute(args, context);
@@ -782,9 +772,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async syncManifest(inputs) {
         const context = (0, utils_4.createDriverContext)(inputs);
-        const projectPath = inputs[constants_4.QuestionNames.ProjectPath];
-        const env = inputs[constants_4.QuestionNames.Env];
-        const teamsAppId = inputs[constants_4.QuestionNames.TeamsAppId];
+        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,
@@ -797,22 +787,19 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * v3 only none lifecycle command
      */
     async createAppPackage(inputs) {
-        var _a, _b, _c;
         inputs.stage = teamsfx_api_1.Stage.createAppPackage;
         const context = (0, utils_4.createDriverContext)(inputs);
         // For TSP projects
         await (0, tools_1.runForTypeSpecProject)(inputs.projectPath, context);
-        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[constants_4.QuestionNames.TeamsAppManifestFilePath];
+        const teamsAppManifestFilePath = inputs?.[constants_3.QuestionNames.TeamsAppManifestFilePath];
         const driver = typedi_1.Container.get("teamsApp/zipAppPackage");
         const args = {
             manifestPath: teamsAppManifestFilePath,
-            outputZipPath: (_a = inputs[constants_4.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_4.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}`,
+            outputZipPath: inputs[constants_3.QuestionNames.OutputZipPathParamName] ??
+                `${inputs.projectPath}/${teamsfx_api_1.AppPackageFolderName}/${teamsfx_api_1.BuildFolderName}/appPackage.${process.env
+                    .TEAMSFX_ENV}.zip`,
+            outputFolder: inputs[constants_3.QuestionNames.OutputManifestParamName] ??
+                `${inputs.projectPath}/${teamsfx_api_1.AppPackageFolderName}/${teamsfx_api_1.BuildFolderName}`,
         };
         const result = (await driver.execute(args, context)).result;
         if (context.platform === teamsfx_api_1.Platform.VSCode) {
@@ -828,7 +815,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                     const appPackageLink = `${constants_1.VSCodeExtensionCommand.openFolder}?%5B%22${folderLink.toString()}%22%5D`;
                     builtSuccess = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.buildSucceedNotice", appPackageLink);
                 }
-                (_c = context.ui) === null || _c === void 0 ? void 0 : _c.showMessage("info", builtSuccess, false);
+                context.ui?.showMessage("info", builtSuccess, false);
             }
         }
         return result;
@@ -841,8 +828,8 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async previewWithManifest(inputs) {
         inputs.stage = teamsfx_api_1.Stage.previewWithManifest;
-        const hub = inputs[constants_4.QuestionNames.M365Host];
-        const manifestFilePath = inputs[constants_4.QuestionNames.TeamsAppManifestFilePath];
+        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_1.generateDriverContext)(context, inputs), false);
         if (manifestRes.isErr()) {
@@ -920,7 +907,6 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * get Teams App Name from yml
      */
     async getTeamsAppName(projectPath) {
-        var _a;
         const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(ymlPath);
         if (maybeProjectModel.isErr()) {
@@ -928,7 +914,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const projectModel = maybeProjectModel.value;
         if (projectModel.provision) {
-            const teamsAppCreate = (_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((d) => d.uses === "teamsApp/create");
+            const teamsAppCreate = projectModel.provision?.driverDefs.find((d) => d.uses === "teamsApp/create");
             if (teamsAppCreate) {
                 let name = teamsAppCreate.with.name;
                 if (name) {
@@ -943,7 +929,6 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * get project info
      */
     async getProjectInfo(projectPath, env) {
-        var _a;
         const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, env);
         const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(ymlPath);
         if (maybeProjectModel.isErr()) {
@@ -964,7 +949,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         if (projectModel.provision) {
             const teamsAppCreate = projectModel.provision.driverDefs.find((d) => d.uses === "teamsApp/create");
             if (teamsAppCreate) {
-                const teamsAppIdEnvName = (_a = teamsAppCreate.writeToEnvironmentFile) === null || _a === void 0 ? void 0 : _a.teamsAppId;
+                const teamsAppIdEnvName = teamsAppCreate.writeToEnvironmentFile?.teamsAppId;
                 if (teamsAppIdEnvName) {
                     const teamsAppId = envObject[teamsAppIdEnvName];
                     res.teamsAppId = teamsAppId;
@@ -1035,7 +1020,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return res.value.decrypt(ciphertext);
     }
     async createEnv(inputs) {
-        return this.createEnvCopyV3(inputs[constants_4.QuestionNames.NewTargetEnvName], inputs[constants_4.QuestionNames.SourceEnvName], inputs.projectPath);
+        return this.createEnvCopyV3(inputs[constants_3.QuestionNames.NewTargetEnvName], inputs[constants_3.QuestionNames.SourceEnvName], inputs.projectPath);
     }
     async createEnvCopyV3(targetEnvName, sourceEnvName, projectPath) {
         let res = await pathUtils_1.pathUtils.getEnvFilePath(projectPath, sourceEnvName);
@@ -1218,9 +1203,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return await coordinator_1.coordinator.publishInDeveloperPortal(context, inputs);
     }
     async copilotPluginAddAPI(inputs) {
-        const newOperations = inputs[constants_4.QuestionNames.ApiOperation];
-        const url = inputs[constants_4.QuestionNames.ApiSpecLocation];
-        const manifestPath = inputs[constants_4.QuestionNames.ManifestPath];
+        const newOperations = inputs[constants_3.QuestionNames.ApiOperation];
+        const url = inputs[constants_3.QuestionNames.ApiSpecLocation];
+        const manifestPath = inputs[constants_3.QuestionNames.ManifestPath];
         const context = (0, globalVars_1.createContext)();
         // Get API spec file path from manifest
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
@@ -1236,7 +1221,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         try {
             // Merge existing operations in manifest.json
-            const specParser = new m365_spec_parser_1.SpecParser(url, (0, helper_2.getParserOptions)(m365_spec_parser_1.ProjectType.SME));
+            const specParser = new m365_spec_parser_1.SpecParser(url, (0, helper_1.getParserOptions)(m365_spec_parser_1.ProjectType.SME));
             const listResult = await specParser.list();
             const apiResultList = listResult.APIs.filter((value) => value.isValid);
             const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
@@ -1266,11 +1251,11 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
             if (authNames.size >= 1) {
                 for (const authName of authNames) {
-                    await (0, helper_2.injectAuthAction)(inputs.projectPath, [...authNames][0], authNamesDict[authName], outputApiSpecPath, false);
+                    await (0, helper_1.injectAuthAction)(inputs.projectPath, [...authNames][0], authNamesDict[authName], outputApiSpecPath, false);
                 }
             }
             let pluginPath;
-            const generateResult = await (0, helper_2.generateFromApiSpec)(specParser, manifestPath, inputs, context, "copilotPluginAddAPI", m365_spec_parser_1.ProjectType.SME, {
+            const generateResult = await (0, helper_1.generateFromApiSpec)(specParser, manifestPath, inputs, context, "copilotPluginAddAPI", m365_spec_parser_1.ProjectType.SME, {
                 destinationApiSpecFilePath: outputApiSpecPath,
                 responseTemplateFolder: adaptiveCardFolder,
                 pluginManifestFilePath: pluginPath,
@@ -1279,7 +1264,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                 return (0, teamsfx_api_1.err)(generateResult.error);
             }
             if (generateResult.value.warnings && generateResult.value.warnings.length > 0) {
-                const warnSummary = await (0, helper_2.generateScaffoldingSummary)(generateResult.value.warnings, manifestRes.value, path.relative(inputs.projectPath, outputApiSpecPath), pluginPath === undefined ? undefined : path.relative(inputs.projectPath, pluginPath), inputs.projectPath);
+                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);
                 }
@@ -1288,7 +1273,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         catch (e) {
             let error;
             if (e instanceof m365_spec_parser_1.SpecParserError) {
-                error = (0, helper_2.convertSpecParserErrorToFxError)(e);
+                error = (0, helper_1.convertSpecParserErrorToFxError)(e);
             }
             else {
                 error = (0, common_2.assembleError)(e);
@@ -1303,7 +1288,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async listPluginApiSpecs(inputs) {
         try {
-            const manifestPath = inputs[constants_4.QuestionNames.ManifestPath];
+            const manifestPath = inputs[constants_3.QuestionNames.ManifestPath];
             const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
             if (manifestRes.isErr()) {
                 return (0, teamsfx_api_1.err)(manifestRes.error);
@@ -1321,7 +1306,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
     async copilotPluginListOperations(inputs) {
-        const res = await (0, helper_2.listOperations)((0, globalVars_1.createContext)(), inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
+        const res = await (0, helper_1.listOperations)((0, globalVars_1.createContext)(), 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));
@@ -1334,137 +1319,16 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * check project type info
      */
     async checkProjectType(projectPath) {
-        var _a;
         const projectTypeRes = await projectTypeChecker_1.projectTypeChecker.checkProjectType(projectPath);
         const props = {};
         telemetry_1.telemetryUtils.fillinProjectTypeProperties(props, projectTypeRes);
-        (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.ProjectType, props);
+        globalVars_1.TOOLS.telemetryReporter?.sendTelemetryEvent(telemetry_1.TelemetryEvent.ProjectType, props);
         return (0, teamsfx_api_1.ok)(projectTypeRes);
     }
-    /**
-     * Add plugin
-     */
-    async addPlugin(inputs) {
-        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_4.QuestionNames.ManifestPath];
-        const appPackageFolder = path.dirname(teamsManifestPath);
-        const isGenerateFromApiSpec = inputs[constants_4.QuestionNames.ActionType] === constants_4.ActionStartOptions.apiSpec().id;
-        // validate the project is valid for adding plugin
-        const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
-        if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
-        }
-        const teamsManifest = manifestRes.value;
-        const declarativeGpt = teamsManifest.copilotExtensions
-            ? (_a = teamsManifest.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0]
-            : (_c = (_b = teamsManifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents) === null || _c === void 0 ? void 0 : _c[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("declarativeAgents", teamsManifestPath)));
-        }
-        const gptManifestFilePathRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath(teamsManifestPath);
-        if (gptManifestFilePathRes.isErr()) {
-            return (0, teamsfx_api_1.err)(gptManifestFilePathRes.error);
-        }
-        const declarativeCopilotManifestPath = gptManifestFilePathRes.value;
-        const declarativeCopilotManifesRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(declarativeCopilotManifestPath);
-        if (declarativeCopilotManifesRes.isErr()) {
-            return (0, teamsfx_api_1.err)(declarativeCopilotManifesRes.error);
-        }
-        const declarativeCopilotManifest = declarativeCopilotManifesRes.value;
-        let confirmMessage = (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", path.relative(inputs.projectPath, appPackageFolder));
-        // Will be used if generating from API spec
-        let specParser = undefined;
-        let authNameAndSchemes = [];
-        if (isGenerateFromApiSpec) {
-            specParser = new m365_spec_parser_1.SpecParser(inputs[constants_4.QuestionNames.ApiSpecLocation].trim(), (0, helper_2.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
-            const listResult = await (0, daSpecParser_1.listAPIInfo)(inputs[constants_4.QuestionNames.ApiSpecLocation].trim());
-            authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
-            if (authNameAndSchemes.length > 0) {
-                const doesLocalYamlPathExists = await fs_extra_1.default.pathExists(path.join(inputs.projectPath, versionMetadata_1.MetadataV3.localConfigFile));
-                confirmMessage = doesLocalYamlPathExists
-                    ? (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm.localTeamsYaml", path.relative(inputs.projectPath, appPackageFolder), versionMetadata_1.MetadataV4.localConfigFile, versionMetadata_1.MetadataV4.configFile)
-                    : (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm.teamsYaml", path.relative(inputs.projectPath, appPackageFolder), versionMetadata_1.MetadataV4.configFile);
-            }
-        }
-        // confirm
-        const confirmRes = await context.userInteraction.showMessage("warn", confirmMessage, true, (0, localizeUtils_1.getLocalizedString)("core.addApi.continue"));
-        if (confirmRes.isErr()) {
-            return (0, 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());
-        }
-        // find the next available action id
-        let actionId = "";
-        let suffix = 1;
-        actionId = `action_${suffix}`;
-        const existingActionIds = (_d = declarativeCopilotManifest.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}`;
-        }
-        let destinationPluginManifestPath;
-        // generate files
-        if (isGenerateFromApiSpec && specParser) {
-            destinationPluginManifestPath =
-                await CopilotGptManifestUtils_1.copilotGptManifestUtils.getDefaultNextAvailablePluginManifestPath(appPackageFolder, undefined);
-            const destinationApiSpecPath = await PluginManifestUtils_1.pluginManifestUtils.getDefaultNextAvailableApiSpecPath(inputs[constants_4.QuestionNames.ApiSpecLocation].trim(), path.join(appPackageFolder, teamsfx_api_1.DefaultApiSpecFolderName));
-            const generateRes = await (0, helper_2.generateFromApiSpec)(specParser, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.addPlugin, m365_spec_parser_1.ProjectType.Copilot, {
-                destinationApiSpecFilePath: destinationApiSpecPath,
-                pluginManifestFilePath: destinationPluginManifestPath,
-            }, inputs[constants_4.QuestionNames.ApiSpecLocation].trim());
-            if (generateRes.isErr()) {
-                return (0, teamsfx_api_1.err)(generateRes.error);
-            }
-            const warnings = generateRes.value.warnings;
-            if (warnings && warnings.length > 0) {
-                const warnSummary = await (0, helper_2.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(inputs.projectPath, destinationApiSpecPath), path.relative(inputs.projectPath, destinationPluginManifestPath), inputs.projectPath);
-                context.logProvider.info(warnSummary + "\n");
-            }
-            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_3.normalizePath)(path.relative(appPackageFolder, destinationPluginManifestPath), true));
-            if (addActionRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addActionRes.error);
-            }
-            for (const authNameAndScheme of authNameAndSchemes) {
-                await this.updateAuthActionInYaml(authNameAndScheme.authName, authNameAndScheme.authScheme, inputs.projectPath, destinationApiSpecPath, destinationPluginManifestPath);
-            }
-        }
-        else {
-            const addPluginRes = await (0, helper_1.addExistingPlugin)(declarativeCopilotManifestPath, inputs[constants_4.QuestionNames.PluginManifestFilePath].trim(), inputs[constants_4.QuestionNames.PluginOpenApiSpecFilePath].trim(), actionId, context, teamsfx_api_1.Stage.addPlugin);
-            if (addPluginRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addPluginRes.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);
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
     async regeneratePlugin(inputs) {
         const projectPath = inputs.projectPath;
         const context = (0, globalVars_1.createContext)();
-        const teamsManifestPath = inputs[constants_4.QuestionNames.ManifestPath];
+        const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
         const appPackageFolder = path.dirname(teamsManifestPath);
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
         if (manifestRes.isErr()) {
@@ -1477,7 +1341,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         let confirmMessage = (0, localizeUtils_1.getLocalizedString)("core.addApi.confirm", path.relative(projectPath, appPackageFolder));
         // Will be used if generating from API spec
         let authNameAndSchemes = [];
-        const specPath = inputs[constants_4.QuestionNames.ApiSpecLocation].trim();
+        const specPath = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
         const listResult = await (0, daSpecParser_1.listAPIInfo)(specPath);
         authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
         if (authNameAndSchemes.length > 0) {
@@ -1493,18 +1357,18 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.regenerateApi.continue")) {
             return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
         }
-        const destinationPluginManifestPath = inputs[constants_4.QuestionNames.SelectPluginManifest];
-        const destinationApiSpecPath = inputs[constants_4.QuestionNames.SelectOpenAPISpecFromPlugin];
-        const generateRes = await (0, helper_2.generateFromApiSpec)(undefined, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.RegeneratePlugin, m365_spec_parser_1.ProjectType.Copilot, {
+        const destinationPluginManifestPath = inputs[constants_3.QuestionNames.SelectPluginManifest];
+        const destinationApiSpecPath = inputs[constants_3.QuestionNames.SelectOpenAPISpecFromPlugin];
+        const generateRes = await (0, helper_1.generateFromApiSpec)(undefined, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.RegeneratePlugin, m365_spec_parser_1.ProjectType.Copilot, {
             destinationApiSpecFilePath: destinationApiSpecPath,
             pluginManifestFilePath: destinationPluginManifestPath,
-        }, inputs[constants_4.QuestionNames.ApiSpecLocation].trim(), true);
+        }, inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), true);
         if (generateRes.isErr()) {
             return (0, teamsfx_api_1.err)(generateRes.error);
         }
         const warnings = generateRes.value.warnings;
         if (warnings && warnings.length > 0) {
-            const warnSummary = await (0, helper_2.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(projectPath, destinationApiSpecPath), path.relative(projectPath, destinationPluginManifestPath), projectPath);
+            const warnSummary = await (0, helper_1.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(projectPath, destinationApiSpecPath), path.relative(projectPath, destinationPluginManifestPath), projectPath);
             context.logProvider.info(warnSummary + "\n");
         }
         for (const authNameAndScheme of authNameAndSchemes) {
@@ -1520,17 +1384,16 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             const actionPath = path.normalize(path.join(appPackageFolder, action.file));
             await CopilotGptManifestUtils_1.copilotGptManifestUtils.updateConversationStarters(actionPath, declarativeAgentManifest);
         }
-        const actionId = inputs[constants_4.QuestionNames.SelectPluginId];
+        const actionId = inputs[constants_3.QuestionNames.SelectPluginId];
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
             const successMessage = (0, localizeUtils_1.getLocalizedString)("core.regeneratePlugin.success.vsc", actionId);
             const viewPluginManifest = (0, localizeUtils_1.getLocalizedString)("core.regeneratePlugin.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));
+                    void globalVars_1.TOOLS?.ui?.openFile?.(destinationPluginManifestPath);
                 }
             });
         }
@@ -1545,9 +1408,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async metaOSExtendToDA(inputs, workDir) {
         const context = (0, globalVars_1.createContext)();
-        inputs[constants_4.QuestionNames.Scratch] = constants_4.ScratchOptions.yes().id;
-        inputs[constants_4.QuestionNames.TemplateName] = templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject;
-        inputs[constants_4.QuestionNames.OfficeAddinFolder] = workDir;
+        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.yes().id;
+        inputs[constants_3.QuestionNames.TemplateName] = templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject;
+        inputs[constants_3.QuestionNames.OfficeAddinFolder] = workDir;
         const res = await coordinator_1.coordinator.create(context, inputs);
         if (res.isOk()) {
             inputs.projectPath = res.value.projectPath;
@@ -1558,12 +1421,11 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * Add Knowledge
      */
     async addKnowledge(inputs) {
-        var _a, _b, _c;
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
         const context = (0, globalVars_1.createContext)();
-        const teamsManifestPath = inputs[constants_4.QuestionNames.ManifestPath];
+        const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
         const appPackageFolder = path.dirname(teamsManifestPath);
         // Validate the project is valid for adding knowledge
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
@@ -1572,9 +1434,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const teamsManifest = manifestRes.value;
         const agent = teamsManifest.copilotExtensions
-            ? (_a = teamsManifest.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0]
-            : (_c = (_b = teamsManifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents) === null || _c === void 0 ? void 0 : _c[0];
-        if (!(agent === null || agent === void 0 ? void 0 : agent.file)) {
+            ? teamsManifest.copilotExtensions.declarativeCopilots?.[0]
+            : teamsManifest.copilotAgents?.declarativeAgents?.[0];
+        if (!agent?.file) {
             return (0, teamsfx_api_1.err)(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.name, errors_1.AppStudioError.TeamsAppRequiredPropertyMissingError.message("declarativeAgents", teamsManifestPath)));
         }
         const agentFilePathRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath(teamsManifestPath);
@@ -1592,18 +1454,18 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
         }
         let result;
-        const knowledgeSource = inputs[constants_4.QuestionNames.KnowledgeSource];
+        const knowledgeSource = inputs[constants_3.QuestionNames.KnowledgeSource];
         switch (knowledgeSource) {
-            case constants_4.KnowledgeSourceOptions.webSearch().id:
+            case constants_3.KnowledgeSourceOptions.webSearch().id:
                 result = await this.addWebSearchKnowledge(context, inputs, agentManifestPath);
                 break;
-            case constants_4.KnowledgeSourceOptions.oneDriveSharePoint().id:
+            case constants_3.KnowledgeSourceOptions.oneDriveSharePoint().id:
                 result = await this.addOneDriveSharePointKnowledge(inputs, agentManifestPath);
                 break;
-            case constants_4.KnowledgeSourceOptions.graphConnector().id:
+            case constants_3.KnowledgeSourceOptions.graphConnector().id:
                 result = await this.addGCKnowledge(inputs, agentManifestPath);
                 break;
-            case constants_4.KnowledgeSourceOptions.embeddedKnowledge().id:
+            case constants_3.KnowledgeSourceOptions.embeddedKnowledge().id:
                 result = await this.addEmbeddedKnowledge(inputs);
                 break;
             default:
@@ -1635,11 +1497,10 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * Need to update da manifest and update m365agents.yml
      */
     async kiotaRegenerate(inputs) {
-        var _a, _b, _c, _d, _e;
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
-        const teamsManifestPath = inputs[constants_4.QuestionNames.ManifestPath];
+        const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
         const appPackageFolder = path.dirname(teamsManifestPath);
         const context = (0, globalVars_1.createContext)();
         // validate the project is valid for adding plugin
@@ -1649,9 +1510,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const teamsManifest = manifestRes.value;
         const declarativeGpt = teamsManifest.copilotExtensions
-            ? (_a = teamsManifest.copilotExtensions.declarativeCopilots) === null || _a === void 0 ? void 0 : _a[0]
-            : (_c = (_b = teamsManifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents) === null || _c === void 0 ? void 0 : _c[0];
-        if (!(declarativeGpt === null || declarativeGpt === void 0 ? void 0 : declarativeGpt.file)) {
+            ? teamsManifest.copilotExtensions.declarativeCopilots?.[0]
+            : teamsManifest.copilotAgents?.declarativeAgents?.[0];
+        if (!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);
@@ -1664,9 +1525,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             return (0, teamsfx_api_1.err)(declarativeCopilotManifesRes.error);
         }
         const declarativeCopilotManifest = declarativeCopilotManifesRes.value;
-        const pluginManifestFilePath = inputs[constants_4.QuestionNames.ActionManifestPath];
+        const pluginManifestFilePath = inputs[constants_3.QuestionNames.ActionManifestPath];
         let actionId = "";
-        (_d = declarativeCopilotManifest.actions) === null || _d === void 0 ? void 0 : _d.forEach((action) => {
+        declarativeCopilotManifest.actions?.forEach((action) => {
             const actionFilePath = path.normalize(path.join(appPackageFolder, action.file));
             if (actionFilePath.toLowerCase() === path.normalize(pluginManifestFilePath).toLowerCase()) {
                 actionId = action.id;
@@ -1677,8 +1538,8 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         if (!actionId) {
             let suffix = 1;
             actionId = `action_${suffix}`;
-            const existingActionIds = (_e = declarativeCopilotManifest.actions) === null || _e === void 0 ? void 0 : _e.map((action) => action.id);
-            while (existingActionIds === null || existingActionIds === void 0 ? void 0 : existingActionIds.includes(actionId)) {
+            const existingActionIds = declarativeCopilotManifest.actions?.map((action) => action.id);
+            while (existingActionIds?.includes(actionId)) {
                 suffix += 1;
                 actionId = `action_${suffix}`;
             }
@@ -1688,15 +1549,15 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
         }
         // 1. Get registration id and update plugin manifest
-        const pluginManifestPath = inputs[constants_4.QuestionNames.ActionManifestPath].trim();
+        const pluginManifestPath = inputs[constants_3.QuestionNames.ActionManifestPath].trim();
         const authData = await (0, daSpecParser_1.parseAndUpdatePluginManifestForKiota)(pluginManifestPath, true);
         // 2. Update teamsapp.local.yaml and teamsapp.yaml if need to add auth action
-        const specPath = inputs[constants_4.QuestionNames.ApiSpecLocation].trim();
+        const specPath = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
         for (const authInfo of authData) {
-            await (0, helper_2.injectAuthAction)(inputs.projectPath, authInfo.authName, undefined, specPath, false, authInfo.authType === "apiKey" ? "ApiKeyPluginVault" : "OAuthPluginVault", false, authInfo.registrationId);
+            await (0, helper_1.injectAuthAction)(inputs.projectPath, authInfo.authName, undefined, specPath, false, authInfo.authType === "apiKey" ? "ApiKeyPluginVault" : "OAuthPluginVault", false, authInfo.registrationId);
         }
         // 3. Update plugin manifest to add ac info (optional)
-        await (0, helper_2.generateAdaptiveCardInPluginManifestForKiota)(pluginManifestFilePath, specPath, context);
+        await (0, helper_1.generateAdaptiveCardInPluginManifestForKiota)(pluginManifestFilePath, specPath, context);
         for (const action of declarativeCopilotManifest.actions) {
             const actionPath = path.normalize(path.join(appPackageFolder, action.file));
             await CopilotGptManifestUtils_1.copilotGptManifestUtils.updateConversationStarters(actionPath, declarativeCopilotManifest);
@@ -1705,73 +1566,87 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return (0, teamsfx_api_1.ok)(undefined);
     }
     async addAuthAction(inputs) {
-        var _a, _b, _c;
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
         const context = (0, globalVars_1.createContext)();
         try {
-            const pluginManifestPath = inputs[constants_4.QuestionNames.PluginManifestFilePath];
-            const apiSpecRelativePath = inputs[constants_4.QuestionNames.ApiSpecLocation];
-            const apiOperation = inputs[constants_4.QuestionNames.ApiOperation];
-            const authName = inputs[constants_4.QuestionNames.AuthName];
+            const pluginManifestPath = inputs[constants_3.QuestionNames.PluginManifestFilePath];
+            const apiSpecRelativePath = inputs[constants_3.QuestionNames.ApiSpecLocation];
+            const apiOperation = inputs[constants_3.QuestionNames.ApiOperation];
+            const authName = inputs[constants_3.QuestionNames.AuthName];
             const apiSpecPath = path.normalize(path.join(path.dirname(pluginManifestPath), apiSpecRelativePath));
-            const authType = inputs[constants_4.QuestionNames.ApiAuth];
+            const authType = inputs[constants_3.QuestionNames.ApiAuth];
             let authParameters = {
                 apis: apiOperation,
             };
-            if (authType === constants_4.AddAuthActionAuthTypeOptions.oauth().id) {
-                const oauthAuthorizationUrl = inputs[constants_4.QuestionNames.OAuthAuthorizationUrl];
-                const oauthTokenUrl = inputs[constants_4.QuestionNames.OAuthTokenUrl];
-                const oauthRefreshUrl = inputs[constants_4.QuestionNames.OAuthRefreshUrl];
-                const oauthScopes = inputs[constants_4.QuestionNames.OAuthScope];
-                const enablePKCEStr = inputs[constants_4.QuestionNames.OauthPKCE];
+            if (authType === constants_3.AddAuthActionAuthTypeOptions.oauth().id) {
+                const oauthAuthorizationUrl = inputs[constants_3.QuestionNames.OAuthAuthorizationUrl];
+                const oauthTokenUrl = inputs[constants_3.QuestionNames.OAuthTokenUrl];
+                const oauthRefreshUrl = inputs[constants_3.QuestionNames.OAuthRefreshUrl];
+                const oauthScopes = inputs[constants_3.QuestionNames.OAuthScope];
+                const enablePKCEStr = inputs[constants_3.QuestionNames.OauthPKCE];
                 const scopeArr = this.parseScope(oauthScopes);
-                authParameters = Object.assign(Object.assign({}, authParameters), { authorizationUrl: oauthAuthorizationUrl, tokenUrl: oauthTokenUrl, refreshUrl: oauthRefreshUrl ? oauthRefreshUrl : undefined, scopes: scopeArr, enablePKCE: enablePKCEStr === "true" });
-            }
-            else if (authType === constants_4.AddAuthActionAuthTypeOptions.apiKey().id) {
-                const apiKeyIn = inputs[constants_4.QuestionNames.ApiKeyIn];
-                const apiKeyName = inputs[constants_4.QuestionNames.ApiKeyName];
-                authParameters = Object.assign(Object.assign({}, authParameters), { in: apiKeyIn, name: apiKeyName });
-            }
-            else if (authType === constants_4.AddAuthActionAuthTypeOptions.microsoftEntra().id) {
-                const oauthScopes = inputs[constants_4.QuestionNames.OAuthScope];
+                authParameters = {
+                    ...authParameters,
+                    authorizationUrl: oauthAuthorizationUrl,
+                    tokenUrl: oauthTokenUrl,
+                    refreshUrl: oauthRefreshUrl ? oauthRefreshUrl : undefined,
+                    scopes: scopeArr,
+                    enablePKCE: enablePKCEStr === "true",
+                };
+            }
+            else if (authType === constants_3.AddAuthActionAuthTypeOptions.apiKey().id) {
+                const apiKeyIn = inputs[constants_3.QuestionNames.ApiKeyIn];
+                const apiKeyName = inputs[constants_3.QuestionNames.ApiKeyName];
+                authParameters = {
+                    ...authParameters,
+                    in: apiKeyIn,
+                    name: apiKeyName,
+                };
+            }
+            else if (authType === constants_3.AddAuthActionAuthTypeOptions.microsoftEntra().id) {
+                const oauthScopes = inputs[constants_3.QuestionNames.OAuthScope];
                 const scopeArr = this.parseScope(oauthScopes);
-                authParameters = Object.assign(Object.assign({}, authParameters), { authorizationUrl: "https://login.microsoftonline.com/${{TEAMS_APP_TENANT_ID}}/oauth2/v2.0/authorize", tokenUrl: "https://login.microsoftonline.com/${{TEAMS_APP_TENANT_ID}}/oauth2/v2.0/token", refreshUrl: undefined, scopes: scopeArr });
+                authParameters = {
+                    ...authParameters,
+                    authorizationUrl: "https://login.microsoftonline.com/${{TEAMS_APP_TENANT_ID}}/oauth2/v2.0/authorize",
+                    tokenUrl: "https://login.microsoftonline.com/${{TEAMS_APP_TENANT_ID}}/oauth2/v2.0/token",
+                    refreshUrl: undefined,
+                    scopes: scopeArr,
+                };
             }
             // Update openapi spec
-            const specParser = new m365_spec_parser_1.SpecParser(apiSpecPath, (0, helper_2.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
+            const specParser = new m365_spec_parser_1.SpecParser(apiSpecPath, (0, helper_1.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
             await specParser.addAuthScheme(authName, authType, authParameters);
             let authTypeScheme;
             switch (authType) {
-                case constants_4.AddAuthActionAuthTypeOptions.apiKey().id:
-                case constants_4.AddAuthActionAuthTypeOptions.bearerToken().id:
+                case constants_3.AddAuthActionAuthTypeOptions.apiKey().id:
+                case constants_3.AddAuthActionAuthTypeOptions.bearerToken().id:
                 default:
                     authTypeScheme = constant_1.APIKeyAuthType;
                     break;
-                case constants_4.AddAuthActionAuthTypeOptions.oauth().id:
+                case constants_3.AddAuthActionAuthTypeOptions.oauth().id:
                     authTypeScheme = constant_1.OAuthAuthType;
                     break;
-                case constants_4.AddAuthActionAuthTypeOptions.microsoftEntra().id:
+                case constants_3.AddAuthActionAuthTypeOptions.microsoftEntra().id:
                     authTypeScheme = constant_1.MicrosoftEntraAuthType;
                     break;
             }
-            const addAuthActionRes = await (0, helper_2.injectAuthAction)(inputs.projectPath, authName, undefined, apiSpecPath, true, authTypeScheme, "enablePKCE" in authParameters ? authParameters.enablePKCE : undefined);
-            if (addAuthActionRes === null || addAuthActionRes === void 0 ? void 0 : addAuthActionRes.registrationIdEnvName) {
+            const addAuthActionRes = await (0, helper_1.injectAuthAction)(inputs.projectPath, authName, undefined, apiSpecPath, true, authTypeScheme, "enablePKCE" in authParameters ? authParameters.enablePKCE : undefined);
+            if (addAuthActionRes?.registrationIdEnvName) {
                 const pluginManifest = (await fs_extra_1.default.readJson(pluginManifestPath));
-                (_a = pluginManifest.runtimes) === null || _a === void 0 ? void 0 : _a.forEach((runtime) => {
-                    var _a, _b, _c;
+                pluginManifest.runtimes?.forEach((runtime) => {
                     if (runtime.type === "OpenApi" &&
-                        ((_a = runtime.auth) === null || _a === void 0 ? void 0 : _a.type) === "None" &&
-                        ((_b = runtime.spec) === null || _b === void 0 ? void 0 : _b.url) === apiSpecRelativePath) {
-                        runtime.run_for_functions = (_c = runtime.run_for_functions) === null || _c === void 0 ? void 0 : _c.filter((value) => !!!apiOperation.includes(value));
+                        runtime.auth?.type === "None" &&
+                        runtime.spec?.url === apiSpecRelativePath) {
+                        runtime.run_for_functions = runtime.run_for_functions?.filter((value) => !!!apiOperation.includes(value));
                     }
                 });
-                pluginManifest.runtimes = (_b = pluginManifest.runtimes) === null || _b === void 0 ? void 0 : _b.filter((runtime) => {
-                    var _a;
-                    return !!runtime.run_for_functions && ((_a = runtime.run_for_functions) === null || _a === void 0 ? void 0 : _a.length) > 0;
+                pluginManifest.runtimes = pluginManifest.runtimes?.filter((runtime) => {
+                    return !!runtime.run_for_functions && runtime.run_for_functions?.length > 0;
                 });
-                (_c = pluginManifest.runtimes) === null || _c === void 0 ? void 0 : _c.push({
+                pluginManifest.runtimes?.push({
                     type: "OpenApi",
                     auth: {
                         type: authTypeScheme === constant_1.MicrosoftEntraAuthType
@@ -1787,7 +1662,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                 });
                 await fs_extra_1.default.writeJson(pluginManifestPath, pluginManifest, { spaces: 4 });
             }
-            if (authType === constants_4.AddAuthActionAuthTypeOptions.microsoftEntra().id) {
+            if (authType === constants_3.AddAuthActionAuthTypeOptions.microsoftEntra().id) {
                 const appIdUriPlaceholder = m365_spec_parser_1.Utils.getSafeRegistrationIdEnvName(`${authName}_APPLICATION_ID_URI`);
                 void context.userInteraction.showMessage("warn", (0, localizeUtils_1.getLocalizedString)("core.addAuthAction.microsoftEntra.message", appIdUriPlaceholder), false);
             }
@@ -1806,7 +1681,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return (0, teamsfx_api_1.ok)(undefined);
     }
     async setSensitivityLabel(inputs) {
-        const declarativeAgentManifestPath = inputs[constants_4.QuestionNames.DeclarativeAgentManifestPath];
+        const declarativeAgentManifestPath = inputs[constants_3.QuestionNames.DeclarativeAgentManifestPath];
         if (!declarativeAgentManifestPath || !(await fs_extra_1.default.pathExists(declarativeAgentManifestPath))) {
             throw new Error("declarativeAgentManifestPath is undefined or does not exist");
         }
@@ -1820,7 +1695,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.setSensitivityLabel.continue")) {
                 return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
             }
-            const selectedLabel = inputs[constants_4.QuestionNames.SensitivityLabel];
+            const selectedLabel = inputs[constants_3.QuestionNames.SensitivityLabel];
             const declarativeAgentManifestRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readDeclarativeAgentManifestFile(declarativeAgentManifestPath);
             if (declarativeAgentManifestRes.isErr()) {
                 return (0, teamsfx_api_1.err)(declarativeAgentManifestRes.error);
@@ -1885,13 +1760,16 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             await fs_extra_1.default.ensureDir(metadataDir);
             const versionFile = path.join(metadataDir, "template-version.txt");
             const needDownload = async () => {
+                // Always re-download for mutable pre-release tags (content changes but tag stays the same)
+                if (latestVersion === "0.0.0-rc")
+                    return true;
                 if (!(await fs_extra_1.default.pathExists(versionFile)))
                     return true;
                 try {
                     const cachedVersion = (await fs_extra_1.default.readFile(versionFile, "utf-8")).trim();
                     return cachedVersion !== latestVersion;
                 }
-                catch (_a) {
+                catch {
                     return true; // re-download if any issue reading cached version
                 }
             };
@@ -1904,14 +1782,61 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             const zip = await (0, utils_5.fetchZipFromUrl)(metadataZipUrl);
             await (0, utils_5.unzip)(zip, metadataDir);
             await fs_extra_1.default.writeFile(versionFile, latestVersion, { encoding: "utf-8" });
+            // Clear locale cache so freshly downloaded NLS files are picked up
+            (0, localizeUtils_1.clearLocaleCache)();
             return (0, teamsfx_api_1.ok)(undefined);
         }
         catch (error) {
-            const message = (error === null || error === void 0 ? void 0 : error.message) || "Unknown error while fetching template metadata";
+            const message = error?.message || "Unknown error while fetching template metadata";
             const systemErr = new teamsfx_api_1.SystemError("FetchOnlineTemplateMetadata", "DownloadFailed", message, message);
             return (0, teamsfx_api_1.err)(systemErr);
         }
     }
+    /**
+     * dynamic VS template metadata download
+     */
+    async fetchOnlineTemplateMetadataForVS() {
+        if ((0, templateHelper_1.useLocalTemplate)()) {
+            return (0, teamsfx_api_1.ok)(undefined); // Skip if using local templates
+        }
+        try {
+            // VS ships stable templates with a stable fx-core and test/pre-release
+            // templates with a beta fx-core. So beta = pre-stable test build → RC.
+            const coreVersion = require("../../package.json").version;
+            const latestVersion = coreVersion.includes("beta")
+                ? "0.0.0-rc"
+                : await (0, utils_5.getTemplateVSLatestVersion)();
+            const homedir = os.homedir();
+            const metadataDir = path.join(homedir, `.${String(teamsfx_api_1.ConfigFolderName)}`, "vs-metadata");
+            await fs_extra_1.default.ensureDir(metadataDir);
+            const versionFile = path.join(metadataDir, "template-vs-version.txt");
+            const needDownload = async () => {
+                if (!(await fs_extra_1.default.pathExists(versionFile)))
+                    return true;
+                try {
+                    const cachedVersion = (await fs_extra_1.default.readFile(versionFile, "utf-8")).trim();
+                    return cachedVersion !== latestVersion;
+                }
+                catch {
+                    return true;
+                }
+            };
+            if (!(await needDownload())) {
+                return (0, teamsfx_api_1.ok)(undefined); // Already up-to-date
+            }
+            const tag = `${templates_config_json_1.default.vstagPrefix}${latestVersion}`;
+            const metadataZipUrl = `${templates_config_json_1.default.templateDownloadBaseURL}/${tag}/metadata.zip`;
+            const zip = await (0, utils_5.fetchZipFromUrl)(metadataZipUrl);
+            await (0, utils_5.unzip)(zip, metadataDir);
+            await fs_extra_1.default.writeFile(versionFile, latestVersion, { encoding: "utf-8" });
+            return (0, teamsfx_api_1.ok)(undefined);
+        }
+        catch (error) {
+            const message = error?.message || "Unknown error while fetching VS template metadata";
+            const systemErr = new teamsfx_api_1.SystemError("FetchOnlineTemplateMetadataForVS", "DownloadFailed", message, message);
+            return (0, teamsfx_api_1.err)(systemErr);
+        }
+    }
     /**
      * generate config files
      */
@@ -1920,9 +1845,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async updateAuthActionInYaml(authName, authScheme, projectPath, apSpecPath, pluginManifestPath, forceToAddNew = true) {
         if (authName && authScheme) {
-            const authInjectRes = await (0, helper_2.injectAuthAction)(projectPath, authName, authScheme, apSpecPath, forceToAddNew);
-            if ((authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.defaultRegistrationIdEnvName) &&
-                (authInjectRes === null || authInjectRes === void 0 ? void 0 : authInjectRes.registrationIdEnvName) &&
+            const authInjectRes = await (0, helper_1.injectAuthAction)(projectPath, authName, authScheme, apSpecPath, forceToAddNew);
+            if (authInjectRes?.defaultRegistrationIdEnvName &&
+                authInjectRes?.registrationIdEnvName &&
                 authInjectRes.defaultRegistrationIdEnvName !== authInjectRes.registrationIdEnvName) {
                 const pluginManifestContent = await fs_extra_1.default.readFile(pluginManifestPath, "utf-8");
                 const updatedPluginManifestContext = pluginManifestContent.replace(authInjectRes.defaultRegistrationIdEnvName, authInjectRes.registrationIdEnvName);
@@ -1933,7 +1858,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     parseAuthNameAndScheme(listResult, inputs) {
         const authApis = listResult.APIs.filter((value) => value.isValid && !!value.auth);
         const result = [];
-        for (const api of inputs[constants_4.QuestionNames.ApiOperation]) {
+        for (const api of inputs[constants_3.QuestionNames.ApiOperation]) {
             const operation = authApis.find((op) => op.api === api);
             if (operation &&
                 operation.auth &&
@@ -1961,7 +1886,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return scopeArr;
     }
     async isDelcarativeAgentApp(inputs) {
-        const projectPath = inputs[constants_4.QuestionNames.ProjectPath];
+        const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
         const manifestRes = await ManifestUtils_1.manifestUtils.readAppManifest(projectPath);
         if (manifestRes.isErr()) {
             return (0, teamsfx_api_1.err)(manifestRes.error);
@@ -1969,21 +1894,25 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return (0, teamsfx_api_1.ok)((0, projectTypeChecker_1.IsDeclarativeAgentManifest)(manifestRes.value));
     }
     async addOneDriveSharePointKnowledge(inputs, agentManifestPath) {
-        var _a;
         const manifestRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(agentManifestPath);
         if (manifestRes.isErr()) {
             return (0, teamsfx_api_1.err)(manifestRes.error);
         }
         let oneDriveSharePointIds = null;
         let oneDriveSharePointUrls = null;
-        const sharePointItem = (_a = inputs.oneDriveSharePointItem) === null || _a === void 0 ? void 0 : _a[0];
+        const sharePointItem = inputs.oneDriveSharePointItem?.[0];
         if (sharePointItem &&
-            inputs[constants_4.QuestionNames.SearchType] !== constants_4.KnowledgeSearchTypeOptions.allOneDriveSharepoint().id) {
+            inputs[constants_3.QuestionNames.SearchType] !== constants_3.KnowledgeSearchTypeOptions.allOneDriveSharepoint().id) {
             if (sharePointItem.url) {
                 oneDriveSharePointUrls = { url: sharePointItem.url };
             }
             else {
-                oneDriveSharePointIds = Object.assign(Object.assign({ site_id: sharePointItem.siteId, web_id: sharePointItem.webId }, (sharePointItem.listId && { list_id: sharePointItem.listId })), (sharePointItem.uniqueId && { unique_id: sharePointItem.uniqueId }));
+                oneDriveSharePointIds = {
+                    site_id: sharePointItem.siteId,
+                    web_id: sharePointItem.webId,
+                    ...(sharePointItem.listId && { list_id: sharePointItem.listId }),
+                    ...(sharePointItem.uniqueId && { unique_id: sharePointItem.uniqueId }),
+                };
             }
         }
         const addOneDriveSharePointCapabilityRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addOneDriveSharePointCapability(agentManifestPath, oneDriveSharePointIds, oneDriveSharePointUrls, manifestRes);
@@ -1998,7 +1927,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             return (0, teamsfx_api_1.err)(manifestRes.error);
         }
         let webSearchUrl = null;
-        if (inputs[constants_4.QuestionNames.SearchType] !== constants_4.KnowledgeSearchTypeOptions.allWeb().id) {
+        if (inputs[constants_3.QuestionNames.SearchType] !== constants_3.KnowledgeSearchTypeOptions.allWeb().id) {
             webSearchUrl = {
                 url: inputs.webSearchUrl,
             };
@@ -2015,11 +1944,11 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             return (0, teamsfx_api_1.err)(manifestRes.error);
         }
         let connectionIds;
-        if (inputs[constants_4.QuestionNames.GCInput]) {
-            connectionIds = [inputs[constants_4.QuestionNames.GCInput]];
+        if (inputs[constants_3.QuestionNames.GCInput]) {
+            connectionIds = [inputs[constants_3.QuestionNames.GCInput]];
         }
         else {
-            connectionIds = inputs[constants_4.QuestionNames.GCList];
+            connectionIds = inputs[constants_3.QuestionNames.GCList];
         }
         const addGCCapabilityRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addGCCapability(agentManifestPath, connectionIds, manifestRes);
         if (addGCCapabilityRes.isErr()) {
@@ -2028,13 +1957,13 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return (0, teamsfx_api_1.ok)(undefined);
     }
     async addEmbeddedKnowledge(inputs) {
-        const manifestFilePath = inputs[constants_4.QuestionNames.ManifestPath];
-        const filePath = inputs[constants_4.QuestionNames.EmbeddedKnowledgeFiles];
+        const manifestFilePath = inputs[constants_3.QuestionNames.ManifestPath];
+        const filePath = inputs[constants_3.QuestionNames.EmbeddedKnowledgeFiles];
         const res = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addEmbeddedKnowledgeFiles(manifestFilePath, filePath);
         return res;
     }
     showAddKnowledgeSuccessMessage(context, inputs, agentManifestPath, knowledgeSource) {
-        if (knowledgeSource === constants_4.KnowledgeSourceOptions.embeddedKnowledge().id) {
+        if (knowledgeSource === constants_3.KnowledgeSourceOptions.embeddedKnowledge().id) {
             void globalVars_1.TOOLS.ui.showMessage("info", (0, localizeUtils_1.getLocalizedString)("core.addEmbeddedKnowledge.success"), false);
             return;
         }
@@ -2044,10 +1973,9 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             void context.userInteraction
                 .showMessage("info", successMessage, false, viewAgentManifest)
                 .then((userRes) => {
-                var _a, _b;
                 if (userRes.isOk() && userRes.value === viewAgentManifest) {
                     context.telemetryReporter.sendTelemetryEvent(telemetry_1.TelemetryEvent.ViewAgentManifestAfterAdded);
-                    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, agentManifestPath));
+                    void globalVars_1.TOOLS?.ui?.openFile?.(agentManifestPath);
                 }
             });
         }
@@ -2057,6 +1985,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
 }
+exports.FxCore = FxCore;
 tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "createProject", reset: true }),
@@ -2645,17 +2574,6 @@ tslib_1.__decorate([
     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 }),
-        errorHandler_1.ErrorHandlerMW,
-        (0, questionMW_1.QuestionMW)("addPlugin"),
-        concurrentLocker_1.ConcurrentLockerMW,
-    ]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "addPlugin", null);
 tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: teamsfx_api_1.Stage.RegeneratePlugin }),
@@ -2749,11 +2667,19 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", []),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "fetchOnlineTemplateMetadata", null);
+tslib_1.__decorate([
+    (0, hooks_1.hooks)([
+        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "fetchOnlineTemplateMetadataForVS" }),
+        errorHandler_1.ErrorHandlerMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", []),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "fetchOnlineTemplateMetadataForVS", null);
 tslib_1.__decorate([
     (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "generateConfigFiles" }), errorHandler_1.ErrorHandlerMW]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "generateConfigFiles", null);
-exports.FxCore = FxCore;
 //# sourceMappingURL=FxCore.js.map