@salesforce/plugin-devops-center 2.2.0 → 2.3.2

package/lib/utils/promoteStage.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { validateSalesforceId } from './soqlUtils.js';
 /**
  * Promotes work items to a target pipeline stage via the Connect API.
  * POST /services/data/v{version}/connect/devops/pipelines/{pipelineId}/promote
@@ -43,4 +44,28 @@ export async function promoteStage(params) {
         promotedWorkitemIds: response.promotedWorkitemIds ?? [],
     };
 }
+/**
+ * DevopsPipelnStgProm.Status values that indicate a promotion has been submitted
+ * but has not yet finished (i.e. is still in flight).
+ */
+export const IN_FLIGHT_PROMOTION_STATUSES = ['NEW', 'IN_PROGRESS', 'FINALIZING'];
+/**
+ * Returns any in-flight promotions targeting the given pipeline stage.
+ *
+ * DevopsPipelnStgProm (Pipeline Stage Promotion) records the target stage of a promotion
+ * (PipelineStageId) and links to its DevopsRequestInfo, so the check is scoped to the
+ * specific target stage — and therefore its pipeline — rather than the whole org. Used to
+ * block a duplicate promotion to the same stage while one is already running, without
+ * affecting promotions in other stages or pipelines.
+ */
+export async function findInFlightPromotions(connection, targetStageId) {
+    validateSalesforceId(targetStageId, 'target stage');
+    const statusList = IN_FLIGHT_PROMOTION_STATUSES.join("', '");
+    const result = await connection.query(`SELECT Id, Status, RequestInfoId, RequestInfo.RequestToken FROM DevopsPipelnStgProm WHERE PipelineStageId = '${targetStageId}' AND Status IN ('${statusList}') LIMIT 10`);
+    return (result.records ?? []).map((r) => ({
+        id: r.Id,
+        requestToken: r.RequestInfo?.RequestToken ?? r.RequestInfoId ?? '',
+        status: r.Status,
+    }));
+}
 //# sourceMappingURL=promoteStage.js.map

package/lib/utils/promoteStage.js.map

