chore: update MD defininition?

Author: WillieRuemmele

src/commands/agent/generate/template.ts

@@ -23,16 +23,12 @@ import type {
   Bot,
   BotVersion,
   BotTemplate,
-  GenAiPlanner,
   BotDialogGroup,
+  GenAiPlannerBundle,
   ConversationDefinitionGoal,
   ConversationVariable,
 } from '@salesforce/types/metadata';
 
-export type GenAiPlannerBundleExt = {
-  GenAiPlannerBundle: GenAiPlanner & { botTemplate?: string };
-};
-
 export type BotTemplateExt = {
   '?xml': { '@_version': '1.0'; '@_encoding': 'UTF-8' };
   BotTemplate: Omit<BotTemplate, 'botDialogGroups' | 'conversationGoals' | 'conversationVariables'> & {
@@ -114,18 +110,18 @@ export default class AgentGenerateTemplate extends SfCommand<AgentGenerateTempla
     // Parse the metadata files as JSON
     const botJson = xmlToJson<BotExt>(join(botDir, `${botName}.bot-meta.xml`), parser);
     const botVersionJson = xmlToJson<BotVersionExt>(join(botDir, `v${botVersion}.botVersion-meta.xml`), parser);
-    const genAiPlannerBundleMetaJson = xmlToJson<GenAiPlannerBundleExt>(
+    const genAiPlannerBundleMetaJson = xmlToJson<GenAiPlannerBundle>(
       join(genAiPlannerBundleDir, botName, `${botName}.genAiPlannerBundle`),
       parser
     );
 
     // Modify the metadata files for final output
     // TODO: Confirm this name (might be conversationDefinitionPlanners)
-    genAiPlannerBundleMetaJson.GenAiPlannerBundle.botTemplate = finalFilename;
+    genAiPlannerBundleMetaJson.botTemplate = finalFilename;
     const botTemplate = convertBotToBotTemplate(botJson, botVersionJson, finalFilename, botTemplateFilePath);
 
     // Build and save the metadata files
-    jsonToXml<GenAiPlannerBundleExt>(clonedGenAiPlannerBundleFilePath, genAiPlannerBundleMetaJson, builder);
+    jsonToXml<GenAiPlannerBundle>(clonedGenAiPlannerBundleFilePath, genAiPlannerBundleMetaJson, builder);
     jsonToXml<BotTemplateExt>(botTemplateFilePath, botTemplate, builder);
 
     this.log(`\nSaved BotTemplate to:\n - ${botTemplateFilePath}`);

test/nuts/shared-setup.ts

@@ -15,7 +15,7 @@
  */
 
 import { join } from 'node:path';
-import { Duration, TestSession } from '@salesforce/cli-plugins-testkit';
+import { Duration, TestSession, execCmd } from '@salesforce/cli-plugins-testkit';
 import { ComponentSetBuilder, RequestStatus, type ScopedPostDeploy } from '@salesforce/source-deploy-retrieve';
 import { Org, SfError, User, Lifecycle, Connection } from '@salesforce/core';
 import { sleep, ensureArray } from '@salesforce/kit';
@@ -113,8 +113,9 @@ export async function getTestSession(): Promise<TestSession> {
 
           // Create agent user using the new CLI command
           console.log('Creating agent user...');
-          const agentUserResult = await session.exec<{ username: string }>(
-            `org create agent-user --target-org ${defaultOrg.username} --json`
+          const agentUserResult = execCmd<{ username: string }>(
+            `org create agent-user --target-org ${defaultOrg.username} --json`,
+            { ensureExitCode: 0 }
           );
 
           if (!agentUserResult.jsonOutput?.result?.username) {

test/nuts/template.nut.ts

@@ -18,11 +18,8 @@ import { readFileSync } from 'node:fs';
 import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit';
 import { XMLParser } from 'fast-xml-parser';
 import { expect } from 'chai';
-import {
-  AgentGenerateTemplateResult,
-  BotTemplateExt,
-  GenAiPlannerBundleExt,
-} from '../../src/commands/agent/generate/template.js';
+import { GenAiPlannerBundle } from '@salesforce/types/metadata';
+import { AgentGenerateTemplateResult, BotTemplateExt } from '../../src/commands/agent/generate/template.js';
 import { getTestSession } from './shared-setup.js';
 
 describe('agent generate template NUTs', function () {
@@ -123,10 +120,10 @@ describe('agent generate template NUTs', function () {
 
     const generatedGenAiPlannerBundleFile = parser.parse(
       readFileSync(generatedGenAiPlannerBundleFilePath, 'utf-8')
-    ) as GenAiPlannerBundleExt;
+    ) as GenAiPlannerBundle;
     const mockGenAiPlannerBundleFile = parser.parse(
       readFileSync(mockGenAiPlannerBundleFilePath, 'utf-8')
-    ) as GenAiPlannerBundleExt;
+    ) as GenAiPlannerBundle;
     expect(generatedGenAiPlannerBundleFile).to.deep.equal(mockGenAiPlannerBundleFile);
   });
 });