chore: update agent preview to work with .agent files

Author: WillieRuemmele

package.json

@@ -15,8 +15,10 @@
     "@salesforce/sf-plugins-core": "^12.2.4",
     "@salesforce/source-deploy-retrieve": "^12.22.1",
     "@salesforce/types": "^1.4.0",
+    "@types/glob": "^9.0.0",
     "ansis": "^3.3.2",
     "fast-xml-parser": "^4.5.1",
+    "glob": "^11.0.3",
     "ink": "5.0.1",
     "ink-text-input": "^6.0.0",
     "inquirer-autocomplete-standalone": "^0.8.1",

src/commands/agent/preview.ts

@@ -15,7 +15,8 @@
  */
 
 import { resolve, join } from 'node:path';
-import { readdirSync, statSync } from 'node:fs';
+import * as path from 'node:path';
+import { globSync } from 'glob';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { AuthInfo, Connection, Messages, SfError, SfProject } from '@salesforce/core';
 import React from 'react';
@@ -49,12 +50,13 @@ enum AgentSource {
   LOCAL = 'local',
 }
 
-type AgentValue = {
-  Id: string;
-  DeveloperName: string;
-  source: AgentSource.ORG;
-} |
-{ DeveloperName: string; source: AgentSource.LOCAL; path: string };
+type AgentValue =
+  | {
+      Id: string;
+      DeveloperName: string;
+      source: AgentSource.ORG;
+    }
+  | { DeveloperName: string; source: AgentSource.LOCAL; path: string };
 
 // https://developer.salesforce.com/docs/einstein/genai/guide/agent-api-get-started.html#prerequisites
 export const UNSUPPORTED_AGENTS = ['Copilot_for_Salesforce'];