@@ -1 +1 @@
-{"version":3,"file":"promoteStage.js","sourceRoot":"","sources":["../../src/utils/promoteStage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AA4BH;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAA0B;IAC3D,MAAM,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,GAAG,KAAK,EAClB,SAAS,GAAG,SAAS,EACrB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,MAAM,IAAI,GAAG,mBAAmB,UAAU,CAAC,aAAa,EAAE,6BAA6B,UAAU,UAAU,CAAC;IAE5G,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAuB;QAC9D,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,IAAI;QACT,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,WAAW,EAAE,WAAW;YACxB,aAAa;YACb,mBAAmB,EAAE,KAAK;YAC1B,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE;gBACb,SAAS;gBACT,YAAY,EAAE,UAAU;gBACxB,QAAQ,EAAE,QAAQ,IAAI,EAAE;aACzB;SACF,CAAC;QACF,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CAAC,CAAC;IAEH,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE;QACnC,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,EAAE;QAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;QAC/B,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,IAAI,EAAE;KACxD,CAAC;AACJ,CAAC"}
+{"version":3,"file":"promoteStage.js","sourceRoot":"","sources":["../../src/utils/promoteStage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AA0BtD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAA0B;IAC3D,MAAM,EACJ,UAAU,EACV,UAAU,EACV,WAAW,EACX,aAAa,EACb,UAAU,GAAG,KAAK,EAClB,SAAS,GAAG,SAAS,EACrB,QAAQ,GACT,GAAG,MAAM,CAAC;IAEX,MAAM,IAAI,GAAG,mBAAmB,UAAU,CAAC,aAAa,EAAE,6BAA6B,UAAU,UAAU,CAAC;IAE5G,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,OAAO,CAAuB;QAC9D,MAAM,EAAE,MAAM;QACd,GAAG,EAAE,IAAI;QACT,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,WAAW,EAAE,WAAW;YACxB,aAAa;YACb,mBAAmB,EAAE,KAAK;YAC1B,aAAa,EAAE,KAAK;YACpB,aAAa,EAAE;gBACb,SAAS;gBACT,YAAY,EAAE,UAAU;gBACxB,QAAQ,EAAE,QAAQ,IAAI,EAAE;aACzB;SACF,CAAC;QACF,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;KAChD,CAAC,CAAC;IAEH,OAAO;QACL,SAAS,EAAE,QAAQ,CAAC,SAAS,IAAI,EAAE;QACnC,MAAM,EAAE,QAAQ,CAAC,MAAM,IAAI,EAAE;QAC7B,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,EAAE;QAC/B,mBAAmB,EAAE,QAAQ,CAAC,mBAAmB,IAAI,EAAE;KACxD,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,KAAK,EAAE,aAAa,EAAE,YAAY,CAAU,CAAC;AAe1F;;;;;;;;GAQG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAAsB,EACtB,aAAqB;IAErB,oBAAoB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,UAAU,GAAG,4BAA4B,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7D,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,KAAK,CACnC,gHAAgH,aAAa,qBAAqB,UAAU,aAAa,CAC1K,CAAC;IACF,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACxC,EAAE,EAAE,CAAC,CAAC,EAAE;QACR,YAAY,EAAE,CAAC,CAAC,WAAW,EAAE,YAAY,IAAI,CAAC,CAAC,aAAa,IAAI,EAAE;QAClE,MAAM,EAAE,CAAC,CAAC,MAAM;KACjB,CAAC,CAAC,CAAC;AACN,CAAC"}

package/lib/utils/updateWorkItem.d.ts

@@ -23,10 +23,30 @@ export type UpdateWorkItemResult = {
 export declare const ALLOWED_STATUSES: readonly ["In Progress", "Ready to Promote"];
 export type AllowedStatus = (typeof ALLOWED_STATUSES)[number];
 export declare function toApiStatus(status: string): string;
+/**
+ * Allowed current statuses for each target status a user can set. A work item may only move
+ * to IN_PROGRESS while it is NEW, and to READY_TO_PROMOTE while it is IN_REVIEW. Target statuses
+ * absent from this map have no precondition.
+ */
+export declare const STATUS_TRANSITION_PRECONDITIONS: Record<string, readonly string[]>;
+/**
+ * Verifies that the work item's current status permits the requested transition. Throws with a
+ * descriptive error when it does not. Only runs a query when the target status has a precondition,
+ * so subject/description-only updates are unaffected.
+ */
+export declare function assertStatusTransitionAllowed(connection: Connection, workItemId: string, targetApiStatus: string): Promise<void>;
 export declare function resolveWorkItemByName(connection: Connection, workItemName: string): Promise<WorkItemContext>;
 export declare function resolveProjectIdForWorkItem(connection: Connection, workItemId: string): Promise<string>;
 /**
- * Updates fields on a DevOps Center work item via the Connect API.
- * PATCH /services/data/v{version}/connect/devops/projects/{projectId}/workitem/{workItemId}
+ * Updates a DevOps Center work item.
+ *
+ * Subject and description are plain WorkItem sObject fields — the DevOps Center connect work item
+ * endpoint does not accept them — so they are written via the sObject API. Status changes go
+ * through the connect endpoint (PATCH /connect/devops/projects/{projectId}/workitem/{workItemId}),
+ * which is the only field that endpoint accepts, so platform-side status handling runs.
+ *
+ * The two writes hit different APIs with no shared transaction. Subject/description are committed
+ * first; if the status call then fails, this returns `{ success: false }` with an error that names
+ * the fields that did persist, rather than throwing and leaving the committed changes unreported.
  */
 export declare function updateWorkItem(params: UpdateWorkItemParams): Promise<UpdateWorkItemResult>;

package/lib/utils/updateWorkItem.js

@@ -26,6 +26,36 @@ export function toApiStatus(status) {
     }
     return apiStatus;
 }
+/**
+ * Allowed current statuses for each target status a user can set. A work item may only move
+ * to IN_PROGRESS while it is NEW, and to READY_TO_PROMOTE while it is IN_REVIEW. Target statuses
+ * absent from this map have no precondition.
+ */
+export const STATUS_TRANSITION_PRECONDITIONS = {
+    IN_PROGRESS: ['NEW'],
+    READY_TO_PROMOTE: ['IN_REVIEW'],
+};
+/**
+ * Verifies that the work item's current status permits the requested transition. Throws with a
+ * descriptive error when it does not. Only runs a query when the target status has a precondition,
+ * so subject/description-only updates are unaffected.
+ */
+export async function assertStatusTransitionAllowed(connection, workItemId, targetApiStatus) {
+    const allowedFrom = STATUS_TRANSITION_PRECONDITIONS[targetApiStatus];
+    if (!allowedFrom) {
+        return;
+    }
+    validateSalesforceId(workItemId, 'work item');
+    const result = await connection.query(`SELECT Status FROM WorkItem WHERE Id = '${workItemId}' LIMIT 1`);
+    const current = result.records?.[0]?.Status;
+    if (!current) {
+        throw new Error(`Work item with ID '${workItemId}' not found.`);
+    }
+    if (!allowedFrom.includes(current)) {
+        const allowed = allowedFrom.join(', ');
+        throw new Error(`Cannot change status to ${targetApiStatus}: the work item is currently ${current}, but this transition is only allowed from ${allowed}.`);
+    }
+}
 export async function resolveWorkItemByName(connection, workItemName) {
     const result = await connection.query(`SELECT Id, DevopsProjectId FROM WorkItem WHERE Name = '${escapeSOQL(workItemName)}' LIMIT 1`);
     const record = (result.records ?? [])[0];
@@ -44,32 +74,80 @@ export async function resolveProjectIdForWorkItem(connection, workItemId) {
     return record.DevopsProjectId;
 }
 /**
- * Updates fields on a DevOps Center work item via the Connect API.
- * PATCH /services/data/v{version}/connect/devops/projects/{projectId}/workitem/{workItemId}
+ * Updates a DevOps Center work item.
+ *
+ * Subject and description are plain WorkItem sObject fields — the DevOps Center connect work item
+ * endpoint does not accept them — so they are written via the sObject API. Status changes go
+ * through the connect endpoint (PATCH /connect/devops/projects/{projectId}/workitem/{workItemId}),
+ * which is the only field that endpoint accepts, so platform-side status handling runs.
+ *
+ * The two writes hit different APIs with no shared transaction. Subject/description are committed
+ * first; if the status call then fails, this returns `{ success: false }` with an error that names
+ * the fields that did persist, rather than throwing and leaving the committed changes unreported.
  */
 export async function updateWorkItem(params) {
     const { connection, workItemId, projectId, status, subject, description } = params;
-    const path = `/services/data/v${connection.getApiVersion()}/connect/devops/projects/${projectId}/workitem/${workItemId}`;
-    const payload = {};
-    if (status !== undefined)
-        payload.status = toApiStatus(status);
-    if (subject !== undefined)
-        payload.subject = subject;
-    if (description !== undefined)
-        payload.description = description;
-    const response = await connection.request({
-        method: 'PATCH',
-        url: path,
-        body: JSON.stringify(payload),
-        headers: { 'Content-Type': 'application/json' },
-    });
-    const data = response ?? {};
+    // Validate the status transition before writing any field. This guard is read-only, so running it
+    // first avoids persisting subject/description when the status change would be rejected — otherwise
+    // a combined --subject/--status call could silently keep the subject change after throwing.
+    let apiStatus;
+    if (status !== undefined) {
+        apiStatus = toApiStatus(status);
+        await assertStatusTransitionAllowed(connection, workItemId, apiStatus);
+    }
+    if (subject !== undefined || description !== undefined) {
+        const fields = { Id: workItemId };
+        if (subject !== undefined)
+            fields.Subject = subject;
+        if (description !== undefined)
+            fields.Description = description;
+        const saveResult = await connection.sobject('WorkItem').update(fields);
+        if (!saveResult.success) {
+            const errorMsg = saveResult.errors
+                .map((e) => (typeof e === 'string' ? e : e.message))
+                .filter(Boolean)
+                .join('; ');
+            return { success: false, workItemId, error: errorMsg || 'Failed to update work item fields.' };
+        }
+    }
+    if (apiStatus) {
+        const path = `/services/data/v${connection.getApiVersion()}/connect/devops/projects/${projectId}/workitem/${workItemId}`;
+        try {
+            await connection.request({
+                method: 'PATCH',
+                url: path,
+                body: JSON.stringify({ status: apiStatus }),
+                headers: { 'Content-Type': 'application/json' },
+            });
+        }
+        catch (error) {
+            // The subject/description sObject write above has already committed. The two writes go to
+            // different APIs with no shared transaction, so a status failure here can't roll them back.
+            // Report a partial success instead of throwing, so the caller can tell the user exactly which
+            // fields persisted rather than surfacing a bare error that hides the committed changes.
+            const statusError = error instanceof Error ? error.message : String(error);
+            const persisted = [
+                subject !== undefined ? 'subject' : undefined,
+                description !== undefined ? 'description' : undefined,
+            ].filter(Boolean);
+            const persistedNote = persisted.length > 0
+                ? ` The ${persisted.join(' and ')} ${persisted.length > 1 ? 'changes were' : 'change was'} already saved.`
+                : '';
+            return {
+                success: false,
+                workItemId,
+                subject,
+                description,
+                error: `Failed to update work item status: ${statusError}.${persistedNote}`,
+            };
+        }
+    }
     return {
         success: true,
         workItemId,
-        status: status !== undefined ? (data.status ?? data.Status ?? status) : undefined,
-        subject: subject !== undefined ? (data.subject ?? data.Subject ?? subject) : undefined,
-        description: description !== undefined ? (data.description ?? data.Description ?? description) : undefined,
+        status: apiStatus,
+        subject,
+        description,
     };
 }
 //# sourceMappingURL=updateWorkItem.js.map

package/lib/utils/updateWorkItem.js.map

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

package/lib/utils/workItems.js

@@ -41,7 +41,7 @@ function extractOwnerFromVcsPayload(payload) {
     if (typeof obj.owner === 'string' && obj.owner.trim()) {
         return obj.owner.trim();
     }
-    const list = (obj.owners || obj.items || obj.records);
+    const list = (obj.owners ?? obj.items ?? obj.records);
     if (Array.isArray(list)) {
         for (const candidate of list) {
             if (typeof candidate === 'string' && candidate.trim())
@@ -147,10 +147,13 @@ function mapRawItemToWorkItem(item, ctx, providerOwnerMap) {
         PipelineId: ctx?.pipelineId,
     };
     if (ctx) {
-        let targetStageId = resolveTargetStageId(mapped.PipelineStageId, ctx.stages);
-        if (!targetStageId) {
-            targetStageId = ctx.firstStageId;
-        }
+        // A work item's changes are promoted into the branch of its *next* pipeline stage. Only fall
+        // back to the first stage when the work item hasn't entered the pipeline yet (no current stage);
+        // a work item already on the final stage has no next stage, so it has no target branch (e.g. a
+        // closed work item that reached the last stage), and the branch is left blank.
+        const targetStageId = mapped.PipelineStageId
+            ? resolveTargetStageId(mapped.PipelineStageId, ctx.stages)
+            : ctx.firstStageId;
         const targetStage = findStageById(ctx.stages, targetStageId);
         mapped.TargetBranch = getBranchNameFromStage(targetStage);
         mapped.TargetStageId = targetStageId;

package/lib/utils/workItems.js.map

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

package/messages/devops.promote.md

@@ -52,6 +52,18 @@ ID of the source pipeline stage whose approved work items will be promoted. Mutu
 
 Skip pre-promote validation. By default, promotion is validated before proceeding to prevent promoting work items without an associated PR. Use this flag to bypass validation.
 
+# flags.force.summary
+
+Submit the promotion even if another promotion to the same target stage is already in progress. By default, the command blocks to avoid creating duplicate promotions.
+
+# error.PromotionInFlight
+
+A promotion to this stage is already in progress (request token%s: %s). Submitting now can create a duplicate promotion. Wait for it to finish (check with "%s devops request status --request-token <token>"), or pass --force to promote anyway.
+
+# warn.InFlightCheckSkipped
+
+Couldn't check for in-flight promotions to this stage, so a duplicate promotion may not be blocked: %s
+
 # error.NoModeFlag
 
 Provide either --work-item-id to promote specific work items or --stage-id to promote all approved work items from a stage.

package/messages/devops.stage.branch.add.md

@@ -5,7 +5,7 @@ Add a source code repository branch to a pipeline stage.
 # description
 
 By default, the branch must exist in the repository. Use --create-vcs-branch to create a branch if it doesn't exist.
-Each pipeline stage supports only one branch. Adding a branch replaces any existing branch linked to the pipeline stage.
+Each pipeline stage supports only one branch. If the stage already has a branch, the command blocks so the existing branch isn't orphaned; pass --force to replace it.
 
 # flags.pipeline-id.summary
 
@@ -23,6 +23,10 @@ Name of the repository branch to assign to the stage.
 
 Create the branch in the remote repository if it doesn't already exist.
 
+# flags.force.summary
+
+Replace the stage's existing branch. By default, the command blocks if the stage already has a branch to avoid orphaning it. With this flag, the new branch is associated and the previous branch record is removed if no other stage references it.
+
 # examples
 
 - Add an existing branch to a stage:
@@ -44,3 +48,15 @@ You must set up a branch on stage "%s" before configuring stage "%s". Branches m
 # error.BranchAttachFailed
 
 Failed to associate branch with stage: %s
+
+# error.BranchAlreadyExists
+
+Stage "%s" already has a branch ("%s"). Adding another would leave the existing one orphaned. Remove it first with "%s devops stage branch delete", or pass --force to replace it.
+
+# info.ReplacedBranchRemoved
+
+Removed the stage's previous branch "%s".
+
+# warn.ReplacedBranchCleanupFailed
+
+Associated the new branch, but couldn't remove the previous branch record (%s). Remove it manually if it's no longer needed.

package/messages/devops.stage.environment.add.md

@@ -26,6 +26,10 @@ Type of the Salesforce org. Valid values: Production, Sandbox.
 
 Don't auto-open the browser for OAuth authentication. The redirect URL is printed for manual use.
 
+# flags.force.summary
+
+Replace the stage's existing environment. By default, the command blocks if the stage already has an environment to avoid orphaning it. With this flag, the new environment is added first and the previous one is removed only after the new environment is associated successfully.
+
 # examples
 
 - Add a production environment to a stage using its ID:
@@ -60,6 +64,18 @@ Pipeline stage "%s" doesn't exist in pipeline "%s". Check the stage ID and try a
 
 Failed to create environment for stage: %s
 
+# error.EnvironmentAlreadyExists
+
+Stage "%s" already has an environment ("%s", %s). Adding another would leave the existing one orphaned. Remove it first with "%s devops stage environment delete", or pass --force to replace it.
+
+# info.ReplacedEnvironmentRemoved
+
+Removed the stage's previous environment "%s".
+
+# warn.ReplacedEnvironmentCleanupFailed
+
+Associated the new environment, but couldn't remove the previous environment record (%s). Remove it manually if it's no longer needed.
+
 # error.AuthTimeout
 
 Authentication timed out. The environment was created but not yet authenticated. Re-run the command or authenticate manually via the org's DevOps Center setup.