Merge pull request #202 from salesforcecli/wr/packagingUpdates

Wr/packaging updates @W-19337177@ @W-19443706@ @W-19366681@

Author: soridalac

README.md

@@ -59,18 +59,24 @@ sf plugins
 
 <!-- commands -->
 
-- [`sf agent activate`](#sf-agent-activate)
-- [`sf agent create`](#sf-agent-create)
-- [`sf agent deactivate`](#sf-agent-deactivate)
-- [`sf agent generate agent-spec`](#sf-agent-generate-agent-spec)
-- [`sf agent generate template`](#sf-agent-generate-template)
-- [`sf agent generate test-spec`](#sf-agent-generate-test-spec)
-- [`sf agent preview`](#sf-agent-preview)
-- [`sf agent test create`](#sf-agent-test-create)
-- [`sf agent test list`](#sf-agent-test-list)
-- [`sf agent test results`](#sf-agent-test-results)
-- [`sf agent test resume`](#sf-agent-test-resume)
-- [`sf agent test run`](#sf-agent-test-run)
+- [plugin-agent](#plugin-agent)
+  - [Install](#install)
+  - [Contributing](#contributing)
+    - [CLA](#cla)
+    - [Build](#build)
+  - [Commands](#commands)
+  - [`sf agent activate`](#sf-agent-activate)
+  - [`sf agent create`](#sf-agent-create)
+  - [`sf agent deactivate`](#sf-agent-deactivate)
+  - [`sf agent generate agent-spec`](#sf-agent-generate-agent-spec)
+  - [`sf agent generate template`](#sf-agent-generate-template)
+  - [`sf agent generate test-spec`](#sf-agent-generate-test-spec)
+  - [`sf agent preview`](#sf-agent-preview)
+  - [`sf agent test create`](#sf-agent-test-create)
+  - [`sf agent test list`](#sf-agent-test-list)
+  - [`sf agent test results`](#sf-agent-test-results)
+  - [`sf agent test resume`](#sf-agent-test-resume)
+  - [`sf agent test run`](#sf-agent-test-run)
 
 ## `sf agent activate`
 

src/commands/agent/generate/template.ts

@@ -35,7 +35,11 @@ export type BotTemplateExt = {
 };
 
 type BotExt = {
-  Bot: Bot;
+  Bot: Bot & {
+    agentDSLEnabled?: boolean;
+    botSource?: string;
+    agentTemplate?: string;
+  };
 };
 
 type BotVersionExt = {
@@ -155,23 +159,16 @@ const convertBotToBotTemplate = (
   delete bot.Bot.botUser;
   delete bot.Bot.logPrivateConversationData;
   delete bot.Bot.sessionTimeout;
+  delete bot.Bot.agentDSLEnabled;
+  delete bot.Bot.botSource;
+  delete bot.Bot.agentTemplate;
 
   const botTemplate: BotTemplateExt = {
     '?xml': { '@_version': '1.0', '@_encoding': 'UTF-8' },
     BotTemplate: {
       masterLabel,
       conversationLanguages: 'en_US',
-      mainMenuDialog: 'Main_Menu',
-      botDialogs: [
-        {
-          developerName: 'Main_Menu',
-          isPlaceholderDialog: false,
-          label: 'Main_Menu',
-          showInFooterMenu: false,
-          botSteps: [],
-        },
-        entryDialogJson,
-      ],
+      botDialogs: [entryDialogJson],
       conversationSystemDialogs,
       conversationVariables,
       entryDialog,

test/commands/agent/generate/template.nut.ts

@@ -93,7 +93,10 @@ describe('agent generate template NUTs', () => {
       genAiPlannerBundleFilePath
     );
 
-    const parser = new XMLParser({ ignoreAttributes: false });
+    const parser = new XMLParser({
+      ignoreAttributes: false,
+      isArray: (name) => ['botDialogs', 'contextVariables', 'contextVariableMappings', 'botSteps'].includes(name),
+    });
 
     // read both files and compare them
     const generatedBotTemplateFile = parser.parse(
@@ -102,6 +105,15 @@ describe('agent generate template NUTs', () => {
     const mockBotTemplateFile = parser.parse(readFileSync(mockBotTemplateFilePath, 'utf-8')) as BotTemplateExt;
     expect(generatedBotTemplateFile).to.deep.equal(mockBotTemplateFile);
 
+    // Verify that mainMenuDialog and Main_Menu dialog are not present in the generated template
+    expect(generatedBotTemplateFile.BotTemplate).to.not.have.property('mainMenuDialog');
+    expect(generatedBotTemplateFile.BotTemplate.botDialogs).to.be.an('array').with.lengthOf(1);
+    expect(generatedBotTemplateFile.BotTemplate.botDialogs[0].developerName).to.not.equal('Main_Menu');
+    expect(generatedBotTemplateFile.BotTemplate).to.not.have.property('agentTemplate');
+    expect(generatedBotTemplateFile.BotTemplate).to.not.have.property('agentDSLEnabled');
+    expect(generatedBotTemplateFile.BotTemplate).to.not.have.property('Main_Menu_Dialog');
+    expect(generatedBotTemplateFile.BotTemplate).to.not.have.property('botSource');
+
     const generatedGenAiPlannerBundleFile = parser.parse(
       readFileSync(generatedGenAiPlannerBundleFilePath, 'utf-8')
     ) as GenAiPlannerBundleExt;

test/mock-projects/agent-generate-template/MOCK-XML/force-app/main/default/botTemplates/Guest_Experience_Agent_v1_Template.botTemplate-meta.xml

@@ -2,13 +2,6 @@
 <BotTemplate xmlns="http://soap.sforce.com/2006/04/metadata">
     <masterLabel>Guest Experience Agent</masterLabel>
     <conversationLanguages>en_US</conversationLanguages>
-    <mainMenuDialog>Main_Menu</mainMenuDialog>
-    <botDialogs>
-        <developerName>Main_Menu</developerName>
-        <isPlaceholderDialog>false</isPlaceholderDialog>
-        <label>Main_Menu</label>
-        <showInFooterMenu>false</showInFooterMenu>
-    </botDialogs>
     <botDialogs>
         <botSteps>
             <botMessages>

test/mock-projects/agent-generate-template/force-app/main/default/bots/Guest_Experience_Agent/Guest_Experience_Agent.bot-meta.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Bot xmlns="http://soap.sforce.com/2006/04/metadata">
     <agentType>EinsteinServiceAgent</agentType>
+    <agentTemplate>myTemplate</agentTemplate>
+    <agentDSLEnabled>true</agentDSLEnabled>
+    <botSource>123</botSource>
     <botMlDomain>
         <label>Guest Experience Agent</label>
         <name>Guest_Experience_Agent</name>