@salesforce/plugin-agent 1.42.1 → 1.44.4

package/lib/commands/agent/adl/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,oBAAoB,CAAC;AAE/E,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;AAIrF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAA6B;IAC9D,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IACtC,MAAM,CAAU,KAAK,GAAG,SAAS,CAAC;IAElC,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,KAAK,CAAC,WAAW,EAAE;QACjC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE;QACpC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,OAAO,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAU;SACxD,CAAC,EAAE;KACL,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAE3E,IAAI,MAA2C,CAAC;QAChD,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC/C,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC9G,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC;gBACT,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE;oBACP,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE;oBACpC,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE;oBACxC,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE;oBAC1C,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACjC,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE;iBACjD;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/list.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,oBAAoB,CAAC;AAC/E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,0BAA0B,EAAE,gBAAgB,CAAC,CAAC;AAIrF,MAAM,CAAC,OAAO,OAAO,YAAa,SAAQ,SAA6B;IAC9D,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IAEtC,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,KAAK,CAAC,WAAW,EAAE;QACjC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE;QACpC,aAAa,EAAE,KAAK,CAAC,MAAM,CAAC;YAC1B,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,2BAA2B,CAAC;YACzD,OAAO,EAAE,CAAC,SAAS,EAAE,WAAW,EAAE,WAAW,CAAU;SACxD,CAAC,EAAE;KACL,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QACjD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAE3E,IAAI,MAA2C,CAAC;QAChD,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,gBAAgB,CAAC,IAAI,CAAC,UAAU,EAAE;gBAC/C,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;aACjC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC;YACjE,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC,YAAY,CAAC,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAC3G,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC;gBACT,IAAI,EAAE,MAAM,CAAC,SAAS;gBACtB,OAAO,EAAE;oBACP,EAAE,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE;oBACpC,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,YAAY,EAAE;oBACxC,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,aAAa,EAAE;oBAC1C,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;oBACjC,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,gBAAgB,EAAE;iBACjD;aACF,CAAC,CAAC;QACL,CAAC;QAED,OAAO,MAAM,CAAC;IAChB,CAAC"}

package/lib/commands/agent/adl/status.d.ts

