fix: keep up with agents lib

Author: mdonnalley

command-snapshot.json

@@ -47,7 +47,7 @@
     "alias": [],
     "command": "agent:test:results",
     "flagAliases": [],
-    "flagChars": ["i", "o", "r"],
+    "flagChars": ["i", "o"],
     "flags": ["api-version", "flags-dir", "job-id", "json", "result-format", "target-org"],
     "plugin": "@salesforce/plugin-agent"
   },
@@ -56,14 +56,14 @@
     "command": "agent:test:resume",
     "flagAliases": [],
     "flagChars": ["i", "o", "r", "w"],
-    "flags": ["api-version", "flags-dir", "job-id", "json", "target-org", "use-most-recent", "wait"],
+    "flags": ["api-version", "flags-dir", "job-id", "json", "result-format", "target-org", "use-most-recent", "wait"],
     "plugin": "@salesforce/plugin-agent"
   },
   {
     "alias": [],
     "command": "agent:test:run",
     "flagAliases": [],
-    "flagChars": ["n", "o", "r", "w"],
+    "flagChars": ["n", "o", "w"],
     "flags": ["api-version", "flags-dir", "json", "name", "result-format", "target-org", "wait"],
     "plugin": "@salesforce/plugin-agent"
   }

package.json

@@ -10,7 +10,7 @@
     "@inquirer/select": "^4.0.1",
     "@oclif/core": "^4",
     "@oclif/multi-stage-output": "^0.7.12",
-    "@salesforce/agents": "^0.2.2",
+    "@salesforce/agents": "^0.3.0",
     "@salesforce/core": "^8.8.0",
     "@salesforce/kit": "^3.2.1",
     "@salesforce/sf-plugins-core": "^12.1.0",

src/commands/agent/generate/spec.ts

@@ -142,9 +142,7 @@ export default class AgentCreateSpec extends SfCommand<AgentCreateSpecResult> {
 
     this.log();
     this.styledHeader('Agent Details');
-    const type = (await this.getFlagOrPrompt(flags.type, FLAGGABLE_PROMPTS.type)) as
-      | 'customer_facing'
-      | 'employee_facing';
+    const type = (await this.getFlagOrPrompt(flags.type, FLAGGABLE_PROMPTS.type)) as 'customer' | 'internal';
     const role = await this.getFlagOrPrompt(flags.role, FLAGGABLE_PROMPTS.role);
     const companyName = await this.getFlagOrPrompt(flags['company-name'], FLAGGABLE_PROMPTS['company-name']);
     const companyDescription = await this.getFlagOrPrompt(

src/commands/agent/test/results.ts

@@ -7,7 +7,7 @@
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
-import { AgentTester, AgentTestDetailsResponse } from '@salesforce/agents';
+import { AgentTester, AgentTestDetailsResponse, humanFormat } from '@salesforce/agents';
 import { resultFormatFlag } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -37,8 +37,10 @@ export default class AgentTestResults extends SfCommand<AgentTestResultsResult>
     const { flags } = await this.parse(AgentTestResults);
 
     const agentTester = new AgentTester(flags['target-org'].getConnection(flags['api-version']));
-    const { response, formatted } = await agentTester.details(flags['job-id'], flags['result-format']);
-    this.log(formatted);
+    const response = await agentTester.details(flags['job-id']);
+    if (flags['result-format'] === 'human') {
+      this.log(await humanFormat(flags['job-id'], response));
+    }
     return response;
   }
 }

src/commands/agent/test/resume.ts

@@ -7,9 +7,10 @@
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
-import { AgentTester } from '@salesforce/agents';
+import { AgentTester, humanFormat } from '@salesforce/agents';
 import { AgentTestCache } from '../../../agentTestCache.js';
 import { TestStages } from '../../../testStages.js';
+import { resultFormatFlag } from '../../../flags.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.test.resume');
@@ -46,6 +47,7 @@ export default class AgentTestResume extends SfCommand<AgentTestResumeResult> {
       summary: messages.getMessage('flags.wait.summary'),
       description: messages.getMessage('flags.wait.description'),
     }),
