From 85a48ff262de6f0fc26420d03f9adddc4295984b Mon Sep 17 00:00:00 2001
From: Marcelino Llano <mllano@salesforce.com>
Date: Mon, 9 Feb 2026 22:50:44 +0100
Subject: [PATCH 1/3] fix: always pass agentSpec to createAuthoringBundle so
 agent_label and description reflect user input

---
 src/commands/agent/generate/authoring-bundle.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/commands/agent/generate/authoring-bundle.ts b/src/commands/agent/generate/authoring-bundle.ts
index 4414fc1..ae2c657 100644
--- a/src/commands/agent/generate/authoring-bundle.ts
+++ b/src/commands/agent/generate/authoring-bundle.ts
@@ -152,9 +152,10 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
 
       // Write Agent file
       await ScriptAgent.createAuthoringBundle({
-        agentSpec: spec
-          ? { ...(YAML.parse(readFileSync(spec, 'utf8')) as AgentJobSpec), ...{ name, developerName: bundleApiName } }
-          : undefined,
+        agentSpec: {
+          ...(spec ? (YAML.parse(readFileSync(spec, 'utf8')) as AgentJobSpec) : {}),
+          ...{ name, developerName: bundleApiName, role: `${name} description` },
+        } as AgentJobSpec & { name: string; developerName: string },
         project: this.project!,
         bundleApiName,
       });

From 3a6c30aca27ef7ad72fca71df34f98dd0b41c9fa Mon Sep 17 00:00:00 2001
From: Marcelino Llano <mllano@salesforce.com>
Date: Mon, 9 Feb 2026 22:55:25 +0100
Subject: [PATCH 2/3] test: add assertions for agent_label and description in
 authoring bundle NUTs

---
 test/nuts/agent.generate.authoring-bundle.nut.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/nuts/agent.generate.authoring-bundle.nut.ts b/test/nuts/agent.generate.authoring-bundle.nut.ts
index 52746b3..2a4117c 100644
--- a/test/nuts/agent.generate.authoring-bundle.nut.ts
+++ b/test/nuts/agent.generate.authoring-bundle.nut.ts
@@ -58,6 +58,8 @@ describe('agent generate authoring-bundle NUTs', function () {
     expect(metaXml).to.include('<AiAuthoringBundle');
     expect(metaXml).to.include('<bundleType>AGENT</bundleType>');
     expect(agent).to.include(`developer_name: "${bundleName}"`);
+    expect(agent).to.include(`agent_label: "${bundleName}"`);
+    expect(agent).to.include(`description: "${bundleName} description"`);
   });
 
   it('should generate authoring bundle with --no-spec', async () => {
@@ -80,6 +82,8 @@ describe('agent generate authoring-bundle NUTs', function () {
     expect(metaXml).to.include('<AiAuthoringBundle');
     expect(metaXml).to.include('<bundleType>AGENT</bundleType>');
     expect(agent).to.include(`developer_name: "${bundleName}"`);
+    expect(agent).to.include(`agent_label: "${bundleName}"`);
+    expect(agent).to.include(`description: "${bundleName} description"`);
   });
 
   it('should fail when both --spec and --no-spec are provided', async () => {

From 51768c5ff2f45b1e33f9a1d4c574f6ac2bf7f93c Mon Sep 17 00:00:00 2001
From: Marcelino Llano <mllano@salesforce.com>
Date: Mon, 9 Feb 2026 23:00:50 +0100
Subject: [PATCH 3/3] fix: preserve spec role when provided, fall back to
 name-derived description

---
 src/commands/agent/generate/authoring-bundle.ts  | 7 +++++--
 test/nuts/agent.generate.authoring-bundle.nut.ts | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/commands/agent/generate/authoring-bundle.ts b/src/commands/agent/generate/authoring-bundle.ts
index ae2c657..88d0eb4 100644
--- a/src/commands/agent/generate/authoring-bundle.ts
+++ b/src/commands/agent/generate/authoring-bundle.ts
@@ -151,10 +151,13 @@ export default class AgentGenerateAuthoringBundle extends SfCommand<AgentGenerat
       const metaXmlPath = join(targetOutputDir, `${bundleApiName}.bundle-meta.xml`);
 
       // Write Agent file
+      const parsedSpec = spec ? (YAML.parse(readFileSync(spec, 'utf8')) as AgentJobSpec) : undefined;
       await ScriptAgent.createAuthoringBundle({
         agentSpec: {
-          ...(spec ? (YAML.parse(readFileSync(spec, 'utf8')) as AgentJobSpec) : {}),
-          ...{ name, developerName: bundleApiName, role: `${name} description` },
+          ...parsedSpec,
+          name,
+          developerName: bundleApiName,
+          role: parsedSpec?.role ?? `${name} description`,
         } as AgentJobSpec & { name: string; developerName: string },
         project: this.project!,
         bundleApiName,
diff --git a/test/nuts/agent.generate.authoring-bundle.nut.ts b/test/nuts/agent.generate.authoring-bundle.nut.ts
index 2a4117c..d9d3d79 100644
--- a/test/nuts/agent.generate.authoring-bundle.nut.ts
+++ b/test/nuts/agent.generate.authoring-bundle.nut.ts
@@ -59,7 +59,7 @@ describe('agent generate authoring-bundle NUTs', function () {
     expect(metaXml).to.include('<bundleType>AGENT</bundleType>');
     expect(agent).to.include(`developer_name: "${bundleName}"`);
     expect(agent).to.include(`agent_label: "${bundleName}"`);
-    expect(agent).to.include(`description: "${bundleName} description"`);
+    expect(agent).to.include('description: "test agent role"');
   });
 
   it('should generate authoring bundle with --no-spec', async () => {