@microsoft/teamsfx-core 3.0.13 → 3.0.14-alpha.0890e15c35.0

package/build/core/FxCore.js

@@ -2,13 +2,14 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FxCore = void 0;
+exports.FxCore = exports.fxCoreDeps = void 0;
 const tslib_1 = require("tslib");
 const hooks_1 = require("@feathersjs/hooks");
 const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const jsonschema = tslib_1.__importStar(require("jsonschema"));
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const os = tslib_1.__importStar(require("os"));
 const path = tslib_1.__importStar(require("path"));
 require("reflect-metadata");
@@ -17,6 +18,7 @@ const url_1 = require("url");
 const teamsDevPortalClient_1 = require("../client/teamsDevPortalClient");
 const constants_1 = require("../common/constants");
 const daSpecParser_1 = require("../common/daSpecParser");
+const featureFlags_1 = require("../common/featureFlags");
 const globalVars_1 = require("../common/globalVars");
 const localizeUtils_1 = require("../common/localizeUtils");
 const projectSettingsHelper_1 = require("../common/projectSettingsHelper");
@@ -34,7 +36,7 @@ const aadManifestHelper_1 = require("../component/driver/aad/utility/aadManifest
 const buildAadManifest_1 = require("../component/driver/aad/utility/buildAadManifest");
 require("../component/driver/index");
 require("../component/driver/script/scriptDriver");
-const utils_2 = require("../component/driver/share/utils");
+const shareUtils = tslib_1.__importStar(require("../component/driver/share/utils"));
 const appStudio_1 = require("../component/driver/teamsApp/appStudio");
 const errors_1 = require("../component/driver/teamsApp/errors");
 const results_1 = require("../component/driver/teamsApp/results");
@@ -42,13 +44,15 @@ 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_3 = require("../component/driver/teamsApp/utils/utils");
-const utils_4 = require("../component/driver/util/utils");
+const utils_2 = require("../component/driver/teamsApp/utils/utils");
+const utils_3 = require("../component/driver/util/utils");
 const oneDriveSharePointHandler_1 = require("../component/generator/declarativeAgent/oneDriveSharePointHandler");
+const openApiSpecHelper = tslib_1.__importStar(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 utils_4 = require("../component/generator/utils");
+const v4MetadataSource_1 = require("../component/generator/v4MetadataSource");
 const launchHelper_1 = require("../component/m365/launchHelper");
 const packageService_1 = require("../component/m365/packageService");
 const envMW_1 = require("../component/middleware/envMW");
@@ -59,28 +63,52 @@ const metadataUtil_1 = require("../component/utils/metadataUtil");
 const pathUtils_1 = require("../component/utils/pathUtils");
 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_3 = require("../question/constants");
 const other_1 = require("../question/other");
 const ProjectTypeOptions_1 = require("../question/scaffold/vsc/ProjectTypeOptions");
 const share_1 = require("../question/share");
 const callback_1 = require("./callback");
+const collaboratorCore = tslib_1.__importStar(require("./collaborator"));
 const collaborator_1 = require("./collaborator");
 const crypto_1 = require("./crypto");
 const environmentName_1 = require("./environmentName");
-const FxCore_declarativeAgent_1 = require("./FxCore.declarativeAgent");
+const FxCore_openPlugin_1 = require("./FxCore.openPlugin");
 const generateConfigFiles_1 = require("./generateConfigFiles");
 const concurrentLocker_1 = require("./middleware/concurrentLocker");
 const contextInjector_1 = require("./middleware/contextInjector");
 const errorHandler_1 = require("./middleware/errorHandler");
 const fileLocker_1 = require("./middleware/fileLocker");
-const projectMigratorV3_1 = require("./middleware/projectMigratorV3");
 const retry_1 = require("./middleware/retry");
 const v3MigrationUtils_1 = require("./middleware/utils/v3MigrationUtils");
 const share_2 = require("./share");
 const telemetry_2 = require("./telemetry");
-class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
+exports.fxCoreDeps = {
+    parseShareAppActionYamlConfig: shareUtils.parseShareAppActionYamlConfig,
+    shareWithTenant: share_2.shareWithTenant,
+    addSharedUsers: share_2.addSharedUsers,
+    removeShareAccess: share_2.removeShareAccess,
+    grantPermission: collaboratorCore.grantPermission,
+    checkPermission: collaboratorCore.checkPermission,
+    listCollaborator: collaboratorCore.listCollaborator,
+    buildAadManifest: buildAadManifest_1.buildAadManifest,
+    listAPIInfo: daSpecParser_1.listAPIInfo,
+    listOperations: openApiSpecHelper.listOperations,
+    getManifestPath: CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath,
+    readCopilotGptManifestFile: CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile,
+    updateConversationStarters: CopilotGptManifestUtils_1.copilotGptManifestUtils.updateConversationStarters,
+    isValidProjectV3: projectSettingsHelper_1.isValidProjectV3,
+    getProjectVersionFromPath: v3MigrationUtils_1.getProjectVersionFromPath,
+    getTrackingIdFromPath: v3MigrationUtils_1.getTrackingIdFromPath,
+    getVersionState: v3MigrationUtils_1.getVersionState,
+    getCoreVersion: () => require("../../package.json").version,
+    useLocalTemplate: templateHelper_1.useLocalTemplate,
+    getTemplateLatestVersion: utils_4.getTemplateLatestVersion,
+    getTemplateVSLatestVersion: utils_4.getTemplateVSLatestVersion,
+    fetchZipFromUrl: utils_4.fetchZipFromUrl,
+    unzip: utils_4.unzip,
+};
+class FxCore extends FxCore_openPlugin_1.FxCoreOpenPluginPart {
     constructor(tools) {
         super();
         (0, globalVars_1.setTools)(tools);
@@ -109,12 +137,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         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)) {
+            if ((0, utils_2.containsUnsupportedFeature)(inputs.teamsAppFromTdp)) {
                 return (0, teamsfx_api_1.err)(new common_2.InputValidationError("manifest.json", "App contains unsupported features"));
             }
             else {
                 context.telemetryReporter.sendTelemetryEvent(telemetry_2.CoreTelemetryEvent.CreateFromTdpStart, {
-                    [telemetry_2.CoreTelemetryProperty.TdpTeamsAppFeatures]: (0, utils_3.getFeaturesFromAppDefinition)(inputs.teamsAppFromTdp).join(","),
+                    [telemetry_2.CoreTelemetryProperty.TdpTeamsAppFeatures]: (0, utils_2.getFeaturesFromAppDefinition)(inputs.teamsAppFromTdp).join(","),
                     [telemetry_2.CoreTelemetryProperty.TdpTeamsAppId]: inputs.teamsAppFromTdp.teamsAppId,
                 });
             }
@@ -180,7 +208,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async provisionResourcesOnce(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.provision;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         try {
             const res = await coordinator_1.coordinator.provision(context, inputs);
             if (res.isOk()) {
@@ -446,7 +474,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async deployArtifacts(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.deploy;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const res = await coordinator_1.coordinator.deploy(context, inputs);
         if (res.isOk()) {
             ctx.envVars = res.value;
@@ -482,7 +510,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             manifestPath: manifestTemplatePath,
             outputFilePath: manifestOutputPath,
         };
-        const Context = (0, utils_4.createDriverContext)(inputs);
+        const Context = (0, utils_3.createDriverContext)(inputs);
         (0, globalVars_1.setErrorContext)({ component: "aadAppUpdate" });
         const res = await updateAadClient.execute(inputArgs, Context);
         if (res.result.isErr()) {
@@ -517,7 +545,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             framework: inputs[constants_3.QuestionNames.SPFxFramework],
             spfxPackage: constants_3.SPFxVersionOptionIds.installLocally,
         };
-        const Context = (0, utils_4.createDriverContext)(inputs);
+        const Context = (0, utils_3.createDriverContext)(inputs);
         const res = await driver.run(args, Context);
         if (res.isErr()) {
             return (0, teamsfx_api_1.err)(res.error);
@@ -529,7 +557,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async publishApplication(inputs, ctx) {
         inputs.stage = teamsfx_api_1.Stage.publish;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const res = await coordinator_1.coordinator.publish(context, inputs);
         if (res.isOk()) {
             ctx.envVars = res.value;
@@ -542,11 +570,17 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
     async removeSharedAccess(inputs, ctx) {
-        const emails = inputs[constants_3.QuestionNames.RemoveUsers];
+        const removeUsersInput = inputs[constants_3.QuestionNames.RemoveUsers];
+        const emails = Array.isArray(removeUsersInput)
+            ? removeUsersInput
+            : removeUsersInput
+                ?.split(",")
+                .map((email) => email.trim())
+                .filter((email) => !!email) ?? [];
         if (!emails || emails.length === 0) {
             return (0, teamsfx_api_1.err)(new common_2.MissingRequiredInputError("emails", "FxCore"));
         }
-        const parseRes = await (0, utils_2.parseShareAppActionYamlConfig)(inputs.projectPath);
+        const parseRes = await exports.fxCoreDeps.parseShareAppActionYamlConfig(inputs.projectPath);
         if (parseRes.isErr()) {
             return (0, teamsfx_api_1.err)(parseRes.error);
         }
@@ -602,12 +636,19 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         let emails = [];
         if (scope === share_1.ShareScopeOption.ShareAppWithSpecificUsers ||
             operation === share_1.ShareOperationOption.RemoveShareAccessFromUsers) {
-            emails = inputs[constants_3.QuestionNames.UserEmail].split(",").map((e) => e.trim());
+            emails =
+                inputs[constants_3.QuestionNames.UserEmail]
+                    ?.split(",")
+                    .map((e) => e.trim())
+                    .filter((e) => !!e) ?? [];
+            if (emails.length === 0) {
+                return (0, teamsfx_api_1.err)(new common_2.InputValidationError("emails", "No emails"));
+            }
             if (emails.length > constants_3.MAX_EMAIL_NUMBER) {
                 return (0, teamsfx_api_1.err)(new common_2.InputValidationError("emails", "Too many emails"));
             }
         }
-        const parseRes = await (0, utils_2.parseShareAppActionYamlConfig)(inputs.projectPath);
+        const parseRes = await exports.fxCoreDeps.parseShareAppActionYamlConfig(inputs.projectPath);
         if (parseRes.isErr()) {
             return (0, teamsfx_api_1.err)(parseRes.error);
         }
@@ -621,13 +662,13 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const mosToken = mosTokenRes.value;
         if (operation === share_1.ShareOperationOption.RemoveShareAccessFromUsers) {
-            return (0, share_2.removeShareAccess)(mosToken, sharedTitleId, emails);
+            return exports.fxCoreDeps.removeShareAccess(mosToken, sharedTitleId, emails);
         }
         else if (scope === share_1.ShareScopeOption.ShareAppWithTenantUsers) {
-            return (0, share_2.shareWithTenant)(mosToken, sharedTitleId);
+            return exports.fxCoreDeps.shareWithTenant(mosToken, sharedTitleId);
         }
         else if (scope === share_1.ShareScopeOption.ShareAppWithSpecificUsers) {
-            return (0, share_2.addSharedUsers)(mosToken, sharedTitleId, emails);
+            return exports.fxCoreDeps.addSharedUsers(mosToken, sharedTitleId, emails);
         }
         else {
             return (0, teamsfx_api_1.err)(new common_2.InputValidationError("shareOption", "Invalid share option"));
@@ -638,7 +679,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async executeUserTask(func, inputs) {
         let res = (0, teamsfx_api_1.ok)(undefined);
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         if (func.method === "addSso") {
             // used in v3 only in VS
             inputs.stage = teamsfx_api_1.Stage.addFeature;
@@ -661,8 +702,8 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         await fs_extra_1.default.ensureDir(path.join(inputs.projectPath, "build"));
         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);
+        const Context = (0, utils_3.createDriverContext)(inputs);
+        await exports.fxCoreDeps.buildAadManifest(Context, manifestTemplatePath, manifestOutputPath);
         return (0, teamsfx_api_1.ok)(undefined);
     }
     async convertAadToNewSchema(inputs) {
@@ -733,7 +774,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async validateManifest(inputs) {
         inputs.stage = teamsfx_api_1.Stage.validateApplication;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const teamsAppManifestFilePath = inputs["manifest-path"];
         const args = {
             manifestPath: teamsAppManifestFilePath,
@@ -748,7 +789,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async validateAppPackage(inputs) {
         inputs.stage = teamsfx_api_1.Stage.validateApplication;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const teamsAppPackageFilePath = inputs["app-package-file-path"];
         const args = {
             appPackagePath: teamsAppPackageFilePath,
@@ -758,7 +799,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         return (await driver.execute(args, context)).result;
     }
     async validateWithTestCases(inputs) {
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const args = {
             appPackagePath: inputs["app-package-file-path"],
             showMessage: true,
@@ -771,7 +812,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * v3 only none lifecycle command
      */
     async syncManifest(inputs) {
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const projectPath = inputs[constants_3.QuestionNames.ProjectPath];
         const env = inputs[constants_3.QuestionNames.Env];
         const teamsAppId = inputs[constants_3.QuestionNames.TeamsAppId];
@@ -788,7 +829,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      */
     async createAppPackage(inputs) {
         inputs.stage = teamsfx_api_1.Stage.createAppPackage;
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         // For TSP projects
         await (0, tools_1.runForTypeSpecProject)(inputs.projectPath, context);
         const teamsAppManifestFilePath = inputs?.[constants_3.QuestionNames.TeamsAppManifestFilePath];
@@ -966,7 +1007,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         inputs.stage = teamsfx_api_1.Stage.grantPermission;
         const context = (0, globalVars_1.createContext)();
         (0, globalVars_1.setErrorContext)({ component: "collaborator" });
-        const res = await (0, collaborator_1.grantPermission)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const res = await exports.fxCoreDeps.grantPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     /**
@@ -975,7 +1016,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     async checkPermission(inputs) {
         inputs.stage = teamsfx_api_1.Stage.checkPermission;
         const context = (0, globalVars_1.createContext)();
-        const res = await (0, collaborator_1.checkPermission)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const res = await exports.fxCoreDeps.checkPermission(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     /**
@@ -984,7 +1025,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     async listCollaborator(inputs) {
         inputs.stage = teamsfx_api_1.Stage.listCollaborator;
         const context = (0, globalVars_1.createContext)();
-        const res = await (0, collaborator_1.listCollaborator)(context, inputs, globalVars_1.TOOLS.tokenProvider);
+        const res = await exports.fxCoreDeps.listCollaborator(context, inputs, globalVars_1.TOOLS.tokenProvider);
         return res;
     }
     getSelectedEnv(inputs) {
@@ -1065,45 +1106,16 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         globalVars_1.TOOLS.logProvider.info(`env file created: ${targetDotEnvFile}`);
         return (0, teamsfx_api_1.ok)(undefined);
     }
-    // a phantom migration method for V3
-    async phantomMigrationV3(inputs) {
-        // If the project is invalid or upgraded, the ProjectMigratorMWV3 will not take action.
-        // Check invaliad/upgraded project here before call ProjectMigratorMWV3
-        const projectPath = inputs.projectPath || "";
-        const version = await (0, v3MigrationUtils_1.getProjectVersionFromPath)(projectPath);
-        if (version.source === versionMetadata_1.VersionSource.teamsapp) {
-            return (0, teamsfx_api_1.err)(new upgrade_1.NoNeedUpgradeError());
-        }
-        else if (version.source === versionMetadata_1.VersionSource.projectSettings) {
-            const isValid = await (0, projectMigratorV3_1.checkActiveResourcePlugins)(projectPath);
-            if (!isValid) {
-                return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
-            }
-        }
-        if (version.source === versionMetadata_1.VersionSource.unknown) {
-            return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
-        }
-        return this.innerMigrationV3(inputs);
-    }
-    innerMigrationV3(inputs) {
-        return (0, teamsfx_api_1.ok)(undefined);
-    }
     // a project version check
     async projectVersionCheck(inputs) {
         const projectPath = inputs.projectPath || "";
-        if ((0, projectSettingsHelper_1.isValidProjectV3)(projectPath) || (0, projectSettingsHelper_1.isValidProjectV2)(projectPath)) {
-            const versionInfo = await (0, v3MigrationUtils_1.getProjectVersionFromPath)(projectPath);
+        if (exports.fxCoreDeps.isValidProjectV3(projectPath)) {
+            const versionInfo = await exports.fxCoreDeps.getProjectVersionFromPath(projectPath);
             if (!versionInfo.version) {
                 return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
             }
-            const trackingId = await (0, v3MigrationUtils_1.getTrackingIdFromPath)(projectPath);
-            const isSupport = (0, v3MigrationUtils_1.getVersionState)(versionInfo);
-            // if the project is upgradeable, check whether the project is valid and invalid project should not show upgrade option.
-            if (isSupport === versionMetadata_1.VersionState.upgradeable) {
-                if (!(await (0, projectMigratorV3_1.checkActiveResourcePlugins)(projectPath))) {
-                    return (0, teamsfx_api_1.err)(new common_2.InvalidProjectError(projectPath));
-                }
-            }
+            const trackingId = await exports.fxCoreDeps.getTrackingIdFromPath(projectPath);
+            const isSupport = exports.fxCoreDeps.getVersionState(versionInfo);
             return (0, teamsfx_api_1.ok)({
                 currentVersion: versionInfo.version,
                 trackingId,
@@ -1189,11 +1201,11 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
     async preProvisionForVS(inputs) {
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         return coordinator_1.coordinator.preProvisionForVS(context, inputs);
     }
     async preCheckYmlAndEnvForVS(inputs) {
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         const result = await coordinator_1.coordinator.preCheckYmlAndEnvForVS(context, inputs);
         return result;
     }
@@ -1251,11 +1263,11 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
             if (authNames.size >= 1) {
                 for (const authName of authNames) {
-                    await (0, helper_1.injectAuthAction)(inputs.projectPath, [...authNames][0], authNamesDict[authName], outputApiSpecPath, false);
+                    await openApiSpecHelper.injectAuthAction(inputs.projectPath, [...authNames][0], authNamesDict[authName], outputApiSpecPath, false);
                 }
             }
             let pluginPath;
-            const generateResult = await (0, helper_1.generateFromApiSpec)(specParser, manifestPath, inputs, context, "copilotPluginAddAPI", m365_spec_parser_1.ProjectType.SME, {
+            const generateResult = await openApiSpecHelper.generateFromApiSpec(specParser, manifestPath, inputs, context, "copilotPluginAddAPI", m365_spec_parser_1.ProjectType.SME, {
                 destinationApiSpecFilePath: outputApiSpecPath,
                 responseTemplateFolder: adaptiveCardFolder,
                 pluginManifestFilePath: pluginPath,
@@ -1264,7 +1276,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_1.generateScaffoldingSummary)(generateResult.value.warnings, manifestRes.value, path.relative(inputs.projectPath, outputApiSpecPath), pluginPath === undefined ? undefined : path.relative(inputs.projectPath, pluginPath), inputs.projectPath);
+                const warnSummary = await openApiSpecHelper.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);
                 }
@@ -1306,7 +1318,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
     }
     async copilotPluginListOperations(inputs) {
-        const res = await (0, helper_1.listOperations)((0, globalVars_1.createContext)(), inputs.apiSpecUrl, inputs, inputs.includeExistingAPIs, inputs.shouldLogWarning);
+        const res = await exports.fxCoreDeps.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));
@@ -1328,13 +1340,14 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     async regeneratePlugin(inputs) {
         const projectPath = inputs.projectPath;
         const context = (0, globalVars_1.createContext)();
-        const teamsManifestPath = inputs[constants_3.QuestionNames.ManifestPath];
+        const teamsManifestPath = (inputs[constants_3.QuestionNames.ManifestPath] ??
+            inputs[constants_3.QuestionNames.TeamsAppManifestFilePath]);
         const appPackageFolder = path.dirname(teamsManifestPath);
         const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
         if (manifestRes.isErr()) {
             return (0, teamsfx_api_1.err)(manifestRes.error);
         }
-        const gptManifestFilePathRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifestPath(teamsManifestPath);
+        const gptManifestFilePathRes = await exports.fxCoreDeps.getManifestPath(teamsManifestPath);
         if (gptManifestFilePathRes.isErr()) {
             return (0, teamsfx_api_1.err)(gptManifestFilePathRes.error);
         }
@@ -1342,7 +1355,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         // Will be used if generating from API spec
         let authNameAndSchemes = [];
         const specPath = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
-        const listResult = await (0, daSpecParser_1.listAPIInfo)(specPath);
+        const listResult = await exports.fxCoreDeps.listAPIInfo(specPath);
         authNameAndSchemes = this.parseAuthNameAndScheme(listResult, inputs);
         if (authNameAndSchemes.length > 0) {
             const doesLocalYamlPathExists = await fs_extra_1.default.pathExists(path.join(projectPath, versionMetadata_1.MetadataV3.localConfigFile));
@@ -1359,7 +1372,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         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, {
+        const generateRes = await openApiSpecHelper.generateFromApiSpec(undefined, teamsManifestPath, inputs, context, teamsfx_api_1.Stage.RegeneratePlugin, m365_spec_parser_1.ProjectType.Copilot, {
             destinationApiSpecFilePath: destinationApiSpecPath,
             pluginManifestFilePath: destinationPluginManifestPath,
         }, inputs[constants_3.QuestionNames.ApiSpecLocation].trim(), true);
@@ -1368,21 +1381,21 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         }
         const warnings = generateRes.value.warnings;
         if (warnings && warnings.length > 0) {
-            const warnSummary = await (0, helper_1.generateScaffoldingSummary)(warnings, manifestRes.value, path.relative(projectPath, destinationApiSpecPath), path.relative(projectPath, destinationPluginManifestPath), projectPath);
+            const warnSummary = await openApiSpecHelper.generateScaffoldingSummary(warnings, manifestRes.value, path.relative(projectPath, destinationApiSpecPath), path.relative(projectPath, destinationPluginManifestPath), projectPath);
             context.logProvider.info(warnSummary + "\n");
         }
         for (const authNameAndScheme of authNameAndSchemes) {
             await this.updateAuthActionInYaml(authNameAndScheme.authName, authNameAndScheme.authScheme, projectPath, destinationApiSpecPath, destinationPluginManifestPath, false);
         }
         const declarativeAgentManifestPath = gptManifestFilePathRes.value;
-        const declarativeAgentManifesRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(declarativeAgentManifestPath);
+        const declarativeAgentManifesRes = await exports.fxCoreDeps.readCopilotGptManifestFile(declarativeAgentManifestPath);
         if (declarativeAgentManifesRes.isErr()) {
             return (0, teamsfx_api_1.err)(declarativeAgentManifesRes.error);
         }
         const declarativeAgentManifest = declarativeAgentManifesRes.value;
         for (const action of declarativeAgentManifest.actions) {
             const actionPath = path.normalize(path.join(appPackageFolder, action.file));
-            await CopilotGptManifestUtils_1.copilotGptManifestUtils.updateConversationStarters(actionPath, declarativeAgentManifest);
+            await exports.fxCoreDeps.updateConversationStarters(actionPath, declarativeAgentManifest);
         }
         const actionId = inputs[constants_3.QuestionNames.SelectPluginId];
         if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
@@ -1481,6 +1494,281 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         this.showAddKnowledgeSuccessMessage(context, inputs, agentManifestPath, knowledgeSource);
         return (0, teamsfx_api_1.ok)(result);
     }
+    /**
+     * Add Skill
+     */
+    async addSkill(inputs) {
+        if (!featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.AgentSkillsManifest)) {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "AgentSkillsDisabled", (0, localizeUtils_1.getLocalizedString)("core.addSkill.featureFlagDisabled")));
+        }
+        if (!inputs.projectPath) {
+            throw new Error("projectPath is undefined"); // should never happen
+        }
+        const context = (0, globalVars_1.createContext)();
+        const projectPath = inputs.projectPath;
+        const teamsManifestPath = path.resolve(projectPath, inputs[constants_3.QuestionNames.ManifestPath]);
+        const appPackageFolder = path.dirname(teamsManifestPath);
+        // Validate the project is valid for adding a skill
+        const manifestRes = await ManifestUtils_1.manifestUtils._readAppManifest(teamsManifestPath);
+        if (manifestRes.isErr()) {
+            return (0, teamsfx_api_1.err)(manifestRes.error);
+        }
+        const teamsManifest = manifestRes.value;
+        const agent = teamsManifest.copilotExtensions
+            ? 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);
+        if (agentFilePathRes.isErr()) {
+            return (0, teamsfx_api_1.err)(agentFilePathRes.error);
+        }
+        const agentManifestPath = agentFilePathRes.value;
+        // Confirm before modifying files (matches addPlugin pattern)
+        const confirmMessage = (0, localizeUtils_1.getLocalizedString)("core.addSkill.confirm", path.relative(inputs.projectPath, appPackageFolder));
+        const confirmRes = await context.userInteraction.showMessage("warn", confirmMessage, true, (0, localizeUtils_1.getLocalizedString)("core.addSkill.continue"));
+        if (confirmRes.isErr()) {
+            return (0, teamsfx_api_1.err)(confirmRes.error);
+        }
+        else if (confirmRes.value !== (0, localizeUtils_1.getLocalizedString)("core.addSkill.continue")) {
+            return (0, teamsfx_api_1.err)(new common_2.UserCancelError());
+        }
+        const skillName = inputs[constants_3.QuestionNames.SkillName];
+        const skillDescription = inputs[constants_3.QuestionNames.SkillDescription];
+        const skillFrom = inputs[constants_3.QuestionNames.SkillFrom];
+        const skillFromZipFile = inputs[constants_3.QuestionNames.SkillFromZipFile];
+        let skillFolder;
+        if (skillFrom || skillFromZipFile) {
+            const isZipImport = skillFromZipFile || (skillFrom && skillFrom.toLowerCase().endsWith(".zip"));
+            const sourcePath = skillFromZipFile || skillFrom;
+            if (isZipImport) {
+                // Zip import mode
+                const importRes = await this.importSkillFromZip(sourcePath, appPackageFolder, agentManifestPath);
+                if (importRes.isErr()) {
+                    return (0, teamsfx_api_1.err)(importRes.error);
+                }
+                skillFolder = importRes.value;
+            }
+            else {
+                // Existing skill folder mode: validate it's within appPackage
+                const skillAbsPath = path.resolve(appPackageFolder, sourcePath);
+                const relativePath = path.relative(appPackageFolder, skillAbsPath);
+                if (relativePath.startsWith("..")) {
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "SkillOutsideAppPackage", "The skill directory must be within the app package folder."));
+                }
+                // Validate folder name format
+                const folderName = path.basename(skillAbsPath);
+                const namePattern = /^[a-zA-Z][a-zA-Z0-9-]*$/;
+                if (!namePattern.test(folderName)) {
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "InvalidSkillFolderName", `Skill folder name "${folderName}" is invalid. It must start with a letter and contain only letters, numbers, and hyphens.`));
+                }
+                // Validate SKILL.md exists
+                const skillMdPath = path.join(skillAbsPath, "SKILL.md");
+                if (!(await fs_extra_1.default.pathExists(skillMdPath))) {
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "SkillMdNotFound", `SKILL.md not found in ${skillAbsPath}. Each skill directory must contain a SKILL.md file.`));
+                }
+                // Validate skill name in SKILL.md matches folder name
+                const skillMdContent = await fs_extra_1.default.readFile(skillMdPath, "utf-8");
+                const nameMatch = skillMdContent.match(/^---[\s\S]*?^name:\s*(.+)$/m);
+                if (nameMatch) {
+                    const skillMdName = nameMatch[1].trim();
+                    if (skillMdName !== folderName) {
+                        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "SkillNameMismatch", `Skill name "${skillMdName}" in SKILL.md does not match folder name "${folderName}". They must be the same.`));
+                    }
+                }
+                skillFolder = (0, utils_2.normalizePath)(path.relative(path.dirname(agentManifestPath), skillAbsPath), true);
+            }
+        }
+        else {
+            // New skill mode: create the directory and SKILL.md
+            const skillDir = path.join(appPackageFolder, "skills", skillName);
+            await fs_extra_1.default.ensureDir(skillDir);
+            const skillMdContent = [
+                "---",
+                `name: ${skillName}`,
+                `description: ${skillDescription}`,
+                "---",
+                `# ${skillName}`,
+                "",
+                "<!-- Add your skill instructions here -->",
+                "<!-- The agent will follow these instructions when this skill is activated -->",
+                "",
+            ].join("\n");
+            await fs_extra_1.default.writeFile(path.join(skillDir, "SKILL.md"), skillMdContent);
+            skillFolder = (0, utils_2.normalizePath)(path.relative(path.dirname(agentManifestPath), skillDir), true);
+        }
+        // Add skill entry to DA manifest
+        const addSkillRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addSkill(agentManifestPath, skillFolder);
+        if (addSkillRes.isErr()) {
+            return (0, teamsfx_api_1.err)(addSkillRes.error);
+        }
+        // Optionally expose skill to Copilot via top-level Teams manifest agentSkills
+        const exposeToCopilot = inputs[constants_3.QuestionNames.ExposeToCopilot];
+        if (exposeToCopilot === true || exposeToCopilot === "yes") {
+            // Compute folder path relative to app package folder (Teams manifest dir)
+            const skillAbsPath = path.resolve(path.dirname(agentManifestPath), skillFolder);
+            const teamsManifestSkillFolder = (0, utils_2.normalizePath)(path.relative(appPackageFolder, skillAbsPath), true);
+            // Read, update, and write the Teams manifest
+            const teamsManifestForSkill = manifestRes.value;
+            if (!teamsManifestForSkill.agentSkills) {
+                teamsManifestForSkill.agentSkills = [];
+            }
+            if (!teamsManifestForSkill.agentSkills.some((s) => s.folder === teamsManifestSkillFolder)) {
+                teamsManifestForSkill.agentSkills.push({ folder: teamsManifestSkillFolder });
+            }
+            await fs_extra_1.default.writeFile(teamsManifestPath, JSON.stringify(teamsManifestForSkill, null, 4));
+        }
+        // Show success message
+        if (inputs.platform === teamsfx_api_1.Platform.VSCode) {
+            const successMessage = (0, localizeUtils_1.getLocalizedString)("core.addSkill.success.vsc");
+            const viewAgentManifest = (0, localizeUtils_1.getLocalizedString)("core.addSkill.success.viewAgentManifest");
+            void context.userInteraction
+                .showMessage("info", successMessage, false, viewAgentManifest)
+                .then((userRes) => {
+                if (userRes.isOk() && userRes.value === viewAgentManifest) {
+                    void globalVars_1.TOOLS?.ui?.openFile?.(agentManifestPath);
+                }
+            });
+        }
+        else {
+            const successMessage = (0, localizeUtils_1.getLocalizedString)("core.addSkill.success", agentManifestPath);
+            void context.userInteraction.showMessage("info", successMessage, false);
+        }
+        return (0, teamsfx_api_1.ok)(undefined);
+    }
+    /**
+     * Import a skill from a .zip file into the appPackage/skills folder.
+     * Validates zip entries for security, extracts to a temp directory, then moves atomically.
+     */
+    async importSkillFromZip(zipPath, appPackageFolder, agentManifestPath) {
+        // Resolve zip path relative to CWD (not appPackage)
+        const resolvedZipPath = path.resolve(zipPath);
+        if (!(await fs_extra_1.default.pathExists(resolvedZipPath))) {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipFileNotFound", `Zip file not found: ${resolvedZipPath}`));
+        }
+        let zip;
+        try {
+            zip = new adm_zip_1.default(resolvedZipPath);
+        }
+        catch {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "InvalidZipFile", `Failed to read zip file: ${resolvedZipPath}. Please provide a valid .zip file.`));
+        }
+        const entries = zip.getEntries();
+        // Metadata directories to ignore
+        const ignoredPrefixes = ["__MACOSX/", ".DS_Store"];
+        // Security: validate all entries before extraction
+        for (const entry of entries) {
+            const entryName = entry.entryName.replace(/\\/g, "/");
+            if (entryName.includes("..") || path.isAbsolute(entryName) || entryName.startsWith("/")) {
+                return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipInvalidEntries", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipInvalidEntries")));
+            }
+        }
+        // Filter out metadata entries
+        const validEntries = entries.filter((entry) => {
+            const entryName = entry.entryName.replace(/\\/g, "/");
+            return !ignoredPrefixes.some((prefix) => entryName.startsWith(prefix) || entryName === prefix.replace("/", ""));
+        });
+        // Determine zip layout: single top-level directory or root-level files
+        const topLevelDirs = new Set();
+        let hasRootFiles = false;
+        for (const entry of validEntries) {
+            const entryName = entry.entryName.replace(/\\/g, "/");
+            const parts = entryName.split("/").filter((p) => p.length > 0);
+            if (parts.length === 1 && !entry.isDirectory) {
+                hasRootFiles = true;
+            }
+            else if (parts.length >= 1) {
+                topLevelDirs.add(parts[0]);
+            }
+        }
+        let skillContentPrefix = "";
+        let derivedSkillName;
+        if (!hasRootFiles && topLevelDirs.size === 1) {
+            // Single top-level directory layout
+            skillContentPrefix = [...topLevelDirs][0] + "/";
+            derivedSkillName = [...topLevelDirs][0];
+        }
+        else if (hasRootFiles) {
+            // Root-level files layout: derive name from SKILL.md frontmatter
+            const skillMdEntry = validEntries.find((e) => {
+                const name = e.entryName.replace(/\\/g, "/");
+                return name === "SKILL.md" || name === "./SKILL.md";
+            });
+            if (!skillMdEntry) {
+                return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipNoSkillMd", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipNoSkillMd")));
+            }
+            const skillMdContent = skillMdEntry.getData().toString("utf-8");
+            const nameMatch = skillMdContent.match(/^---[\s\S]*?^name:\s*(.+)$/m);
+            if (!nameMatch) {
+                return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipNoSkillMd", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipNoSkillMd") +
+                    " The SKILL.md file must include a 'name' field in its frontmatter."));
+            }
+            derivedSkillName = nameMatch[1].trim();
+        }
+        else {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipInvalidLayout", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipInvalidLayout")));
+        }
+        // Validate skill name format
+        const namePattern = /^[a-zA-Z][a-zA-Z0-9-]*$/;
+        if (!namePattern.test(derivedSkillName)) {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "InvalidSkillFolderName", `Skill name "${derivedSkillName}" is invalid. It must start with a letter and contain only letters, numbers, and hyphens.`));
+        }
+        // Check target folder doesn't already exist
+        const targetSkillDir = path.join(appPackageFolder, "skills", derivedSkillName);
+        if (await fs_extra_1.default.pathExists(targetSkillDir)) {
+            return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "SkillFolderAlreadyExists", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipSkillFolderExists", derivedSkillName)));
+        }
+        // Extract to temp directory first, then move atomically
+        const tempDir = await fs_extra_1.default.mkdtemp(path.join(os.tmpdir(), "atk-skill-import-"));
+        const tempSkillDir = path.join(tempDir, derivedSkillName);
+        try {
+            await fs_extra_1.default.ensureDir(tempSkillDir);
+            // Extract relevant entries
+            for (const entry of validEntries) {
+                if (entry.isDirectory)
+                    continue;
+                const entryName = entry.entryName.replace(/\\/g, "/");
+                let relativeName = entryName;
+                if (skillContentPrefix && entryName.startsWith(skillContentPrefix)) {
+                    relativeName = entryName.slice(skillContentPrefix.length);
+                }
+                if (!relativeName)
+                    continue;
+                const targetPath = path.join(tempSkillDir, relativeName);
+                // Re-validate no path traversal after joining
+                const normalizedTarget = path.resolve(targetPath);
+                if (!normalizedTarget.startsWith(path.resolve(tempSkillDir))) {
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipInvalidEntries", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipInvalidEntries")));
+                }
+                await fs_extra_1.default.ensureDir(path.dirname(targetPath));
+                await fs_extra_1.default.writeFile(targetPath, entry.getData());
+            }
+            // Validate SKILL.md exists in extracted content
+            const extractedSkillMdPath = path.join(tempSkillDir, "SKILL.md");
+            if (!(await fs_extra_1.default.pathExists(extractedSkillMdPath))) {
+                return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "ZipNoSkillMd", (0, localizeUtils_1.getLocalizedString)("core.addSkill.zipNoSkillMd")));
+            }
+            // Validate name in SKILL.md matches derived folder name
+            const extractedSkillMd = await fs_extra_1.default.readFile(extractedSkillMdPath, "utf-8");
+            const extractedNameMatch = extractedSkillMd.match(/^---[\s\S]*?^name:\s*(.+)$/m);
+            if (extractedNameMatch) {
+                const extractedName = extractedNameMatch[1].trim();
+                if (extractedName !== derivedSkillName) {
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "SkillNameMismatch", `Skill name "${extractedName}" in SKILL.md does not match folder name "${derivedSkillName}". They must be the same.`));
+                }
+            }
+            // Move to final location
+            await fs_extra_1.default.ensureDir(path.dirname(targetSkillDir));
+            await fs_extra_1.default.move(tempSkillDir, targetSkillDir);
+        }
+        finally {
+            // Clean up temp directory
+            await fs_extra_1.default.remove(tempDir).catch(() => { });
+        }
+        const skillFolder = (0, utils_2.normalizePath)(path.relative(path.dirname(agentManifestPath), targetSkillDir), true);
+        return (0, teamsfx_api_1.ok)(skillFolder);
+    }
     /**
      * only for vs code extension
      */
