chore: finish changing to --api-name

Author: WillieRuemmele

messages/agent.publish.authoring-bundle.md

@@ -31,3 +31,11 @@ Invalid bundle path. Please provide a valid path to an Agent Authoring Bundle.
 
 Failed to publish agent with the following errors:
 %s
+
+# error.afscriptNotFound
+
+Could not find an .afscript file with API name '%s' in the project.
+
+# error.afscriptNotFoundAction
+
+Please check that the API name is correct and that the .afscript file exists in your project directory.

messages/agent.validate.authoring-bundle.md

@@ -27,3 +27,11 @@ Invalid bundle path. Please provide a valid path to an Agent Authoring Bundle.
 
 AF Script compilation failed with the following errors:
 %s
+
+# error.afscriptNotFound
+
+Could not find an .afscript file with API name '%s' in the project.
+
+# error.afscriptNotFoundAction
+
+Please check that the API name is correct and that the .afscript file exists in your project directory.

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

@@ -4,14 +4,13 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { resolve } from 'node:path';
-import { existsSync } from 'node:fs';
 import { EOL } from 'node:os';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages, Lifecycle } from '@salesforce/core';
+import { Messages, Lifecycle, SfError } from '@salesforce/core';
 import { Agent } from '@salesforce/agents';
 import { RetrieveResult, RequestStatus } from '@salesforce/source-deploy-retrieve';
 import { ensureArray } from '@salesforce/kit';
+import { findAndReadAfScript } from '../../../utils/afscriptFinder.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.publish.authoring-bundle');
@@ -40,11 +39,12 @@ export default class AgentPublishAuthoringBundle extends SfCommand<AgentPublishA
 
   public async run(): Promise<AgentPublishAuthoringBundleResult> {
     const { flags } = await this.parse(AgentPublishAuthoringBundle);
-    const bundlePath = resolve(flags['api-name']);
+    const afScript = findAndReadAfScript(this.project!.getPath(), flags['api-name']);
 
-    // Validate bundle path exists
-    if (!existsSync(bundlePath)) {
-      throw messages.createError('error.invalidBundlePath');
+    if (!afScript) {
+      throw new SfError(messages.getMessage('error.afscriptNotFound', [flags['api-name']]), 'AfScriptNotFoundError', [
+        messages.getMessage('error.afscriptNotFoundAction'),
+      ]);
     }
 
     try {
@@ -66,7 +66,7 @@ export default class AgentPublishAuthoringBundle extends SfCommand<AgentPublishA
 
       // First compile the AF script to get the Agent JSON
       this.log('Compiling authoring bundle...');
-      const agentJson = await Agent.compileAfScript(conn, bundlePath);
+      const agentJson = await Agent.compileAfScript(conn, afScript);
 
       // Then publish the Agent JSON to create the agent
       this.log('Publishing agent...');

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

@@ -4,11 +4,10 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import { resolve } from 'node:path';
-import { existsSync } from 'node:fs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages } from '@salesforce/core';
+import { Messages, SfError } from '@salesforce/core';
 import { Agent } from '@salesforce/agents';
+import { findAndReadAfScript } from '../../../utils/afscriptFinder.js';
 
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.validate.authoring-bundle');
@@ -35,18 +34,19 @@ export default class AgentValidateAuthoringBundle extends SfCommand<AgentValidat
 
   public async run(): Promise<AgentValidateAuthoringBundleResult> {
     const { flags } = await this.parse(AgentValidateAuthoringBundle);
-    const bundlePath = resolve(flags['api-name']);
+    const afScript = findAndReadAfScript(this.project!.getPath(), flags['api-name']);
 
-    // Validate bundle path exists
-    if (!existsSync(bundlePath)) {
-      throw messages.createError('error.invalidBundlePath');
+    if (!afScript) {
+      throw new SfError(messages.getMessage('error.afscriptNotFound', [flags['api-name']]), 'AfScriptNotFoundError', [
+        messages.getMessage('error.afscriptNotFoundAction'),
+      ]);
     }
 
     try {
       const targetOrg = flags['target-org'];
       const conn = targetOrg.getConnection(flags['api-version']);
       // Call Agent.compileAfScript() API
-      await Agent.compileAfScript(conn, bundlePath);
+      await Agent.compileAfScript(conn, afScript);
       this.log('Successfully compiled');
       return {
         success: true,

src/utils/afscriptFinder.ts

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2023, salesforce.com, inc.
+ * All rights reserved.
+ * Licensed under the BSD 3-Clause license.
+ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+import { join } from 'node:path';
+import { readdirSync, readFileSync, statSync } from 'node:fs';
+import { type AfScript } from '@salesforce/agents';
+
+/**
+ * Finds an .afscript file with the given API name in the project directory.
+ * Searches for pattern: any/file/path/authoringbundles/<apiName>/<apiName>.afscript
+ *
+ * @param projectDir - The root directory to start searching from
+ * @param apiName - The API name to search for
+ * @returns The full path to the .afscript file if found, undefined otherwise
+ */
+export function findAndReadAfScript(projectDir: string, apiName: string): AfScript | undefined {
+  const walk = (dir: string): string | undefined => {
+    const files = readdirSync(dir);
+
+    // If we find authoringbundles dir, check for the expected file structure
+    if (files.includes('authoringbundles')) {
+      const expectedPath = join(dir, 'authoringbundles', apiName, `${apiName}.afscript`);
+      if (statSync(expectedPath, { throwIfNoEntry: false })?.isFile()) {
+        return readFileSync(expectedPath, 'utf-8');
+      }
+    }
+
+    // Otherwise keep searching directories
+    for (const file of files) {
+      const filePath = join(dir, file);
+      if (statSync(filePath, { throwIfNoEntry: false })?.isDirectory()) {
+        const found = walk(filePath);
+        if (found) return found;
+      }
+    }
+  };
+
+  return walk(projectDir);
+}