Merge branch 'wr/nga' into js/edit-messages

Author: EstebanRomero84

.github/workflows/onRelease.yml

@@ -25,7 +25,7 @@ jobs:
     uses: salesforcecli/github-workflows/.github/workflows/npmPublish.yml@main
     needs: [getDistTag]
     with:
-      ctc: true
+      #      ctc: true
       sign: true
       tag: ${{ needs.getDistTag.outputs.tag || 'latest' }}
       githubTag: ${{ github.event.release.tag_name || inputs.tag }}

README.md

@@ -112,7 +112,7 @@ EXAMPLES
     $ sf agent activate --api-name Resort_Manager --target-org my-org
 ```
 
-_See code: [src/commands/agent/activate.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/activate.ts)_
+_See code: [src/commands/agent/activate.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/activate.ts)_
 
 ## `sf agent create`
 
@@ -174,7 +174,7 @@ EXAMPLES
     $ sf agent create --name "Resort Manager" --spec specs/resortManagerAgent.yaml --preview
 ```
 
-_See code: [src/commands/agent/create.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/create.ts)_
+_See code: [src/commands/agent/create.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/create.ts)_
 
 ## `sf agent deactivate`
 
@@ -214,7 +214,7 @@ EXAMPLES
     $ sf agent deactivate --api-name Resort_Manager --target-org my-org
 ```
 
-_See code: [src/commands/agent/deactivate.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/deactivate.ts)_
+_See code: [src/commands/agent/deactivate.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/deactivate.ts)_
 
 ## `sf agent generate agent-spec`
 
@@ -319,7 +319,7 @@ EXAMPLES
     $ sf agent generate agent-spec --tone formal --agent-user [email protected]
 ```
 
-_See code: [src/commands/agent/generate/agent-spec.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/generate/agent-spec.ts)_
+_See code: [src/commands/agent/generate/agent-spec.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/generate/agent-spec.ts)_
 
 ## `sf agent generate authoring-bundle`
 
@@ -360,7 +360,7 @@ EXAMPLES
       path/to/output
 ```
 
-_See code: [src/commands/agent/generate/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/generate/authoring-bundle.ts)_
+_See code: [src/commands/agent/generate/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/generate/authoring-bundle.ts)_
 
 ## `sf agent generate template`
 
@@ -408,7 +408,7 @@ EXAMPLES
       force-app/main/default/bots/My_Awesome_Agent/My_Awesome_Agent.bot-meta.xml --agent-version 1
 ```
 
-_See code: [src/commands/agent/generate/template.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/generate/template.ts)_
+_See code: [src/commands/agent/generate/template.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/generate/template.ts)_
 
 ## `sf agent generate test-spec`
 
@@ -469,7 +469,7 @@ EXAMPLES
       force-app//main/default/aiEvaluationDefinitions/Resort_Manager_Tests.aiEvaluationDefinition-meta.xml
 ```
 
-_See code: [src/commands/agent/generate/test-spec.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/generate/test-spec.ts)_
+_See code: [src/commands/agent/generate/test-spec.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/generate/test-spec.ts)_
 
 ## `sf agent preview`
 
@@ -534,7 +534,7 @@ EXAMPLES
       transcripts/my-preview
 ```
 
-_See code: [src/commands/agent/preview.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/preview.ts)_
+_See code: [src/commands/agent/preview.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/preview.ts)_
 
 ## `sf agent publish authoring-bundle`
 
@@ -545,7 +545,7 @@ USAGE
   $ sf agent publish authoring-bundle -o <value> [--json] [--flags-dir <value>] [--api-version <value>] [-n <value>]
 
 FLAGS
-  -n, --api-name=<value>     API name of the Agent Authoring Bundle to publish
+  -n, --api-name=<value>     API name of the Agent Authoring Bundle to publish.
   -o, --target-org=<value>   (required) Username or alias of the target org. Not required if the `target-org`
                              configuration variable is already set.
       --api-version=<value>  Override the api version used for api requests made by this command
@@ -557,7 +557,7 @@ GLOBAL FLAGS
 DESCRIPTION
   Publish an Agent Authoring Bundle as a new agent
 
-  Publishes an Agent Authoring Bundle by compiling the AF script and creating a new agent in your org.
+  Publishes an Agent Authoring Bundle by compiling the .agent file and creating a new agent in your org.
 
 EXAMPLES
   Publish an Agent Authoring Bundle:
@@ -566,7 +566,7 @@ EXAMPLES
       [email protected]
 ```
 
-_See code: [src/commands/agent/publish/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/publish/authoring-bundle.ts)_
+_See code: [src/commands/agent/publish/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/publish/authoring-bundle.ts)_
 
 ## `sf agent test create`
 
@@ -621,7 +621,7 @@ EXAMPLES
     $ sf agent test create --spec specs/Resort_Manager-testSpec.yaml --api-name Resort_Manager_Test --preview
 ```
 
