feat: add agent skills support for declarative agents

packages/api/src/constants.ts

@@ -84,6 +84,7 @@ export enum Stage {
   kiotaRegenerate = "kiotaRegenerate",
   addAuthAction = "addAuthAction",
   addKnowledge = "addKnowledge",
+  addSkill = "addSkill",
   setSensitivityLabel = "setSensitivityLabel",
   installApp = "installApp",
   updateActionWithMCP = "updateActionWithMCP",

packages/cli/src/commands/models/add.ts

@@ -1,14 +1,24 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 import { CLICommand } from "@microsoft/teamsfx-api";
+import { featureFlagManager, FeatureFlags } from "@microsoft/teamsfx-core";
 import { commands } from "../../resource";
 import { addSPFxWebpartCommand } from "./addSPFxWebpart";
 import { addPluginCommand } from "./addPlugin";
 import { addAuthConfigCommand } from "./addAuthConfig";
 import { addCapabilityCommand } from "./addCapability";
+import { addSkillCommand } from "./addSkill";
 
 const adjustCommands = (): CLICommand[] => {
-  return [addSPFxWebpartCommand, addPluginCommand, addAuthConfigCommand, addCapabilityCommand];
+  return [
+    addSPFxWebpartCommand,
+    addPluginCommand,
+    addAuthConfigCommand,
+    addCapabilityCommand,
+    ...(featureFlagManager.getBooleanValue(FeatureFlags.AgentSkillsEnabled)
+      ? [addSkillCommand]
+      : []),
+  ];
 };
 export function addCommand(): CLICommand {
   return {

packages/cli/src/commands/models/addSkill.ts

@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+import { CLICommand } from "@microsoft/teamsfx-api";
+import { AddSkillInputs, AddSkillOptions } from "@microsoft/teamsfx-core";
+import { getFxCore } from "../../activate";
+import { commands } from "../../resource";
+import { TelemetryEvent } from "../../telemetry/cliTelemetryEvents";
+import { ProjectFolderOption } from "../common";
+
+export const addSkillCommand: CLICommand = {
+  name: "skill",
+  description: commands["add.skill"].description,
+  options: [...AddSkillOptions, ProjectFolderOption],
+  telemetry: {
+    event: TelemetryEvent.AddSkill,
+  },
+  handler: async (ctx) => {
+    const inputs = ctx.optionValues as AddSkillInputs;
+    const core = getFxCore();
+    const res = await core.addSkill(inputs);
+    return res;
+  },
+};

packages/cli/src/resource/commands.json

@@ -62,6 +62,9 @@
   "add.capability": {
     "description": "A capability to extend Copilot using your APIs."
   },
+  "add.skill": {
+    "description": "An agent skill to bundle with your Declarative Agent."
+  },
   "regenerate": {
     "description": "Regenerate existing resources for your app."
   },

packages/cli/src/telemetry/cliTelemetryEvents.ts

@@ -128,6 +128,7 @@ export enum TelemetryEvent {
   AddCopilotPlugin = "add-copilot-plugin",
   RegneratePlugin = "regenerate-copilot-plugin",
   AddAuthAction = "add-auth-action",
+  AddSkill = "add-skill",
 
   SetSensitivityLabel = "set-sensitivity-label",
 }

packages/fx-core/resource/package.nls.json

@@ -6,6 +6,8 @@
   "core.regenerateApi.continue": "Regenerate",
   "core.addKnowledge.confirm": "Microsoft 365 Agents Toolkit will modify files in your \"%s\" folder based on the capability source you provided. To avoid losing unexpected changes, back up your files or use git for change tracking before proceeding.",
   "core.addKnowledge.continue": "Add",
+  "core.addSkill.confirm": "Microsoft 365 Agents Toolkit will modify files in your \"%s\" folder to add the agent skill. To avoid losing unexpected changes, back up your files or use git for change tracking before proceeding.",
+  "core.addSkill.continue": "Add",
   "core.setSensitivityLabel.confirm": "Teams Toolkit will modify the file \"%s\" based on the sensitivity label you provided. To avoid losing unexpected changes, back up your files or use git for change tracking before proceeding.",
   "core.setSensitivityLabel.continue": "Set",
   "core.provision.provision": "Provision",
@@ -479,6 +481,9 @@
   "core.addKnowledge.success.vsc": "Capability source added to the project successfully.",
   "core.addKnowledge.success": "Capability source added to the project successfully. View agent manifest in \"%s\".",
   "core.addKnowledge.success.viewAgentManifest": "View agent manifest",
+  "core.addSkill.success.vsc": "Agent skill added to the project successfully.",
+  "core.addSkill.success": "Agent skill added to the project successfully. View agent manifest in \"%s\".",
+  "core.addSkill.success.viewAgentManifest": "View agent manifest",
   "core.scaffold.warning.summary": "We have detected following issues:\n%s",
   "core.addPlugin.warning.manifestVariables": "Environment variables \"%s\" found in manifest of the added plugin. Ensure the values are set in .env file or system environment variables.",
   "core.addPlugin.warning.apiSpecVariables": "Environment variables \"%s\" found in API specification of the added plugin. Ensure the values are set in .env file or system environment variables.",
@@ -1059,6 +1064,26 @@
   "driver.typespec.error.multipleActionError": "More than one action found in declarativeAgent.json. Please make sure your TypeSpec files are valid and try again.",
   "driver.typeSpec.progressBar": "Compiling and generating files...",
   "core.addKnowledge.doubleConfirm": "Performing this action will overwrite your existing manifest file and can't be undone. To keep your existing data, please back it up before proceeding. Would you like to add new content?",
+  "core.addSkillQuestion.name.title": "Skill Name",
+  "core.addSkillQuestion.name.placeholder": "Enter a name for your skill (letters, numbers, and hyphens only)",
+  "core.addSkillQuestion.name.validation": "Skill name must start with a letter and contain only letters, numbers, and hyphens.",
+  "core.addSkillQuestion.name.duplicate": "A skill named \"%s\" already exists. Please choose a different name.",
+  "core.addSkillQuestion.description.title": "Skill Description",
+  "core.addSkillQuestion.description.placeholder": "Describe what this skill does",
+  "core.addSkillQuestion.expose.title": "Expose skill to M365 Copilot",
+  "core.addSkillQuestion.expose.yes": "Yes",
+  "core.addSkillQuestion.expose.no": "No",
+  "core.addSkillQuestion.sourceType.title": "How would you like to add a skill?",
+  "core.addSkillQuestion.sourceType.new": "Create a new skill",
+  "core.addSkillQuestion.sourceType.newDetail": "Start from scratch with a blank skill template",
+  "core.addSkillQuestion.sourceType.existing": "Start from an existing skill",
+  "core.addSkillQuestion.sourceType.existingDetail": "Import a skill from a .zip file",
+  "core.addSkillQuestion.zipFile.title": "Select a skill zip file",
+  "core.addSkillQuestion.zipFile.placeholder": "Select a .zip file containing a skill",
+  "core.addSkill.zipInvalidEntries": "The zip file contains invalid entries (path traversal or absolute paths). Please provide a valid skill zip file.",
+  "core.addSkill.zipNoSkillMd": "The zip file does not contain a SKILL.md file. Each skill must include a SKILL.md file.",
+  "core.addSkill.zipInvalidLayout": "The zip file has an invalid layout. It must contain either a single skill folder or skill files at the root level.",
+  "core.addSkill.zipSkillFolderExists": "A skill folder named \"%s\" already exists in the app package. Please remove it first or choose a different skill.",
   "error.dep.InstallNodeJSError": "Unable to install Node.js for reason: %s. Please install it manually from https://nodejs.org and restart Visual Studio Code.",
   "action.devTool.nodeInstaller.Progress.title": "Install NodeJS",
   "action.devTool.nodeInstaller.Progress1": "Checking NodeJS in system environment",

packages/fx-core/src/common/featureFlags.ts

@@ -28,6 +28,7 @@ export class FeatureFlagName {
   static readonly CFShortcutMetaOS = "TEAMSFX_CF_SHORTCUT_METAOS";
   static readonly MCPForDA = "TEAMSFX_MCP_FOR_DA";
   static readonly BrokerAuth = "TEAMSFX_BROKER_AUTH";
+  static readonly AgentSkillsEnabled = "TEAMSFX_AGENT_SKILLS";
   // Add config files to existing project to make it toolkit compatible
   static readonly GenerateConfigFiles = "TEAMSFX_GENERATE_CONFIG_FILES";
 
@@ -102,6 +103,10 @@ export class FeatureFlags {
     name: FeatureFlagName.BrokerAuth,
     defaultValue: "false",
   };
+  static readonly AgentSkillsEnabled = {
+    name: FeatureFlagName.AgentSkillsEnabled,
+    defaultValue: "false",
+  };
   static readonly GenerateConfigFiles = {
     name: FeatureFlagName.GenerateConfigFiles,
     defaultValue: "false",

packages/fx-core/src/component/driver/teamsApp/createAppPackage.ts

@@ -381,6 +381,39 @@ export class CreateAppPackageDriver implements StepDriver {
             }
           }
         }
+        // Add agent skill directories (support both agent_skills and x-agent_skills)
+        const agentSkills =
+          getCopilotGptRes.value.agent_skills || (getCopilotGptRes.value as any)["x-agent_skills"];
+        if (agentSkills && Array.isArray(agentSkills)) {
+          for (const skill of agentSkills) {
+            if (skill.folder) {
+              // Resolve skill folder relative to appDirectory (not .generated/)
+              // since skill folders don't support env var substitution
+              const skillFolderAbsolutePath = path.resolve(appDirectory, skill.folder);
+              const checkExistenceRes = await this.validateReferencedFile(
+                skillFolderAbsolutePath,
+                appDirectory
+              );
+              if (checkExistenceRes.isErr()) {
+                return err(checkExistenceRes.error);
+              }
+
+              const skillMdPath = path.join(skillFolderAbsolutePath, "SKILL.md");
+              if (!(await fs.pathExists(skillMdPath))) {
+                return err(
+                  new FileNotFoundError(
+                    actionName,
+                    skillMdPath,
+                    "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"
+                  )
+                );
+              }
+
+              const skillRelativePath = path.relative(appDirectory, skillFolderAbsolutePath);
+              zip.addLocalFolder(skillFolderAbsolutePath, skillRelativePath);
+            }
+          }
+        }
       } else {
         return err(getCopilotGptRes.error);
       }

packages/fx-core/src/component/driver/teamsApp/interfaces/ValidationResult.ts

@@ -5,10 +5,17 @@ export interface DeclarativeCopilotManifestValidationResult {
   filePath: string;
   validationResult: string[];
   actionValidationResult: PluginManifestValidationResult[];
+  skillValidationResult: SkillValidationResult[];
 }
 
 export interface PluginManifestValidationResult {
   id: string;
   filePath: string;
   validationResult: string[];
 }
+
+export interface SkillValidationResult {
+  folder: string;
+  filePath: string;
+  validationResult: string[];
+}