@microsoft/teamsfx-core 3.0.4 → 3.0.5-alpha.1d492cee1.0

package/build/component/driver/m365/acquire.js

@@ -2,24 +2,25 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.M365TitleAcquireDriver = void 0;
+exports.M365TitleAcquireDriver = exports.actionName = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const typedi_1 = require("typedi");
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../common/localizeUtils");
+const common_1 = require("../../../error/common");
 const packageService_1 = require("../../m365/packageService");
 const serviceConstant_1 = require("../../m365/serviceConstant");
-const common_1 = require("../../../error/common");
 const common_2 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const actionName = "teamsApp/extendToM365";
+exports.actionName = "teamsApp/extendToM365";
 const helpLink = "https://aka.ms/teamsfx-actions/teamsapp-extendToM365";
 const outputKeys = {
     titleId: "titleId",
     appId: "appId",
+    shareLink: "shareLink",
 };
 let M365TitleAcquireDriver = class M365TitleAcquireDriver {
     constructor() {
@@ -30,7 +31,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
         return (0, common_2.wrapRun)(async () => {
             const result = await this.handler(args, context);
             return result.output;
-        }, actionName);
+        }, exports.actionName);
     }
     async execute(args, ctx, outputEnvVarNames) {
         let summaries = [];
@@ -38,7 +39,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             const result = await this.handler(args, ctx, outputEnvVarNames);
             summaries = result.summaries;
             return result.output;
-        }, actionName);
+        }, exports.actionName);
         return {
             result: outputResult,
             summaries,
@@ -51,7 +52,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             this.validateOutputEnvVarNames(outputEnvVarNames);
             const appPackagePath = (0, common_2.getAbsolutePath)(args.appPackagePath, context.projectPath);
             if (!(await fs.pathExists(appPackagePath))) {
-                throw new common_1.FileNotFoundError(actionName, appPackagePath, helpLink);
+                throw new common_1.FileNotFoundError(exports.actionName, appPackagePath, helpLink);
             }
             // get sideloading service settings
             const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.MosServiceEndpoint;
@@ -64,23 +65,26 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
                 throw sideloadingTokenRes.error;
             }
             const sideloadingToken = sideloadingTokenRes.value;
-            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath);
+            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath, args.scope);
+            const mapping = new Map();
+            mapping.set(outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]);
+            mapping.set(outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]);
+            if (outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.shareLink)) {
+                mapping.set(outputEnvVarNames.get(outputKeys.shareLink), sideloadingRes[2]);
+            }
             return {
-                output: new Map([
-                    [outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]],
-                    [outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]],
-                ]),
+                output: mapping,
                 summaries: [(0, localizeUtils_1.getLocalizedString)("driver.m365.acquire.summary", sideloadingRes[0])],
             };
         }
         catch (error) {
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
+                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
                 throw error;
             }
             const message = JSON.stringify(error);
-            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
-            throw (0, common_1.assembleError)(error, actionName);
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
+            throw (0, common_1.assembleError)(error, exports.actionName);
         }
     }
     validateArgs(args) {
@@ -88,30 +92,36 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
         if (!args.appPackagePath || typeof args.appPackagePath !== "string") {
             invalidParameters.push("appPackagePath");
         }
+        if (args.scope &&
+            !Object.values(packageService_1.AppScope)
+                .map((v) => v.toLowerCase())
+                .includes(args.scope)) {
+            invalidParameters.push("scope");
+        }
         if (invalidParameters.length > 0) {
-            throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
+            throw new common_1.InvalidActionInputError(exports.actionName, invalidParameters, helpLink);
         }
     }
     validateOutputEnvVarNames(outputEnvVarNames) {
         if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) || !outputEnvVarNames.get(outputKeys.appId)) {
-            throw new common_1.InvalidActionInputError(actionName, ["writeToEnvironmentFile"], helpLink);
+            throw new common_1.InvalidActionInputError(exports.actionName, ["writeToEnvironmentFile"], helpLink);
         }
     }
 };
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
+    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], M365TitleAcquireDriver.prototype, "run", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
+    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
     tslib_1.__metadata("design:returntype", Promise)
 ], M365TitleAcquireDriver.prototype, "execute", null);
 M365TitleAcquireDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(actionName) // DO NOT MODIFY the service name
