@microsoft/teamsfx-core 3.1.0 → 3.1.1

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

@@ -2,13 +2,16 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OfficeAddinGeneratorNew = exports.OfficeAddinGenerator = void 0;
+exports.OfficeAddinGeneratorNew = exports.OFFICE_ADDIN_HOSTS = exports.OfficeAddinGenerator = exports.officeAddinGeneratorDeps = void 0;
 exports.getHost = getHost;
+const tslib_1 = require("tslib");
 /**
  * @author yefuwang@microsoft.com
  */
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const office_addin_project_1 = require("office-addin-project");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const officeAddinProject = tslib_1.__importStar(require("office-addin-project"));
+const path_1 = tslib_1.__importDefault(require("path"));
 const localizeUtils_1 = require("../../../common/localizeUtils");
 const stringUtils_1 = require("../../../common/stringUtils");
 const error_1 = require("../../../error");
@@ -17,7 +20,9 @@ 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");
+exports.officeAddinGeneratorDeps = {
+    convertProject: officeAddinProject.convertProject,
+};
 /**
  * case 1: project-type=office-xml-addin-type AND addin-host=outlook
  * case 2: project-type=office-addin-type (addin-host=undefined)
@@ -33,6 +38,22 @@ class OfficeAddinGenerator {
         process.chdir(addinRoot);
         try {
             if (fromFolder) {
+                // Validate the source project early to avoid cryptic failures when the user
+                // points at a manifest-only project.
+                // Without `package.json`, that project package's `convertProject` would
+                // ultimately call `Object.keys(content.scripts)` on undefined and throw runtime errors.
+                const sourceManifestFileEarly = inputs[constants_1.QuestionNames.OfficeAddinManifest];
+                if (sourceManifestFileEarly &&
+                    sourceManifestFileEarly.endsWith(".xml") &&
+                    !(await fs_extra_1.default.pathExists(path_1.default.join(fromFolder, "package.json")))) {
+                    await importProgress.end(false, true);
+                    process.chdir(workingDir);
+                    return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError({
+                        source: "office-addin-generator",
+                        name: "ManifestOnlyAddinNotSupported",
+                        message: (0, localizeUtils_1.getLocalizedString)("core.generator.officeAddin.importProject.manifestOnlyNotSupported", fromFolder),
+                    }));
+                }
                 await importProgress.start();
                 // from existing project
                 await importProgress.next((0, localizeUtils_1.getLocalizedString)("core.generator.officeAddin.importProject.copyFiles"));
@@ -41,8 +62,13 @@ class OfficeAddinGenerator {
                 let manifestFile = sourceManifestFile.replace(fromFolder, addinRoot);
                 await importProgress.next((0, localizeUtils_1.getLocalizedString)("core.generator.officeAddin.importProject.convertProject"));
                 if (manifestFile.endsWith(".xml")) {
+                    // The convertProject reads `./package.json` and calls `Object.keys(content.scripts)` unconditionally.
+                    // Formanifest-only Office Add-in projects there is no package.json (or no
+                    // `scripts` field), which would otherwise crash with runtime errors. Ensure a minimal
+                    // package.json with a `scripts` object exists before converting.
+                    await OfficeAddinGenerator.ensurePackageJsonForConvert(addinRoot);
                     // Need to convert to json project first
-                    await (0, office_addin_project_1.convertProject)(manifestFile, "./backup.zip", addinRoot, true);
+                    await exports.officeAddinGeneratorDeps.convertProject(manifestFile, "./backup.zip", addinRoot, true);
                     manifestFile = manifestFile.replace(/\.xml$/, ".json");
                 }
                 inputs[constants_1.QuestionNames.OfficeAddinHost] = await getHost(manifestFile);
@@ -59,6 +85,29 @@ class OfficeAddinGenerator {
             return (0, teamsfx_api_1.err)((0, error_1.assembleError)(e));
         }
     }
+    /**
+     * Ensure a `package.json` with a `scripts` object exists at `addinRoot`.
+     * The project package's `convertProject` reads
+     * `./package.json` and unconditionally calls `Object.keys(content.scripts)`,
+     * which throws runtime errors when the field is missing. Creating or
+     * normalizing the file beforehand prevents the crash.
+     */
+    static async ensurePackageJsonForConvert(addinRoot) {
+        const pkgJsonPath = path_1.default.join(addinRoot, "package.json");
+        let pkg = {};
+        if (await fs_extra_1.default.pathExists(pkgJsonPath)) {
+            try {
+                pkg = (await fs_extra_1.default.readJSON(pkgJsonPath));
+            }
+            catch {
+                pkg = {};
+            }
+        }
+        if (!pkg.scripts || typeof pkg.scripts !== "object") {
+            pkg.scripts = {};
+            await fs_extra_1.default.writeJSON(pkgJsonPath, pkg, { spaces: 2 });
+        }
+    }
 }
 exports.OfficeAddinGenerator = OfficeAddinGenerator;
 async function getHost(addinManifestPath) {
@@ -85,6 +134,27 @@ async function getHost(addinManifestPath) {
     }
     return host;
 }