-_See code: [src/commands/agent/test/create.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/test/create.ts)_
+_See code: [src/commands/agent/test/create.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/test/create.ts)_
 
 ## `sf agent test list`
 
@@ -656,7 +656,7 @@ EXAMPLES
     $ sf agent test list --target-org my-org
 ```
 
-_See code: [src/commands/agent/test/list.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/test/list.ts)_
+_See code: [src/commands/agent/test/list.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/test/list.ts)_
 
 ## `sf agent test results`
 
@@ -722,7 +722,7 @@ FLAG DESCRIPTIONS
     expression when using custom evaluations.
 ```
 
-_See code: [src/commands/agent/test/results.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/test/results.ts)_
+_See code: [src/commands/agent/test/results.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/test/results.ts)_
 
 ## `sf agent test resume`
 
@@ -795,7 +795,7 @@ FLAG DESCRIPTIONS
     expression when using custom evaluations.
 ```
 
-_See code: [src/commands/agent/test/resume.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/test/resume.ts)_
+_See code: [src/commands/agent/test/resume.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/test/resume.ts)_
 
 ## `sf agent test run`
 
@@ -869,7 +869,7 @@ FLAG DESCRIPTIONS
     expression when using custom evaluations.
 ```
 
-_See code: [src/commands/agent/test/run.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/test/run.ts)_
+_See code: [src/commands/agent/test/run.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/test/run.ts)_
 
 ## `sf agent validate authoring-bundle`
 
@@ -880,7 +880,7 @@ USAGE
   $ sf agent validate authoring-bundle -o <value> [--json] [--flags-dir <value>] [--api-version <value>] [-n <value>]
 
 FLAGS
-  -n, --api-name=<value>     Path to the Agent Authoring Bundle to validate
+  -n, --api-name=<value>     API name of the Agent Authoring Bundle to validate.
   -o, --target-org=<value>   (required) Username or alias of the target org. Not required if the `target-org`
                              configuration variable is already set.
       --api-version=<value>  Override the api version used for api requests made by this command
@@ -892,14 +892,14 @@ GLOBAL FLAGS
 DESCRIPTION
   Validate an Agent Authoring Bundle
 
