@copado/agentia-cli 1.2.0 → 1.4.0

package/dist/commands/cicd/work/environment-sync.js

@@ -1,18 +1,21 @@
 import { Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { commandStdioCaptureOptions, withCapturedCommandOutput } from '../../../lib/command-output-buffer.js';
-import { assertEnvironmentSyncDestOrgSelector, formatWorkEnvironmentSyncResult, performWorkEnvironmentSync, WorkEnvironmentSyncConflictError, WorkEnvironmentSyncValidationError, } from '../../../lib/work-environment-sync.js';
-export default class WorkEnvironmentSync extends AgentiaCommand {
+import { isPromotionRunExecutionError, PROMOTION_RUN_DEFAULT_TIMEOUT_SECONDS, promotionRunErrorJson, waitForPromotionDeploymentExecution, } from '../../../lib/promotion-run.js';
+import { assertEnvironmentSyncDestOrgSelector, ENVIRONMENT_SYNC_DEPLOYMENT_WAIT_MESSAGE, ENVIRONMENT_SYNC_DEPLOYMENTS, formatWorkEnvironmentSyncDeploymentMonitor, formatWorkEnvironmentSyncResult, performWorkEnvironmentSync, shouldWaitForEnvironmentSyncDeployment, WorkEnvironmentSyncConflictError, WorkEnvironmentSyncValidationError, } from '../../../lib/work-environment-sync.js';
+export default class WorkEnvironmentSync extends CicdCommand {
     static description = [
         'Sync committed metadata from the next environment onto the destination environment (or current feature branch).',
         'Back-promotes every user story behind the destination environment from the next environment branch.',
-        'GET user stories ahead and behind. If none are behind, log that and stop. Otherwise create a back-promotion and POST those behind stories onto the promotion.',
+        'On a feature branch, requires published commits first: stops when HEAD is ahead of origin/<feature> and suggests `cicd work publish`.',
+        'GET user stories ahead and behind. If none are behind, log that and stop. Otherwise create a back-promotion via POST /agentia/headless/work/promote-action (PromoteAction with execute flags false) including those behind stories.',
         'Resolves the next-environment Git branch from --destination-environment or --dev-org-branch (the dest pipeline connection destinationBranch, or that destination environment\'s outbound branch).',
-        'Merges origin/<next-env> with --no-ff --no-commit, restores every other path from HEAD, commits the guessed pathspecs,',
-        'and pushes the dest org branch (and the feature branch when HEAD starts with feature/).',
-        'If guessed pathspecs still conflict, PATCH the back-promotion status to Merge Conflict, store lastEnvironmentSyncName, resolve the files, and re-run with --continue (optional --promotion). The promotion destination environment supplies the dest org branch and the next-env branch.',
-        'To discard a conflicted merge, re-run with --abort (optional --promotion); runs git merge --abort and sets the back-promotion status to Draft.',
-        'After a successful sync, PATCH the back-promotion status to Completed and clear lastEnvironmentSyncName.',
+        'Creates promotion/<promotionName> from the dest org branch, merges origin/<next-env> pathspecs into that promotion branch (--no-ff --no-commit, restores non-pathspec paths), commits, merges the promotion branch into the dest org branch, and pushes both refs.',
+        'If the run started on a feature branch, checks out that branch\'s changed files (vs lastBaseBranch) from the dest org, commits updates when needed, and tells you to re-check and publish again.',
+        'If guessed pathspecs still conflict, PATCH the back-promotion status to Merge Conflict, store lastEnvironmentSyncName, resolve the files on promotion/<name>, and re-run with --continue (optional --promotion).',
+        'To discard a conflicted merge, re-run with --abort (optional --promotion); runs git merge --abort and POST /agentia/headless/work/promote-action/complete with status Cancelled.',
+        'After a successful sync, when --deployment resolves to local, runs `sf project deploy start --ignore-conflicts` against --sf-alias (Add-only changes), then POST /agentia/headless/work/promote-action/complete with status Completed and the resolved deployment (none|local|cloud; auto chooses local when every change is Add and --sf-alias is set, otherwise cloud).',
+        'By default polls the cloud deployment JobExecution to a terminal status when deployment is cloud (--no-wait to skip).',
         'On git/merge failure (including conflicts) and after a successful --continue, uploads the captured command transcript as a Salesforce File on the back-promotion (`Environment Sync Logs <name-or-id> <datetime>.txt`) via `/agentia/headless/file/upload`. HTTP 404 is ignored until that endpoint is rolled out; other upload failures are warned and do not change the environment-sync outcome.',
     ].join(' ');
     static examples = [
@@ -21,12 +24,16 @@ export default class WorkEnvironmentSync extends AgentiaCommand {
         '<%= config.bin %> <%= command.id %> --continue',
         '<%= config.bin %> <%= command.id %> --abort',
         '<%= config.bin %> <%= command.id %> --promotion=P29334 --continue',
+        '<%= config.bin %> <%= command.id %> --destination-environment=dev1 --deployment=local --sf-alias=dev1',
+        '<%= config.bin %> <%= command.id %> --destination-environment=dev1 --deployment=cloud',
+        '<%= config.bin %> <%= command.id %> --destination-environment=dev1 --no-wait',
         '<%= config.bin %> <%= command.id %> --destination-environment=dev1 --json',
     ];
+    static experimental = true;
     static flags = {
         abort: Flags.boolean({
             default: false,
-            description: 'Abort an in-progress merge (`git merge --abort`) and set the back-promotion status to Draft. Uses --promotion or lastEnvironmentSyncName. Exclusive with --continue.',
+            description: 'Abort an in-progress merge (`git merge --abort`) and cancel the back-promotion via promote-action/complete. Uses --promotion or lastEnvironmentSyncName. Exclusive with --continue.',
             exclusive: ['continue'],
         }),
         continue: Flags.boolean({
@@ -34,8 +41,13 @@ export default class WorkEnvironmentSync extends AgentiaCommand {
             description: 'Finish after merge conflicts. If the merge is still in progress (conflicts fixed and staged, but not committed), commits it; if you already committed, continues from there through the remaining git steps. Uses --promotion or lastEnvironmentSyncName.',
             exclusive: ['abort'],
         }),
+        deployment: Flags.string({
+            default: 'auto',
+            description: 'How promote-action/complete handles deployment after a successful sync: none (leave deployment job untouched), local (sf project deploy start --ignore-conflicts then mark deployment JobExecution Successful; Add-only changes; requires --sf-alias), cloud (start PromotionDeployAction), or auto (local when every change is Add and --sf-alias is set, otherwise cloud). Sent to the gateway as none|local|cloud (never auto).',
+            options: [...ENVIRONMENT_SYNC_DEPLOYMENTS],
+        }),
         'destination-credential': Flags.string({
-            description: 'Credential ID posted as destinationCredentialId when creating the back-promotion. Copado requires a credential on the next/source environment (PRO-033 if a dest/dev credential is sent) and then stores the dest/dev credential. Defaults to that source environment defaultCredential, otherwise the first source credential.',
+            description: 'Credential ID recorded on the environment-sync result as destinationCredentialId. Defaults to the next/source environment defaultCredential, otherwise the first source credential. PromoteAction resolves deployment credentials itself.',
         }),
         'destination-environment': Flags.string({
             description: 'Destination org environment name or Id. Resolves to that environment\'s pipeline connection Git branch.',
@@ -51,42 +63,29 @@ export default class WorkEnvironmentSync extends AgentiaCommand {
         promotion: Flags.string({
             description: 'Back-promotion Id or name to PATCH when this run stops on merge conflicts, finishes successfully, continues, or aborts. Optional for --continue/--abort when lastEnvironmentSyncName was stored from a prior environment-sync run. Defaults to the back-promotion created in this run.',
         }),
+        'sf-alias': Flags.string({
+            description: 'Salesforce CLI org alias or username for local deployment (`sf project deploy start -o`). Required with --deployment=local; with --deployment=auto enables local when changes are Add-only.',
+        }),
+        wait: Flags.boolean({
+            allowNo: true,
+            default: true,
+            description: 'Poll promotion and deployment executions to terminal status.',
+        }),
+        'wait-timeout': Flags.integer({
+            default: PROMOTION_RUN_DEFAULT_TIMEOUT_SECONDS,
+            description: 'Maximum total seconds to wait for promotion and deployment executions.',
+        }),
     };
     async run() {
         const { flags } = await this.parse(WorkEnvironmentSync);
+        const syncFlags = flags;
+        if (!Number.isInteger(syncFlags['wait-timeout']) || syncFlags['wait-timeout'] <= 0) {
+            this.error('--wait-timeout must be a positive integer.', { exit: 2 });
+        }
         return withCapturedCommandOutput(async () => {
             const startedAt = Date.now();
             try {
-                await assertEnvironmentSyncDestOrgSelector({
-                    abort: flags.abort === true,
-                    continue: flags.continue === true,
-                    destinationEnvironment: flags['destination-environment'],
-                    devOrgBranch: flags['dev-org-branch'],
-                    promotion: flags.promotion,
-                });
-                const result = await performWorkEnvironmentSync({
-                    abort: flags.abort === true,
-                    cliBin: this.config.bin,
-                    continue: flags.continue === true,
-                    hooks: {
-                        log: (message) => {
-                            this.display(() => {
-                                this.log(message);
-                            });
-                        },
-                        withSpinner: (message, action) => this.withSpinner(message, action),
-                    },
-                    json: this.jsonEnabled(),
-                    ...(flags['destination-credential'] === undefined
-                        ? {}
-                        : { destinationCredentialId: flags['destination-credential'] }),
-                    ...(flags['destination-environment'] === undefined
-                        ? {}
-                        : { destinationEnvironment: flags['destination-environment'] }),
-                    ...(flags['dev-org-branch'] === undefined ? {} : { devOrgBranch: flags['dev-org-branch'] }),
-                    ...(flags['pipeline-id'] === undefined ? {} : { pipelineId: flags['pipeline-id'] }),
-                    ...(flags.promotion === undefined ? {} : { promotion: flags.promotion }),
-                });
+                const result = await this.runEnvironmentSync(syncFlags);
                 this.display(() => {
                     const formatted = formatWorkEnvironmentSyncResult(result);
                     if (formatted.length > 0) {
@@ -94,34 +93,111 @@ export default class WorkEnvironmentSync extends AgentiaCommand {
                     }
                 });
                 this.logElapsed(startedAt);
+                await this.waitForDeploymentIfNeeded(result, syncFlags, startedAt);
                 return result;
             }
             catch (error) {
-                if (error instanceof WorkEnvironmentSyncConflictError) {
-                    const { suggestions } = error;
-                    const suggestionOptions = suggestions === undefined ? {} : { suggestions };
-                    if (this.jsonEnabled()) {
-                        const message = error.gitStatus === undefined || error.gitStatus.length === 0
-                            ? error.message
-                            : `${error.message}\n\n${error.gitStatus}`;
-                        this.error(message, { exit: error.exit, ...suggestionOptions });
-                    }
-                    this.error(error.message, { exit: false, ...suggestionOptions });
-                    if (error.gitStatus !== undefined && error.gitStatus.length > 0) {
-                        this.log('');
-                        this.log(error.gitStatus);
-                    }
-                    this.exit(error.exit);
-                }
-                if (error instanceof WorkEnvironmentSyncValidationError) {
-                    this.error(error.message, {
-                        exit: error.exit,
-                        ...(error.suggestions === undefined ? {} : { suggestions: error.suggestions }),
-                    });
-                }
-                throw error;
+                this.handleEnvironmentSyncError(error);
             }
         }, commandStdioCaptureOptions(this));
     }
+    toErrorJson(err) {
+        const base = super.toErrorJson(err);
+        return promotionRunErrorJson(base, err);
+    }
+    handleEnvironmentSyncError(error) {
+        if (error instanceof WorkEnvironmentSyncConflictError) {
+            const { suggestions } = error;
+            const suggestionOptions = suggestions === undefined ? {} : { suggestions };
+            if (this.jsonEnabled()) {
+                const message = error.gitStatus === undefined || error.gitStatus.length === 0
+                    ? error.message
+                    : `${error.message}\n\n${error.gitStatus}`;
+                this.error(message, { exit: error.exit, ...suggestionOptions });
+            }
+            this.error(error.message, { exit: false, ...suggestionOptions });
+            if (error.gitStatus !== undefined && error.gitStatus.length > 0) {
+                this.log('');
+                this.log(error.gitStatus);
+            }
+            this.exit(error.exit);
+        }
+        if (error instanceof WorkEnvironmentSyncValidationError) {
+            this.error(error.message, {
+                exit: error.exit,
+                ...(error.suggestions === undefined ? {} : { suggestions: error.suggestions }),
+            });
+        }
+        throw error;
+    }
+    async runEnvironmentSync(syncFlags) {
+        await assertEnvironmentSyncDestOrgSelector({
+            abort: syncFlags.abort === true,
+            continue: syncFlags.continue === true,
+            destinationEnvironment: syncFlags['destination-environment'],
+            devOrgBranch: syncFlags['dev-org-branch'],
+            promotion: syncFlags.promotion,
+        });
+        return performWorkEnvironmentSync({
+            abort: syncFlags.abort === true,
+            cliBin: this.config.bin,
+            continue: syncFlags.continue === true,
+            deployment: syncFlags.deployment,
+            hooks: {
+                log: (message) => {
+                    this.display(() => {
+                        this.log(message);
+                    });
+                },
+                withSpinner: (message, action) => this.withSpinner(message, action),
+            },
+            json: this.jsonEnabled(),
+            ...(syncFlags['destination-credential'] === undefined
+                ? {}
+                : { destinationCredentialId: syncFlags['destination-credential'] }),
+            ...(syncFlags['destination-environment'] === undefined
+                ? {}
+                : { destinationEnvironment: syncFlags['destination-environment'] }),
+            ...(syncFlags['dev-org-branch'] === undefined ? {} : { devOrgBranch: syncFlags['dev-org-branch'] }),
+            ...(syncFlags['pipeline-id'] === undefined ? {} : { pipelineId: syncFlags['pipeline-id'] }),
+            ...(syncFlags.promotion === undefined ? {} : { promotion: syncFlags.promotion }),
+            ...(syncFlags['sf-alias'] === undefined ? {} : { sfAlias: syncFlags['sf-alias'] }),
+        });
+    }
+    async waitForDeploymentIfNeeded(result, syncFlags, startedAt) {
+        if (!syncFlags.wait || !shouldWaitForEnvironmentSyncDeployment(result) || result.promotion?.id === undefined) {
+            return;
+        }
+        this.display(() => {
+            this.log(ENVIRONMENT_SYNC_DEPLOYMENT_WAIT_MESSAGE);
+        });
+        try {
+            const deploymentJobMonitor = await this.withSpinner('Waiting for deployment execution', () => waitForPromotionDeploymentExecution({
+                hooks: {
+                    log: (message) => {
+                        this.display(() => {
+                            this.log(message);
+                        });
+                    },
+                    withSpinner: (message, action) => this.withSpinner(message, action),
+                },
+                promotionId: result.promotion.id,
+                timeoutSeconds: syncFlags['wait-timeout'],
+            }));
+            result.deploymentJobMonitor = deploymentJobMonitor;
+            result.wait = true;
+            this.display(() => {
+                this.log(formatWorkEnvironmentSyncDeploymentMonitor(deploymentJobMonitor));
+            });
+        }
+        catch (error) {
+            if (isPromotionRunExecutionError(error)) {
+                ;
+                error.oclif = { exit: 1 };
+            }
+            throw error;
+        }
+        this.logElapsed(startedAt);
+    }
 }
 //# sourceMappingURL=environment-sync.js.map

package/dist/commands/cicd/work/get.js

@@ -1,18 +1,18 @@
 import { Args, Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { WorkActiveResolutionError } from '../../../lib/work-active.js';
 import { formatCommittedMetadataSection, } from '../../../lib/work-committed-metadata.js';
 import { fetchWorkItemWithOptions } from '../../../lib/work-get.js';
 import { formatUserStoriesAheadBehindLines, reportUserStoriesAheadBehindForStory, } from '../../../lib/work-submit-ahead-behind.js';
 import { formatUserStoryDetail, } from '../../../lib/work-types.js';
-export default class WorkGet extends AgentiaCommand {
+export default class WorkGet extends CicdCommand {
     static args = {
         id: Args.string({
-            description: 'User story ID (defaults to the active work item from `work set`)',
+            description: 'User story ID or name (defaults to the active work item from `work set`)',
             required: false,
         }),
     };
-    static description = 'Get a Copado user story by ID';
+    static description = 'Get a Copado user story by ID or name';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
         '<%= config.bin %> <%= command.id %> a0SKC000000CmZ2AU',

package/dist/commands/cicd/work/list.js

@@ -1,10 +1,10 @@
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
-import { displayListPagination } from '../../../lib/list-pagination.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
+import { displayListPagination, emitPaginatedListWarnings } from '../../../lib/list-pagination.js';
 import { getUserContext } from '../../../lib/user-context.js';
 import { buildWorkListFilters, workListFilterFlags } from '../../../lib/work-flags.js';
 import { fetchWorkItems } from '../../../lib/work-get.js';
 import { formatUserStoryTable } from '../../../lib/work-types.js';
-export default class WorkList extends AgentiaCommand {
+export default class WorkList extends CicdCommand {
     static description = 'List Copado user stories';
     static examples = [
         '<%= config.bin %> <%= command.id %>',
@@ -42,6 +42,7 @@ export default class WorkList extends AgentiaCommand {
             }
         }
         const page = await this.withSpinner('Fetching user stories', () => fetchWorkItems(filters));
+        emitPaginatedListWarnings(this.warn.bind(this), page);
         this.display(() => {
             if (page.data.length === 0) {
                 this.log('No user stories found.');

package/dist/commands/cicd/work/open.js

@@ -1,9 +1,9 @@
 import { Args } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { openNavigationTarget } from '../../../lib/navigation-open.js';
 import { resolveNavigationTarget } from '../../../lib/navigation.js';
 import { resolveWorkItemId, WorkActiveResolutionError } from '../../../lib/work-active.js';
-export default class WorkOpen extends AgentiaCommand {
+export default class WorkOpen extends CicdCommand {
     static args = {
         id: Args.string({
             description: 'User story ID (defaults to the active work item from `work set`)',

package/dist/commands/cicd/work/promote.js

@@ -1,7 +1,7 @@
 import { Args, Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { collectPromoteUserStoryIds, formatWorkPromoteResult, performWorkPromote, WorkPromoteConflictError, WorkPromoteValidationError, } from '../../../lib/work-promote.js';
-export default class WorkPromote extends AgentiaCommand {
+export default class WorkPromote extends CicdCommand {
     static args = {
         userStoryIds: Args.string({
             description: 'User story ID. Pass more than one to merge those feature branches in order. Omit when using --promotion with --continue or --abort.',

package/dist/commands/cicd/work/publish.js

@@ -1,7 +1,7 @@
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { commandStdioCaptureOptions, withCapturedCommandOutput } from '../../../lib/command-output-buffer.js';
 import { runWorkPublish, WORK_PUBLISH_DESCRIPTION, workPublishFlags, } from '../../../lib/work-publish-command.js';
-export default class WorkPublish extends AgentiaCommand {
+export default class WorkPublish extends CicdCommand {
     static description = WORK_PUBLISH_DESCRIPTION;
     static examples = [
         '<%= config.bin %> <%= command.id %>',

package/dist/commands/cicd/work/push.js

@@ -1,11 +1,11 @@
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { commandStdioCaptureOptions, withCapturedCommandOutput } from '../../../lib/command-output-buffer.js';
 import { runWorkPublish, workPublishFlags, } from '../../../lib/work-publish-command.js';
 /**
  * Compatibility alias of `cicd work publish`.
  * Prefer `agentia cicd work publish` in scripts and docs.
  */
-export default class WorkPush extends AgentiaCommand {
+export default class WorkPush extends CicdCommand {
     static description = [
         'Alias of cicd work publish.',
         'Publishes the current feature/<lastWorkItem> branch and registers commits with Copado.',

package/dist/commands/cicd/work/set.js

@@ -1,5 +1,5 @@
 import { Args, Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { CicdGateway } from '../../../lib/cicd-gateway.js';
 import { reconcileWorkSetCredential } from '../../../lib/credential-sync.js';
 import { writeLastWorkSelection } from '../../../lib/defaults-store.js';
@@ -8,7 +8,7 @@ import { withLocalDevelopmentFlow } from '../../../lib/work-local-development-fl
 import { performWorkSetNone, WorkSetNoneValidationError } from '../../../lib/work-set-none.js';
 import { isWorkSetWarning, parseWorkSetSelection, toWorkSetWarningResult, writeWorkSetWarningSelection, } from '../../../lib/work-set-selection.js';
 import { featureBranchName, workSetEndpoint, } from '../../../lib/work-types.js';
-export default class WorkSet extends AgentiaCommand {
+export default class WorkSet extends CicdCommand {
     static args = {
         id: Args.string({
             description: 'User story ID or name (omit with --none)',

package/dist/commands/cicd/work/status.js

@@ -1,10 +1,10 @@
 import { Args, Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { CicdGateway } from '../../../lib/cicd-gateway.js';
 import { readLastWorkItem } from '../../../lib/defaults-store.js';
 import { resolveRecordedWorkBranchMetadata, } from '../../../lib/work-branch-metadata.js';
 import { formatWorkBranchMetadata, formatWorkStatus, workStatusEndpoint, } from '../../../lib/work-types.js';
-export default class WorkStatus extends AgentiaCommand {
+export default class WorkStatus extends CicdCommand {
     static args = {
         id: Args.string({
             description: 'User story ID or name (defaults to the last work item from `work set`)',

package/dist/commands/cicd/work/submit.js

@@ -1,6 +1,6 @@
 import { Flags } from '@oclif/core';
 import path from 'node:path';
-import { AgentiaCommand } from '../../../lib/agentia-command.js';
+import { CicdCommand } from '../../../lib/cicd-command.js';
 import { CicdGateway } from '../../../lib/cicd-gateway.js';
 import { commandStdioCaptureOptions, withCapturedCommandOutput } from '../../../lib/command-output-buffer.js';
 import { readLastBaseBranch, readLastPullRequestBaseUrl, readSkipPullRequest, } from '../../../lib/defaults-store.js';
@@ -15,7 +15,7 @@ import { performWorkPush, resolveActiveFeatureWorkItem, resolveWorkPushContext,
 import { reportSubmitUserStoriesAheadBehind } from '../../../lib/work-submit-ahead-behind.js';
 import { waitForPendingCommitJobBeforeSubmit } from '../../../lib/work-submit-wait.js';
 import { buildPullRequestCompareUrl, formatWorkCommandMessage, workSubmitEndpoint, } from '../../../lib/work-types.js';
-export default class WorkSubmit extends AgentiaCommand {
+export default class WorkSubmit extends CicdCommand {
     static description = withLocalDevelopmentFlow([
         'Submit the current feature/<lastWorkItem> work item for pipeline quality gates and validation.',
         'Runs project-root .agentia_quality_gates.sh (macOS/Linux) or .agentia_quality_gates.cmd (Windows) when present,',

package/dist/commands/cicd/work/test/apex.js

@@ -1,11 +1,11 @@
 import { Flags } from '@oclif/core';
-import { AgentiaCommand } from '../../../../lib/agentia-command.js';
-import { planWorkApexTestRun, recordWorkApexTestOutcome, WorkApexRerunError, } from '../../../../lib/work-apex-test-failures.js';
-import { DEFAULT_APEX_TEST_WAIT_MINUTES, formatWorkApexTestHuman, parseApexTestClassNames, runWorkApexTests, skippedWorkApexTestResult, validateApexTestWaitMinutes, WorkApexTestError, } from '../../../../lib/work-apex-test.js';
-export default class WorkTestApex extends AgentiaCommand {
+import { CicdCommand } from '../../../../lib/cicd-command.js';
+import { executeWorkApexTestRun, WorkApexRerunError } from '../../../../lib/work-apex-test-failures.js';
+import { DEFAULT_APEX_TEST_WAIT_MINUTES, formatWorkApexTestHuman, parseApexTestClassNames, validateApexTestWaitMinutes, } from '../../../../lib/work-apex-test.js';
+export default class WorkTestApex extends CicdCommand {
     static description = [
+        'Legacy alias of `work test --gate apex`; prefer that form (it is what the sample quality-gate scripts call).',
         'Run specified Apex test classes via Salesforce CLI (`sf apex run test`) with code coverage.',
-        'Usually run from project-root local quality gates (`.agentia_quality_gates.sh` / `.agentia_quality_gates.cmd`) when those scripts are configured.',
         'When `--apex-test-classes` is omitted or empty, logs that no Apex tests were specified and exits without running Salesforce CLI.',
         'Failed runs save `.agentia/apex.tests.<user-story>.json`; successful runs delete that file.',
         '`--rerun-failed-apex-tests` runs the previously failed classes (optionally filtered by `--apex-test-classes`).',
@@ -34,6 +34,7 @@ export default class WorkTestApex extends AgentiaCommand {
             description: 'Minutes to wait for Salesforce CLI Apex test results',
         }),
     };
+    static hidden = true;
     async run() {
         const { flags } = await this.parse(WorkTestApex);
         const startedAt = Date.now();
@@ -46,42 +47,26 @@ export default class WorkTestApex extends AgentiaCommand {
         catch (error) {
             this.error(error.message, { exit: 2 });
         }
-        let plan;
         try {
-            plan = await planWorkApexTestRun({
-                requestedClassNames: classNames,
-                rerunFailed: flags['rerun-failed-apex-tests'] === true,
-            });
-        }
-        catch (error) {
-            if (error instanceof WorkApexRerunError) {
-                this.error(error.message, { exit: 2 });
-            }
-            throw error;
-        }
-        if (plan.kind === 'skip') {
-            const result = skippedWorkApexTestResult(waitMinutes);
-            this.display(() => {
-                this.log(plan.message);
-            });
-            this.logElapsed(startedAt);
-            return result;
-        }
-        try {
-            const result = await this.withSpinner(`Running Apex tests (${plan.classNames.join(', ')}), waiting up to ${waitMinutes} minute(s)`, () => runWorkApexTests({ classNames: plan.classNames, waitMinutes }));
-            await recordWorkApexTestOutcome({ failed: false, result, userStory: plan.userStory });
-            this.display(() => {
-                this.log(formatWorkApexTestHuman(result));
+            const result = await executeWorkApexTestRun({ requestedClassNames: classNames, rerunFailed: flags['rerun-failed-apex-tests'] === true, waitMinutes }, {
+                onResult: (apexResult) => {
+                    this.display(() => {
+                        this.log(formatWorkApexTestHuman(apexResult));
+                    });
+                },
+                onSkip: (message) => {
+                    this.display(() => {
+                        this.log(message);
+                    });
+                },
+                withSpinner: (message, action) => this.withSpinner(message, action),
             });
             this.logElapsed(startedAt);
             return result;
         }
         catch (error) {
-            if (error instanceof WorkApexTestError) {
-                await recordWorkApexTestOutcome({ failed: true, result: error.result, userStory: plan.userStory });
-                this.display(() => {
-                    this.log(formatWorkApexTestHuman(error.result));
-                });
+            if (error instanceof WorkApexRerunError) {
+                this.error(error.message, { exit: 2 });
             }
             throw error;
         }