+exports.OFFICE_ADDIN_HOSTS = ["word", "powerpoint", "outlook", "excel"];
+// Office add-in manifest requirement scope for each host.
+const OFFICE_ADDIN_HOST_SCOPE = {
+    outlook: "mail",
+    excel: "workbook",
+    word: "document",
+    powerpoint: "presentation",
+};
+function getSelectedOfficeAddinHosts(inputs) {
+    const hosts = inputs[constants_1.QuestionNames.OfficeAddinHosts];
+    // Fall back to all hosts when the question was not asked (CLI / non-interactive).
+    return Array.isArray(hosts) && hosts.length > 0 ? hosts : [...exports.OFFICE_ADDIN_HOSTS];
+}
+// Nested App Auth SSO template supports a single Office host.
+const OFFICE_ADDIN_NAA_HOSTS = ["word", "excel", "powerpoint"];
+function getSelectedNaaHost(inputs) {
+    const host = inputs[constants_1.QuestionNames.OfficeAddinNaaHost];
+    return typeof host === "string" && OFFICE_ADDIN_NAA_HOSTS.includes(host)
+        ? host
+        : "word";
+}
 class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerator {
     componentName = "office-addin-generator";
     // activation condition
@@ -94,55 +164,56 @@ class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerato
             templateNames_1.TemplateNames.OutlookTaskpane,
             templateNames_1.TemplateNames.WXPTaskpane,
             templateNames_1.TemplateNames.ExcelCFShortcut,
+            templateNames_1.TemplateNames.ExcelCustomFunctions,
+            templateNames_1.TemplateNames.OfficeAddinSsoNaa,
             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
-        // Handle upgrade - NO scaffolding needed
-        if (templateName === templateNames_1.TemplateNames.DeclarativeAgentMetaOSUpgradeProject) {
-            return Promise.resolve((0, teamsfx_api_1.ok)([]));
-        }
-        // Handle new project - needs scaffolding
-        if (templateName === templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject) {
-            return Promise.resolve((0, teamsfx_api_1.ok)([
-                {
-                    templateName: templateName,
-                    language: inputs[constants_1.QuestionNames.ProgrammingLanguage],
-                },
-            ]));
-        }
         // Hanlde the MetaOS Project
         const res = await OfficeAddinGenerator.doScaffolding(context, inputs, destinationPath);
         if (res.isErr())
             return (0, teamsfx_api_1.err)(res.error);
+        const replaceMap = { manifestId: (0, stringUtils_1.getUuid)() };
+        if (templateName === templateNames_1.TemplateNames.WXPTaskpane) {
+            const hosts = getSelectedOfficeAddinHosts(inputs);
+            for (const host of exports.OFFICE_ADDIN_HOSTS) {
+                replaceMap[host] = hosts.includes(host) ? "true" : "";
+            }
+            // Pre-join the manifest requirement scopes so the rendered JSON array stays
+            // valid for any host subset (avoids trailing-comma issues in Mustache).
+            replaceMap["manifestScopes"] = exports.OFFICE_ADDIN_HOSTS.filter((host) => hosts.includes(host))
+                .map((host) => `"${OFFICE_ADDIN_HOST_SCOPE[host]}"`)
+                .join(",\n                    ");
+        }
+        else if (templateName === templateNames_1.TemplateNames.OfficeAddinSsoNaa) {
+            // NAA SSO supports a single host; its source code is host-agnostic, so only
+            // the manifest scope and the debug host reflect the selection.
+            const naaHost = getSelectedNaaHost(inputs);
+            replaceMap["manifestScope"] = `"${OFFICE_ADDIN_HOST_SCOPE[naaHost]}"`;
+        }
         return Promise.resolve((0, teamsfx_api_1.ok)([
             {
                 templateName: templateName,
                 language: constants_1.ProgrammingLanguage.TS,
-                replaceMap: { manifestId: (0, stringUtils_1.getUuid)() },
+                replaceMap,
             },
         ]));
     }
     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]);
-                await metaOSHelper_1.MetaOSHelper.unifyProjectID(destinationPath);
-                return (0, teamsfx_api_1.ok)({});
-            }
-            catch (e) {
-                return (0, teamsfx_api_1.err)(e.message);
-            }
+        // Prune everything tied to the Office hosts that the user did not select.
+        if (inputs[constants_1.QuestionNames.TemplateName] === templateNames_1.TemplateNames.WXPTaskpane) {
+            const hosts = getSelectedOfficeAddinHosts(inputs);
+            await pruneUnselectedOfficeAddinHosts(destinationPath, hosts, { removeSourceFiles: true });
         }