-  Validates an Agent Authoring Bundle by compiling the AF script and checking for errors.
+  Validates an Agent Authoring Bundle by compiling the .agent file and checking for errors.
 
 EXAMPLES
   Validate an Agent Authoring Bundle:
 
     $ sf agent validate authoring-bundle --api-name path/to/bundle
 ```
 
-_See code: [src/commands/agent/validate/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.3/src/commands/agent/validate/authoring-bundle.ts)_
+_See code: [src/commands/agent/validate/authoring-bundle.ts](https://github.com/salesforcecli/plugin-agent/blob/1.24.14-demo.8/src/commands/agent/validate/authoring-bundle.ts)_
 
 <!-- commandsstop -->

messages/agent.publish.authoring-bundle.md

@@ -43,7 +43,7 @@ Failed to publish agent with the following errors:
 
 # error.agentNotFound
 
-Couldn't find an .agent file with API name '%s' in the project.
+Could not find a .bundle-meta.xml file with API name '%s' in the project.
 
 # error.agentNotFoundAction
 

messages/agent.test.run.md

@@ -14,6 +14,10 @@ By default, this command outputs test results in human-readable tables for each
 
 API name of the agent test to run; corresponds to the name of the AiEvaluationDefinition metadata component that implements the agent test.
 
+# flags.api-name.prompt
+
+API name of the agent test to run
+
 # flags.wait.summary
 
 Number of minutes to wait for the command to complete and display results to the terminal window.

messages/agent.validate.authoring-bundle.md

@@ -39,7 +39,7 @@ Compilation of the agent file failed with the following errors:
 
 # error.agentNotFound
 
-Couldn't find an ".agent" file with API name '%s' in the project.
+Could not find a .bundle-meta.xml file with API name '%s' in the project.
 
 # error.agentNotFoundAction
 

package.json

@@ -1,15 +1,15 @@
 {
   "name": "@salesforce/plugin-agent",
   "description": "Commands to interact with Salesforce agents",
-  "version": "1.24.14-demo.3",
+  "version": "1.24.14-demo.8",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@inquirer/core": "^10.2.2",
     "@inquirer/prompts": "^7.8.6",
     "@oclif/core": "^4",
     "@oclif/multi-stage-output": "^0.8.23",
-    "@salesforce/agents": "^0.17.11",
+    "@salesforce/agents": "^0.18.1",
     "@salesforce/core": "^8.23.1",
     "@salesforce/kit": "^3.2.3",
     "@salesforce/sf-plugins-core": "^12.2.4",
@@ -25,17 +25,17 @@
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.19",
-    "@oclif/test": "^4.1.0",
+    "@oclif/test": "^4.1.14",
     "@salesforce/cli-plugins-testkit": "^5.3.41",
     "@salesforce/dev-scripts": "^11.0.4",
-    "@salesforce/plugin-command-reference": "^3.1.67",
+    "@salesforce/plugin-command-reference": "^3.1.72",
     "@types/inquirer": "^9.0.9",
     "@types/react": "^18.3.3",
     "eslint-config-xo": "^0.49.0",
     "eslint-config-xo-react": "^0.27.0",
     "eslint-plugin-react": "^7.34.3",
     "eslint-plugin-react-hooks": "^4.6.2",
-    "eslint-plugin-sf-plugin": "^1.20.20",
+    "eslint-plugin-sf-plugin": "^1.20.33",
     "esmock": "^2.7.1",
     "oclif": "^4.22.14",
     "ts-node": "^10.9.2",

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

@@ -134,7 +134,7 @@ 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.createAfScript(conn, specContents);
+      const agent = await Agent.createAgent(conn, specContents);
       // Create output directory if it doesn't exist
       mkdirSync(targetOutputDir, { recursive: true });
       writeFileSync(agentPath, agent);

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, promptForFileByExtensions } from '../../../flags.js';
+import { FlaggablePrompt, promptForAgentFiles } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.publish.authoring-bundle');
@@ -70,10 +70,11 @@ export default class AgentPublishAuthoringBundle extends SfCommand<AgentPublishA
     // 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 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);
+      (await promptForAgentFiles(this.project!, AgentPublishAuthoringBundle.FLAGGABLE_PROMPTS['api-name']));
+    const authoringBundleDir = findAuthoringBundle(
+      this.project!.getPackageDirectories().map((dir) => dir.fullPath),
+      apiName
+    );
 
     if (!authoringBundleDir) {
       throw new SfError(messages.getMessage('error.agentNotFound', [apiName]), 'AgentNotFoundError', [
@@ -101,8 +102,8 @@ export default class AgentPublishAuthoringBundle extends SfCommand<AgentPublishA
       const targetOrg = flags['target-org'];
       const conn = targetOrg.getConnection(flags['api-version']);
 
-      // First compile the AF script to get the Agent JSON
-      const agentJson = await Agent.compileAfScript(
+      // First compile the .agent file to get the Agent JSON
+      const agentJson = await Agent.compileAgent(
         conn,
         readFileSync(join(authoringBundleDir, `${apiName}.agent`), 'utf8')
       );

src/commands/agent/test/run.ts

@@ -40,6 +40,7 @@ const FLAGGABLE_PROMPTS = {
     char: 'n',
     required: true,
     message: messages.getMessage('flags.api-name.summary'),
+    promptMessage: messages.getMessage('flags.api-name.prompt'),
     validate: (d: string): boolean | string => {
       if (d.length === 0) {
         return true;

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, promptForFileByExtensions } from '../../../flags.js';
+import { FlaggablePrompt, promptForAgentFiles } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.validate.authoring-bundle');
@@ -68,8 +68,11 @@ export default class AgentValidateAuthoringBundle extends SfCommand<AgentValidat
     // 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 promptForFileByExtensions(AgentValidateAuthoringBundle.FLAGGABLE_PROMPTS['api-name'], ['.agent'], true));
-    const authoringBundleDir = findAuthoringBundle(this.project!.getPath(), apiName);
+      (await promptForAgentFiles(this.project!, AgentValidateAuthoringBundle.FLAGGABLE_PROMPTS['api-name']));
+    const authoringBundleDir = findAuthoringBundle(
+      this.project!.getPackageDirectories().map((dir) => dir.fullPath),
+      apiName
+    );
     if (!authoringBundleDir) {
       throw new SfError(messages.getMessage('error.agentNotFound', [apiName]), 'AgentNotFoundError', [
         messages.getMessage('error.agentNotFoundAction'),
@@ -100,9 +103,9 @@ export default class AgentValidateAuthoringBundle extends SfCommand<AgentValidat
       mso.skipTo('Validating Authoring Bundle');
       const targetOrg = flags['target-org'];
       const conn = targetOrg.getConnection(flags['api-version']);
-      // Call Agent.compileAfScript() API
+      // Call Agent.compileAgent() API
       await sleep(Duration.seconds(2));
-      await Agent.compileAfScript(conn, readFileSync(join(authoringBundleDir, `${apiName}.agent`), 'utf8'));
+      await Agent.compileAgent(conn, readFileSync(join(authoringBundleDir, `${apiName}.agent`), 'utf8'));
       mso.updateData({ status: 'COMPLETED' });
       mso.stop('completed');
       return {