@@ -1543,7 +1831,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                 suffix += 1;
                 actionId = `action_${suffix}`;
             }
-            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_3.normalizePath)(path.relative(appPackageFolder, pluginManifestFilePath), true));
+            const addActionRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.addAction(declarativeCopilotManifestPath, actionId, (0, utils_2.normalizePath)(path.relative(appPackageFolder, pluginManifestFilePath), true));
             if (addActionRes.isErr()) {
                 return (0, teamsfx_api_1.err)(addActionRes.error);
             }
@@ -1554,7 +1842,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
         // 2. Update teamsapp.local.yaml and teamsapp.yaml if need to add auth action
         const specPath = inputs[constants_3.QuestionNames.ApiSpecLocation].trim();
         for (const authInfo of authData) {
-            await (0, helper_1.injectAuthAction)(inputs.projectPath, authInfo.authName, undefined, specPath, false, authInfo.authType === "apiKey" ? "ApiKeyPluginVault" : "OAuthPluginVault", false, authInfo.registrationId);
+            await openApiSpecHelper.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_1.generateAdaptiveCardInPluginManifestForKiota)(pluginManifestFilePath, specPath, context);
@@ -1633,7 +1921,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                     authTypeScheme = constant_1.MicrosoftEntraAuthType;
                     break;
             }
