Merge pull request #230 from salesforcecli/er/promptUserToSelectAgentFile

W-19829287: if api-name flag is not used, prompt user to select an .agent file from the project

Author: WillieRuemmele

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

@@ -129,7 +129,7 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
 
       // Generate file paths
       const agentPath = join(targetOutputDir, `${bundleApiName}.agent`);
-      const metaXmlPath = join(targetOutputDir, `${bundleApiName}.aiAuthoringBundle-meta.xml`);
+      const metaXmlPath = join(targetOutputDir, `${bundleApiName}.bundle-meta.xml`);
 
       // Write Agent file
       const conn = targetOrg.getConnection(flags['api-version']);

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

@@ -22,7 +22,7 @@ import { Messages, Lifecycle, SfError } from '@salesforce/core';
 import { Agent, findAuthoringBundle } from '@salesforce/agents';
 import { RequestStatus, type ScopedPostRetrieve } from '@salesforce/source-deploy-retrieve';
 import { ensureArray } from '@salesforce/kit';
-import { FlaggablePrompt, promptForFlag } from '../../../flags.js';
+import { FlaggablePrompt, promptForFileByExtensions } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.publish.authoring-bundle');
@@ -67,9 +67,10 @@ export default class AgentPublishAuthoringBundle extends SfCommand<AgentPublishA
 
   public async run(): Promise<AgentPublishAuthoringBundleResult> {
     const { flags } = await this.parse(AgentPublishAuthoringBundle);
-    // If we don't have an api name yet, prompt for it
+    // If api-name is not provided, prompt user to select an .agent file from the project and extract the API name from it
     const apiName =
-      flags['api-name'] ?? (await promptForFlag(AgentPublishAuthoringBundle.FLAGGABLE_PROMPTS['api-name']));
+      flags['api-name'] ??
+      (await promptForFileByExtensions(AgentPublishAuthoringBundle.FLAGGABLE_PROMPTS['api-name'], ['.agent'], true));
     // todo: this eslint warning can be removed once published
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     const authoringBundleDir = findAuthoringBundle(this.project!.getPath(), apiName);

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

@@ -21,7 +21,7 @@ import { MultiStageOutput } from '@oclif/multi-stage-output';
 import { Agent, findAuthoringBundle } from '@salesforce/agents';
 import { Duration, sleep } from '@salesforce/kit';
 import { colorize } from '@oclif/core/ux';
-import { FlaggablePrompt, promptForFlag } from '../../../flags.js';
+import { FlaggablePrompt, promptForFileByExtensions } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.validate.authoring-bundle');
@@ -65,9 +65,10 @@ export default class AgentValidateAuthoringBundle extends SfCommand<AgentValidat
 
   public async run(): Promise<AgentValidateAuthoringBundleResult> {
     const { flags } = await this.parse(AgentValidateAuthoringBundle);
-    // If we don't have an api name yet, prompt for it
+    // If api-name is not provided, prompt user to select an .agent file from the project and extract the API name from it
     const apiName =
-      flags['api-name'] ?? (await promptForFlag(AgentValidateAuthoringBundle.FLAGGABLE_PROMPTS['api-name']));
+      flags['api-name'] ??
+      (await promptForFileByExtensions(AgentValidateAuthoringBundle.FLAGGABLE_PROMPTS['api-name'], ['.agent'], true));
     const authoringBundleDir = findAuthoringBundle(this.project!.getPath(), apiName);
     if (!authoringBundleDir) {
       throw new SfError(messages.getMessage('error.agentNotFound', [apiName]), 'AgentNotFoundError', [

src/flags.ts

@@ -15,7 +15,7 @@
  */
 
 import { readdir } from 'node:fs/promises';
-import { join, relative } from 'node:path';
+import { basename, join, relative } from 'node:path';
 import { Interfaces } from '@oclif/core';
 import { Flags } from '@salesforce/sf-plugins-core';
 import { Connection, Messages, SfError } from '@salesforce/core';
@@ -151,21 +151,32 @@ export const promptForAiEvaluationDefinitionApiName = async (
   });
 };
 
-export const promptForYamlFile = async (flagDef: FlaggablePrompt): Promise<string> => {
+export const promptForFileByExtensions = async (
+  flagDef: FlaggablePrompt,
+  extensions: string[],
+  fileNameOnly = false
+): Promise<string> => {
   const hiddenDirs = await getHiddenDirs();
-  const yamlFiles = await traverseForFiles(process.cwd(), ['.yml', '.yaml'], ['node_modules', ...hiddenDirs]);
+  const files = await traverseForFiles(process.cwd(), extensions, ['node_modules', ...hiddenDirs]);
   return autocomplete({
-    message: flagDef.message,
+    message: flagDef.promptMessage ?? flagDef.message.replace(/\.$/, ''),
     // eslint-disable-next-line @typescript-eslint/require-await
     source: async (input) => {
-      const arr = yamlFiles.map((o) => ({ name: relative(process.cwd(), o), value: o }));
-
+      let arr;
+      if (fileNameOnly) {
+        arr = files.map((o) => ({ name: basename(o).split('.')[0], value: basename(o).split('.')[0] }));
+      } else {
+        arr = files.map((o) => ({ name: relative(process.cwd(), o), value: o }));
+      }
       if (!input) return arr;
       return arr.filter((o) => o.name.includes(input));
     },
   });
 };
 
+export const promptForYamlFile = async (flagDef: FlaggablePrompt): Promise<string> =>
+  promptForFileByExtensions(flagDef, ['.yml', '.yaml']);
+
 export const promptForFlag = async (flagDef: FlaggablePrompt): Promise<string> => {
   const message = flagDef.promptMessage ?? flagDef.message.replace(/\.$/, '');
   if (flagDef.options) {