Merge branch 'nga' into er/add-mso-step-to-publish-aab-command

Author: shetzel

messages/agent.generate.authoring-bundle.md

@@ -18,6 +18,10 @@ This command requires an org because it uses it to access an LLM for generating
 
 Path to the agent spec YAML file; if not specified, the command provides a list that you can choose from.
 
+# flags.spec.prompt
+
+Path to the agent spec YAML file
+
 # flags.output-dir.summary
 
 Directory where the authoring bundle files are generated.
@@ -26,6 +30,10 @@ Directory where the authoring bundle files are generated.
 
 Name (label) of the authoring bundle; if not specified, you're prompted for the name.
 
+# flags.name.prompt
+
+Name (label) of the authoring bundle
+
 # flags.api-name.summary
 
 API name of the new authoring bundle; if not specified, the API name is derived from the authoring bundle name (label); the API name can't exist in the org.

messages/agent.publish.authoring-bundle.md

@@ -6,7 +6,7 @@ Publish an authoring bundle to your org, which results in a new agent or a new v
 
 An authoring bundle is a metadata type (named aiAuthoringBundle) that provides the blueprint for an agent. The metadata type contains two files: the standard metatada XML file and an Agent Script file (extension ".agent") that fully describes the agent using the Agent Script language.
 
-When you publish an authoring bundle to your org, a number of things happen. First, this command validates that the Agent Script file successfully compiles. If there are compilation errors, the command exits and you must fix the Agent Script file to continue. Once the Agent Script file compiles, then the authoring bundle metadata component is deployed to the org. All associated agent metadata components, such as the Bot, BotVersion, and GenAiXXX components, are either created or updated in the org. Finally, all the new or changed metadata components associated with the new agent are retrieved back to your local DX project.
+When you publish an authoring bundle to your org, a number of things happen. First, this command validates that the Agent Script file successfully compiles. If there are compilation errors, the command exits and you must fix the Agent Script file to continue. Once the Agent Script file compiles, then it's published to the org, which in turn creates new associated metadata (Bot, BotVersion, GenAiX), or new versions of the metadata if the agent already exists. The new or updated metadata is retrieved back to your DX project, and then the authoring bundle metadata (AiAuthoringBundle) is deployed to your org. 
 
 This command uses the API name of the authoring bundle.
 

package.json

@@ -9,7 +9,7 @@
     "@inquirer/prompts": "^7.8.6",
     "@oclif/core": "^4",
     "@oclif/multi-stage-output": "^0.8.23",
-    "@salesforce/agents": "0.18.3-nga.8",
+    "@salesforce/agents": "0.19.3",
     "@salesforce/core": "^8.23.1",
     "@salesforce/kit": "^3.2.3",
     "@salesforce/sf-plugins-core": "^12.2.4",
@@ -78,12 +78,19 @@
         "external": true,
         "subtopics": {
           "test": {
+            "description": "Commands to test agents.",
+            "external": true
+          },
+          "publish": {
+            "description": "Command to publish agents to an org.",
             "external": true
           },
           "generate": {
+            "description": "Commands to generate agent artifacts, such as the agent spec YAML file, authoring bundle, and test spec file.",
             "external": true
           },
-          "create": {
+          "validate": {
+            "description": "Command to validate an Agent Script file.",
             "external": true
           }
         }

schemas/agent-generate-agent__spec.json

@@ -69,7 +69,7 @@
     },
     "AgentType": {
       "type": "string",
-      "enum": ["customer", "internal"]
+      "enum": ["customer", "internal", "AGENT"]
     }
   }
 }

src/commands/agent/generate/authoring-bundle.ts

@@ -15,7 +15,7 @@
  */
 
 import { join, resolve } from 'node:path';
-import { mkdirSync, writeFileSync, readFileSync, existsSync } from 'node:fs';
+import { readFileSync, existsSync } from 'node:fs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { generateApiName, Messages, SfError } from '@salesforce/core';
 import { Agent, AgentJobSpec } from '@salesforce/agents';