+    (0, typedi_1.Service)(exports.actionName) // DO NOT MODIFY the service name
 ], M365TitleAcquireDriver);
 exports.M365TitleAcquireDriver = M365TitleAcquireDriver;
 //# sourceMappingURL=acquire.js.map

package/build/component/driver/m365/acquire.js.map

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

package/build/component/driver/share/utils.d.ts

@@ -1,3 +1,7 @@
 import { FxError, Result } from "@microsoft/teamsfx-api";
-export declare function parseShareAppActionYamlConfig(projectPath: string): Promise<Result<string[], FxError>>;
+export declare function parseShareAppActionYamlConfig(projectPath: string): Promise<Result<{
+    teamsappId: string;
+    titleId: string;
+    appId: string;
+}, FxError>>;
 //# sourceMappingURL=utils.d.ts.map

package/build/component/driver/share/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAe/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC,CA0GpC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAc/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CAsGlF"}

package/build/component/driver/share/utils.js

@@ -5,35 +5,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseShareAppActionYamlConfig = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const pathUtils_1 = require("../../utils/pathUtils");
-const metadataUtil_1 = require("../../utils/metadataUtil");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const localizeUtils_1 = require("../../../common/localizeUtils");
-const envUtil_1 = require("../../utils/envUtil");
 const lifecycle_1 = require("../../configManager/lifecycle");
-const path_1 = tslib_1.__importDefault(require("path"));
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
+const envUtil_1 = require("../../utils/envUtil");
+const metadataUtil_1 = require("../../utils/metadataUtil");
+const pathUtils_1 = require("../../utils/pathUtils");
+const acquire_1 = require("../m365/acquire");
 const constants_1 = require("../teamsApp/constants");
-const shareToOthers = tslib_1.__importStar(require("./shareToOthers"));
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-// Read teamsapp.yaml and get the value of teamsapp id, shared title id, and shared app id
-// Output [teamsapp id, shared title id, shared app id]
+// Read m365agents.yaml and get the value of shared title id, and shared app id
 async function parseShareAppActionYamlConfig(projectPath) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const templatePath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
     const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath);
     if (maybeProjectModel.isErr()) {
         return (0, teamsfx_api_1.err)(maybeProjectModel.error);
     }
     const projectModel = maybeProjectModel.value;
-    if (!projectModel.share || !projectModel.share.driverDefs) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.yamlConfigNotFound")));
+    if ((!projectModel.provision || !projectModel.provision.driverDefs) &&
+        (!projectModel.deploy || !projectModel.deploy.driverDefs)) {
+        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.yamlConfigNotFound")));
     }
-    const shareToOthersAction = projectModel.share.driverDefs.find((d) => d.uses === shareToOthers.actionName);
-    if (!shareToOthersAction) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", shareToOthers.actionName)));
+    const extendToM365Action = ((_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((d) => d.uses === acquire_1.actionName)) ||
+        ((_b = projectModel.deploy) === null || _b === void 0 ? void 0 : _b.driverDefs.find((d) => d.uses === acquire_1.actionName));
+    if (!extendToM365Action) {
+        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", acquire_1.actionName)));
     }
     // 1. get manifest id
-    const appPackagePath = (_a = shareToOthersAction.with) === null || _a === void 0 ? void 0 : _a.appPackagePath;
+    const appPackagePath = (_c = extendToM365Action.with) === null || _c === void 0 ? void 0 : _c.appPackagePath;
     if (!appPackagePath) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageConfigNotFound")));
     }
