@microsoft/teamsfx-core 2.0.9-rc-hotfix.2 → 2.0.10-alpha.288b4cdfa.0

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,15 +29,19 @@ 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/copilotPlugin/helper");
+const launchHelper_1 = require("../component/m365/launchHelper");
 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");
@@ -46,27 +50,19 @@ 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 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) {
         globalVars_1.setTools(tools);
@@ -79,15 +75,15 @@ class FxCore {
         return callback_1.CallbackRegistry.set(event, callback);
     }
     async createProject(inputs) {
-        const context = utils_2.createContextV3();
-        if (inputs[questionNames_1.QuestionNames.ProjectType] === question_1.ProjectTypeOptions.startWithGithubCopilot().id) {
+        const context = globalVars_1.createContext();
+        if (inputs[constants_3.QuestionNames.ProjectType] === constants_3.ProjectTypeOptions.startWithGithubCopilot().id) {
             return teamsfx_api_1.ok({ projectPath: "", shouldInvokeTeamsAgent: true });
         }
-        inputs[questionNames_1.QuestionNames.Scratch] = create_1.ScratchOptions.yes().id;
+        inputs[constants_3.QuestionNames.Scratch] = constants_3.ScratchOptions.yes().id;
         if (inputs.teamsAppFromTdp) {
             // should never happen as we do same check on Developer Portal.
             if (utils_1.containsUnsupportedFeature(inputs.teamsAppFromTdp)) {
-                return teamsfx_api_1.err(error_1.InvalidInputError("Teams app contains unsupported features"));
+                return teamsfx_api_1.err(new common_2.InputValidationError("manifest.json", "Teams app contains unsupported features"));
             }
             else {
                 context.telemetryReporter.sendTelemetryEvent(telemetry_2.CoreTelemetryEvent.CreateFromTdpStart, {
@@ -109,16 +105,16 @@ class FxCore {
         folder = path.resolve(folder);
         const appName = inputs["app-name"];
         if (undefined === appName)
-            return teamsfx_api_1.err(new common_2.MissingRequiredInputError(questionNames_1.QuestionNames.AppName));
+            return teamsfx_api_1.err(new common_2.MissingRequiredInputError(constants_3.QuestionNames.AppName));
         const validateResult = jsonschema.validate(appName, {
-            pattern: question_1.AppNamePattern,
+            pattern: constants_3.AppNamePattern,
         });
         if (validateResult.errors && validateResult.errors.length > 0) {
-            return teamsfx_api_1.err(new common_2.InputValidationError(questionNames_1.QuestionNames.AppName, validateResult.errors[0].message));
+            return 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
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         const genRes = await generator.run(context, inputs, projectPath);
         if (genRes.isErr())
             return teamsfx_api_1.err(genRes.error);
@@ -137,8 +133,8 @@ class FxCore {
      * lifecycle command: create new sample project
      */
     async createSampleProject(inputs) {
-        const context = utils_2.createContextV3();
-        inputs[questionNames_1.QuestionNames.Scratch] = create_1.ScratchOptions.no().id;
+        const context = globalVars_1.createContext();
+        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;
@@ -197,7 +193,7 @@ 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[questionNames_1.QuestionNames.AadAppManifestFilePath];
+        const manifestTemplatePath = inputs[constants_3.QuestionNames.AadAppManifestFilePath];
         if (!(await fs_extra_1.default.pathExists(manifestTemplatePath))) {
             return teamsfx_api_1.err(new common_2.FileNotFoundError("deployAadManifest", manifestTemplatePath));
         }
@@ -238,12 +234,12 @@ class FxCore {
         globalVars_1.setErrorContext({ component: "spfxAdd", method: "run" });
         const driver = typedi_1.Container.get("spfx/add");
         const args = {
-            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,
+            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 = utils_2.createDriverContext(inputs);
         const res = await driver.run(args, Context);
@@ -278,7 +274,7 @@ class FxCore {
         if (func.method === "addSso") {
             // used in v3 only in VS
             inputs.stage = teamsfx_api_1.Stage.addFeature;
-            inputs[questionNames_1.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
+            inputs[constants_3.QuestionNames.Features] = constants_2.SingleSignOnOptionItem.id;
             const component = typedi_1.Container.get("sso");
             globalVars_1.setErrorContext({ component: "sso", method: "add" });
             res = await component.add(context, inputs);
@@ -307,8 +303,8 @@ class FxCore {
      * v3 only none lifecycle command
      */
     async deployTeamsManifest(inputs, ctx) {
-        inputs.manifestTemplatePath = inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
-        const context = utils_2.createContextV3();
+        inputs.manifestTemplatePath = inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
+        const context = globalVars_1.createContext();
         const res = await appStudio_1.updateManifestV3(context, inputs);
         if (res.isOk()) {
             ctx.envVars = envUtil_1.envUtil.map2object(res.value);
@@ -354,7 +350,7 @@ class FxCore {
         if (inputs["manifest-path"]) {
             return await this.validateManifest(inputs);
         }
-        else if (inputs[questionNames_1.QuestionNames.ValidateMethod] === other_1.TeamsAppValidationOptions.testCases().id) {
+        else if (inputs[constants_3.QuestionNames.ValidateMethod] === constants_3.TeamsAppValidationOptions.testCases().id) {
             return await this.validateWithTestCases(inputs);
         }
         else {
@@ -407,15 +403,15 @@ class FxCore {
         var _a, _b, _c;
         inputs.stage = teamsfx_api_1.Stage.createAppPackage;
         const context = utils_2.createDriverContext(inputs);
-        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
+        const teamsAppManifestFilePath = inputs === null || inputs === void 0 ? void 0 : inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
         const driver = typedi_1.Container.get("teamsApp/zipAppPackage");
         const args = {
             manifestPath: teamsAppManifestFilePath,
-            outputZipPath: (_a = inputs[questionNames_1.QuestionNames.OutputZipPathParamName]) !== null && _a !== void 0 ? _a : 
+            outputZipPath: (_a = inputs[constants_3.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`,
-            outputJsonPath: (_b = inputs[questionNames_1.QuestionNames.OutputManifestParamName]) !== null && _b !== void 0 ? _b : 
+            outputJsonPath: (_b = inputs[constants_3.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}/manifest.${process.env
                 .TEAMSFX_ENV}.json`,
@@ -447,8 +443,8 @@ class FxCore {
      */
     async previewWithManifest(inputs) {
         inputs.stage = teamsfx_api_1.Stage.previewWithManifest;
-        const hub = inputs[questionNames_1.QuestionNames.M365Host];
-        const manifestFilePath = inputs[questionNames_1.QuestionNames.TeamsAppManifestFilePath];
+        const hub = inputs[constants_3.QuestionNames.M365Host];
+        const manifestFilePath = inputs[constants_3.QuestionNames.TeamsAppManifestFilePath];
         const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestFilePath, undefined, false);
         if (manifestRes.isErr()) {
             return teamsfx_api_1.err(manifestRes.error);
@@ -519,21 +515,10 @@ class FxCore {
      * @description get projectId and version from yml
      */
     async getProjectMetadata(projectPath) {
-        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) {
+        const res = projectSettingsHelper_1.getProjectMetadata(projectPath);
+        if (!res)
             return teamsfx_api_1.ok({});
-        }
+        return Promise.resolve(teamsfx_api_1.ok(res));
     }
     /**
      * get Teams App Name from yml
@@ -598,7 +583,7 @@ class FxCore {
     }
     async grantPermission(inputs) {
         inputs.stage = teamsfx_api_1.Stage.grantPermission;
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         globalVars_1.setErrorContext({ component: "collaborator" });
         const res = await collaborator_1.grantPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
@@ -608,7 +593,7 @@ class FxCore {
      */
     async checkPermission(inputs) {
         inputs.stage = teamsfx_api_1.Stage.checkPermission;
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         const res = await collaborator_1.checkPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
@@ -617,7 +602,7 @@ class FxCore {
      */
     async listCollaborator(inputs) {
         inputs.stage = teamsfx_api_1.Stage.listCollaborator;
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         const res = await collaborator_1.listCollaborator(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
@@ -654,7 +639,7 @@ class FxCore {
         return res.value.decrypt(ciphertext);
     }
     async createEnv(inputs) {
-        return this.createEnvCopyV3(inputs[questionNames_1.QuestionNames.NewTargetEnvName], inputs[questionNames_1.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);
@@ -749,11 +734,11 @@ class FxCore {
     // apply the given yaml template to current project.
     async apply(inputs, templatePath, lifecycleName) {
         if (!inputs.projectPath) {
-            return teamsfx_api_1.err(error_1.InvalidInputError("invalid projectPath", inputs));
+            return teamsfx_api_1.err(new common_2.InputValidationError("projectPath", "empty", "Core"));
         }
         const projectPath = inputs.projectPath;
         if (!inputs.env) {
-            return teamsfx_api_1.err(error_1.InvalidInputError("invalid env", inputs));
+            return teamsfx_api_1.err(new common_2.InputValidationError("env", "empty", "Core"));
         }
         const env = inputs.env;
         const lifecycleName_ = lifecycleName;
@@ -830,16 +815,15 @@ class FxCore {
     }
     async publishInDeveloperPortal(inputs) {
         inputs.stage = teamsfx_api_1.Stage.publishInDeveloperPortal;
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         return await coordinator_1.coordinator.publishInDeveloperPortal(context, inputs);
     }
     async copilotPluginAddAPI(inputs) {
-        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();
+        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.Capabilities] === constants_3.copilotPluginApiSpecOptionId;
+        const context = globalVars_1.createContext();
         // Get API spec file path from manifest
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
         if (manifestRes.isErr()) {
@@ -864,11 +848,11 @@ class FxCore {
         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));
+            if (!inputs[constants_3.QuestionNames.DestinationApiSpecFilePath]) {
+                return teamsfx_api_1.err(new common_2.MissingRequiredInputError(constants_3.QuestionNames.DestinationApiSpecFilePath));
             }
-            outputApiSpecPath = inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath];
-            existingOperations = await helper_1.listPluginExistingOperations(manifestRes.value, manifestPath, inputs[questionNames_1.QuestionNames.DestinationApiSpecFilePath]);
+            outputApiSpecPath = inputs[constants_3.QuestionNames.DestinationApiSpecFilePath];
+            existingOperations = await helper_1.listPluginExistingOperations(manifestRes.value, manifestPath, inputs[constants_3.QuestionNames.DestinationApiSpecFilePath]);
         }
         else {
             const existingOperationIds = ManifestUtils_1.manifestUtils.getOperationIds(manifestRes.value);
@@ -936,11 +920,13 @@ class FxCore {
                 [helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
                     .map((w) => w.type.toString() + ": " + w.content)
                     .join(";"),
-                [telemetry_2.CoreTelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
+                [telemetry_1.TelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
             });
             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);
+                if (warnSummary) {
+                    context.logProvider.info(warnSummary);
+                }
             }
         }
         catch (e) {
@@ -961,7 +947,7 @@ class FxCore {
     }
     async listPluginApiSpecs(inputs) {
         try {
-            const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
+            const manifestPath = inputs[constants_3.QuestionNames.ManifestPath];
             const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
             if (manifestRes.isErr()) {
                 return teamsfx_api_1.err(manifestRes.error);
@@ -978,16 +964,8 @@ class FxCore {
             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 helper_1.listOperations(utils_2.createContextV3(), inputs.manifest, inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
+        const res = await helper_1.listOperations(globalVars_1.createContext(), inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
         if (res.isErr()) {
             const msg = res.error.map((e) => e.content).join("\n");
             return teamsfx_api_1.err(new teamsfx_api_1.UserError("FxCore", "ListOpenAPISpecOperationsError", msg, msg));
@@ -1003,7 +981,7 @@ class FxCore {
         var _a;
         const projectTypeRes = await projectTypeChecker_1.projectTypeChecker.checkProjectType(projectPath);
         const props = {};
-        telemetry_1.fillinProjectTypeProperties(props, projectTypeRes);
+        telemetry_1.telemetryUtils.fillinProjectTypeProperties(props, projectTypeRes);
         (_a = globalVars_1.TOOLS.telemetryReporter) === null || _a === void 0 ? void 0 : _a.sendTelemetryEvent(telemetry_1.TelemetryEvent.ProjectType, props);
         return teamsfx_api_1.ok(projectTypeRes);
     }
@@ -1015,17 +993,17 @@ class FxCore {
         if (!inputs.projectPath) {
             throw new Error("projectPath is undefined"); // should never happen
         }
-        const operations = inputs[questionNames_1.QuestionNames.ApiOperation];
-        const url = inputs[questionNames_1.QuestionNames.ApiSpecLocation];
-        const manifestPath = inputs[questionNames_1.QuestionNames.ManifestPath];
+        const operations = inputs[constants_3.QuestionNames.ApiOperation];
+        const url = inputs[constants_3.QuestionNames.ApiSpecLocation];
+        const manifestPath = inputs[constants_3.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;
+        const needAddAction = inputs[constants_3.QuestionNames.PluginAvailability] === constants_3.PluginAvailabilityOptions.action().id ||
+            inputs[constants_3.QuestionNames.PluginAvailability] ===
+                constants_3.PluginAvailabilityOptions.copilotPluginAndAction().id;
+        const needAddCopilotPlugin = inputs[constants_3.QuestionNames.PluginAvailability] === constants_3.PluginAvailabilityOptions.copilotPlugin().id ||
+            inputs[constants_3.QuestionNames.PluginAvailability] ===
+                constants_3.PluginAvailabilityOptions.copilotPluginAndAction().id;
         // validate the project is valid for adding plugin
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(manifestPath);
         if (manifestRes.isErr()) {
@@ -1042,7 +1020,7 @@ class FxCore {
             return teamsfx_api_1.err(gptManifestRes.error);
         }
         const gptManifest = gptManifestRes.value;
-        const context = utils_2.createContextV3();
+        const context = globalVars_1.createContext();
         // confirm
         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()) {
@@ -1064,15 +1042,17 @@ class FxCore {
         const openApiSpecFileNamePrefix = openApiSpecFileName.split(".")[0];
         const openApiSpecFileType = openApiSpecFileName.split(".")[1];
         let apiSpecFileNameSuffix = 1;
+        openApiSpecFileName = `${openApiSpecFileNamePrefix}_${apiSpecFileNameSuffix}.${openApiSpecFileType}`;
         while (await fs_extra_1.default.pathExists(path.join(apiSpecFolder, openApiSpecFileName))) {
-            openApiSpecFileName = `${openApiSpecFileNamePrefix}_${apiSpecFileNameSuffix++}.${openApiSpecFileType}`;
+            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;
+        pluginManifestName = `${pluginManifestNamePrefix}_${pluginFileNameSuffix}.json`;
         while (await fs_extra_1.default.pathExists(path.join(appPackageFolder, pluginManifestName))) {
-            pluginManifestName = `${pluginManifestNamePrefix}_${pluginFileNameSuffix++}.json`;
+            pluginManifestName = `${pluginManifestNamePrefix}_${++pluginFileNameSuffix}.json`;
         }
         const pluginManifestFilePath = path.join(appPackageFolder, pluginManifestName);
         // generate plugin related files
@@ -1085,7 +1065,7 @@ class FxCore {
                 [helper_1.specParserGenerateResultWarningsTelemetryProperty]: generateResult.warnings
                     .map((w) => w.type.toString() + ": " + w.content)
                     .join(";"),
-                [telemetry_2.CoreTelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
+                [telemetry_1.TelemetryProperty.Component]: telemetry_2.CoreTelemetryComponentName,
             });
             if (generateResult.warnings && generateResult.warnings.length > 0) {
                 const warnSummary = helper_1.generateScaffoldingSummary(generateResult.warnings, manifestRes.value, path.relative(inputs.projectPath, openApiSpecFilePath));
@@ -1588,15 +1568,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "listPluginApiSpecs", null);
-tslib_1.__decorate([
-    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" }),