@@ -6,11 +6,11 @@ export default class AgentAdlStatus extends SfCommand<AgentAdlStatusResult> {
     static readonly description: string;
     static readonly examples: string[];
     static readonly enableJsonFlag = true;
-    static readonly state = "preview";
     static readonly flags: {
         'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
         'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'library-id': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        'include-artifacts': import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<AgentAdlStatusResult>;
 }

package/lib/commands/agent/adl/status.js

@@ -16,6 +16,7 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
 import { AgentDataLibrary } from '@salesforce/agents';
+import { extractApiError } from '../../../adlUtils.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.adl.status');
 export default class AgentAdlStatus extends SfCommand {
@@ -23,7 +24,6 @@ export default class AgentAdlStatus extends SfCommand {
     static description = messages.getMessage('description');
     static examples = messages.getMessages('examples');
     static enableJsonFlag = true;
-    static state = 'preview';
     static flags = {
         'target-org': Flags.requiredOrg(),
         'api-version': Flags.orgApiVersion(),
@@ -32,23 +32,40 @@ export default class AgentAdlStatus extends SfCommand {
             char: 'i',
             required: true,
         }),
+        'include-artifacts': Flags.boolean({
+            summary: messages.getMessage('flags.include-artifacts.summary'),
+            default: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(AgentAdlStatus);
         const connection = flags['target-org'].getConnection(flags['api-version']);
         let result;
         try {
-            result = await AgentDataLibrary.status(connection, flags['library-id']);
+            result = await AgentDataLibrary.status(connection, flags['library-id'], {
+                includeArtifacts: flags['include-artifacts'],
+            });
         }
         catch (error) {
             const wrapped = SfError.wrap(error);
-            throw new SfError(messages.getMessage('error.statusFailed', [wrapped.message]), 'StatusFailed', [], 4, wrapped);
+            const cleanMessage = extractApiError(wrapped) ?? wrapped.message;
+            throw new SfError(messages.getMessage('error.statusFailed', [cleanMessage]), 'StatusFailed', [], 4, wrapped);
         }
         const { indexingStatus } = result;
         this.log(`Library ${indexingStatus.libraryId}: ${indexingStatus.status}`);
         if (indexingStatus.stageDetails) {
             for (const stage of indexingStatus.stageDetails) {
-                this.log(`  ${stage.name}: ${stage.status}${stage.error ? ` (${stage.error})` : ''}`);
+                let line = `  ${stage.name}: ${stage.status}`;
+                if (stage.errorCode)
+                    line += ` [${stage.errorCode}]`;
+                if (stage.error)
+                    line += ` (${stage.error})`;
+                this.log(line);
+                if (stage.artifacts?.length) {
+                    for (const artifact of stage.artifacts) {
+                        this.log(`    → ${artifact.assetType}: ${artifact.label} (${artifact.id})`);
+                    }
+                }
             }
         }
         return result;

package/lib/commands/agent/adl/status.js.map

@@ -1 +1 @@
-{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/status.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAA+B,MAAM,oBAAoB,CAAC;AAEnF,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,0BAA0B,EAAE,kBAAkB,CAAC,CAAC;AAIvF,MAAM,CAAC,OAAO,OAAO,cAAe,SAAQ,SAA+B;IAClE,MAAM,CAAU,OAAO,GAAG,QAAQ,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,CAAU,WAAW,GAAG,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;IACjE,MAAM,CAAU,QAAQ,GAAG,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC5D,MAAM,CAAU,cAAc,GAAG,IAAI,CAAC;IACtC,MAAM,CAAU,KAAK,GAAG,SAAS,CAAC;IAElC,MAAM,CAAU,KAAK,GAAG;QAC7B,YAAY,EAAE,KAAK,CAAC,WAAW,EAAE;QACjC,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE;QACpC,YAAY,EAAE,KAAK,CAAC,MAAM,CAAC;YACzB,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,0BAA0B,CAAC;YACxD,IAAI,EAAE,GAAG;YACT,QAAQ,EAAE,IAAI;SACf,CAAC;KACH,CAAC;IAEK,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QACnD,MAAM,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;QAE3E,IAAI,MAA8B,CAAC;QACnC,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,UAAU,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC;QAC1E,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;QAClH,CAAC;QAED,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,CAAC;QAClC,IAAI,CAAC,GAAG,CAAC,WAAW,cAAc,CAAC,SAAS,KAAK,cAAc,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1E,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC;YAChC,KAAK,MAAM,KAAK,IAAI,cAAc,CAAC,YAAY,EAAE,CAAC;gBAChD,IAAI,CAAC,GAAG,CAAC,KAAK,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACxF,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC"}
+{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/status.ts"],"names":[],"mappings":"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"}

package/lib/commands/agent/adl/update.d.ts

@@ -6,7 +6,6 @@ export default class AgentAdlUpdate extends SfCommand<AgentAdlUpdateResult> {
     static readonly description: string;
     static readonly examples: string[];
     static readonly enableJsonFlag = true;
-    static readonly state = "preview";
     static readonly flags: {
         'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
         'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
@@ -15,6 +14,7 @@ export default class AgentAdlUpdate extends SfCommand<AgentAdlUpdateResult> {
         description: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'content-fields': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'restrict-to-public-articles': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'data-category-rule': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'retriever-id': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<AgentAdlUpdateResult>;

package/lib/commands/agent/adl/update.js

@@ -16,6 +16,7 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
 import { AgentDataLibrary } from '@salesforce/agents';
+import { extractApiError } from '../../../adlUtils.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.adl.update');
 export default class AgentAdlUpdate extends SfCommand {
@@ -23,7 +24,6 @@ export default class AgentAdlUpdate extends SfCommand {
     static description = messages.getMessage('description');
     static examples = messages.getMessages('examples');
     static enableJsonFlag = true;
-    static state = 'preview';
     static flags = {
         'target-org': Flags.requiredOrg(),
         'api-version': Flags.orgApiVersion(),
@@ -46,6 +46,10 @@ export default class AgentAdlUpdate extends SfCommand {
             summary: messages.getMessage('flags.restrict-to-public-articles.summary'),
             allowNo: true,
         }),
+        'data-category-rule': Flags.boolean({
+            summary: messages.getMessage('flags.data-category-rule.summary'),
+            allowNo: true,
+        }),
         'retriever-id': Flags.string({
             summary: messages.getMessage('flags.retriever-id.summary'),
         }),
@@ -58,20 +62,28 @@ export default class AgentAdlUpdate extends SfCommand {
             input.masterLabel = flags.name;
         if (flags.description)
             input.description = flags.description;
-        const hasKnowledgeFlags = flags['content-fields'] !== undefined || flags['restrict-to-public-articles'] !== undefined;
+        const hasKnowledgeFlags = flags['content-fields'] !== undefined ||
+            flags['restrict-to-public-articles'] !== undefined ||
+            flags['data-category-rule'] !== undefined;
         if (hasKnowledgeFlags) {
             const detail = await AgentDataLibrary.get(connection, flags['library-id']);
             if (detail.sourceType !== 'KNOWLEDGE') {
-                this.warn('--content-fields and --restrict-to-public-articles are only valid for KNOWLEDGE libraries. Ignoring.');
+                this.warn('--content-fields, --restrict-to-public-articles, and --data-category-rule are only valid for KNOWLEDGE libraries. Ignoring.');
             }
             else {
                 const knowledgeConfig = {};
                 if (flags['content-fields'] !== undefined) {
-                    knowledgeConfig.contentFields = flags['content-fields'].split(',').map((f) => f.trim());
+                    knowledgeConfig.contentFields = flags['content-fields']
+                        .split(',')
+                        .map((f) => f.trim())
+                        .filter(Boolean);
                 }
                 if (flags['restrict-to-public-articles'] !== undefined) {
                     knowledgeConfig.isRestrictToPublicArticle = flags['restrict-to-public-articles'];
                 }
+                if (flags['data-category-rule'] !== undefined) {
+                    knowledgeConfig.isDataCategoryRuleEnabled = flags['data-category-rule'];
+                }
                 input.groundingSource = {
                     sourceType: 'KNOWLEDGE',
                     knowledgeConfig,
@@ -93,7 +105,8 @@ export default class AgentAdlUpdate extends SfCommand {
         }
         catch (error) {
             const wrapped = SfError.wrap(error);
-            throw new SfError(messages.getMessage('error.updateFailed', [wrapped.message]), 'UpdateFailed', [], 4, wrapped);
+            const cleanMessage = extractApiError(wrapped) ?? wrapped.message;
+            throw new SfError(messages.getMessage('error.updateFailed', [cleanMessage]), 'UpdateFailed', [], 4, wrapped);
         }
         this.log(`Updated data library "${result.masterLabel}" (${result.libraryId}).`);
         return result;

package/lib/commands/agent/adl/update.js.map

@@ -1 +1 @@
-{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/update.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/update.ts"],"names":[],"mappings":"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"}

package/lib/commands/agent/adl/upload.d.ts

@@ -6,7 +6,6 @@ export default class AgentAdlUpload extends SfCommand<AgentAdlUploadResult> {
     static readonly description: string;
     static readonly examples: string[];
     static readonly enableJsonFlag = true;
-    static readonly state = "preview";
     static readonly flags: {
         'target-org': import("@oclif/core/interfaces").OptionFlag<import("@salesforce/core").Org, import("@oclif/core/interfaces").CustomOptions>;
         'api-version': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;

package/lib/commands/agent/adl/upload.js

@@ -16,6 +16,7 @@
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError } from '@salesforce/core';
 import { AgentDataLibrary } from '@salesforce/agents';
+import { extractApiError } from '../../../adlUtils.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.adl.upload');
 export default class AgentAdlUpload extends SfCommand {
@@ -23,7 +24,6 @@ export default class AgentAdlUpload extends SfCommand {
     static description = messages.getMessage('description');
     static examples = messages.getMessages('examples');
     static enableJsonFlag = true;
-    static state = 'preview';
     static flags = {
         'target-org': Flags.requiredOrg(),
         'api-version': Flags.orgApiVersion(),
@@ -63,7 +63,8 @@ export default class AgentAdlUpload extends SfCommand {
         }
         catch (error) {
             const wrapped = SfError.wrap(error);
-            throw new SfError(wrapped.message, wrapped.name ?? 'UploadFailed', [], 4, wrapped);
+            const cleanMessage = extractApiError(wrapped) ?? wrapped.message;
+            throw new SfError(cleanMessage, wrapped.name ?? 'UploadFailed', [], 4, wrapped);
         }
         if (result.status === 'READY') {
             this.log('Library ready.');

package/lib/commands/agent/adl/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../../src/commands/agent/adl/upload.ts"],"names":[],"mappings":"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"}

package/lib/commands/agent/generate/test-spec.d.ts

@@ -1,5 +1,7 @@
 import { SfCommand } from '@salesforce/sf-plugins-core';
+import { type NgtTestCase } from '@salesforce/agents';
 import { ComponentSet } from '@salesforce/source-deploy-retrieve';
+type TestRunner = 'agentforce-studio' | 'testing-center';
 type TestCase = {
     utterance: string;
     expectedActions: string[];
@@ -67,6 +69,12 @@ export declare function getPluginsAndFunctions(subjectName: string, cs: Componen
     genAiFunctions: string[];
 }>;
 export declare function ensureYamlExtension(filePath: string): string;
+/**
+ * Infer the test runner from the file extension of an AiEvaluationDefinition / AiTestingDefinition
+ * metadata XML file. Throws when the extension matches neither.
+ */
+export declare function inferRunnerFromMdPath(mdPath: string): TestRunner;
+export declare function promptForNgtTestCase(topics: string[], bots: string[], subjectName: string, caseNumber: number, log: (msg?: string) => void): Promise<NgtTestCase>;
 export default class AgentGenerateTestSpec extends SfCommand<void> {
     static readonly summary: string;
     static readonly description: string;
@@ -76,6 +84,7 @@ export default class AgentGenerateTestSpec extends SfCommand<void> {
         'from-definition': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         'force-overwrite': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'output-file': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        'test-runner': import("@oclif/core/interfaces").OptionFlag<"agentforce-studio" | "testing-center" | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/agent/generate/test-spec.js

@@ -18,7 +18,7 @@ import { join, parse } from 'node:path';
 import { existsSync } from 'node:fs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages, SfError, SfProject } from '@salesforce/core';
-import { AgentTest } from '@salesforce/agents';
+import { AgentTest, NgtScorerCatalog, } from '@salesforce/agents';
 import { select, input, confirm, checkbox } from '@inquirer/prompts';
 import { XMLParser } from 'fast-xml-parser';
 import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve';
@@ -26,6 +26,7 @@ import { warn } from '@oclif/core/errors';
 import { ensureArray } from '@salesforce/kit';
 import { theme } from '../../../inquirer-theme.js';
 import yesNoOrCancel from '../../../yes-no-cancel.js';
+import { testRunnerFlag } from '../../../flags.js';
 Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('@salesforce/plugin-agent', 'agent.generate.test-spec');
 /**
@@ -291,6 +292,17 @@ export function ensureYamlExtension(filePath) {
     warn(`Provided file path does not have a .yaml or .yml extension. Normalizing to ${normalized}`);
     return normalized;
 }
+/**
+ * Infer the test runner from the file extension of an AiEvaluationDefinition / AiTestingDefinition
+ * metadata XML file. Throws when the extension matches neither.
+ */
+export function inferRunnerFromMdPath(mdPath) {
+    if (mdPath.endsWith('aiTestingDefinition-meta.xml'))
+        return 'agentforce-studio';
+    if (mdPath.endsWith('aiEvaluationDefinition-meta.xml'))
+        return 'testing-center';
+    throw messages.createError('error.UnknownDefinitionExtension', [mdPath]);
+}
 async function promptUntilUniqueFile(subjectName, filePath) {
     const outputFile = filePath ??
         (await input({
@@ -323,10 +335,151 @@ async function promptUntilUniqueFile(subjectName, filePath) {
  * If the user provides the --force-overwrite flag, then we'll use the default file path (either the one provided by --output-file or the default path).
  * If the user doesn't provide it, we'll prompt the user for a file path until they provide a unique one or cancel.
  */
-async function determineFilePath(subjectName, outputFile, forceOverwrite) {
-    const defaultFile = ensureYamlExtension(outputFile ?? join('specs', `${subjectName}-testSpec.yaml`));
+async function determineFilePath(subjectName, outputFile, forceOverwrite, testRunner = 'testing-center') {
+    const suffix = testRunner === 'agentforce-studio' ? '-ngtTestSpec.yaml' : '-testSpec.yaml';
+    const defaultFile = ensureYamlExtension(outputFile ?? join('specs', `${subjectName}${suffix}`));
     return forceOverwrite ? defaultFile : promptUntilUniqueFile(subjectName, defaultFile);
 }
+const NGT_BOILERPLATE_HISTORY = [
+    { role: 'user', message: 'example user message' },
+    { role: 'agent', message: 'example agent message', topic: 'Example_agent_topic' },
+];
+async function promptForNgtContextVariables() {
+    const vars = [];
+    let wantsMore = await confirm({ message: 'Add context variables to this case', default: false, theme });
+    while (wantsMore) {
+        // eslint-disable-next-line no-await-in-loop
+        const name = await input({
+            message: 'Variable name',
+            validate: (d) => d.length > 0 || 'Name cannot be empty',
+            theme,
+        });
+        // eslint-disable-next-line no-await-in-loop
+        const value = await input({ message: 'Variable value', theme });
+        vars.push({ name, value });
+        // eslint-disable-next-line no-await-in-loop
+        wantsMore = await confirm({ message: 'Add another context variable', default: false, theme });
+    }
+    return vars;
+}
+async function promptForNgtUtterance(message) {
+    return input({
+        message,
+        validate: (d) => d.length > 0 || 'utterance cannot be empty',
+        theme,
+    });
+}
+async function promptForNgtInputs() {
+    const isMulti = await confirm({
+        message: 'Does this case have multiple input phrasings sharing one scorer set',
+        default: false,
+        theme,
+    });
+    // contextVariables / conversationHistory are decided once and shared across the input set.
+    const contextVariables = await promptForNgtContextVariables();
+    const wantsHistory = await confirm({
+        message: 'Generate boilerplate conversation history for this case',
+        default: false,
+        theme,
+    });
+    const conversationHistory = wantsHistory ? [...NGT_BOILERPLATE_HISTORY] : undefined;
+    const utterances = [];
+    if (!isMulti) {
+        utterances.push(await promptForNgtUtterance('Utterance'));
+    }
+    else {
+        utterances.push(await promptForNgtUtterance('Utterance #1'));
+        let addAnother = await confirm({ message: 'Add another input utterance', default: true, theme });
+        while (addAnother) {
+            // eslint-disable-next-line no-await-in-loop
+            utterances.push(await promptForNgtUtterance(`Utterance #${utterances.length + 1}`));
+            // eslint-disable-next-line no-await-in-loop
+            addAnother = await confirm({ message: 'Add another input utterance', default: false, theme });
+        }
+    }
+    return utterances.map((utterance) => {
+        const ngtInput = { utterance };
+        if (contextVariables.length > 0)
+            ngtInput.contextVariables = contextVariables;
+        if (conversationHistory)
+            ngtInput.conversationHistory = conversationHistory;
+        return ngtInput;
+    });
+}
+/* eslint-disable camelcase */
+const NGT_SCORER_HELP = {
+    topic_sequence_match: 'Topic API name (DeveloperName from a GenAiPlugin).',
+    action_sequence_match: "Single action API name, OR a Python-list-style string for multi-action: ['Verify_Customer','Get_Order_Status'].",
+    agent_handoff_match: "Target agent's DeveloperName (NOT label).",
+    bot_response_rating: "Natural-language assertion (LLM-judged). Example: 'Agent confirms the cancellation.'",
+    response_match: "Natural-language assertion (LLM-judged). Example: 'Agent confirms the cancellation.'",
+};
+/* eslint-enable camelcase */
+async function promptForNgtScorerExpected(scorerName, topics, bots, subjectName) {
+    const help = NGT_SCORER_HELP[scorerName] ?? '';
+    if (scorerName === 'topic_sequence_match' && topics.length > 0) {
+        return select({
+            message: `Expected for ${scorerName}: ${help}`,
+            choices: topics.map((t) => ({ name: t, value: t })),
+            theme,
+        });
+    }
+    if (scorerName === 'agent_handoff_match') {
+        const targets = bots.filter((b) => b !== subjectName);
+        if (targets.length > 0) {
+            return select({
+                message: `Expected for ${scorerName}: ${help}`,
+                choices: targets.map((t) => ({ name: t, value: t })),
+                theme,
+            });
+        }
+    }
+    return input({
+        message: `Expected for ${scorerName}${help ? `: ${help}` : ''}`,
+        validate: (d) => d.length > 0 || 'expected cannot be empty',
+        theme,
+    });
+}
+async function promptForNgtScorers(topics, bots, subjectName) {
+    const choices = Object.keys(NgtScorerCatalog).map((n) => ({ name: n, value: n }));
+    const selected = await checkbox({
+        message: 'Select scorers for this test case',
+        choices,
+        required: true,
+        theme,
+    });
+    const scorers = [];
+    for (const name of selected) {
+        if (NgtScorerCatalog[name].needsExpected) {
+            // eslint-disable-next-line no-await-in-loop
+            const expected = await promptForNgtScorerExpected(name, topics, bots, subjectName);
+            scorers.push({ name, expected });
+        }
+        else {
+            scorers.push({ name });
+        }
+    }
+    return scorers;
+}
+export async function promptForNgtTestCase(topics, bots, subjectName, caseNumber, log) {
+    const inputs = await promptForNgtInputs();
+    const scorers = await promptForNgtScorers(topics, bots, subjectName);
+    const usesTaskResolution = scorers.some((s) => s.name === 'task_resolution');
+    const hasHistory = inputs.some((i) => Array.isArray(i.conversationHistory) && i.conversationHistory.length > 0);
+    if (usesTaskResolution && !hasHistory) {
+        const wantsBoilerplate = await confirm({
+            message: 'task_resolution requires conversationHistory. Add boilerplate conversation history now',
+            default: true,
+            theme,
+        });
+        if (wantsBoilerplate) {
+            const stamped = inputs.map((i) => ({ ...i, conversationHistory: [...NGT_BOILERPLATE_HISTORY] }));
+            return { inputs: stamped, scorers };
+        }
+        log(messages.getMessage('warning.NoConversationHistoryForTaskResolution', [caseNumber.toString()]));
+    }
+    return { inputs, scorers };
+}
 export default class AgentGenerateTestSpec extends SfCommand {
     static summary = messages.getMessage('summary');
     static description = messages.getMessage('description');
@@ -337,12 +490,6 @@ export default class AgentGenerateTestSpec extends SfCommand {
             char: 'd',
             exists: true,
             summary: messages.getMessage('flags.from-definition.summary'),
-            parse: async (raw) => {
-                if (!raw.endsWith('aiEvaluationDefinition-meta.xml')) {
-                    throw messages.createError('error.InvalidAiEvaluationDefinition');
-                }
-                return Promise.resolve(raw);
-            },
         }),
         'force-overwrite': Flags.boolean({
             summary: messages.getMessage('flags.force-overwrite.summary'),
@@ -352,6 +499,7 @@ export default class AgentGenerateTestSpec extends SfCommand {
             summary: messages.getMessage('flags.output-file.summary'),
             parse: async (raw) => Promise.resolve(ensureYamlExtension(raw)),
         }),
+        'test-runner': testRunnerFlag,
     };
     async run() {
         const { flags } = await this.parse(AgentGenerateTestSpec);
@@ -363,9 +511,14 @@ export default class AgentGenerateTestSpec extends SfCommand {
             },
         });
         if (flags['from-definition']) {
+            const inferredRunner = inferRunnerFromMdPath(flags['from-definition']);
+            if (flags['test-runner'] && flags['test-runner'] !== inferredRunner) {
+                throw messages.createError('error.RunnerMismatch', [flags['test-runner'], inferredRunner]);
+            }
+            const testRunner = flags['test-runner'] ?? inferredRunner;
             const agentTest = new AgentTest({ mdPath: flags['from-definition'] });
             const spec = await agentTest.getTestSpec();
-            const outputFile = await determineFilePath(spec.subjectName, flags['output-file'], flags['force-overwrite']);
+            const outputFile = await determineFilePath(spec.subjectName, flags['output-file'], flags['force-overwrite'], testRunner);
             if (!outputFile) {
                 this.log(messages.getMessage('info.cancel'));
                 return;
@@ -383,6 +536,7 @@ export default class AgentGenerateTestSpec extends SfCommand {
         if (bots.length === 0) {
             throw messages.createError('error.NoAgentsFound', [directoryPaths.join(', ')]);
         }
+        const testRunner = flags['test-runner'] ?? 'testing-center';
         const subjectType = (await select({
             message: 'What are you testing',
             choices: ['AGENT'],
@@ -393,7 +547,7 @@ export default class AgentGenerateTestSpec extends SfCommand {
             choices: bots,
             theme,
         });
-        const outputFile = await determineFilePath(subjectName, flags['output-file'], flags['force-overwrite']);
+        const outputFile = await determineFilePath(subjectName, flags['output-file'], flags['force-overwrite'], testRunner);
         if (!outputFile) {
             this.log(messages.getMessage('info.cancel'));
             return;
@@ -414,6 +568,35 @@ export default class AgentGenerateTestSpec extends SfCommand {
             message: 'Enter a description for the test (optional)',
             theme,
         });
+        if (testRunner === 'agentforce-studio') {
+            const subjectVersion = await input({
+                message: 'Enter the agent version (e.g. v1)',
+                default: 'v1',
+                theme,
+            });
+            const ngtTestCases = [];
+            do {
+                this.log();
+                this.styledHeader(`Adding test case #${ngtTestCases.length + 1}`);
+                // eslint-disable-next-line no-await-in-loop
+                const tc = await promptForNgtTestCase(Object.keys(genAiPlugins), bots, subjectName, ngtTestCases.length + 1, (msg) => this.warn(msg ?? ''));
+                ngtTestCases.push(tc);
+            } while ( // eslint-disable-next-line no-await-in-loop
+            await confirm({ message: 'Do you want to add another test case', default: true }));
+            this.log();
+            const ngtSpec = {
+                name,
+                description: description || undefined,
+                subjectType,
+                subjectName,
+                subjectVersion,
+                testCases: ngtTestCases,
+            };
+            const agentTest = new AgentTest({ specData: ngtSpec });
+            await agentTest.writeTestSpec(outputFile);
+            this.log(`Created ${outputFile}`);
+            return;
+        }
         const testCases = [];
         do {
             this.log();