-        else if (templateNames_1.TemplateNames.DeclarativeAgentMetaOSNewProject === inputs[constants_1.QuestionNames.TemplateName]) {
-            await metaOSHelper_1.MetaOSHelper.unifyProjectID(destinationPath);
-            return (0, teamsfx_api_1.ok)({});
+        else if (inputs[constants_1.QuestionNames.TemplateName] === templateNames_1.TemplateNames.OfficeAddinSsoNaa) {
+            // NAA source is host-agnostic (runtime host switch); only trim the debug
+            // config down to the single selected host.
+            const naaHost = getSelectedNaaHost(inputs);
+            await pruneUnselectedOfficeAddinHosts(destinationPath, [naaHost], {
+                removeSourceFiles: false,
+            });
         }
         // Hanlde the MetaOS Project import
         const fromFolder = inputs[constants_1.QuestionNames.OfficeAddinFolder];
@@ -160,4 +231,57 @@ class OfficeAddinGeneratorNew extends defaultGenerator_1.DefaultTemplateGenerato
     }
 }
 exports.OfficeAddinGeneratorNew = OfficeAddinGeneratorNew;
+/**
+ * Remove all references to unselected Office hosts from a scaffolded add-in
+ * project: (optionally) per-host source files, the `.vscode/launch.json` debug
+ * configurations/compounds (which drive the Run and Debug dropdown), and the
+ * `package.json` debug scripts / default debug app. `hosts` is the set of hosts
+ * to KEEP.
+ */
+async function pruneUnselectedOfficeAddinHosts(destinationPath, hosts, options) {
+    const unselected = exports.OFFICE_ADDIN_HOSTS.filter((host) => !hosts.includes(host));
+    const removeSourceFiles = options?.removeSourceFiles ?? true;
+    // 1. Per-host source files.
+    if (removeSourceFiles) {
+        for (const host of unselected) {
+            await fs_extra_1.default.remove(path_1.default.join(destinationPath, "src", "taskpane", `${host}.ts`));
+            await fs_extra_1.default.remove(path_1.default.join(destinationPath, "src", "commands", `${host}.ts`));
+        }
+    }
+    const hostSet = new Set(exports.OFFICE_ADDIN_HOSTS);
+    const selectedHostSet = new Set(hosts);
+    const isSelectedHostName = (name) => {
+        const firstToken = name.trim().split(/\s+/)[0]?.toLowerCase();
+        // Keep entries that do not belong to any known host, or belong to a selected one.
+        return firstToken && hostSet.has(firstToken) ? selectedHostSet.has(firstToken) : true;
+    };
+    // 2. `.vscode/launch.json` — filter host-specific configurations and compounds
+    //    so the Run and Debug dropdown only lists the selected hosts.
+    const launchPath = path_1.default.join(destinationPath, ".vscode", "launch.json");
+    if (await fs_extra_1.default.pathExists(launchPath)) {
+        const launch = await fs_extra_1.default.readJson(launchPath);
+        if (Array.isArray(launch.configurations)) {
+            launch.configurations = launch.configurations.filter((c) => isSelectedHostName(c.name ?? ""));
+        }
+        if (Array.isArray(launch.compounds)) {
+            launch.compounds = launch.compounds.filter((c) => isSelectedHostName(c.name ?? ""));
+        }
+        await fs_extra_1.default.writeJson(launchPath, launch, { spaces: 2 });
+    }
+    // 3. `package.json` — drop the `start:desktop:<host>` scripts for unselected
+    //    hosts and point the default debug app at a selected host.
+    const packagePath = path_1.default.join(destinationPath, "package.json");
+    if (await fs_extra_1.default.pathExists(packagePath)) {
+        const pkg = await fs_extra_1.default.readJson(packagePath);
+        if (pkg.scripts) {
+            for (const host of unselected) {
+                delete pkg.scripts[`start:desktop:${host}`];
+            }
+        }
+        if (pkg.config && !hosts.includes(pkg.config.app_to_debug)) {
+            pkg.config.app_to_debug = hosts[0];
+        }
+        await fs_extra_1.default.writeJson(packagePath, pkg, { spaces: 2 });
+    }
+}
 //# sourceMappingURL=generator.js.map

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":"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"}

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

@@ -2,6 +2,10 @@
  * @author darrmill@microsoft.com, yefuwang@microsoft.com
  */
 import { FxError, Result } from "@microsoft/teamsfx-api";