@@ -64,6 +64,7 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
   private static readonly FLAGGABLE_PROMPTS = {
     name: {
       message: messages.getMessage('flags.name.summary'),
+      promptMessage: messages.getMessage('flags.name.prompt'),
       validate: (d: string): boolean | string =>
         d.trim().length > 0 || 'Name cannot be empty or contain only whitespace',
       required: true,
@@ -87,6 +88,7 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
     },
     spec: {
       message: messages.getMessage('flags.spec.summary'),
+      promptMessage: messages.getMessage('flags.spec.prompt'),
       validate: (d: string): boolean | string => {
         const specPath = resolve(d);
         if (!existsSync(specPath)) {
@@ -135,22 +137,12 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
       // Write Agent file
       const conn = targetOrg.getConnection(flags['api-version']);
       const specContents = YAML.parse(readFileSync(spec, 'utf8')) as AgentJobSpec;
-      const agent = await Agent.createAgentScript(conn, { ...specContents, ...{ name, developerName: bundleApiName } });
-      // Create output directory if it doesn't exist
-      mkdirSync(targetOutputDir, { recursive: true });
-      writeFileSync(agentPath, agent);
-
-      // Write meta.xml file
-      const metaXml = `<?xml version="1.0" encoding="UTF-8"?>
-<aiAuthoringBundle>
-  <Label>${specContents.role}</Label>
-  <BundleType>${specContents.agentType}</BundleType>
-  <VersionTag>Spring2026</VersionTag>
-  <VersionDescription>Initial release for ${bundleApiName}</VersionDescription>
-  <SourceBundleVersion></SourceBundleVersion>
-  <Target></Target>
-</aiAuthoringBundle>`;
-      writeFileSync(metaXmlPath, metaXml);
+      await Agent.createAuthoringBundle({
+        connection: conn,
+        agentSpec: { ...specContents, ...{ name, developerName: bundleApiName } },
+        project: this.project!,
+        bundleApiName,
+      });
 
       this.logSuccess(`Successfully generated ${bundleApiName} Authoring Bundle`);
 

yarn.lock

@@ -1595,18 +1595,18 @@
   resolved "https://registry.yarnpkg.com/@rtsao/scc/-/scc-1.1.0.tgz#927dd2fae9bc3361403ac2c7a00c32ddce9ad7e8"
   integrity sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==
 
-"@salesforce/agents@0.18.3-nga.8":
-  version "0.18.3-nga.8"
-  resolved "https://registry.yarnpkg.com/@salesforce/agents/-/agents-0.18.3-nga.8.tgz#f5aceafa449c175c50ab63b2ae1bec2fbe29c314"
-  integrity sha512-hi0LQdiuVKhHIHugqtexX0/GtRPCk6BMY4PxqOox8ZVqiOgPU6+/MUgB6Lt8T+rDUaJ0tx05g1SDq08eWWr3aQ==
+"@salesforce/agents@0.19.3":
+  version "0.19.3"
+  resolved "https://registry.yarnpkg.com/@salesforce/agents/-/agents-0.19.3.tgz#adf3edc5f340d57e34bbf368d851729d18267661"
+  integrity sha512-PA4Bh6pbzWTEFxowl3aHDpNLgulNTWqztvkJxJbgbbnIg/N6tl3ZL1FbIw0C1bLEvZCJpgeCNsXgsE20c5Tkuw==
   dependencies:
-    "@salesforce/core" "^8.23.4"
+    "@salesforce/core" "^8.23.5"
     "@salesforce/kit" "^3.2.4"
-    "@salesforce/source-deploy-retrieve" "^12.25.0"
+    "@salesforce/source-deploy-retrieve" "^12.30.0"
     "@salesforce/types" "^1.5.0"
-    fast-xml-parser "^5.2.5"
+    fast-xml-parser "^5.3.2"
     nock "^13.5.6"
-    yaml "^2.8.1"
+    yaml "^2.8.2"
 
 "@salesforce/cli-plugins-testkit@^5.3.41":
   version "5.3.41"
@@ -1649,6 +1649,31 @@
     semver "^7.7.3"
     ts-retry-promise "^0.8.1"
 
+"@salesforce/core@^8.23.5":
+  version "8.23.6"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.23.6.tgz#caa73369b3fe80df9e8212c58491c4490f9d326d"
+  integrity sha512-NPPp9vfOUtVCojrk8NRq+c6O4cil7i0Tz/BBh6+4tNbJTEk1scZdzkTUGGQ6ZSImesUyLiIsEo0Afc/UobtRnw==
+  dependencies:
+    "@jsforce/jsforce-node" "^3.10.10"
+    "@salesforce/kit" "^3.2.4"
+    "@salesforce/schemas" "^1.10.3"
+    "@salesforce/ts-types" "^2.0.12"
+    ajv "^8.17.1"
+    change-case "^4.1.2"
+    fast-levenshtein "^3.0.0"
+    faye "^1.4.1"
+    form-data "^4.0.4"
+    js2xmlparser "^4.0.1"
+    jsonwebtoken "9.0.2"
+    jszip "3.10.1"
+    memfs "^4.30.1"
+    pino "^9.7.0"
+    pino-abstract-transport "^1.2.0"
+    pino-pretty "^11.3.0"
+    proper-lockfile "^4.1.2"
+    semver "^7.7.3"
+    ts-retry-promise "^0.8.1"
+
 "@salesforce/dev-config@^4.3.1":
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.3.2.tgz#10047e2b8d289c93f157ab4243a1b1de57f2d6a2"
@@ -1751,7 +1776,7 @@
     cli-progress "^3.12.0"
     terminal-link "^3.0.0"
 
-"@salesforce/source-deploy-retrieve@^12.25.0":
+"@salesforce/source-deploy-retrieve@^12.25.0", "@salesforce/source-deploy-retrieve@^12.30.0":
   version "12.30.0"
   resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.30.0.tgz#cae4e00b5f9f301f28d9224997f63bfa5a7ede1b"
   integrity sha512-elfNE4NRw2JNRsYoS/e9Gi2KdaFg7c2JVdRY6ZT20vpxV3z81SvvbYhauiKOYkVvsP3Y+FBEzWiG6AwdF0fSWA==
@@ -4594,7 +4619,7 @@ fast-xml-parser@^4.5.1, fast-xml-parser@^4.5.3:
   dependencies:
     strnum "^1.1.1"
 
-fast-xml-parser@^5.2.5:
+fast-xml-parser@^5.3.2:
   version "5.3.2"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.3.2.tgz#78a51945fbf7312e1ff6726cb173f515b4ea11d8"
   integrity sha512-n8v8b6p4Z1sMgqRmqLJm3awW4NX7NkaKPfb3uJIBTSH7Pdvufi3PQ3/lJLQrvxcMYl7JI2jnDO90siPEpD8JBA==
@@ -9072,7 +9097,7 @@ yallist@^4.0.0:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^2.5.1, yaml@^2.8.1:
+yaml@^2.5.1, yaml@^2.8.1, yaml@^2.8.2:
   version "2.8.2"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-2.8.2.tgz#5694f25eca0ce9c3e7a9d9e00ce0ddabbd9e35c5"
   integrity sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==