+    'result-format': resultFormatFlag(),
   };
 
   public async run(): Promise<AgentTestResumeResult> {
@@ -61,10 +63,15 @@ export default class AgentTestResume extends SfCommand<AgentTestResumeResult> {
     mso.start({ id: aiEvaluationId });
     const agentTester = new AgentTester(flags['target-org'].getConnection(flags['api-version']));
 
-    const completed = await mso.poll(agentTester, aiEvaluationId, flags.wait);
+    const { completed, response } = await mso.poll(agentTester, aiEvaluationId, flags.wait);
     if (completed) await agentTestCache.removeCacheEntry(aiEvaluationId);
 
     mso.stop();
+
+    if (response && flags['result-format'] === 'human') {
+      this.log(await humanFormat(name ?? aiEvaluationId, response));
+    }
+
     return {
       status: 'COMPLETED',
       aiEvaluationId,

src/commands/agent/test/run.ts

@@ -7,7 +7,7 @@
 
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
-import { AgentTester } from '@salesforce/agents';
+import { AgentTester, humanFormat } from '@salesforce/agents';
 import { colorize } from '@oclif/core/ux';
 import { resultFormatFlag } from '../../../flags.js';
 import { AgentTestCache } from '../../../agentTestCache.js';
@@ -64,9 +64,14 @@ export default class AgentTestRun extends SfCommand<AgentTestRunResult> {
     await agentTestCache.createCacheEntry(response.aiEvaluationId, flags.name);
 
     if (flags.wait?.minutes) {
-      const completed = await mso.poll(agentTester, response.aiEvaluationId, flags.wait);
+      const { completed, response: detailsResponse } = await mso.poll(agentTester, response.aiEvaluationId, flags.wait);
       if (completed) await agentTestCache.removeCacheEntry(response.aiEvaluationId);
+
       mso.stop();
+
+      if (detailsResponse && flags['result-format'] === 'human') {
+        this.log(await humanFormat(flags.name, detailsResponse));
+      }
       return {
         status: 'COMPLETED',
         aiEvaluationId: response.aiEvaluationId,

src/flags.ts

@@ -18,6 +18,5 @@ export const resultFormatFlag = Flags.option({
     // 'junit'
   ] as const,
   default: 'human',
-  char: 'r',
   summary: messages.getMessage('flags.result-format.summary'),
 });

src/testStages.ts

@@ -7,7 +7,7 @@
 
 import { colorize } from '@oclif/core/ux';
 import { MultiStageOutput } from '@oclif/multi-stage-output';
-import { AgentTester } from '@salesforce/agents';
+import { AgentTestDetailsResponse, AgentTester } from '@salesforce/agents';
 import { Lifecycle } from '@salesforce/core';
 import { Duration } from '@salesforce/kit';
 import { Ux } from '@salesforce/sf-plugins-core';
@@ -76,7 +76,11 @@ export class TestStages {
     this.mso.skipTo('Starting Tests', data);
   }
 
-  public async poll(agentTester: AgentTester, id: string, wait: Duration): Promise<boolean> {
+  public async poll(
+    agentTester: AgentTester,
+    id: string,
+    wait: Duration
+  ): Promise<{ completed: boolean; response?: AgentTestDetailsResponse }> {
     this.mso.skipTo('Polling for Test Results');
     const lifecycle = Lifecycle.getInstance();
     lifecycle.on(
@@ -91,16 +95,15 @@ export class TestStages {
     );
 
     try {
-      const { formatted } = await agentTester.poll(id, { timeout: wait });
+      const response = await agentTester.poll(id, { timeout: wait });
       this.stop();
-      this.ux.log(formatted);
-      return true;
+      return { completed: true, response };
     } catch (e) {
       if (isTimeoutError(e)) {
         this.stop('async');
         this.ux.log(`Client timed out after ${wait.minutes} minutes.`);
         this.ux.log(`Run ${colorize('dim', `sf agent test resume --job-id ${id}`)} to resuming watching this test.`);
-        return true;
+        return { completed: true };
       } else {
         this.error();
         throw e;

yarn.lock

@@ -1344,23 +1344,7 @@
     http-call "^5.2.2"
     lodash "^4.17.21"
 
-"@oclif/table@^0.3.2":
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/@oclif/table/-/table-0.3.3.tgz#5dc1c98cfa5415b131d77c85048df187fc241d12"
-  integrity sha512-sz6gGT1JAPP743vxl1491hxboIu0ZFHaP3gyvhz5Prgsuljp2NGyyu7JPEMeVImCnZ9N3K9cy3VXxRFEwRH/ig==
-  dependencies:
-    "@oclif/core" "^4"
-    "@types/react" "^18.3.12"
-    change-case "^5.4.4"
-    cli-truncate "^4.0.0"
-    ink "^5.0.1"
-    natural-orderby "^3.0.2"
-    object-hash "^3.0.0"
-    react "^18.3.1"
-    strip-ansi "^7.1.0"
-    wrap-ansi "^9.0.0"
-
-"@oclif/table@^0.3.3":
+"@oclif/table@^0.3.2", "@oclif/table@^0.3.3":
   version "0.3.5"
   resolved "https://registry.yarnpkg.com/@oclif/table/-/table-0.3.5.tgz#118149eab364f3485eab5c9fd0d717c56082bacb"
   integrity sha512-1IjoVz7WAdUdBW5vYIRc6wt9N7Ezwll6AtdmeqLQ8lUmB9gQJVyeb7dqXtUaUvIG7bZMvryfPe6Xibeo5FTCWA==
@@ -1389,10 +1373,10 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@salesforce/agents@^0.2.2":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@salesforce/agents/-/agents-0.2.2.tgz#c32e35e043f60ae6b4192448984342541bb0fc81"
-  integrity sha512-X5HGMHLFqK8rpXrNF4r/dYEdseu//0PnI6oGuWoVwnNPgJ4D0b3iIqTYeznpVEYqOa8wVZdceG2pZXd0GiO+9w==
+"@salesforce/agents@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/agents/-/agents-0.3.0.tgz#5f58d69eca1dde07daaf88bc2226b1a09e579666"
+  integrity sha512-BV/Fa+WN8IT5n+bsdDI8wga5dxjY9Rhu6eAvU3OCyRQ7F0nFd5uqLe2Ybo+0gLbGCvGCrV9gt8eJ5z4fsgLoDQ==
   dependencies:
     "@oclif/table" "^0.3.3"
     "@salesforce/core" "^8.8.0"