@@ -41,7 +42,7 @@ async function parseShareAppActionYamlConfig(projectPath) {
     if (readEnvRes.isErr()) {
         return (0, teamsfx_api_1.err)(readEnvRes.error);
     }
-    const resolvedDriver = (0, lifecycle_1.resolve)(shareToOthersAction, [], []);
+    const resolvedDriver = (0, lifecycle_1.resolve)(extendToM365Action, [], []);
     const resolvedAppPackagePath = path_1.default.resolve(projectPath, resolvedDriver.with.appPackagePath);
     if (!fs_extra_1.default.existsSync(resolvedAppPackagePath)) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageNotFound", resolvedAppPackagePath)));
@@ -57,18 +58,18 @@ async function parseShareAppActionYamlConfig(projectPath) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.manifestIdNotFound")));
     }
     // 2. get shared title id and shared app id
-    const sharedTitleIdEnvName = (_b = shareToOthersAction.writeToEnvironmentFile) === null || _b === void 0 ? void 0 : _b.titleId;
-    const sharedAppIdEnvName = (_c = shareToOthersAction.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.appId;
+    const sharedTitleIdEnvName = (_d = extendToM365Action.writeToEnvironmentFile) === null || _d === void 0 ? void 0 : _d.titleId;
+    const sharedAppIdEnvName = (_e = extendToM365Action.writeToEnvironmentFile) === null || _e === void 0 ? void 0 : _e.appId;
     if (!sharedTitleIdEnvName || !sharedAppIdEnvName) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.sharedConfigNotFound")));
+        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.sharedConfigNotFound")));
     }
     // env file has already been loaded before calling this function.
     const sharedTitleId = process.env[sharedTitleIdEnvName];
     const sharedAppId = process.env[sharedAppIdEnvName];
     if (!sharedTitleId || !sharedAppId) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.sharedIdNotFound", sharedTitleId, sharedAppId)));
+        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.sharedIdNotFound", sharedTitleId, sharedAppId)));
     }
-    return (0, teamsfx_api_1.ok)([manifestId, sharedTitleId, sharedAppId]);
+    return (0, teamsfx_api_1.ok)({ teamsappId: manifestId, titleId: sharedTitleId, appId: sharedAppId });
 }
 exports.parseShareAppActionYamlConfig = parseShareAppActionYamlConfig;
 //# sourceMappingURL=utils.js.map

package/build/component/driver/share/utils.js.map

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

