npm - @microsoft/teamsfx-core - Versions diffs - 3.0.4-alpha.9bab0e8a0.0 → 3.0.4-alpha.b29ac9cbb.0 - Mend

@microsoft/teamsfx-core 3.0.4-alpha.9bab0e8a0.0 → 3.0.4-alpha.b29ac9cbb.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (53) hide show

package/build/component/driver/file/createOrUpdateEnvironmentFile.js CHANGED Viewed

@@ -93,176 +93,34 @@ let CreateOrUpdateEnvironmentFileDriver = class CreateOrUpdateEnvironmentFileDri
      * @returns
      */
     async askForOpenAIEnvironmentVariables(ctx, args, envOutput) {
-        const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/;
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIKeyQuestion)().name,
-                    title: (0, question_1.azureOpenAIKeyQuestion)().title,
-                    password: (0, question_1.azureOpenAIKeyQuestion)().password,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIKey.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIEndpointQuestion)().name,
-                    title: (0, question_1.azureOpenAIEndpointQuestion)().title,
-                    validation: (input) => {
-                        if (!input.startsWith("https://") && !input.startsWith("http://")) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentEndpoint.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIDeploymentNameQuestion)().name,
-                    title: (0, question_1.azureOpenAIDeploymentNameQuestion)().title,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIDeploymentNameQuestion)().name,
-                    title: (0, question_1.azureOpenAIDeploymentNameQuestion)().title,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME] =
-                        result.value.result;
-                }
+        for (const [envKey, envValue] of Object.entries(args.envs)) {
+            const result = await this.processOpenAIEnvironmentVariable(ctx, args, envOutput, envKey, envValue);
+            if (result.isErr()) {
+                return result;
             }
         }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_API_KEY]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_API_KEY]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.openAIKeyQuestion)().name,
-                    title: (0, question_1.openAIKeyQuestion)().title,
-                    password: true,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIKey.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_API_KEY] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.openAIAssistantIdQuestion)().name,
-                    title: (0, question_1.openAIAssistantIdQuestion)().title,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID]);
-            if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIAssistantIdQuestion)().name,
-                    title: (0, question_1.azureOpenAIAssistantIdQuestion)().title,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
-                    return result;
-                }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID] = result.value.result;
-                }
-            }
-        }
-        if (args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT]) {
-            const matches = placeHolderReg.exec(args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT]);
+        return (0, teamsfx_api_1.ok)(teamsfx_api_1.Void);
+    }
+    async processOpenAIEnvironmentVariable(ctx, args, envOutput, envKey, envValue) {
+        var _a;
+        if (envValue) {
+            const placeHolderReg = /\${{\s*([a-zA-Z_][a-zA-Z0-9_]*)\s*}}/;
+            const matches = placeHolderReg.exec(envValue);
             if (matches != null && matches.length > 1) {
-                const result = await ctx.ui.inputText({
-                    name: (0, question_1.azureOpenAIEmbeddingDeploymentNameQuestion)().name,
-                    title: (0, question_1.azureOpenAIEmbeddingDeploymentNameQuestion)().title,
-                    validation: (input) => {
-                        if (input.length < 1) {
-                            return (0, localizeUtils_1.getLocalizedString)("driver.file.createOrUpdateEnvironmentFile.OpenAIEmbeddingDeploymentName.validation");
-                        }
-                    },
-                });
-                if (result.isErr()) {
+                const envVarName = matches[1];
+                const config = envVarConfigs.find((c) => c.envKey === envKey) || getGenericEnvVarConfig(envKey);
+                const result = await ((_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.inputText({
+                    name: config.question.name,
+                    title: config.question.title,
+                    password: config.isPassword || config.question.password,
+                    validation: config.validation,
+                }));
+                if (result === null || result === void 0 ? void 0 : result.isErr()) {
                     return result;
                 }
-                else {
-                    envOutput.set(matches[1], result.value.result);
-                    args.envs[constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT] =
-                        result.value.result;
+                else if ((result === null || result === void 0 ? void 0 : result.isOk()) && result.value.result) {
+                    envOutput.set(envVarName, result.value.result);
+                    args.envs[envKey] = result.value.result;
                 }
             }
         }
@@ -304,4 +162,70 @@ CreateOrUpdateEnvironmentFileDriver = tslib_1.__decorate([
     (0, typedi_1.Service)(actionName) // DO NOT MODIFY the service name
 ], CreateOrUpdateEnvironmentFileDriver);
 exports.CreateOrUpdateEnvironmentFileDriver = CreateOrUpdateEnvironmentFileDriver;
+const getNonEmptyStringValidation = (key) => {
+    return (input) => (input.length < 1 ? (0, localizeUtils_1.getLocalizedString)(key) : undefined);
+};
+const getEndpointValidation = (key) => {
+    return (input) => !input.startsWith("https://") && !input.startsWith("http://")
+        ? (0, localizeUtils_1.getLocalizedString)(key)
+        : undefined;
+};
+const getGenericEnvVarConfig = (envKey) => ({
+    envKey,
+    question: {
+        type: "text",
+        name: envKey,
+        title: envKey,
+    },
+    validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.genericEnvVar.validation"),
+});
+const envVarConfigs = [
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_API_KEY,
+        question: (0, question_1.azureOpenAIKeyQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIKey.validation"),
+        isPassword: true,
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ENDPOINT,
+        question: (0, question_1.azureOpenAIEndpointQuestion)(),
+        validation: getEndpointValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentEndpoint.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_DEPLOYMENT_NAME,
+        question: (0, question_1.azureOpenAIDeploymentNameQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_MODEL_DEPLOYMENT_NAME,
+        question: (0, question_1.azureOpenAIDeploymentNameQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIDeploymentName.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.OPENAI_API_KEY,
+        question: (0, question_1.openAIKeyQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIKey.validation"),
+        isPassword: true,
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.OPENAI_ASSISTANT_ID,
+        question: (0, question_1.openAIAssistantIdQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_ASSISTANT_ID,
+        question: (0, question_1.azureOpenAIAssistantIdQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIAssistantID.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT,
+        question: (0, question_1.azureOpenAIEmbeddingDeploymentNameQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIEmbeddingDeploymentName.validation"),
+    },
+    {
+        envKey: constants_1.OpenAIEnvironmentVariables.AZURE_OPENAI_EMBEDDING_DEPLOYMENT_NAME,
+        question: (0, question_1.azureOpenAIEmbeddingDeploymentNameQuestion)(),
+        validation: getNonEmptyStringValidation("driver.file.createOrUpdateEnvironmentFile.OpenAIEmbeddingDeploymentName.validation"),
+    },
+];
 //# sourceMappingURL=createOrUpdateEnvironmentFile.js.map

package/build/component/driver/file/createOrUpdateEnvironmentFile.js.map CHANGED Viewed

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

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

	@@ -1 +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"}
1	+ {"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;mBAiV3B,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 CHANGED Viewed

@@ -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,72 @@ 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 = 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 +161,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 +176,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 +200,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 +221,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);
                         }
@@ -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);
                     }