@microsoft/teamsfx-core 3.0.0-alpha.e2e4e5205.0 → 3.0.0-alpha.e86157a65.0

package/build/component/generator/officeAddin/generator.js

@@ -16,6 +16,7 @@ const envUtil_1 = require("../../utils/envUtil");
 const defaultGenerator_1 = require("../defaultGenerator");
 const templateNames_1 = require("../templates/templateNames");
 const helperMethods_1 = require("./helperMethods");
+const metaOSHelper_1 = require("./metaOSHelper");
 /**
  * case 1: project-type=office-xml-addin-type AND addin-host=outlook
  * case 2: project-type=office-addin-type (addin-host=undefined)
@@ -40,7 +41,7 @@ class OfficeAddinGenerator {
                 await importProgress.next((0, localizeUtils_1.getLocalizedString)("core.generator.officeAddin.importProject.convertProject"));
                 if (manifestFile.endsWith(".xml")) {
                     // Need to convert to json project first
-                    await (0, office_addin_project_1.convertProject)(manifestFile, "./backup.zip", "", true);
+                    await (0, office_addin_project_1.convertProject)(manifestFile, "./backup.zip", addinRoot, true);
                     manifestFile = manifestFile.replace(/\.xml$/, ".json");
                 }
                 inputs[constants_1.QuestionNames.OfficeAddinHost] = await getHost(manifestFile);
@@ -97,10 +98,26 @@ class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerato
             templateNames_1.TemplateNames.OutlookTaskpane,
             templateNames_1.TemplateNames.WXPTaskpane,
             templateNames_1.TemplateNames.OfficeAddinCommon,
+            templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject,
+            templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject,
         ].includes(templateName);
     }
     async getTemplateInfos(context, inputs, destinationPath, actionContext) {
         const templateName = inputs[constants_1.QuestionNames.TemplateName];
+        // Handle the Declarative Agent MetaOS project
+        if ([
+            templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject,
+            templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject,
+        ].includes(templateName)) {
+            return Promise.resolve((0, teamsfx_api_1.ok)([
+                {
+                    templateName: templateName,
+                    language: inputs[constants_1.QuestionNames.ProgrammingLanguage],
+                    // replaceMap: { manifestId: getUuid() },
+                },
+            ]));
+        }
+        // Hanlde the MetaOS Project
         const res = await OfficeAddinGenerator.doScaffolding(context, inputs, destinationPath);
         if (res.isErr())
             return (0, teamsfx_api_1.err)(res.error);
@@ -113,6 +130,21 @@ class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerato
         ]));
     }
     async post(context, inputs, destinationPath, actionContext) {
+        // Handle the Declarative Agent MetaOS project
+        if (templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject === inputs[constants_1.QuestionNames.TemplateName]) {
+            try {
+                await metaOSHelper_1.MetaOSHelper.copyExistMetaOSProject(inputs[constants_1.QuestionNames.OfficeAddinFolder], destinationPath);
+                await metaOSHelper_1.MetaOSHelper.extendToDA(destinationPath, inputs[constants_1.QuestionNames.AppName]);
+                return (0, teamsfx_api_1.ok)({});
+            }
+            catch (e) {
+                return (0, teamsfx_api_1.err)(e.message);
+            }
+        }
+        else if (templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject === inputs[constants_1.QuestionNames.TemplateName]) {
+            return (0, teamsfx_api_1.ok)({});
+        }
+        // Hanlde the MetaOS Project import
         const fromFolder = inputs[constants_1.QuestionNames.OfficeAddinFolder];
         if (fromFolder) {
             // reset all env files

package/build/component/generator/officeAddin/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/generator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC;;GAEG;AAEH,wDAUgC;AAChC,+DAAsD;AACtD,iEAAmE;AACnE,6DAAsD;AACtD,0CAA+C;AAC/C,2DAAiF;AAEjF,iDAA8C;AAC9C,0DAA+D;AAE/D,8DAA2D;AAC3D,mDAAgD;AAChD,iDAA8C;AAE9C;;;;GAIG;AACH,MAAa,oBAAoB;IACxB,MAAM,CAAC,KAAK,CAAC,aAAa,CAC/B,OAAgB,EAChB,MAAc,EACd,eAAuB;QAEvB,MAAM,SAAS,GAAG,eAAe,CAAC;QAClC,MAAM,UAAU,GAAG,MAAM,CAAC,yBAAa,CAAC,iBAAiB,CAAC,CAAC;QAC3D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QACjC,MAAM,iBAAiB,GAAG,IAAA,kCAAkB,EAC1C,sDAAsD,CACvD,CAAC;QACF,MAAM,cAAc,GAAG,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAEvF,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACzB,IAAI;YACF,IAAI,UAAU,EAAE;gBACd,MAAM,cAAc,CAAC,KAAK,EAAE,CAAC;gBAC7B,wBAAwB;gBACxB,MAAM,cAAc,CAAC,IAAI,CACvB,IAAA,kCAAkB,EAAC,oDAAoD,CAAC,CACzE,CAAC;gBACF,6BAAa,CAAC,cAAc,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBACpD,MAAM,kBAAkB,GAAW,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAC,CAAC;gBAC7E,IAAI,YAAY,GAAW,kBAAkB,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;gBAC7E,MAAM,cAAc,CAAC,IAAI,CACvB,IAAA,kCAAkB,EAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;oBACjC,wCAAwC;oBACxC,MAAM,IAAA,qCAAc,EAAC,YAAY,EAAE,cAAc,EAAE,SAAS,EAAE,IAAI,CAAC,CAAC;oBACpE,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;iBACxD;gBACD,MAAM,CAAC,yBAAa,CAAC,eAAe,CAAC,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,CAAC;gBACpE,MAAM,cAAc,CAAC,IAAI,CACvB,IAAA,kCAAkB,EAAC,yDAAyD,CAAC,CAC9E,CAAC;gBACF,MAAM,6BAAa,CAAC,cAAc,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;aACnE;YACD,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACrC,OAAO,IAAA,gBAAE,EAAC,SAAS,CAAC,CAAC;SACtB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;YACtC,OAAO,IAAA,iBAAG,EAAC,IAAA,qBAAa,EAAC,CAAU,CAAC,CAAC,CAAC;SACvC;IACH,CAAC;CACF;AAhDD,oDAgDC;AAKM,KAAK,UAAU,OAAO,CAAC,iBAAyB;;IACrD,4BAA4B;IAC5B,MAAM,aAAa,GAAG,CAAC,MAAM,0BAAY,CAAC,YAAY,CACpD,iBAAiB,CAClB,CAA6B,CAAC;IAC/B,IAAI,IAAI,GAAe,SAAS,CAAC;IACjC,QAAQ,MAAA,MAAA,MAAA,aAAa,CAAC,UAAU,0CAAG,CAAC,EAAE,YAAY,0CAAE,MAAM,0CAAG,CAAC,CAAC,EAAE;QAC/D,KAAK,UAAU;YACb,IAAI,GAAG,MAAM,CAAC;YACd,MAAM;QACR,KAAK,MAAM;YACT,IAAI,GAAG,SAAS,CAAC;YACjB,MAAM;QACR,mBAAmB;QACnB,sBAAsB;QACtB,KAAK,cAAc;YACjB,IAAI,GAAG,YAAY,CAAC;YACpB,MAAM;QACR,kBAAkB;QAClB,sBAAsB;QACtB,KAAK,UAAU;YACb,IAAI,GAAG,OAAO,CAAC;YACf,MAAM;KACT;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAzBD,0BAyBC;AAED,MAAa,uBAAwB,SAAQ,2CAAwB;IAArE;;QACE,kBAAa,GAAG,wBAAwB,CAAC;IA4F3C,CAAC;IA1FC,uBAAuB;IACP,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QACxD,OAAO;YACL,6BAAa,CAAC,eAAe;YAC7B,6BAAa,CAAC,WAAW;YACzB,6BAAa,CAAC,iBAAiB;YAC/B,6BAAa,CAAC,gCAAgC;YAC9C,6BAAa,CAAC,oCAAoC;SACnD,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;IAC3B,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,MAAM,YAAY,GAAG,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,CAAC;QAExD,8CAA8C;QAC9C,IACE;YACE,6BAAa,CAAC,gCAAgC;YAC9C,6BAAa,CAAC,oCAAoC;SACnD,CAAC,QAAQ,CAAC,YAAY,CAAC,EACxB;YACA,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;gBACD;oBACE,YAAY,EAAE,YAAY;oBAC1B,QAAQ,EAAE,MAAM,CAAC,yBAAa,CAAC,mBAAmB,CAAwB;oBAC1E,yCAAyC;iBAC1C;aACF,CAAC,CACH,CAAC;SACH;QAED,4BAA4B;QAC5B,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;QACvF,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,IAAA,iBAAG,EAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO,OAAO,CAAC,OAAO,CACpB,IAAA,gBAAE,EAAC;YACD;gBACE,YAAY,EAAE,YAAY;gBAC1B,QAAQ,EAAE,+BAAmB,CAAC,EAAE;gBAChC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAA,qBAAO,GAAE,EAAE;aACtC;SACF,CAAC,CACH,CAAC;IACJ,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,8CAA8C;QAC9C,IAAI,6BAAa,CAAC,oCAAoC,KAAK,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,EAAE;YAC7F,IAAI;gBACF,MAAM,2BAAY,CAAC,sBAAsB,CACvC,MAAM,CAAC,yBAAa,CAAC,iBAAiB,CAAC,EACvC,eAAe,CAChB,CAAC;gBACF,MAAM,2BAAY,CAAC,UAAU,CAAC,eAAe,EAAE,MAAM,CAAC,yBAAa,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9E,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;aACf;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,IAAA,iBAAG,EAAC,CAAC,CAAC,OAAO,CAAC,CAAC;aACvB;SACF;aAAM,IACL,6BAAa,CAAC,gCAAgC,KAAK,MAAM,CAAC,yBAAa,CAAC,YAAY,CAAC,EACrF;YACA,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;SACf;QAED,mCAAmC;QACnC,MAAM,UAAU,GAAG,MAAM,CAAC,yBAAa,CAAC,iBAAiB,CAAC,CAAC;QAC3D,IAAI,UAAU,EAAE;YACd,sBAAsB;YACtB,MAAM,MAAM,GAAG,MAAM,iBAAO,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACtD,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE;gBACjB,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC1B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;oBACtB,MAAM,iBAAO,CAAC,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC,CAAC;iBAClF;aACF;SACF;QACD,OAAO,IAAA,gBAAE,EAAC,EAAE,CAAC,CAAC;IAChB,CAAC;CACF;AA7FD,0DA6FC"}

package/build/component/generator/officeAddin/metaOSHelper.d.ts

@@ -0,0 +1,13 @@
+export declare class MetaOSHelper {
+    static copyFilterFn(filePath: string): boolean;
+    static copyExistMetaOSProject(sourceFolder: string, targetFolder: string): Promise<void>;
+    static getNameWithSuffix(name: string, suffix: number): string;
+    static ensureFunctionNameIsNotExist(jsonObj: any[], key: string, functionName: string): string;
+    static ensureFileNameIsNotExist(filePath: string, filename: string, ext: string): string;
+    static extendToDA(projectFolder: string, appName: string): Promise<void>;
+    static modifyManifest(projectFolder: string, DAFilename: string): Promise<string>;
+    static generateDAFile(projectFolder: string, DAFilename: string, ActionFilename: string, appName: string): Promise<void>;
+    static generateActionFile(projectFolder: string, ActionFilename: string, appName: string, commandName: string): Promise<void>;
+    static addCodeToCommands(projectFolder: string, commandName: string): Promise<void>;
+}
+//# sourceMappingURL=metaOSHelper.d.ts.map

package/build/component/generator/officeAddin/metaOSHelper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"metaOSHelper.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/metaOSHelper.ts"],"names":[],"mappings":"AA4BA,qBAAa,YAAY;IACvB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;WAgBjC,sBAAsB,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM9F,MAAM,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM;IAI9D,MAAM,CAAC,4BAA4B,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM;IAkB9F,MAAM,CAAC,wBAAwB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM;WAY3E,UAAU,CAAC,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAwBjE,cAAc,CAAC,aAAa,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WA8D1E,cAAc,CACzB,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC;WA2BH,kBAAkB,CAC7B,aAAa,EAAE,MAAM,EACrB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,IAAI,CAAC;WA6DH,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CA8B1F"}

package/build/component/generator/officeAddin/metaOSHelper.js

@@ -0,0 +1,236 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetaOSHelper = void 0;
+const tslib_1 = require("tslib");
+/* eslint-disable @typescript-eslint/no-explicit-any */
+const path_1 = tslib_1.__importDefault(require("path"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const NOT_COPY_FILES = ["README.md", "teamsapp.yml", "m365agents.yml"];
+const NOT_COPY_FOLDERS = ["node_modules", "env"];
+const DEFAULT_MANIFEST_ID = "${{TEAMS_APP_ID}}";
+const DEFAULT_DA_ID = "declarativeCopilotAlc";
+const DEFAULT_CMD_NAME = "fillcolor";
+const DEFAULT_CMD_FILE_NAME = "commands.js";
+const DEFAULT_DA_FILENAME = "declarativeCopilot";
+const DEFAULT_ACTION_FILENAME = "Excel-API-local-plugin";
+const FILE_EXTENSION = ".json";
+class MetaOSHelper {
+    static copyFilterFn(filePath) {
+        for (const item of NOT_COPY_FILES) {
+            if (filePath.endsWith(item)) {
+                return false;
+            }
+        }
+        for (const item of NOT_COPY_FOLDERS) {
+            if (filePath.includes(item)) {
+                return false;
+            }
+        }
+        return true;
+    }
+    static async copyExistMetaOSProject(sourceFolder, targetFolder) {
+        await fs_extra_1.default.copy(sourceFolder, targetFolder, {
+            filter: MetaOSHelper.copyFilterFn,
+        });
+    }
+    static getNameWithSuffix(name, suffix) {
+        return suffix ? `${name}${suffix}` : name;
+    }
+    static ensureFunctionNameIsNotExist(jsonObj, key, functionName) {
+        let suffix = 0;
+        let nameConflict = false;
+        do {
+            nameConflict = false;
+            for (const obj of jsonObj) {
+                if ((obj === null || obj === void 0 ? void 0 : obj[key]) === MetaOSHelper.getNameWithSuffix(functionName, suffix)) {
+                    suffix++;
+                    nameConflict = true;
+                    break;
+                }
+            }
+        } while (nameConflict);
+        return MetaOSHelper.getNameWithSuffix(functionName, suffix);
+    }
+    static ensureFileNameIsNotExist(filePath, filename, ext) {
+        let suffix = 0;
+        while (fs_extra_1.default.existsSync(path_1.default.join(filePath, MetaOSHelper.getNameWithSuffix(filename, suffix), ext))) {
+            suffix++;
+        }
+        return `${MetaOSHelper.getNameWithSuffix(filename, suffix)}${ext}`;
+    }
+    static async extendToDA(projectFolder, appName) {
+        // Ensure schema files name
+        const DAFilename = MetaOSHelper.ensureFileNameIsNotExist(projectFolder, DEFAULT_DA_FILENAME, FILE_EXTENSION);
+        const ActionFilename = MetaOSHelper.ensureFileNameIsNotExist(projectFolder, DEFAULT_ACTION_FILENAME, FILE_EXTENSION);
+        // Modify manifest.json
+        const commandName = await MetaOSHelper.modifyManifest(projectFolder, DAFilename);
+        // generate DA files
+        await MetaOSHelper.generateDAFile(projectFolder, DAFilename, ActionFilename, appName);
+        await MetaOSHelper.generateActionFile(projectFolder, ActionFilename, appName, commandName);
+        // Add functions to command.ts
+        await MetaOSHelper.addCodeToCommands(projectFolder, commandName);
+    }
+    static async modifyManifest(projectFolder, DAFilename) {
+        var _a, _b, _c, _d;
+        let commandName = DEFAULT_CMD_NAME;
+        const manifestPath = path_1.default.join(projectFolder, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.ManifestTemplateFileName);
+        const manifest = (await teamsfx_api_1.AppManifestUtils.readTeamsManifest(manifestPath));
+        // Update manifest GUID
+        manifest.id = DEFAULT_MANIFEST_ID;
+        // Add the DA definition
+        manifest.copilotAgents = {
+            declarativeAgents: [
+                {
+                    id: DEFAULT_DA_ID,
+                    file: DAFilename,
+                },
+            ],
+        };
+        // Add the command to command's runtime
+        const runtimes = (_b = (_a = manifest.extensions) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.runtimes;
+        if (runtimes) {
+            let added = false;
+            for (const runtime of runtimes) {
+                if ((_d = (_c = runtime === null || runtime === void 0 ? void 0 : runtime.code) === null || _c === void 0 ? void 0 : _c.script) === null || _d === void 0 ? void 0 : _d.includes(DEFAULT_CMD_FILE_NAME)) {
+                    if (runtime.actions) {
+                        commandName = MetaOSHelper.ensureFunctionNameIsNotExist(runtime.actions, "id", commandName);
+                        runtime.actions.push({
+                            id: commandName,
+                            type: "executeFunction",
+                        });
+                    }
+                    else {
+                        runtime.actions = [
+                            {
+                                id: commandName,
+                                type: "executeFunction",
+                            },
+                        ];
+                    }
+                    added = true;
+                    break;
+                }
+            }
+            if (!added) {
+                throw new Error("No command's runtime found in manifest.extensions!");
+            }
+        }
+        else {
+            throw new Error("No runtimes found in manifest.extensions!");
+        }
+        // save file and return
+        await teamsfx_api_1.AppManifestUtils.writeTeamsManifest(manifestPath, manifest);
+        return commandName;
+    }
+    static async generateDAFile(projectFolder, DAFilename, ActionFilename, appName) {
+        const fileJson = {
+            version: "v1.3",
+            name: `Excel Add-in + Agent for ${appName}`,
+            description: "Agent for working with Excel cells.",
+            instructions: "You are an agent for working with an add-in. You can work with any cells, not just a well-formatted table.",
+            conversation_starters: [
+                {
+                    title: "Change cell color",
+                    text: "I want to change the color of cell B2 to orange",
+                },
+            ],
+            actions: [
+                {
+                    id: "localExcelPlugin",
+                    file: ActionFilename,
+                },
+            ],
+        };
+        await teamsfx_api_1.AppManifestUtils.writeDeclarativeAgentManifest(path_1.default.join(projectFolder, teamsfx_api_1.AppPackageFolderName, DAFilename), fileJson);
+    }
+    static async generateActionFile(projectFolder, ActionFilename, appName, commandName) {
+        // TODO: as any for temporary, since the runtime type `localPlugin` is not type defined yet
+        const fileJson = {
+            schema_version: "v2.2",
+            name_for_human: `Excel Add-in + Agent for ${appName}`,
+            description_for_human: `Add-in Actions in Agents for ${appName}`,
+            namespace: "addin_function",
+            functions: [
+                {
+                    name: `${commandName}`,
+                    description: `${commandName} changes a single cell location to a specific color.`,
+                    parameters: {
+                        type: "object",
+                        properties: {
+                            Cell: {
+                                type: "string",
+                                description: "A cell location in the format of A1, B2, etc.",
+                                default: "B2",
+                            },
+                            Color: {
+                                type: "string",
+                                description: "A color in hex format, e.g. #30d5c8",
+                                default: "#30d5c8",
+                            },
+                        },
+                        required: ["Cell", "Color"],
+                    },
+                    returns: {
+                        type: "string",
+                        description: "A string indicating the result of the action.",
+                    },
+                    states: {
+                        reasoning: {
+                            description: `\`${commandName}\` changes the color of a single cell based on the grid location and a color value.`,
+                            instructions: "The user will pass ask for a color that isn't in the hex format needed in most cases, make sure to convert to the closest approximation in the right format.",
+                        },
+                        responding: {
+                            description: `\`${commandName}\` changes the color of a single cell based on the grid location and a color value.`,
+                            instructions: "If there is no error present, tell the user the cell location and color that was set.",
+                        },
+                    },
+                },
+            ],
+            runtimes: [
+                {
+                    type: "LocalPlugin",
+                    spec: {
+                        local_endpoint: "ms-office-addin",
+                    },
+                    run_for_functions: [`${commandName}`],
+                },
+            ],
+        };
+        const filePath = path_1.default.join(projectFolder, teamsfx_api_1.AppPackageFolderName, ActionFilename);
+        // directly write JSON to avoid type check for not type defined runtime.type `LocalPlugin`
+        await fs_extra_1.default.writeJSON(filePath, fileJson, { spaces: 2 });
+    }
+    static async addCodeToCommands(projectFolder, commandName) {
+        if (!fs_extra_1.default.existsSync(path_1.default.join(projectFolder, "src", "commands", "commands.ts"))) {
+            throw new Error("command.ts file doesn't exist!");
+        }
+        const codeToAppend = `
+/* global Excel, performance, console */
+
+async function ${commandName}(cell, color) {
+  await Excel.run(async (context) => {
+    context.workbook.worksheets.getActiveWorksheet().getRange(cell).format.fill.color = color;
+    await context.sync();
+  });
+}
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+Office.onReady((info) => {
+  Office.actions.associate("${commandName}", async (message) => {
+    const start = performance.now();
+    const { Cell: cell, Color: color } = JSON.parse(message);
+    await ${commandName}(cell, color);
+    const duration = performance.now() - start;
+    const result = \`Demo add-in: Action completed! completed in \$\{duration.toFixed(0)\} ms.\`;
+    console.log(\`Returning result: "\$\{result\}"\`);
+    return result;
+  });
+});
+`;
+        await fs_extra_1.default.appendFile(path_1.default.join(projectFolder, "src", "commands", "commands.ts"), codeToAppend);
+    }
+}
+exports.MetaOSHelper = MetaOSHelper;
+//# sourceMappingURL=metaOSHelper.js.map

package/build/component/generator/officeAddin/metaOSHelper.js.map

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

package/build/component/generator/openApiSpec/helper.d.ts

@@ -31,7 +31,7 @@ interface SpecParserOutputFilePath {
 interface SpecParserGenerateResult {
     warnings: WarningResult[];
 }
-export declare function generateFromApiSpec(specParser: SpecParser, teamsManifestPath: string, inputs: Inputs, context: Context, sourceComponent: string, projectType: ProjectType, outputFilePath: SpecParserOutputFilePath, specPath: string): Promise<Result<SpecParserGenerateResult, FxError>>;
+export declare function generateFromApiSpec(specParser: SpecParser | undefined, teamsManifestPath: string, inputs: Inputs, context: Context, sourceComponent: string, projectType: ProjectType, outputFilePath: SpecParserOutputFilePath, specPath: string, updateExistingPlugin?: boolean): Promise<Result<SpecParserGenerateResult, FxError>>;
 export declare function logValidationResults(projectType: ProjectType, errors: ErrorResult[], warnings: WarningResult[], context: Context, shouldLogWarning: boolean, shouldSkipTelemetry: boolean, specHash?: string, existingCorrelationId?: string): void;
 export declare function injectAuthAction(projectPath: string, authName: string, authScheme: AuthType | undefined, outputApiSpecPath: string, forceToAddNew: boolean, authType?: string, enablePKCE?: boolean, registrationId?: string): Promise<AuthActionInjectResult | undefined>;
 /**

package/build/component/generator/openApiSpec/helper.d.ts.map

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

package/build/component/generator/openApiSpec/helper.js

@@ -138,6 +138,9 @@ async function listOperations(context, apiSpecUrl, inputs, includeExistingAPIs =
             ["oauth2-auth-count" /* telemetryProperties.oauth2AuthCount */]: oauth2AuthAPIs.length.toString(),
             ["other-auth-count" /* telemetryProperties.otherAuthCount */]: otherAuthAPIs.length.toString(),
             ["spec-hash" /* telemetryProperties.specHash */]: validationRes.specHash,
+            [telemetry_1.TelemetryProperty.IsKiotaNPMIntegrationEnabled]: featureFlags_1.featureFlagManager
+                .getBooleanValue(featureFlags_1.FeatureFlags.KiotaNPMIntegration)
+                .toString(),
         });
         // Filter out exsiting APIs
         if (!includeExistingAPIs) {
@@ -264,7 +267,7 @@ async function listPluginExistingOperations(manifest, teamsManifestPath, destina
     return listResult.APIs.map((o) => o.api);
 }
 exports.listPluginExistingOperations = listPluginExistingOperations;
-async function generateFromApiSpec(specParser, teamsManifestPath, inputs, context, sourceComponent, projectType, outputFilePath, specPath) {
+async function generateFromApiSpec(specParser, teamsManifestPath, inputs, context, sourceComponent, projectType, outputFilePath, specPath, updateExistingPlugin = false) {
     const operations = inputs[constants_2.QuestionNames.ApiOperation];
     let validationRes;
     if (projectType === m365_spec_parser_1.ProjectType.Copilot) {
@@ -302,7 +305,7 @@ async function generateFromApiSpec(specParser, teamsManifestPath, inputs, contex
             adaptiveCardUpdateStrategy = m365_spec_parser_1.AdaptiveCardUpdateStrategy.KeepExisting;
         }
         const generateResult = projectType === m365_spec_parser_1.ProjectType.Copilot
-            ? await (0, daSpecParser_1.generatePlugin)(specPath, teamsManifestPath, outputFilePath.destinationApiSpecFilePath, outputFilePath.pluginManifestFilePath, operations, adaptiveCardUpdateStrategy, inputs.platform)
+            ? await (0, daSpecParser_1.generatePlugin)(specPath, teamsManifestPath, outputFilePath.destinationApiSpecFilePath, outputFilePath.pluginManifestFilePath, operations, adaptiveCardUpdateStrategy, inputs.platform, updateExistingPlugin)
             : await specParser.generate(teamsManifestPath, operations, outputFilePath.destinationApiSpecFilePath, projectType === m365_spec_parser_1.ProjectType.TeamsAi ? undefined : outputFilePath.responseTemplateFolder);
         // Send SpecParser.generate() warnings
         context.telemetryReporter.sendTelemetryEvent(exports.specParserGenerateResultTelemetryEvent, {
@@ -312,6 +315,9 @@ async function generateFromApiSpec(specParser, teamsManifestPath, inputs, contex
                 .map((w) => `${w.type.toString()}: ${w.content}`)
                 .join(";"),
             [telemetry_1.TelemetryProperty.Component]: sourceComponent,
+            [telemetry_1.TelemetryProperty.IsKiotaNPMIntegrationEnabled]: featureFlags_1.featureFlagManager
+                .getBooleanValue(featureFlags_1.FeatureFlags.KiotaNPMIntegration)
+                .toString(),
         });
         if (generateResult.warnings && generateResult.warnings.length > 0) {
             generateResult.warnings.find((o) => {
@@ -350,6 +356,9 @@ function logValidationResults(projectType, errors, warnings, context, shouldLogW
         if (specHash) {
             properties["spec-hash" /* telemetryProperties.specHash */] = specHash;
         }
+        properties[telemetry_1.TelemetryProperty.IsKiotaNPMIntegrationEnabled] = featureFlags_1.featureFlagManager
+            .getBooleanValue(featureFlags_1.FeatureFlags.KiotaNPMIntegration)
+            .toString();
         const specNotValidError = errors.find((error) => error.type === m365_spec_parser_1.ErrorType.SpecNotValid);
         if (specNotValidError) {
             properties[telemetry_1.ApiSpecTelemetryPropertis.SpecNotValidDetails] = specNotValidError.content;
@@ -393,7 +402,9 @@ async function injectAuthAction(projectPath, authName, authScheme, outputApiSpec
     const ymlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath);
     const localYamlPath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "local", true);
     const relativeSpecPath = `./${path_1.default.relative(projectPath, outputApiSpecPath).replace(/\\/g, "/")}`;
-    if ((!!authScheme && m365_spec_parser_1.Utils.isBearerTokenAuth(authScheme)) || authType === constant_1.APIKeyAuthType) {
+    if ((!!authScheme &&
+        (m365_spec_parser_1.Utils.isBearerTokenAuth(authScheme) || m365_spec_parser_1.Utils.isAPIKeyAuthButNotInCookie(authScheme))) ||
+        authType === constant_1.APIKeyAuthType) {
         const res = await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(ymlPath, authName, relativeSpecPath, forceToAddNew, registrationId);
         if (!!localYamlPath && (await fs_extra_1.default.pathExists(localYamlPath))) {
             await actionInjector_1.ActionInjector.injectCreateAPIKeyAction(localYamlPath, authName, relativeSpecPath, forceToAddNew, registrationId);
@@ -465,6 +476,11 @@ function formatApiSpecValidationWarningMessage(specWarnings, apiSpecFileName, te
         resultWarnings.push(`${constant_1.SummaryConstant.Info} ` +
             (0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary.warning.swaggerVersion", apiSpecFileName));
     }
+    const spec31Warning = specWarnings.find((w) => w.type === m365_spec_parser_1.WarningType.OpenAPI31ConvertTo30);
+    if (spec31Warning) {
+        resultWarnings.push(`${constant_1.SummaryConstant.Info} ` +
+            (0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary.warning.spec31ConvertTo30", apiSpecFileName));
+    }
     const specialCharactersWarnings = specWarnings.filter((w) => w.type === m365_spec_parser_1.WarningType.OperationIdContainsSpecialCharacters);
     specialCharactersWarnings.forEach((warning) => {
         resultWarnings.push(`${constant_1.SummaryConstant.Info} ` +