@@ -166,10 +168,10 @@ export default class AgentPreview extends SfCommand<AgentPreviewResult> {
 
     const outputDir = await resolveOutputDir(flags['output-dir'], flags['apex-debug']);
     // Both classes share the same interface for the methods we need
-    const agentPreview = selectedAgent.source === AgentSource.ORG ?
-      new Preview(jwtConn, selectedAgent.Id) :
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-      new AgentSimulate(jwtConn, selectedAgent.path, true) as unknown as Preview;
+    const agentPreview: Preview | AgentSimulate =
+      selectedAgent.source === AgentSource.ORG
+        ? new Preview(jwtConn, selectedAgent.Id)
+        : new AgentSimulate(jwtConn, selectedAgent.path, true);
 
     agentPreview.toggleApexDebugMode(flags['apex-debug']);
 
@@ -207,10 +209,7 @@ export const validateAgent = (agent: AgentData): boolean => {
   return true;
 };
 
-export const getAgentChoices = (
-  agents: AgentData[],
-  project: SfProject
-): Array<Choice<AgentValue>> => {
+export const getAgentChoices = (agents: AgentData[], project: SfProject): Array<Choice<AgentValue>> => {
   const choices: Array<Choice<AgentValue>> = [];
 
   // Add org agents
@@ -229,37 +228,25 @@ export const getAgentChoices = (
     });
   }
 
-  // Add local agents from authoring bundles
-  const localAgents = findAuthoringBundle(project.getPath(), '*');
-  if (localAgents) {
-    const bundlePath = localAgents.replace(/\/[^/]+$/, ''); // Get parent directory
-    const agentDirs = readdirSync(bundlePath).filter((dir) =>
-      statSync(join(bundlePath, dir)).isDirectory()
-    );
-
-    agentDirs.forEach((agentDir) => {
-      choices.push({
-        name: `${agentDir} (local)`,
-        value: {
-          DeveloperName: agentDir,
-          source: AgentSource.LOCAL,
-          path: join(bundlePath, agentDir),
-        },
-      });
+  // Add local agents from .agent files
+  const localAgentPaths = globSync('**/*.agent', { cwd: project.getPath() });
+  for (const agentPath of localAgentPaths) {
+    const agentName = path.basename(agentPath, '.agent');
+    choices.push({
+      name: `${agentName} (local)`,
+      value: {
+        DeveloperName: agentName,
+        source: AgentSource.LOCAL,
+        path: path.join(project.getPath(), agentPath),
+      },
     });
   }
 
   return choices;
 };
 
-
-export const getClientAppsFromAuth = (authInfo: AuthInfo): string[] => {
-  const config = authInfo.getConnectionOptions();
-  const clientApps = Object.entries(config)
-    .filter(([key]) => key.startsWith('oauthClientApp_'))
-    .map(([, value]) => value as string);
-  return clientApps;
-};
+export const getClientAppsFromAuth = (authInfo: AuthInfo): string[] =>
+  Object.keys(authInfo.getFields().clientApps ?? {});
 
 export const resolveOutputDir = async (
   outputDir: string | undefined,

src/components/agent-preview-react.tsx

@@ -21,7 +21,7 @@ import React from 'react';
 import { Box, Text, useInput } from 'ink';
 import TextInput from 'ink-text-input';
 import { Connection, SfError } from '@salesforce/core';
-import { AgentPreview, AgentPreviewSendResponse, writeDebugLog } from '@salesforce/agents';
+import { AgentPreviewBase, AgentPreviewSendResponse, writeDebugLog, type AgentInteractionBase } from '@salesforce/agents';
 import { sleep } from '@salesforce/kit';
 
 // Component to show a simple typing animation
@@ -76,7 +76,7 @@ const saveTranscriptsToFile = (
  */
 export function AgentPreviewReact(props: {
   readonly connection: Connection;
-  readonly agent: AgentPreview;
+  readonly agent: AgentPreviewBase | AgentInteractionBase;
   readonly name: string;
   readonly outputDir: string | undefined;
 }): React.ReactNode {

yarn.lock

@@ -2451,6 +2451,13 @@
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.20.tgz#cb291577ed342ca92600430841a00329ba05cecc"
   integrity sha512-/pC9HAB5I/xMlc5FP77qjCnI16ChlJfW0tGa0IUcFn38VJrTV6DeZ60NU5KZBtaOZqjdpwTWohz5HU1RrhiYxQ==
 
+"@types/glob@^9.0.0":
+  version "9.0.0"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-9.0.0.tgz#7b942fafe09c55671912b34f04e8e4676faf32b1"
+  integrity sha512-00UxlRaIUvYm4R4W9WYkN8/J+kV8fmOQ7okeH6YFtGWFMt3odD45tpG5yA5wnL7HE6lLgjaTW5n14ju2hl2NNA==
+  dependencies:
+    glob "*"
+
 "@types/hast@^3.0.0", "@types/hast@^3.0.4":
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/@types/hast/-/hast-3.0.4.tgz#1d6b39993b82cea6ad783945b0508c25903e15aa"
@@ -4941,6 +4948,18 @@ glob-to-regex.js@^1.0.1:
   resolved "https://registry.yarnpkg.com/glob-to-regex.js/-/glob-to-regex.js-1.2.0.tgz#2b323728271d133830850e32311f40766c5f6413"
   integrity sha512-QMwlOQKU/IzqMUOAZWubUOT8Qft+Y0KQWnX9nK3ch0CJg0tTp4TvGZsTfudYKv2NzoQSyPcnA6TYeIQ3jGichQ==
 
+glob@*, glob@^11.0.3:
+  version "11.0.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.3.tgz#9d8087e6d72ddb3c4707b1d2778f80ea3eaefcd6"
+  integrity sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==
+  dependencies:
+    foreground-child "^3.3.1"
+    jackspeak "^4.1.1"
+    minimatch "^10.0.3"
+    minipass "^7.1.2"
+    package-json-from-dist "^1.0.0"
+    path-scurry "^2.0.0"
+
 glob@^10.3.10:
   version "10.4.5"
   resolved "https://registry.yarnpkg.com/glob/-/glob-10.4.5.tgz#f4d9f0b90ffdbab09c9d77f5f29b4262517b0956"
@@ -4953,18 +4972,6 @@ glob@^10.3.10:
     package-json-from-dist "^1.0.0"
     path-scurry "^1.11.1"
 
-glob@^11.0.3:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-11.0.3.tgz#9d8087e6d72ddb3c4707b1d2778f80ea3eaefcd6"
-  integrity sha512-2Nim7dha1KVkaiF4q6Dj+ngPPMdfvLJEOpZk/jKiUAkqKebpGAWQXAq9z1xu9HKu5lWfqw/FASuccEjyznjPaA==
-  dependencies:
-    foreground-child "^3.3.1"
-    jackspeak "^4.1.1"
-    minimatch "^10.0.3"
-    minipass "^7.1.2"
-    package-json-from-dist "^1.0.0"
-    path-scurry "^2.0.0"
-
 glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6:
   version "7.2.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"