+import * as generatorUtils from "../utils";
+export declare const helperMethodsDeps: {
+    fetchZipFromUrl: typeof generatorUtils.fetchZipFromUrl;
+};
 export declare class HelperMethods {
     static copyAddinFiles(fromFolder: string, toFolder: string): void;
     static updateManifest(projectRoot: string, addinManifestPath: string): Promise<void>;

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

@@ -1 +1 @@
-{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAoB,OAAO,EAAgB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAQlG,qBAAa,aAAa;IACxB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAoB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;WA4CH,aAAa,CACxB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,cAAc,UAAO,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAuCvC;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}
+{"version":3,"file":"helperMethods.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/officeAddin/helperMethods.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,OAAO,EAAoB,OAAO,EAAgB,MAAM,EAAW,MAAM,wBAAwB,CAAC;AAMlG,OAAO,KAAK,cAAc,MAAM,UAAU,CAAC;AAE3C,eAAO,MAAM,iBAAiB;;CAE7B,CAAC;AAEF,qBAAa,aAAa;IACxB,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;WAMpD,cAAc,CAAC,WAAW,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAoB7E,oBAAoB,CAC/B,WAAW,EAAE,MAAM,EACnB,oBAAoB,EAAE,MAAM,GAC3B,OAAO,CAAC,IAAI,CAAC;WA4CH,aAAa,CACxB,SAAS,EAAE,MAAM,EACjB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EACjB,cAAc,UAAO,GACpB,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;CAuCvC;AAED,wBAAgB,iBAAiB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,GAAG,IAAI,CAKxF"}

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

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HelperMethods = void 0;
+exports.HelperMethods = exports.helperMethodsDeps = void 0;
 exports.unzipErrorHandler = unzipErrorHandler;
 const tslib_1 = require("tslib");
 /**
@@ -13,7 +13,10 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const common_1 = require("../../../error/common");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
-const utils_1 = require("../utils");
+const generatorUtils = tslib_1.__importStar(require("../utils"));
+exports.helperMethodsDeps = {
+    fetchZipFromUrl: generatorUtils.fetchZipFromUrl,
+};
 class HelperMethods {
     static copyAddinFiles(fromFolder, toFolder) {
         fs_extra_1.default.copySync(fromFolder, toFolder, {
@@ -76,7 +79,7 @@ class HelperMethods {
     static async fetchAndUnzip(component, zipUrl, targetDir, skipRootFolder = true) {
         let zip;
         try {
-            zip = await (0, utils_1.fetchZipFromUrl)(zipUrl);
+            zip = await exports.helperMethodsDeps.fetchZipFromUrl(zipUrl);
         }
         catch (e) {
             return (0, teamsfx_api_1.err)(new common_1.AccessGithubError(zipUrl, component, e));

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

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

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

@@ -2,9 +2,17 @@
  * @author KennethBWSong, Ning Tang
  */
 import { Context, FxError, GeneratorResult, Inputs, Result } from "@microsoft/teamsfx-api";
+import { assembleError } from "../../../error";
 import { ActionContext } from "../../middleware/actionExecutionMW";
 import { DefaultTemplateGenerator } from "../defaultGenerator";
 import { TemplateInfo } from "../templates/templateInfo";
+import { generateFilesFromApiSpec } from "./common";
+import { convertSpecParserErrorToFxError } from "./helper";
+export declare const customEngineAgentGeneratorDeps: {
+    generateFilesFromApiSpec: typeof generateFilesFromApiSpec;
+    convertSpecParserErrorToFxError: typeof convertSpecParserErrorToFxError;
+    assembleError: typeof assembleError;
+};
 export declare class CustomEngineAgentWithExistingApiSpecGenerator extends DefaultTemplateGenerator {
     componentName: string;
     activate(context: Context, inputs: Inputs): boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"customEngineAgentGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/customEngineAgentGenerator.ts"],"names":[],"mappings":"AAEA;;GAEG;AAGH,OAAO,EAAE,OAAO,EAAO,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAGhG,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAKzD,qBAAa,6CAA8C,SAAQ,wBAAwB;IACzF,aAAa,SAAqC;IAElC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAI7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAIrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAmB7C"}
+{"version":3,"file":"customEngineAgentGenerator.d.ts","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/customEngineAgentGenerator.ts"],"names":[],"mappings":"AAEA;;GAEG;AAGH,OAAO,EAAE,OAAO,EAAO,OAAO,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChG,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,OAAO,EAAE,wBAAwB,EAA+B,MAAM,UAAU,CAAC;AACjF,OAAO,EAAE,+BAA+B,EAAE,MAAM,UAAU,CAAC;AAE3D,eAAO,MAAM,8BAA8B;;;;CAI1C,CAAC;AAEF,qBAAa,6CAA8C,SAAQ,wBAAwB;IACzF,aAAa,SAAqC;IAElC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAI7C,gBAAgB,CACpC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,OAAO,CAAC,CAAC;IAIrB,IAAI,CACxB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,aAAa,CAAC,EAAE,aAAa,GAC5B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;CAmB7C"}

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

