feat: support --version flag with --api-name in org open agent

Allow --version to work with both --api-name and --authoring-bundle.
When used with --api-name, queries BotVersion to get the version ID
and adds it to the URL as versionId parameter.

Author: WillieRuemmele

src/commands/org/open/agent.ts

@@ -60,7 +60,6 @@ export class OrgOpenAgent extends OrgOpenCommandBase<OrgOpenOutput> {
     version: Flags.string({
       summary: messages.getMessage('flags.version.summary'),
       description: messages.getMessage('flags.version.description'),
-      dependsOn: ['authoring-bundle'],
     }),
   };
 
@@ -71,7 +70,7 @@ export class OrgOpenAgent extends OrgOpenCommandBase<OrgOpenOutput> {
 
     let path: string;
     if (flags['api-name']) {
-      path = await buildRetUrl(this.connection, flags['api-name']);
+      path = await buildRetUrl(this.connection, flags['api-name'], flags.version);
     } else {
       // authoring-bundle is provided
       const queryParams = new URLSearchParams({
@@ -89,8 +88,14 @@ export class OrgOpenAgent extends OrgOpenCommandBase<OrgOpenOutput> {
 }
 
 // Build the URL part to the Agent Builder given a Bot API name.
-const buildRetUrl = async (conn: Connection, botName: string): Promise<string> => {
+const buildRetUrl = async (conn: Connection, botName: string, version?: string): Promise<string> => {
   const query = `SELECT id FROM BotDefinition WHERE DeveloperName='${botName}'`;
   const botId = (await conn.singleRecordQuery<{ Id: string }>(query)).Id;
-  return `AiCopilot/copilotStudio.app#/copilot/builder?copilotId=${botId}`;
+  const queryParams = new URLSearchParams({ copilotId: botId });
+  if (version) {
+    const versionQuery = `SELECT Id FROM BotVersion WHERE BotDefinitionId='${botId}' AND VersionNumber=${version}`;
+    const versionId = (await conn.singleRecordQuery<{ Id: string }>(versionQuery)).Id;
+    queryParams.set('versionId', versionId);
+  }
+  return `AiCopilot/copilotStudio.app#/copilot/builder?${queryParams.toString()}`;
 };

test/unit/org/open/agent.test.ts

@@ -33,6 +33,7 @@ describe('org:open:agent', () => {
 
   const mockBotId = '0Xx1234567890ABCD';
   const mockBotName = 'TestAgent';
+  const mockVersionId = '0X9DD0000000032s0AA';
 
   let sfCommandUxStubs: ReturnType<typeof stubSfCommandUx>;
 
@@ -107,27 +108,6 @@ describe('org:open:agent', () => {
         expect((error as Error).message).to.match(/exactly one|cannot also be provided/i);
       }
     });
-
-    it('requires authoring-bundle when version is provided', async () => {
-      try {
-        await OrgOpenAgent.run([
-          '--json',
-          '--target-org',
-          testOrg.username,
-          '--url-only',
-          '--api-name',
-          mockBotName,
-          '--version',
-          '1',
-        ]);
-        assert.fail('Should have thrown an error');
-      } catch (error) {
-        expect(error).to.exist;
-        expect((error as Error).message).to.include('--version');
-        expect((error as Error).message).to.include('--authoring-bundle');
-        expect((error as Error).message).to.match(/All of the following must be provided|depends on/i);
-      }
-    });
   });
 
   describe('url generation with api-name', () => {
@@ -168,6 +148,45 @@ describe('org:open:agent', () => {
       expect(spies.get('singleRecordQuery').callCount).to.equal(1);
       expect(spies.get('singleRecordQuery').firstCall.args[0]).to.include(specialName);
     });
+
+    it('builds URL with api-name and version using BotVersion query', async () => {
+      const version = '2';
+      // Override the singleRecordQuery stub to return different results for BotDefinition and BotVersion
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+      const singleRecordQueryStub = spies.get('singleRecordQuery');
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      singleRecordQueryStub.onFirstCall().resolves({ Id: mockBotId }); // BotDefinition query
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      singleRecordQueryStub.onSecondCall().resolves({ Id: mockVersionId }); // BotVersion query
+
+      const response = await OrgOpenAgent.run([
+        '--json',
+        '--target-org',
+        testOrg.username,
+        '--url-only',
+        '--api-name',
+        mockBotName,
+        '--version',
+        version,
+      ]);
+      assert(response);
+      testJsonStructure(response);
+
+      // Verify both queries were made
+      expect(singleRecordQueryStub.callCount).to.equal(2);
+
+      // Verify BotDefinition query
+      expect(singleRecordQueryStub.firstCall.args[0]).to.include(mockBotName);
+      expect(singleRecordQueryStub.firstCall.args[0]).to.include('BotDefinition');
+
+      // Verify BotVersion query
+      expect(singleRecordQueryStub.secondCall.args[0]).to.include('BotVersion');
+      expect(singleRecordQueryStub.secondCall.args[0]).to.include(mockBotId);
+      expect(singleRecordQueryStub.secondCall.args[0]).to.include(`VersionNumber=${version}`);
+
+      const expectedPath = `AiCopilot/copilotStudio.app#/copilot/builder?copilotId=${mockBotId}&versionId=${mockVersionId}`;
+      expect(response.url).to.equal(getExpectedUrlWithPath(expectedPath));
+    });
   });
 
   describe('url generation with authoring-bundle', () => {