fix more comments

Author: icecrasher321

apps/sim/app/workspace/[workspaceId]/w/[workflowId]/components/panel/components/deploy/components/deploy-modal/deploy-modal.tsx

@@ -194,6 +194,21 @@ export function DeployModal({
     }
   }
 
+  /**
+   * Post-activation warnings (dead-lettered or still-queued side effects)
+   * arrive with an `active` attempt, so the Live badge gives no signal —
+   * surface them as a toast. Pending/failed attempts are excluded: the
+   * status badge already covers those.
+   */
+  const toastPostActivationWarnings = (
+    title: string,
+    result: { latestDeploymentAttempt?: { status: string } | null; warnings?: string[] }
+  ) => {
+    if (result.latestDeploymentAttempt?.status !== 'active') return
+    if (!result.warnings?.length) return
+    toast.warning(title, { description: result.warnings.join(' ') })
+  }
+
   useEffect(() => {
     deployActionIdRef.current += 1
     setIsFinalizingDeploy(false)
@@ -310,6 +325,9 @@ export function DeployModal({
         if (result.latestDeploymentAttempt?.status === 'active') {
           await syncDraftAfterDeploy()
         }
+        if (isWorkflowStillActive(workflowId)) {
+          toastPostActivationWarnings('Workflow deployed', result)
+        }
       } finally {
         if (deployActionIdRef.current === actionId) {
           setIsFinalizingDeploy(false)
@@ -338,7 +356,10 @@ export function DeployModal({
     setDeployError(null)
 
     try {
-      await activateVersionMutation.mutateAsync({ workflowId, version })
+      const result = await activateVersionMutation.mutateAsync({ workflowId, version })
+      if (isWorkflowStillActive(workflowId)) {
+        toastPostActivationWarnings(`Promoted v${version} to live`, result)
+      }
     } catch (error) {
       if (!isWorkflowStillActive(workflowId)) return
       logger.error('Error promoting version:', { error })
@@ -413,6 +434,9 @@ export function DeployModal({
         if (result.latestDeploymentAttempt?.status === 'active') {
           await syncDraftAfterDeploy()
         }
+        if (isWorkflowStillActive(workflowId)) {
+          toastPostActivationWarnings('Workflow redeployed', result)
+        }
       } finally {
         if (deployActionIdRef.current === actionId) {
           setIsFinalizingDeploy(false)

apps/sim/ee/workspace-forking/lib/promote/rollback.test.ts

@@ -310,6 +310,23 @@ describe('rollbackFork', () => {
     expect(mockDeleteAllRuns).not.toHaveBeenCalled()
   })
 
+  it('keeps the undo point when no operation row exists to verify cutover', async () => {
+    const run = makeRun({
+      snapshot: { updated: [{ workflowId: 'wf-a', priorVersion: 3 }], created: [], archived: [] },
+    })
+    mockGetLatestRun.mockResolvedValue(run)
+    mockGetDeploymentStatus.mockResolvedValue({ activeDeployment: null, latestOperation: null })
+
+    const result = await rollbackFork({
+      targetWorkspaceId: 'target-ws',
+      otherWorkspaceId: 'other-ws',
+      userId: 'user-1',
+    })
+
+    expect(result.pendingActivations).toEqual(['wf-a'])
+    expect(mockDeleteAllRuns).not.toHaveBeenCalled()
+  })
+
   it('treats a superseding operation as settled and consumes the undo point', async () => {
     const run = makeRun({
       snapshot: { updated: [{ workflowId: 'wf-a', priorVersion: 3 }], created: [], archived: [] },

apps/sim/ee/workspace-forking/lib/promote/rollback.ts

@@ -276,15 +276,25 @@ export async function rollbackFork(params: RollbackForkParams): Promise<Rollback
     try {
       const status = await getWorkflowDeploymentStatus(reactivation.workflowId)
       const operation = status.latestOperation
-      const activated =
-        operation?.id === reactivation.operationId
-          ? operation.status === 'active'
-          : /**
-             * A different latest operation means something newer superseded
-             * our attempt (e.g. a manual promote); treat it as settled — the
-             * newer intent owns the workflow now.
-             */
-            true
+      let activated: boolean
+      if (!operation) {
+        /**
+         * No operation row at all — cutover cannot be verified (only a
+         * concurrent hard-delete of the workflow can cascade ours away), so
+         * keep the undo point. A re-run skips hard-deleted workflows and
+         * then consumes it.
+         */
+        activated = false
+      } else if (operation.id === reactivation.operationId) {
+        activated = operation.status === 'active'
+      } else {
+        /**
+         * A different latest operation means something newer superseded our
+         * attempt (e.g. a manual promote); treat it as settled — the newer
+         * intent owns the workflow now.
+         */
+        activated = true
+      }
       if (!activated) pendingActivations.push(reactivation.workflowId)
     } catch (error) {
       logger.warn(`[${requestId}] Could not verify rollback activation status`, {