package/build/component/driver/teamsApp/createAppPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,OAAO,EACP,MAAM,EAOP,MAAM,wBAAwB,CAAC;AAShC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAUzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBAkW3B,aAAa;IASlC,OAAO,CAAC,YAAY;YAwBN,sBAAsB;IAsBpC;;;;;;;;OAQG;YACW,SAAS;IA4HvB;;;;;;;OAOG;YACW,qBAAqB;YAuCrB,mBAAmB;IA+BjC,OAAO,CAAC,YAAY;YAIN,aAAa;YASb,2BAA2B;CA0C1C"}
+{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAML,OAAO,EAGP,MAAM,EAKP,MAAM,wBAAwB,CAAC;AAchC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAKzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBA6U3B,aAAa;IASlC,OAAO,CAAC,YAAY;YAwBN,sBAAsB;IAsBpC;;;;;;;;OAQG;YACW,SAAS;IA4HvB;;;;;;;OAOG;YACW,qBAAqB;YAuCrB,mBAAmB;IA+BjC,OAAO,CAAC,YAAY;YAIN,aAAa;YASb,2BAA2B;CA0C1C"}

package/build/component/driver/teamsApp/createAppPackage.js

@@ -10,22 +10,23 @@ const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
-const uuid = tslib_1.__importStar(require("uuid"));
+const semver_1 = tslib_1.__importDefault(require("semver"));
 const typedi_1 = require("typedi");
-const localizeUtils_1 = require("../../../common/localizeUtils");
+const uuid = tslib_1.__importStar(require("uuid"));
+const featureFlags_1 = require("../../../common/featureFlags");
 const globalVars_1 = require("../../../common/globalVars");
+const localizeUtils_1 = require("../../../common/localizeUtils");
 const common_1 = require("../../../error/common");
+const teamsApp_1 = require("../../../error/teamsApp");
+const common_2 = require("../../utils/common");
+const envFunctionUtils_1 = require("../../utils/envFunctionUtils");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
+const utils_1 = require("../util/utils");
 const wrapUtil_1 = require("../util/wrapUtil");
 const constants_1 = require("./constants");
-const ManifestUtils_1 = require("./utils/ManifestUtils");
-const teamsApp_1 = require("../../../error/teamsApp");
-const utils_1 = require("./utils/utils");
 const CopilotGptManifestUtils_1 = require("./utils/CopilotGptManifestUtils");
-const envFunctionUtils_1 = require("../../utils/envFunctionUtils");
-const common_2 = require("../../utils/common");
-const featureFlags_1 = require("../../../common/featureFlags");
-const utils_2 = require("../util/utils");
+const ManifestUtils_1 = require("./utils/ManifestUtils");
+const utils_2 = require("./utils/utils");
 exports.actionName = "teamsApp/zipAppPackage";
 let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDriver {
     constructor() {
@@ -41,7 +42,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
         };
     }
     async build(args, context) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const result = this.validateArgs(args);
         if (result.isErr()) {
             return (0, teamsfx_api_1.err)(result.error);
@@ -79,55 +80,74 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
         }
         await fs_extra_1.default.mkdir(jsonFileDir, { recursive: true });
         const appDirectory = path.dirname(hasTTKGeneratedFolder ? generatedFolder : manifestPath);
-        const colorFile = path.resolve(appDirectory, manifest.icons.color);
-        if (!(await fs_extra_1.default.pathExists(colorFile))) {
-            const error = new common_1.FileNotFoundError(exports.actionName, colorFile, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage");
-            return (0, teamsfx_api_1.err)(error);
-        }
-        const colorFileRelativePath = path.relative(appDirectory, colorFile);
-        if (colorFileRelativePath.startsWith("..")) {
-            return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(colorFile));
-        }
-        const outlineFile = path.resolve(appDirectory, manifest.icons.outline);
-        if (!(await fs_extra_1.default.pathExists(outlineFile))) {
-            const error = new common_1.FileNotFoundError(exports.actionName, outlineFile, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage");
-            return (0, teamsfx_api_1.err)(error);
+        // check and include all relative file paths in manifest
+        const relativeFiles = [manifest.icons.color, manifest.icons.outline];
+        const manifestVersion = manifest.manifestVersion === "devPreview"
+            ? semver_1.default.coerce("1.19.0") // for MetaOS WXP, fallback the `devPreview` ver as `1.19.0` to enable following logics
+            : semver_1.default.coerce(manifest.manifestVersion); // ensure manifestVersion is a valid semver
+        if (manifestVersion && semver_1.default.gte(manifestVersion, "1.21.0")) {
+            const color32x32 = manifest.icons.color32x32;
+            if (color32x32) {
+                relativeFiles.push(color32x32);
+            }
         }
-        const outlineFileRelativePath = path.relative(appDirectory, outlineFile);
-        if (outlineFileRelativePath.startsWith("..")) {
-            return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(outlineFile));
+        for (const file of relativeFiles) {
+            const filePath = path.resolve(appDirectory, file);
+            if (!(await fs_extra_1.default.pathExists(filePath))) {
+                const error = new common_1.FileNotFoundError(exports.actionName, filePath, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage");
+                return (0, teamsfx_api_1.err)(error);
+            }
+            const fileRelativePath = path.relative(appDirectory, filePath);
+            if (fileRelativePath.startsWith("..")) {
+                return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(filePath));
+            }
         }
         // pre-check existence
-        if (manifest.localizationInfo &&
-            manifest.localizationInfo.additionalLanguages &&
-            manifest.localizationInfo.additionalLanguages.length > 0) {
-            for (const language of manifest.localizationInfo.additionalLanguages) {
+        let additionalLanguages;
+        if (manifestVersion && semver_1.default.gte(manifestVersion, "1.5.0")) {
+            additionalLanguages = (_a = manifest.localizationInfo) === null || _a === void 0 ? void 0 : _a.additionalLanguages;
+        }
+        let composeExtensionType;
+        let apiSpecificationFile;
+        let commands;
+        if (manifestVersion && semver_1.default.gte(manifestVersion, "1.17.0")) {
+            composeExtensionType = (_c = (_b = manifest
+                .composeExtensions) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.composeExtensionType;
+            apiSpecificationFile = (_e = (_d = manifest
+                .composeExtensions) === null || _d === void 0 ? void 0 : _d[0]) === null || _e === void 0 ? void 0 : _e.apiSpecificationFile;
+            commands = (_g = (_f = manifest.composeExtensions) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.commands;
+        }
+        let defaultLanguageFile;
+        let declarativeAgents;
+        if (manifestVersion && semver_1.default.gte(manifestVersion, "1.19.0")) {
+            defaultLanguageFile = (_h = manifest.localizationInfo) === null || _h === void 0 ? void 0 : _h.defaultLanguageFile;
+            declarativeAgents = (_j = manifest.copilotAgents) === null || _j === void 0 ? void 0 : _j.declarativeAgents;
+        }
+        if (additionalLanguages && additionalLanguages.length > 0) {
+            for (const language of additionalLanguages) {
                 const file = language.file;
-                const fileName = `${appDirectory}/${file}`;
+                const fileName = path.join(appDirectory, file);
                 if (!(await fs_extra_1.default.pathExists(fileName))) {
                     return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError(exports.actionName, fileName, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
                 }
             }
         }
-        if (manifest.localizationInfo && manifest.localizationInfo.defaultLanguageFile) {
-            const file = manifest.localizationInfo.defaultLanguageFile;
-            const fileName = `${appDirectory}/${file}`;
+        if (defaultLanguageFile) {
+            const fileName = path.join(appDirectory, defaultLanguageFile);
             if (!(await fs_extra_1.default.pathExists(fileName))) {
                 return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError(exports.actionName, fileName, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
             }
         }
         const zip = new adm_zip_1.default();
         zip.addFile(constants_1.Constants.MANIFEST_FILE, Buffer.from(JSON.stringify(manifest, null, 4)));
-        // outline.png & color.png, relative path
-        let dir = path.dirname(manifest.icons.color);
-        zip.addLocalFile(colorFile, dir === "." ? "" : dir);
-        dir = path.dirname(manifest.icons.outline);
-        zip.addLocalFile(outlineFile, dir === "." ? "" : dir);
+        // icon images, relative path
+        for (const icon of relativeFiles) {
+            const dir = path.dirname(icon);
+            zip.addLocalFile(path.resolve(appDirectory, icon), dir === "." ? "" : dir);
+        }
         // localization file
-        if (manifest.localizationInfo &&
-            manifest.localizationInfo.additionalLanguages &&
-            manifest.localizationInfo.additionalLanguages.length > 0) {
-            for (const language of manifest.localizationInfo.additionalLanguages) {
+        if (additionalLanguages && additionalLanguages.length > 0) {
+            for (const language of additionalLanguages) {
                 const file = language.file;
                 const fileName = path.resolve(appDirectory, file);
                 const relativePath = path.relative(appDirectory, fileName);
@@ -143,9 +163,8 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                 }
             }
         }
-        if (manifest.localizationInfo && manifest.localizationInfo.defaultLanguageFile) {
-            const file = manifest.localizationInfo.defaultLanguageFile;
-            const fileName = path.resolve(appDirectory, file);
+        if (defaultLanguageFile) {
+            const fileName = path.resolve(appDirectory, defaultLanguageFile);
             const relativePath = path.relative(appDirectory, fileName);
             if (relativePath.startsWith("..")) {
                 return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(fileName));
@@ -159,21 +178,18 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             }
         }
         // API ME, API specification and Adaptive card templates
-        if (manifest.composeExtensions &&
-            manifest.composeExtensions.length > 0 &&
-            manifest.composeExtensions[0].composeExtensionType == "apiBased" &&
-            manifest.composeExtensions[0].apiSpecificationFile) {
-            const apiSpecificationFile = path.resolve(appDirectory, manifest.composeExtensions[0].apiSpecificationFile);
-            const checkExistenceRes = await this.validateReferencedFile(apiSpecificationFile, appDirectory);
+        if (composeExtensionType == "apiBased" && apiSpecificationFile) {
+            const apiSpecificationFilePath = path.resolve(appDirectory, apiSpecificationFile);
+            const checkExistenceRes = await this.validateReferencedFile(apiSpecificationFilePath, appDirectory);
             if (checkExistenceRes.isErr()) {
                 return (0, teamsfx_api_1.err)(checkExistenceRes.error);
             }
-            const addFileWithVariableRes = await this.addFileWithVariable(zip, manifest.composeExtensions[0].apiSpecificationFile, apiSpecificationFile, envFunctionUtils_1.ManifestType.ApiSpec, context);
+            const addFileWithVariableRes = await this.addFileWithVariable(zip, apiSpecificationFile, apiSpecificationFilePath, envFunctionUtils_1.ManifestType.ApiSpec, context);
             if (addFileWithVariableRes.isErr()) {
                 return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
             }
-            if (manifest.composeExtensions[0].commands.length > 0) {
-                for (const command of manifest.composeExtensions[0].commands) {
+            if (commands && commands.length > 0) {
+                for (const command of commands) {
                     if (command.apiResponseRenderingTemplateFile) {
                         const adaptiveCardFile = path.resolve(appDirectory, command.apiResponseRenderingTemplateFile);
                         const checkExistenceRes = await this.validateReferencedFile(adaptiveCardFile, appDirectory);
@@ -186,27 +202,14 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                 }
             }
         }
-        const plugins = manifest.copilotExtensions
-            ? manifest.copilotExtensions.plugins
-            : (_a = manifest.copilotAgents) === null || _a === void 0 ? void 0 : _a.plugins;
-        if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) && plugins[0].file) {
-            // API plugin
-            const addFilesRes = await this.addPlugin(zip, plugins[0].file, appDirectory, context, !shouldwriteAllManifest ? undefined : jsonFileDir);
-            if (addFilesRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addFilesRes.error);
-            }
-        }
-        const declarativeCopilots = manifest.copilotExtensions
-            ? manifest.copilotExtensions.declarativeCopilots
-            : (_b = manifest.copilotAgents) === null || _b === void 0 ? void 0 : _b.declarativeAgents;
         // Copilot GPT
-        if ((declarativeCopilots === null || declarativeCopilots === void 0 ? void 0 : declarativeCopilots.length) && declarativeCopilots[0].file) {
-            const declarativeAgentManifestFile = path.resolve(hasTTKGeneratedFolder ? generatedFolder : appDirectory, declarativeCopilots[0].file);
+        if ((declarativeAgents === null || declarativeAgents === void 0 ? void 0 : declarativeAgents.length) && declarativeAgents[0].file) {
+            const declarativeAgentManifestFile = path.resolve(hasTTKGeneratedFolder ? generatedFolder : appDirectory, declarativeAgents[0].file);
             const checkExistenceRes = await this.validateReferencedFile(declarativeAgentManifestFile, appDirectory);
             if (checkExistenceRes.isErr()) {
                 return (0, teamsfx_api_1.err)(checkExistenceRes.error);
             }
-            const addFileWithVariableRes = await this.addFileWithVariable(zip, declarativeCopilots[0].file, declarativeAgentManifestFile, envFunctionUtils_1.ManifestType.DeclarativeCopilotManifest, context, shouldwriteAllManifest
+            const addFileWithVariableRes = await this.addFileWithVariable(zip, declarativeAgents[0].file, declarativeAgentManifestFile, envFunctionUtils_1.ManifestType.DeclarativeCopilotManifest, context, shouldwriteAllManifest
                 ? path.join(jsonFileDir, path.relative(appDirectory, declarativeAgentManifestFile))
                 : undefined);
             if (addFileWithVariableRes.isErr()) {
@@ -220,8 +223,8 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                     for (const pluginFile of pluginFiles) {
                         const pluginFileAbsolutePath = path.resolve(path.dirname(declarativeAgentManifestFile), pluginFile);
                         const pluginFileRelativePath = path.relative(hasTTKGeneratedFolder ? generatedFolder : appDirectory, pluginFileAbsolutePath);
-                        const useForwardSlash = declarativeCopilots[0].file.concat(pluginFile).includes("/");
-                        const addPluginRes = await this.addPlugin(zip, (0, utils_1.normalizePath)(pluginFileRelativePath, useForwardSlash), hasTTKGeneratedFolder ? generatedFolder : appDirectory, context, !shouldwriteAllManifest ? undefined : jsonFileDir, hasTTKGeneratedFolder ? appDirectory : undefined);
+                        const useForwardSlash = declarativeAgents[0].file.concat(pluginFile).includes("/");
+                        const addPluginRes = await this.addPlugin(zip, (0, utils_2.normalizePath)(pluginFileRelativePath, useForwardSlash), hasTTKGeneratedFolder ? generatedFolder : appDirectory, context, !shouldwriteAllManifest ? undefined : jsonFileDir, hasTTKGeneratedFolder ? appDirectory : undefined);
                         if (addPluginRes.isErr()) {
                             return (0, teamsfx_api_1.err)(addPluginRes.error);
                         }
@@ -252,10 +255,8 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                                     if (checkExistenceRes.isErr()) {
                                         return (0, teamsfx_api_1.err)(checkExistenceRes.error);
                                     }
-                                    const addKnowledgeRes = await this.addFileWithVariable(zip, file, knowledgeFileAbsolutePath, envFunctionUtils_1.ManifestType.EmbeddedKnowledgeFile, context);
-                                    if (addKnowledgeRes.isErr()) {
-                                        return (0, teamsfx_api_1.err)(addKnowledgeRes.error);
-                                    }
+                                    const dir = path.dirname(file);
+                                    zip.addLocalFile(knowledgeFileAbsolutePath, dir === "." ? "" : dir);
                                 }
                             }
                         }
@@ -279,7 +280,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
     }
     static async expandEnvVars(filePath, ctx, manifestType) {
         const content = await fs_extra_1.default.readFile(filePath, "utf8");
-        return (0, utils_1.getResolvedManifest)(content, filePath, manifestType, ctx);
+        return (0, utils_2.getResolvedManifest)(content, filePath, manifestType, ctx);
     }
     validateArgs(args) {
         const invalidParams = [];
@@ -358,7 +359,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             context.logProvider.warning((0, localizeUtils_1.getLocalizedString)("plugins.appstudio.createPackage.aiPlugin.containsUnderscore", pluginRelativePath));
         }
         if (containExternalAdaptiveCard) {
-            await (0, utils_2.updateVersionForTeamsAppYamlFile)(context.projectPath);
+            await (0, utils_1.updateVersionForTeamsAppYamlFile)(context.projectPath);
         }
         if (namespaceContainsUnderscore || containExternalAdaptiveCard) {
             tempFolder = path.join(appDirectory, ".tmp");
@@ -412,7 +413,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                     }
                     const entryName = path.relative(appDirectory, specFile);
                     const useForwardSlash = pluginFile.concat(runtime.spec.url).includes("/");
-                    const addFileWithVariableRes = await this.addFileWithVariable(zip, (0, utils_1.normalizePath)(entryName, useForwardSlash), specFile, envFunctionUtils_1.ManifestType.ApiSpec, context);
+                    const addFileWithVariableRes = await this.addFileWithVariable(zip, (0, utils_2.normalizePath)(entryName, useForwardSlash), specFile, envFunctionUtils_1.ManifestType.ApiSpec, context);
                     if (addFileWithVariableRes.isErr()) {
                         return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
                     }