-            const addAuthActionRes = await (0, helper_1.injectAuthAction)(inputs.projectPath, authName, undefined, apiSpecPath, true, authTypeScheme, "enablePKCE" in authParameters ? authParameters.enablePKCE : undefined);
+            const addAuthActionRes = await openApiSpecHelper.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));
                 pluginManifest.runtimes?.forEach((runtime) => {
@@ -1670,13 +1958,13 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
                 [telemetry_1.TelemetryProperty.AddAuthType]: authType,
             });
         }
-        catch (err) {
-            const error = (0, common_2.assembleError)(err);
+        catch (e) {
+            const error = (0, common_2.assembleError)(e);
             context.telemetryReporter.sendTelemetryErrorEvent(telemetry_1.TelemetryEvent.AddAuthAction, {
                 [telemetry_1.TelemetryProperty.ErrorCode]: error.name,
                 [telemetry_1.TelemetryProperty.ErrorMessage]: error.message,
             });
-            return err(error);
+            return (0, teamsfx_api_1.err)(error);
         }
         return (0, teamsfx_api_1.ok)(undefined);
     }
@@ -1713,7 +2001,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async installAppToChannel(inputs) {
         const installAppDriver = typedi_1.Container.get("devChannel/installApp");
-        const context = (0, utils_4.createDriverContext)(inputs);
+        const context = (0, utils_3.createDriverContext)(inputs);
         (0, globalVars_1.setErrorContext)({ component: "devChannelInstallApp" });
         const env = inputs.env;
         const readEnvRes = await envUtil_1.envUtil.readEnv(context.projectPath, env, false, false);
@@ -1736,29 +2024,60 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * dynamic template metadata download
      */
     async fetchOnlineTemplateMetadata() {
-        if ((0, templateHelper_1.useLocalTemplate)()) {
+        if (exports.fxCoreDeps.useLocalTemplate()) {
             return (0, teamsfx_api_1.ok)(undefined); // Skip if using local templates
         }
         // Downloads the latest online template metadata (metadata.zip) into user's home .fx folder.
         // Caches the template version so subsequent calls avoid redundant downloads if unchanged.
         try {
-            // Determine latest template version (respect prerelease env variable similar to getTemplateVSCUrl)
-            const coreVersion = require("../../package.json").version;
-            let latestVersion = "0.0.0-rc";
-            if (coreVersion.includes("alpha") ||
-                coreVersion.includes("beta") ||
-                coreVersion.includes("rc")) {
-                // daily build, prerelease or rc
-                latestVersion = "0.0.0-rc";
-            }
-            else {
-                // stable version
-                latestVersion = await (0, utils_5.getTemplateLatestVersion)();
-            }
+            const useV4Channel = featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.V4Enabled);
             const homedir = os.homedir();
             const metadataDir = path.join(homedir, `.${String(teamsfx_api_1.ConfigFolderName)}`);
             await fs_extra_1.default.ensureDir(metadataDir);
-            const versionFile = path.join(metadataDir, "template-version.txt");
+            let latestVersion;
+            if (useV4Channel) {
+                // Transitional: in the v4 channel the metadata rides the SAME single
+                // decision point as the template package —
+                // `resolveTemplateSource((v4.range, v4.bundled, port))`. The `bundled`
+                // field is CD-baked (= !goproduct), so goproduct builds (stable AND
+                // prerelease) resolve to an online/cache source while non-goproduct or
+                // daily builds resolve to the bundled floor. metadata.zip lives in the
+                // same `templates-v4@<ver>` release as the resolved package, so the
+                // resolved version names the release to pull metadata from. Remove once
+                // selector.json drives metadata distribution.
+                const resolved = await (0, v4MetadataSource_1.resolveV4MetadataSource)();
+                if (resolved.isErr()) {
+                    // Malformed tag list / digest mismatch are hard errors (no silent
+                    // fallback). An unreachable channel does not reach here — it already
+                    // resolved to a bundled-fallback origin handled below.
+                    return (0, teamsfx_api_1.err)(resolved.error);
+                }
+                const source = resolved.value;
+                if (source.origin === "bundled" || source.origin === "bundled-fallback") {
+                    // Bundled build or unreachable channel: read the bundled metadata
+                    // (the readers fall back via `useBundledMetadataForV4`). No download.
+                    return (0, teamsfx_api_1.ok)(undefined);
+                }
+                latestVersion = source.version;
+            }
+            else {
+                // v3: prerelease builds use the mutable rolling `0.0.0-rc` tag; stable
+                // builds resolve the latest published templates version.
+                const coreVersion = exports.fxCoreDeps.getCoreVersion();
+                if (coreVersion.includes("alpha") ||
+                    coreVersion.includes("beta") ||
+                    coreVersion.includes("rc")) {
+                    latestVersion = "0.0.0-rc";
+                }
+                else {
+                    latestVersion = await exports.fxCoreDeps.getTemplateLatestVersion();
+                }
+            }
+            // Use a channel-specific cache file so flipping the flag triggers a fresh
+            // download instead of a stale v3 cache hit; the v4 file's presence is also
+            // the readers' signal (`useBundledMetadataForV4`) that downloaded v4
+            // metadata is available.
+            const versionFile = path.join(metadataDir, useV4Channel ? "template-version-v4.txt" : "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")
@@ -1776,11 +2095,12 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             if (!(await needDownload())) {
                 return (0, teamsfx_api_1.ok)(undefined); // Already up-to-date
             }
-            // Construct metadata.zip download URL based on tag prefix and version
-            const tag = `${templates_config_json_1.default.tagPrefix}${latestVersion}`;
+            // Construct metadata.zip download URL based on tag prefix and version.
+            const tagPrefix = useV4Channel ? templates_config_json_1.default.v4tagPrefix : templates_config_json_1.default.tagPrefix;
+            const tag = `${tagPrefix}${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);
+            const zip = await exports.fxCoreDeps.fetchZipFromUrl(metadataZipUrl);
+            await exports.fxCoreDeps.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)();
@@ -1796,16 +2116,16 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
      * dynamic VS template metadata download
      */
     async fetchOnlineTemplateMetadataForVS() {
-        if ((0, templateHelper_1.useLocalTemplate)()) {
+        if (exports.fxCoreDeps.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 coreVersion = exports.fxCoreDeps.getCoreVersion();
             const latestVersion = coreVersion.includes("beta")
                 ? "0.0.0-rc"
-                : await (0, utils_5.getTemplateVSLatestVersion)();
+                : await exports.fxCoreDeps.getTemplateVSLatestVersion();
             const homedir = os.homedir();
             const metadataDir = path.join(homedir, `.${String(teamsfx_api_1.ConfigFolderName)}`, "vs-metadata");
             await fs_extra_1.default.ensureDir(metadataDir);
@@ -1826,8 +2146,8 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
             }
             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);
+            const zip = await exports.fxCoreDeps.fetchZipFromUrl(metadataZipUrl);
+            await exports.fxCoreDeps.unzip(zip, metadataDir);
             await fs_extra_1.default.writeFile(versionFile, latestVersion, { encoding: "utf-8" });
             return (0, teamsfx_api_1.ok)(undefined);
         }
@@ -1845,7 +2165,7 @@ class FxCore extends FxCore_declarativeAgent_1.FxCoreDeclarativeAgentPart {
     }
     async updateAuthActionInYaml(authName, authScheme, projectPath, apSpecPath, pluginManifestPath, forceToAddNew = true) {
         if (authName && authScheme) {
-            const authInjectRes = await (0, helper_1.injectAuthAction)(projectPath, authName, authScheme, apSpecPath, forceToAddNew);
+            const authInjectRes = await openApiSpecHelper.injectAuthAction(projectPath, authName, authScheme, apSpecPath, forceToAddNew);
             if (authInjectRes?.defaultRegistrationIdEnvName &&
                 authInjectRes?.registrationIdEnvName &&
                 authInjectRes.defaultRegistrationIdEnvName !== authInjectRes.registrationIdEnvName) {
@@ -2033,7 +2353,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "provision", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2047,7 +2366,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "uninstall", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("uninstall"),
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -2116,7 +2434,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deploy", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2136,7 +2453,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deployAadManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("deployAadManifest"),
         (0, envMW_1.EnvLoaderMW)(true, true),
         concurrentLocker_1.ConcurrentLockerMW,
@@ -2151,7 +2467,6 @@ tslib_1.__decorate([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "addWebpart", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         (0, questionMW_1.QuestionMW)("addWebpart"),
-        projectMigratorV3_1.ProjectMigratorMWV3,
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
     tslib_1.__metadata("design:type", Function),
@@ -2162,7 +2477,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "publish", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2177,7 +2491,6 @@ tslib_1.__decorate([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "share", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         (0, questionMW_1.QuestionMW)("removeSharedAccess"),
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2191,7 +2504,6 @@ tslib_1.__decorate([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "share", reset: true }),
         errorHandler_1.ErrorHandlerMW,
         (0, questionMW_1.QuestionMW)("share"),
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2205,7 +2517,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "executeUserTask", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
@@ -2217,7 +2528,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "buildAadManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
     ]),
@@ -2239,7 +2549,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "deployTeamsManifest", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("selectTeamsAppManifest"),
         (0, envMW_1.EnvLoaderMW)(true),
         concurrentLocker_1.ConcurrentLockerMW,
@@ -2404,7 +2713,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "grantPermission", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("grantPermission"),
         (0, envMW_1.EnvLoaderMW)(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
@@ -2418,7 +2726,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "checkPermission", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("listCollaborator"),
         (0, envMW_1.EnvLoaderMW)(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
@@ -2432,7 +2739,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "listCollaborator", reset: true }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, questionMW_1.QuestionMW)("listCollaborator"),
         (0, envMW_1.EnvLoaderMW)(false, true),
         concurrentLocker_1.ConcurrentLockerMW,
@@ -2481,18 +2787,6 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "createEnv", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "phantomMigrationV3", reset: true })]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Promise)
-], FxCore.prototype, "phantomMigrationV3", null);
-tslib_1.__decorate([
-    (0, hooks_1.hooks)([errorHandler_1.ErrorHandlerMW, projectMigratorV3_1.ProjectMigratorMWV3]),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", [Object]),
-    tslib_1.__metadata("design:returntype", Object)
-], FxCore.prototype, "innerMigrationV3", null);
 tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "projectVersionCheck", reset: true }),
@@ -2506,7 +2800,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "preProvisionForVS" }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2519,7 +2812,6 @@ tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "preCheckYmlAndEnvForVS" }),
         errorHandler_1.ErrorHandlerMW,
-        projectMigratorV3_1.ProjectMigratorMWV3,
         (0, envMW_1.EnvLoaderMW)(false),
         concurrentLocker_1.ConcurrentLockerMW,
         contextInjector_1.ContextInjectorMW,
@@ -2606,6 +2898,17 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], FxCore.prototype, "addKnowledge", null);
+tslib_1.__decorate([
+    (0, hooks_1.hooks)([
+        (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: teamsfx_api_1.Stage.addSkill }),
+        errorHandler_1.ErrorHandlerMW,
+        (0, questionMW_1.QuestionMW)("addSkill"),
+        concurrentLocker_1.ConcurrentLockerMW,
+    ]),
+    tslib_1.__metadata("design:type", Function),
+    tslib_1.__metadata("design:paramtypes", [Object]),
+    tslib_1.__metadata("design:returntype", Promise)
+], FxCore.prototype, "addSkill", null);
 tslib_1.__decorate([
     (0, hooks_1.hooks)([
         (0, globalVars_1.ErrorContextMW)({ component: "FxCore", stage: "getODSPItemDetails", reset: true }),