fix: copilot spec parser

OfficeDev · Sep 30, 2024 · 1d93226 · 1d93226
1 parent 467e728
commit 1d93226
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/manifest/src/index.ts b/packages/manifest/src/index.ts
@@ -235,4 +235,9 @@ export class ManifestUtil {
 
     return telemetryProperties;
   }
+
+  static async useCopilotExtensionsInSchema(manifest: TeamsAppManifest): Promise<boolean> {
+    const schema = await this.fetchSchema(manifest);
+    return !!schema.value.definitions?.copilotExtensions;
+  }
 }
diff --git a/packages/spec-parser/src/manifestUpdater.ts b/packages/spec-parser/src/manifestUpdater.ts
@@ -24,6 +24,7 @@ import {
   PluginManifestSchema,
   FunctionObject,
   AuthObject,
+  ManifestUtil,
 } from "@microsoft/teams-manifest";
 import { AdaptiveCardGenerator } from "./adaptiveCardGenerator";
 import { wrapResponseSemantics } from "./adaptiveCardWrapper";
@@ -41,7 +42,9 @@ export class ManifestUpdater {
     const manifest: TeamsAppManifest = await fs.readJSON(manifestPath);
     const apiPluginRelativePath = ManifestUpdater.getRelativePath(manifestPath, apiPluginFilePath);
 
-    if (manifest.copilotExtensions) {
+    const useCopilotExtensionsInSchema = await ManifestUtil.useCopilotExtensionsInSchema(manifest);
+    if (useCopilotExtensionsInSchema) {
+      manifest.copilotExtensions = manifest.copilotExtensions || {};
       if (!options.isGptPlugin) {
         manifest.copilotExtensions.plugins = [
           {
@@ -52,8 +55,7 @@ export class ManifestUpdater {
         ManifestUpdater.updateManifestDescription(manifest, spec);
       }
     } else {
-      (manifest as any).copilotAgents = (manifest as any).copilotAgents || {};
-
+      manifest.copilotAgents = manifest.copilotAgents || {};
       if (!options.isGptPlugin) {
         (manifest as any).copilotAgents.plugins = [
           {