@@ -5,7 +5,7 @@
  * @author KennethBWSong, Ning Tang
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CustomEngineAgentWithExistingApiSpecGenerator = void 0;
+exports.CustomEngineAgentWithExistingApiSpecGenerator = exports.customEngineAgentGeneratorDeps = void 0;
 const m365_spec_parser_1 = require("@microsoft/m365-spec-parser");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const error_1 = require("../../../error");
@@ -14,6 +14,11 @@ const defaultGenerator_1 = require("../defaultGenerator");
 const templateNames_1 = require("../templates/templateNames");
 const common_1 = require("./common");
 const helper_1 = require("./helper");
+exports.customEngineAgentGeneratorDeps = {
+    generateFilesFromApiSpec: common_1.generateFilesFromApiSpec,
+    convertSpecParserErrorToFxError: helper_1.convertSpecParserErrorToFxError,
+    assembleError: error_1.assembleError,
+};
 class CustomEngineAgentWithExistingApiSpecGenerator extends defaultGenerator_1.DefaultTemplateGenerator {
     componentName = "cea-with-existing-api-generator";
     activate(context, inputs) {
@@ -24,15 +29,15 @@ class CustomEngineAgentWithExistingApiSpecGenerator extends defaultGenerator_1.D
     }
     async post(context, inputs, destinationPath, actionContext) {
         try {
-            return await (0, common_1.generateFilesFromApiSpec)(context, inputs, destinationPath, m365_spec_parser_1.ProjectType.TeamsAi, this.componentName);
+            return await exports.customEngineAgentGeneratorDeps.generateFilesFromApiSpec(context, inputs, destinationPath, m365_spec_parser_1.ProjectType.TeamsAi, this.componentName);
         }
         catch (e) {
             let error;
             if (e instanceof m365_spec_parser_1.SpecParserError) {
-                error = (0, helper_1.convertSpecParserErrorToFxError)(e);
+                error = exports.customEngineAgentGeneratorDeps.convertSpecParserErrorToFxError(e);
             }
             else {
-                error = (0, error_1.assembleError)(e);
+                error = exports.customEngineAgentGeneratorDeps.assembleError(e);
             }
             return (0, teamsfx_api_1.err)(error);
         }

package/build/component/generator/openApiSpec/customEngineAgentGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"customEngineAgentGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/customEngineAgentGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;AAEH,kEAA2E;AAC3E,wDAAgG;AAChG,0CAA+C;AAC/C,gDAAkD;AAElD,0DAA+D;AAE/D,8DAA2D;AAC3D,qCAAiF;AACjF,qCAA2D;AAE3D,MAAa,6CAA8C,SAAQ,2CAAwB;IACzF,aAAa,GAAG,iCAAiC,CAAC;IAElC,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO,6BAAa,CAAC,yBAAyB,IAAI,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;IACvF,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,OAAO,IAAA,oCAA2B,EAAC,OAAO,EAAE,MAAM,EAAE,8BAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1F,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,IAAI,CAAC;YACH,OAAO,MAAM,IAAA,iCAAwB,EACnC,OAAO,EACP,MAAM,EACN,eAAe,EACf,8BAAW,CAAC,OAAO,EACnB,IAAI,CAAC,aAAa,CACnB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC,YAAY,kCAAe,EAAE,CAAC;gBACjC,KAAK,GAAG,IAAA,wCAA+B,EAAC,CAAC,CAAC,CAAC;YAC7C,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,IAAA,qBAAa,EAAC,CAAC,CAAC,CAAC;YAC3B,CAAC;YACD,OAAO,IAAA,iBAAG,EAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;CACF;AAxCD,sGAwCC"}
+{"version":3,"file":"customEngineAgentGenerator.js","sourceRoot":"","sources":["../../../../src/component/generator/openApiSpec/customEngineAgentGenerator.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;AAClC;;GAEG;;;AAEH,kEAA2E;AAC3E,wDAAgG;AAChG,0CAA+C;AAC/C,gDAAkD;AAElD,0DAA+D;AAE/D,8DAA2D;AAC3D,qCAAiF;AACjF,qCAA2D;AAE9C,QAAA,8BAA8B,GAAG;IAC5C,wBAAwB,EAAxB,iCAAwB;IACxB,+BAA+B,EAA/B,wCAA+B;IAC/B,aAAa,EAAb,qBAAa;CACd,CAAC;AAEF,MAAa,6CAA8C,SAAQ,2CAAwB;IACzF,aAAa,GAAG,iCAAiC,CAAC;IAElC,QAAQ,CAAC,OAAgB,EAAE,MAAc;QACvD,OAAO,6BAAa,CAAC,yBAAyB,IAAI,MAAM,CAAC,wBAAa,CAAC,YAAY,CAAC,CAAC;IACvF,CAAC;IAEe,KAAK,CAAC,gBAAgB,CACpC,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,OAAO,IAAA,oCAA2B,EAAC,OAAO,EAAE,MAAM,EAAE,8BAAW,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;IAC1F,CAAC;IAEe,KAAK,CAAC,IAAI,CACxB,OAAgB,EAChB,MAAc,EACd,eAAuB,EACvB,aAA6B;QAE7B,IAAI,CAAC;YACH,OAAO,MAAM,sCAA8B,CAAC,wBAAwB,CAClE,OAAO,EACP,MAAM,EACN,eAAe,EACf,8BAAW,CAAC,OAAO,EACnB,IAAI,CAAC,aAAa,CACnB,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,KAAc,CAAC;YACnB,IAAI,CAAC,YAAY,kCAAe,EAAE,CAAC;gBACjC,KAAK,GAAG,sCAA8B,CAAC,+BAA+B,CAAC,CAAC,CAAC,CAAC;YAC5E,CAAC;iBAAM,CAAC;gBACN,KAAK,GAAG,sCAA8B,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAC1D,CAAC;YACD,OAAO,IAAA,iBAAG,EAAC,KAAK,CAAC,CAAC;QACpB,CAAC;IACH,CAAC;CACF;AAxCD,sGAwCC"}

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

@@ -1,11 +1,11 @@
 /**
  * @author yuqzho@microsoft.com
  */
-import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, AuthType, ParseOptions, ProjectType, SpecParser, SpecParserError, WarningResult } from "@microsoft/m365-spec-parser";
+import { ErrorResult as ApiSpecErrorResult, ErrorType as ApiSpecErrorType, AuthType, ProjectType, SpecParser, SpecParserError, WarningResult } from "@microsoft/m365-spec-parser";
 import { ApiOperation, Context, FxError, Inputs, Result, TeamsAppManifest, Warning } from "@microsoft/teamsfx-api";
 import { OpenAPIV3 } from "openapi-types";
 import { AuthActionInjectResult } from "../../configManager/actionInjector";
-export declare function getParserOptions(type: ProjectType, isDeclarativeAgent?: boolean, platform?: string): ParseOptions;
+export { getParserOptions } from "../../../common/openApiParserOptions";
 export declare const specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
 export declare const specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
 export declare const specParserGenerateResultWarningsTelemetryProperty = "warnings";
@@ -50,5 +50,4 @@ export declare function updateForCustomApi(spec: OpenAPIV3.Document, language: s
 export declare function getEnvName(authName: string): string;
 export declare function copyKiotaFolder(specPath: string, projectPath: string): Promise<void>;
 export declare function generateAdaptiveCardInPluginManifestForKiota(pluginManifestPath: string, specPath: string, context: Context): Promise<void>;
-export {};
 //# sourceMappingURL=helper.d.ts.map

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":"AAGA;;GAEG;AAEH,OAAO,EAGL,WAAW,IAAI,kBAAkB,EACjC,SAAS,IAAI,gBAAgB,EAC7B,QAAQ,EAKR,YAAY,EACZ,WAAW,EACX,UAAU,EACV,eAAe,EAIf,aAAa,EAEd,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,YAAY,EAEZ,OAAO,EAEP,OAAO,EACP,MAAM,EAIN,MAAM,EAGN,gBAAgB,EAEhB,OAAO,EACR,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAmB1C,OAAO,EAAkB,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAqC5F,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,WAAW,EACjB,kBAAkB,CAAC,EAAE,OAAO,EAC5B,QAAQ,CAAC,EAAE,MAAM,GAChB,YAAY,CAmDd;AAED,eAAO,MAAM,sCAAsC,gCAAgC,CAAC;AACpF,eAAO,MAAM,mDAAmD,gBAAgB,CAAC;AACjF,eAAO,MAAM,iDAAiD,aAAa,CAAC;AAE5E,eAAO,MAAM,uBAAuB,qBAAqB,CAAC;AAG1D,MAAM,WAAW,WAAW;IAC1B;;OAEG;IACH,IAAI,EAAE,gBAAgB,CAAC;IAEvB;;OAEG;IACH,OAAO,EAAE,MAAM,CAAC;IAEhB,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,wBAAsB,cAAc,CAClC,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,MAAM,EAAE,MAAM,EACd,mBAAmB,UAAO,EAC1B,gBAAgB,UAAO,EACvB,qBAAqB,CAAC,EAAE,MAAM,GAC7B,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,WAAW,EAAE,CAAC,CAAC,CAiMhD;AAmDD,wBAAsB,4BAA4B,CAChD,QAAQ,EAAE,gBAAgB,EAC1B,iBAAiB,EAAE,MAAM,EACzB,0BAA0B,EAAE,MAAM,GACjC,OAAO,CAAC,MAAM,EAAE,CAAC,CA4BnB;AAED,UAAU,wBAAwB;IAChC,0BAA0B,EAAE,MAAM,CAAC;IACnC,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAChC,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC;AAED,UAAU,wBAAwB;IAChC,QAAQ,EAAE,aAAa,EAAE,CAAC;CAC3B;AACD,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,UAAU,GAAG,SAAS,EAClC,iBAAiB,EAAE,MAAM,EACzB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,eAAe,EAAE,MAAM,EACvB,WAAW,EAAE,WAAW,EACxB,cAAc,EAAE,wBAAwB,EACxC,QAAQ,EAAE,MAAM,EAChB,oBAAoB,UAAQ,GAC3B,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAC,CA2GpD;AAED,wBAAgB,oBAAoB,CAClC,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,WAAW,EAAE,EACrB,QAAQ,EAAE,aAAa,EAAE,EACzB,OAAO,EAAE,OAAO,EAChB,gBAAgB,EAAE,OAAO,EACzB,mBAAmB,EAAE,OAAO,EAC5B,QAAQ,CAAC,EAAE,MAAM,EACjB,qBAAqB,CAAC,EAAE,MAAM,GAC7B,IAAI,CA4EN;AAED,wBAAsB,gBAAgB,CACpC,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,QAAQ,GAAG,SAAS,EAChC,iBAAiB,EAAE,MAAM,EACzB,aAAa,EAAE,OAAO,EACtB,QAAQ,CAAC,EAAE,MAAM,EACjB,UAAU,CAAC,EAAE,OAAO,EACpB,cAAc,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CAyD7C;AAED;;;;;;;;GAQG;AACH,wBAAsB,0BAA0B,CAC9C,QAAQ,EAAE,OAAO,EAAE,EACnB,aAAa,EAAE,gBAAgB,EAC/B,eAAe,EAAE,MAAM,EACvB,kBAAkB,EAAE,MAAM,GAAG,SAAS,EACtC,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC,CA4CjB;AA+ND,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAO/E;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,kBAAkB,EAAE,EAC5B,MAAM,EAAE,MAAM,GACb,kBAAkB,EAAE,CAQtB;AAkoBD,wBAAsB,kBAAkB,CACtC,IAAI,EAAE,SAAS,CAAC,QAAQ,EACxB,QAAQ,EAAE,MAAM,EAChB,eAAe,EAAE,MAAM,EACvB,mBAAmB,EAAE,MAAM,GAC1B,OAAO,CAAC,aAAa,EAAE,CAAC,CAmC1B;AAoCD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAc1F;AAED,wBAAsB,4CAA4C,CAChE,kBAAkB,EAAE,MAAM,EAC1B,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAcf"}
+{"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

@@ -2,8 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.invalidApiSpecErrorName = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = void 0;
-exports.getParserOptions = getParserOptions;
+exports.invalidApiSpecErrorName = exports.specParserGenerateResultWarningsTelemetryProperty = exports.specParserGenerateResultAllSuccessTelemetryProperty = exports.specParserGenerateResultTelemetryEvent = exports.getParserOptions = void 0;
 exports.listOperations = listOperations;
 exports.listPluginExistingOperations = listPluginExistingOperations;
 exports.generateFromApiSpec = generateFromApiSpec;
@@ -29,6 +28,7 @@ const util = tslib_1.__importStar(require("util"));
 const constants_1 = require("../../../common/constants");
 const featureFlags_1 = require("../../../common/featureFlags");
 const localizeUtils_1 = require("../../../common/localizeUtils");
+const openApiParserOptions_1 = require("../../../common/openApiParserOptions");
 const telemetry_1 = require("../../../common/telemetry");
 const error_1 = require("../../../error");
 const constants_2 = require("../../../question/constants");
@@ -37,59 +37,10 @@ const constant_1 = require("../../configManager/constant");
 const ManifestUtils_1 = require("../../driver/teamsApp/utils/ManifestUtils");
 const PluginManifestUtils_1 = require("../../driver/teamsApp/utils/PluginManifestUtils");
 const daSpecParser_1 = require("../../../common/daSpecParser");
+const mcpAuthScaffolder_1 = require("../../utils/mcpAuthScaffolder");
 const pathUtils_1 = require("../../utils/pathUtils");
-function getParserOptions(type, isDeclarativeAgent, platform) {
-    return type === m365_spec_parser_1.ProjectType.Copilot
-        ? {
-            isGptPlugin: isDeclarativeAgent,
-            allowAPIKeyAuth: false,
-            allowBearerTokenAuth: !!platform && platform === teamsfx_api_1.Platform.VS ? false : true,
-            allowMultipleParameters: true,
-            allowOauth2: !!platform && platform === teamsfx_api_1.Platform.VS ? false : true,
-            projectType: m365_spec_parser_1.ProjectType.Copilot,
-            allowMissingId: true,
-            allowSwagger: true,
-            allowMethods: [
-                "get",
-                "post",
-                "put",
-                "delete",
-                "patch",
-                "head",
-                "connect",
-                "options",
-                "trace",
-            ],
-            allowResponseSemantics: true,
-            allowConversationStarters: false, // Conversation starters in the plugin file are no longer used; they are now sourced from the declarativeAgent file.
-            allowConfirmation: false, // confirmation is not stable for public preview in Sydney, so it's temporarily set to false
-        }
-        : type === m365_spec_parser_1.ProjectType.TeamsAi
-            ? {
-                allowAPIKeyAuth: true,
-                allowBearerTokenAuth: true,
-                allowMultipleParameters: true,
-                allowOauth2: true,
-                projectType: m365_spec_parser_1.ProjectType.TeamsAi,
-                allowMethods: [
-                    "get",
-                    "post",
-                    "put",
-                    "delete",
-                    "patch",
-                    "head",
-                    "connect",
-                    "options",
-                    "trace",
-                ],
-            }
-            : {
-                projectType: type,
-                allowBearerTokenAuth: !!platform && platform === teamsfx_api_1.Platform.VS ? false : true, // Currently, API key auth support is actually bearer token auth
-                allowMultipleParameters: true,
-                allowOauth2: featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.SMEOAuth),
-            };
-}
+var openApiParserOptions_2 = require("../../../common/openApiParserOptions");
+Object.defineProperty(exports, "getParserOptions", { enumerable: true, get: function () { return openApiParserOptions_2.getParserOptions; } });
 exports.specParserGenerateResultTelemetryEvent = "spec-parser-generate-result";
 exports.specParserGenerateResultAllSuccessTelemetryProperty = "all-success";
 exports.specParserGenerateResultWarningsTelemetryProperty = "warnings";
@@ -104,7 +55,7 @@ async function listOperations(context, apiSpecUrl, inputs, includeExistingAPIs =
             ? m365_spec_parser_1.ProjectType.TeamsAi
             : m365_spec_parser_1.ProjectType.SME;
     try {
-        const specParser = new m365_spec_parser_1.SpecParser(apiSpecUrl, getParserOptions(projectType, undefined, inputs.platform));
+        const specParser = new m365_spec_parser_1.SpecParser(apiSpecUrl, (0, openApiParserOptions_1.getParserOptions)(projectType, undefined, inputs.platform));
         let validationRes;
         if (projectType === m365_spec_parser_1.ProjectType.Copilot) {
             validationRes = await (0, daSpecParser_1.validateOpenAPISpec)(apiSpecUrl, inputs.platform);
@@ -451,9 +402,17 @@ async function generateScaffoldingSummary(warnings, teamsManifest, apiSpecFilePa
             return `${constant_1.SummaryConstant.NotExecuted} ${warn}`;
         });
     }
+    // MCP scaffolding warnings are not spec-parser warnings, but they report a project that
+    // cannot provision until the developer edits it (unresolved auth placeholders, tools that
+    // could not be fetched), so they must reach the summary too. Declarative-agent projects
+    // route through this function, which would otherwise drop them silently.
+    const mcpWarningMessage = warnings.filter(mcpAuthScaffolder_1.isMCPScaffoldWarning).map((warn) => {
+        return `${constant_1.SummaryConstant.NotExecuted} ${warn.content}`;
+    });
     if (apiSpecWarningMessage.length ||
         manifestWarningMessage.length ||
-        pluginWarningMessage.length) {
+        pluginWarningMessage.length ||
+        mcpWarningMessage.length) {
         let details = "";
         if (apiSpecWarningMessage.length) {
             details += os_1.EOL + apiSpecWarningMessage.join(os_1.EOL);
@@ -464,6 +423,9 @@ async function generateScaffoldingSummary(warnings, teamsManifest, apiSpecFilePa
         if (pluginWarningMessage.length) {
             details += os_1.EOL + pluginWarningMessage.join(os_1.EOL);
         }
+        if (mcpWarningMessage.length) {
+            details += os_1.EOL + mcpWarningMessage.join(os_1.EOL);
+        }
         return (0, localizeUtils_1.getLocalizedString)("core.copilotPlugin.scaffold.summary", details);
     }
     else {
@@ -1190,7 +1152,7 @@ async function copyKiotaFolder(specPath, projectPath) {
 async function generateAdaptiveCardInPluginManifestForKiota(pluginManifestPath, specPath, context) {
     try {
         const operation = (await (0, daSpecParser_1.listAPIInfo)(specPath)).APIs.filter((value) => value.isValid).map((value) => value.api);
-        const specParser = new m365_spec_parser_1.SpecParser(specPath, getParserOptions(m365_spec_parser_1.ProjectType.Copilot, true));
+        const specParser = new m365_spec_parser_1.SpecParser(specPath, (0, openApiParserOptions_1.getParserOptions)(m365_spec_parser_1.ProjectType.Copilot, true));
         await specParser.generateAdaptiveCardInPlugin(pluginManifestPath, operation, undefined);
     }
     catch (error) {