From d331c667259739c5760ea15d730681fd0cdfe344 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:23:26 +0200
Subject: [PATCH 01/32] Extend activity history for grouped events

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 .../components/ActivityCommentCard.vue        | 85 ++++++++++++++++++
 .../components/ActivityTimelineComment.vue    | 88 ++++---------------
 .../markdown-field/commentToolbarButtons.ts   | 11 +++
 src/Activity/Activities.php                   |  4 +-
 src/Activity/ActivityEventRecorder.php        |  2 +-
 src/Activity/ActivityTimelinePresenter.php    |  9 +-
 src/Activity/Models/ActivityEvent.php         | 10 +--
 .../Elements/ActivityCommentsController.php   |  6 +-
 src/Support/Facades/Activities.php            |  2 +-
 tests/Feature/Activity/ActivitiesTest.php     |  3 +-
 .../ActivityTimelineControllerTest.php        | 18 ++--
 11 files changed, 140 insertions(+), 98 deletions(-)
 create mode 100644 resources/js/modules/activity/components/ActivityCommentCard.vue
 create mode 100644 resources/js/modules/markdown-field/commentToolbarButtons.ts

diff --git a/resources/js/modules/activity/components/ActivityCommentCard.vue b/resources/js/modules/activity/components/ActivityCommentCard.vue
new file mode 100644
index 00000000000..fe6be1c7ad0
--- /dev/null
+++ b/resources/js/modules/activity/components/ActivityCommentCard.vue
@@ -0,0 +1,85 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+  import type {ActivityTarget} from '@/modules/activity/composables/useActivityTimeline';
+  import ActivityTimelineActor from './ActivityTimelineActor.vue';
+
+  withDefaults(
+    defineProps<{
+      actor: ActivityTarget;
+      impersonator: ActivityTarget | null;
+      descriptionText?: string | null;
+      descriptionHtml?: string | null;
+      html: string | null;
+      occurredAt: string;
+      formattedOccurredAt: {
+        time: string;
+        full: string;
+      };
+      edited?: boolean;
+    }>(),
+    {
+      descriptionText: null,
+      descriptionHtml: null,
+      edited: false,
+    }
+  );
+
+  function sentenceFragment(text: string | null): string {
+    return text === null
+      ? t('commented.')
+      : text.charAt(0).toLocaleLowerCase() + text.slice(1);
+  }
+</script>
+
+<template>
+  <craft-card>
+    <div slot="label" class="activity-comment-card__heading">
+      <ActivityTimelineActor :actor="actor" :impersonator="impersonator" />
+      <span
+        v-if="descriptionHtml"
+        class="activity-comment-card__description"
+        v-html="descriptionHtml"
+      />
+      <span v-else class="activity-comment-card__description">
+        {{ sentenceFragment(descriptionText) }}
+      </span>
+    </div>
+
+    <div v-if="$slots.actions" slot="actions">
+      <slot name="actions" />
+    </div>
+
+    <div class="activity-comment-card__body" v-html="html" />
+
+    <slot />
+
+    <div slot="footer" class="activity-comment-card__footer">
+      <span v-if="edited">{{ t('Edited') }}</span>
+      <time :datetime="occurredAt" :title="formattedOccurredAt.full">
+        {{ formattedOccurredAt.time }}
+      </time>
+    </div>
+  </craft-card>
+</template>
+
+<style scoped>
+  .activity-comment-card__description {
+    margin-inline-start: 0.25em;
+  }
+
+  .activity-comment-card__footer {
+    display: flex;
+    width: 100%;
+    color: var(--c-text-quiet);
+    font-size: var(--c-text-xs);
+  }
+
+  .activity-comment-card__footer time {
+    margin-inline-start: auto;
+    white-space: nowrap;
+  }
+
+  .activity-comment-card__body :deep(> :last-child) {
+    margin: 0;
+  }
+</style>
diff --git a/resources/js/modules/activity/components/ActivityTimelineComment.vue b/resources/js/modules/activity/components/ActivityTimelineComment.vue
index 247f4c99f2a..6b542f990c2 100644
--- a/resources/js/modules/activity/components/ActivityTimelineComment.vue
+++ b/resources/js/modules/activity/components/ActivityTimelineComment.vue
@@ -10,7 +10,8 @@
   import ActionMenu from '@/common/components/ActionMenu.vue';
   import type {ActionItem} from '@/common/types';
   import type {ActivityEvent} from '@/modules/activity/composables/useActivityTimeline';
-  import ActivityTimelineActor from './ActivityTimelineActor.vue';
+  import {commentToolbarButtons} from '@/modules/markdown-field/commentToolbarButtons';
+  import ActivityCommentCard from './ActivityCommentCard.vue';
   import ActivityTimelineEvent from './ActivityTimelineEvent.vue';
   import '../../markdown-field/markdown-field';
 
@@ -54,18 +55,6 @@
       : []),
   ]);
   const editorId = `activity-comment-${useId()}`;
-  const toolbarButtons = [
-    'bold',
-    'italic',
-    'code',
-    'h3',
-    'quote',
-    'unordered-list',
-    'ordered-list',
-    'check-list',
-    'link',
-  ];
-
   function requestData() {
     return {
       elementType: props.elementType,
@@ -86,12 +75,6 @@
     },
   ]);
 
-  function sentenceFragment(text: string | null): string {
-    return text === null
-      ? ''
-      : text.charAt(0).toLocaleLowerCase() + text.slice(1);
-  }
-
   function startEditing(): void {
     editing.value = true;
     draft.value = comment.value!.markdown ?? '';
@@ -189,7 +172,7 @@
         :placeholder="creating ? t('Add a comment…') : undefined"
         sanitize-html
         show-toolbar
-        .toolbarButtons="toolbarButtons"
+        .toolbarButtons="commentToolbarButtons"
         .value="draft"
         @input="draft = ($event.target as HTMLTextAreaElement).value"
       />
@@ -223,49 +206,27 @@
     </div>
   </div>
 
-  <craft-card
+  <ActivityCommentCard
     v-else-if="event && comment && !comment.deleted"
     class="activity-timeline__comment"
     data-activity-comment
+    :actor="event.actor"
+    :impersonator="event.impersonator"
+    :description-html="event.description.html"
+    :description-text="event.description.text"
+    :html="comment.html"
+    :occurred-at="event.occurredAt"
+    :formatted-occurred-at="event.formattedOccurredAt"
+    :edited="comment.edited"
   >
-    <div slot="label" class="activity-timeline__comment-heading">
-      <ActivityTimelineActor
-        :actor="event.actor"
-        :impersonator="event.impersonator"
-      />
-      <span
-        v-if="event?.description.html"
-        class="activity-timeline__comment-description"
-        v-html="event.description.html"
-      />
-      <span v-else class="activity-timeline__comment-description">
-        {{ sentenceFragment(event?.description.text ?? null) }}
-      </span>
-    </div>
-
-    <ActionMenu
-      v-if="commentActions.length"
-      slot="actions"
-      :actions="commentActions"
-      :label="t('Comment actions')"
-    />
-
-    <div class="activity-timeline__comment-body" v-html="comment.html" />
+    <template v-if="commentActions.length" #actions>
+      <ActionMenu :actions="commentActions" :label="t('Comment actions')" />
+    </template>
 
     <p v-if="error" class="error" role="alert">
       {{ t('Couldn’t update comment.') }}
     </p>
-
-    <div v-if="event" slot="footer" class="activity-timeline__comment-footer">
-      <span v-if="comment.edited">{{ t('Edited') }}</span>
-      <time
-        :datetime="event.occurredAt"
-        :title="event.formattedOccurredAt.full"
-      >
-        {{ event.formattedOccurredAt.time }}
-      </time>
-    </div>
-  </craft-card>
+  </ActivityCommentCard>
 
   <ActivityTimelineEvent
     v-else-if="event"
@@ -278,29 +239,12 @@
 </template>
 
 <style scoped>
-  .activity-timeline__comment-description {
-    margin-inline-start: 0.25em;
-  }
-
-  .activity-timeline__comment-footer {
-    display: flex;
-    width: 100%;
-    color: var(--c-text-quiet);
-    font-size: var(--c-text-xs);
-  }
-
-  .activity-timeline__comment-footer time {
-    margin-inline-start: auto;
-    white-space: nowrap;
-  }
-
   .activity-timeline__comment-actions {
     display: flex;
     align-items: center;
     gap: var(--c-spacing-xs);
   }
 
-  .activity-timeline__comment-body :deep(> :last-child),
   .activity-timeline__comment .error {
     margin: 0;
   }
diff --git a/resources/js/modules/markdown-field/commentToolbarButtons.ts b/resources/js/modules/markdown-field/commentToolbarButtons.ts
new file mode 100644
index 00000000000..37f9f9fb6b3
--- /dev/null
+++ b/resources/js/modules/markdown-field/commentToolbarButtons.ts
@@ -0,0 +1,11 @@
+export const commentToolbarButtons = [
+  'bold',
+  'italic',
+  'code',
+  'h3',
+  'quote',
+  'unordered-list',
+  'ordered-list',
+  'check-list',
+  'link',
+];
diff --git a/src/Activity/Activities.php b/src/Activity/Activities.php
index 0f0ab38d50d..dfe21924902 100644
--- a/src/Activity/Activities.php
+++ b/src/Activity/Activities.php
@@ -23,9 +23,9 @@ public function __construct(
         private readonly ActivityEventRecorder $events,
     ) {}
 
-    public function record(ActivityEventTypeInterface $event): ActivityEvent
+    public function record(ActivityEventTypeInterface $event, ?int $rootEventId = null): ActivityEvent
     {
-        return $this->events->record($event);
+        return $this->events->record($event, $rootEventId);
     }
 
     /** @return Builder<ActivityEvent> */
diff --git a/src/Activity/ActivityEventRecorder.php b/src/Activity/ActivityEventRecorder.php
index 300dd7207d7..27ecef7d71d 100644
--- a/src/Activity/ActivityEventRecorder.php
+++ b/src/Activity/ActivityEventRecorder.php
@@ -20,7 +20,7 @@ public function __construct(
         private readonly Impersonation $impersonation,
     ) {}
 
-    public function record(ActivityEventTypeInterface $event, ?string $rootEventId = null): ActivityEvent
+    public function record(ActivityEventTypeInterface $event, ?int $rootEventId = null): ActivityEvent
     {
         $data = $event->data();
 
diff --git a/src/Activity/ActivityTimelinePresenter.php b/src/Activity/ActivityTimelinePresenter.php
index 0e14bc16884..caaf871ba45 100644
--- a/src/Activity/ActivityTimelinePresenter.php
+++ b/src/Activity/ActivityTimelinePresenter.php
@@ -56,7 +56,7 @@ public function events(
 
     /**
      * @param  Collection<int, ActivityEvent>  $events
-     * @return Collection<string, ActivityEvent>
+     * @return Collection<int, ActivityEvent>
      */
     private function latestVersions(Collection $events): Collection
     {
@@ -127,10 +127,13 @@ private function event(
         $formatted = $this->activities->format($event);
         $deleted = $isComment && $event->eventType === CommentDeleted::class;
         $canEdit = $isComment && ! $deleted && $root->actorId === $viewer->id;
+        $renderedComment = $isComment && ! $deleted
+            ? $this->comments->render($event, $viewer, $mentionedUsers)
+            : null;
         $occurredAt = $root->occurredAt->setTimezone($formatter->timeZone);
 
         return [
-            'id' => $root->id,
+            'id' => (string) $root->id,
             'component' => $event->eventType::component(),
             'props' => $event->eventType::props($event),
             'icon' => $this->activities->icon($event),
@@ -164,7 +167,7 @@ private function event(
             ],
             'changes' => $event->changes,
             'comment' => $isComment ? [
-                'html' => $deleted ? null : $this->comments->render($event, $viewer, $mentionedUsers)->toHtml(),
+                'html' => $renderedComment?->toHtml(),
                 'markdown' => $canEdit ? $event->data['markdown'] : null,
                 'edited' => $event->eventType === CommentEdited::class,
                 'deleted' => $deleted,
diff --git a/src/Activity/Models/ActivityEvent.php b/src/Activity/Models/ActivityEvent.php
index df7f81d25c0..838ea48ddc9 100644
--- a/src/Activity/Models/ActivityEvent.php
+++ b/src/Activity/Models/ActivityEvent.php
@@ -18,7 +18,7 @@
 use InvalidArgumentException;
 
 /**
- * @property string $id
+ * @property int $id
  * @property string $eventType
  * @property string $source
  * @property string $actorType
@@ -26,7 +26,7 @@
  * @property string|null $subjectType
  * @property string|null $subjectId
  * @property int|null $siteId
- * @property string|null $rootEventId
+ * @property int|null $rootEventId
  * @property array{snapshots: array<string, array<string, int|string>>, changes: list<array<string, mixed>>, data: array<string, mixed>} $payload
  * @property array<string, array<string, int|string>> $snapshots
  * @property list<ActivityChange> $changes
@@ -45,10 +45,10 @@ class ActivityEvent extends BaseModel
     protected function casts(): array
     {
         return [
-            'id' => 'string',
+            'id' => 'integer',
             'actorId' => 'integer',
             'siteId' => 'integer',
-            'rootEventId' => 'string',
+            'rootEventId' => 'integer',
             'payload' => 'array',
             'occurredAt' => 'immutable_datetime',
         ];
@@ -139,7 +139,7 @@ protected function actor(Builder $query, ActivityActor $actor): Builder
      * @return Builder<static>
      */
     #[Scope]
-    protected function rootEvent(Builder $query, self|string $rootEvent): Builder
+    protected function rootEvent(Builder $query, self|int $rootEvent): Builder
     {
         return $query->where('rootEventId', $rootEvent instanceof self ? $rootEvent->id : $rootEvent);
     }
diff --git a/src/Http/Controllers/Elements/ActivityCommentsController.php b/src/Http/Controllers/Elements/ActivityCommentsController.php
index 4c17c2ac33e..6549eb94f88 100644
--- a/src/Http/Controllers/Elements/ActivityCommentsController.php
+++ b/src/Http/Controllers/Elements/ActivityCommentsController.php
@@ -47,7 +47,7 @@ public function update(ActivityCommentRequest $request): JsonResponse
     {
         $subject = $request->subject();
         $element = $request->subjectElement();
-        $comment = $this->comment($subject, $element, $request->string('commentId')->toString());
+        $comment = $this->comment($subject, $element, $request->integer('commentId'));
         $user = $this->currentUser();
 
         abort_unless($comment->actorId === $user->id, 403, 'Only the comment author may edit it.');
@@ -66,7 +66,7 @@ public function destroy(ActivityCommentRequest $request): JsonResponse
     {
         $subject = $request->subject();
         $element = $request->subjectElement();
-        $comment = $this->comment($subject, $element, $request->string('commentId')->toString());
+        $comment = $this->comment($subject, $element, $request->integer('commentId'));
         $user = $this->currentUser();
 
         abort_unless(
@@ -85,7 +85,7 @@ public function destroy(ActivityCommentRequest $request): JsonResponse
     private function comment(
         ElementInterface $subject,
         ElementInterface $element,
-        string $commentId,
+        int $commentId,
     ): ActivityEvent {
         return $this->activities->query()
             ->subject(ActivitySubject::fromElement($subject))
diff --git a/src/Support/Facades/Activities.php b/src/Support/Facades/Activities.php
index 8e70b1e3809..c051866e37d 100644
--- a/src/Support/Facades/Activities.php
+++ b/src/Support/Facades/Activities.php
@@ -7,7 +7,7 @@
 use Illuminate\Support\Facades\Facade;
 
 /**
- * @method static \CraftCms\Cms\Activity\Models\ActivityEvent record(\CraftCms\Cms\Activity\Contracts\ActivityEventTypeInterface $event)
+ * @method static \CraftCms\Cms\Activity\Models\ActivityEvent record(\CraftCms\Cms\Activity\Contracts\ActivityEventTypeInterface $event, ?int $rootEventId = null)
  * @method static \Illuminate\Database\Eloquent\Builder query()
  * @method static \Illuminate\Contracts\Support\Htmlable|string format(\CraftCms\Cms\Activity\Models\ActivityEvent $event)
  * @method static string|null icon(\CraftCms\Cms\Activity\Models\ActivityEvent $event)
diff --git a/tests/Feature/Activity/ActivitiesTest.php b/tests/Feature/Activity/ActivitiesTest.php
index c76098e82c6..f742a9cd112 100644
--- a/tests/Feature/Activity/ActivitiesTest.php
+++ b/tests/Feature/Activity/ActivitiesTest.php
@@ -56,8 +56,7 @@
         changes: [new ActivityChange('Summary', null, 'Ready')],
     ));
 
-    expect($event->id)->toBeString()
-        ->and($event->eventType)->toBe(TestPluginEntryUpdated::class)
+    expect($event->eventType)->toBe(TestPluginEntryUpdated::class)
         ->and($event->source)->toBe('test-plugin')
         ->and($event->actorType)->toBe(ActivityActor::TYPE_USER)
         ->and($event->actorId)->toBe($actor->id)
diff --git a/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php b/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
index 614e0081dc9..c3a5a616059 100644
--- a/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
@@ -136,14 +136,14 @@
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
             ->has('events', 2)
-            ->where('events.0.id', $neutral->id)
+            ->where('events.0.id', (string) $neutral->id)
             ->where('events.0.component', 'craft:activity-timeline-event')
             ->where('events.0.props', [])
             ->where('events.0.icon', 'plus')
             ->where('events.0.actor.label', 'Ada Lovelace')
             ->whereType('events.0.actor.url', 'string')
             ->where('events.0.actor.deleted', false)
-            ->where('events.1.id', $updated->id)
+            ->where('events.1.id', (string) $updated->id)
             ->where('events.1.changes.0.label', 'Title')
             ->where('events.1.changes.0.old', 'Draft')
             ->where('events.1.changes.0.new', 'Release notes')
@@ -198,8 +198,8 @@
     ])
         ->assertOk()
         ->assertJsonCount(25, 'events')
-        ->assertJsonPath('events.0.id', $events[1]->id)
-        ->assertJsonPath('events.24.id', $events[25]->id);
+        ->assertJsonPath('events.0.id', (string) $events[1]->id)
+        ->assertJsonPath('events.24.id', (string) $events[25]->id);
 
     postJson(action(ActivityTimelineController::class), [
         'elementType' => Entry::class,
@@ -209,8 +209,8 @@
     ])
         ->assertOk()
         ->assertJsonCount(26, 'events')
-        ->assertJsonPath('events.0.id', $events[0]->id)
-        ->assertJsonPath('events.25.id', $events[25]->id);
+        ->assertJsonPath('events.0.id', (string) $events[0]->id)
+        ->assertJsonPath('events.25.id', (string) $events[25]->id);
 });
 
 it('keeps deleted actors identifiable and sanitizes plugin descriptions', function () {
@@ -227,7 +227,7 @@
     ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
-            ->where('events.0.id', $event->id)
+            ->where('events.0.id', (string) $event->id)
             ->where('events.0.icon', 'bolt')
             ->where('events.0.actor.label', 'Deleted editor')
             ->where('events.0.actor.url', null)
@@ -250,7 +250,7 @@
     ])
         ->assertOk()
         ->assertJson(fn (AssertableJson $json) => $json
-            ->where('events.0.id', $event->id)
+            ->where('events.0.id', (string) $event->id)
             ->where('events.0.icon', null)
             ->where('events.0.actor.label', 'Webhook')
             ->where('events.0.actor.url', null)
@@ -276,7 +276,7 @@
         $derivative => $derivativeId,
     ])
         ->assertOk()
-        ->assertJsonPath('events.0.id', $event->id);
+        ->assertJsonPath('events.0.id', (string) $event->id);
 })->with([
     'draft' => 'draftId',
     'revision' => 'revisionId',

From 352ffd10a1ea2f05cefa994cd25f0e689cfbc1d3 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:23:47 +0200
Subject: [PATCH 02/32] Improve reusable form controls

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 .../src/components/button/button.test.ts      |  10 ++
 .../src/components/button/button.ts           |  15 ++
 .../craftcms-ui/src/styles/form.styles.ts     |   7 +-
 .../js/common/components/FormActions.test.ts  |   9 +-
 .../js/common/components/FormActions.vue      |   8 +-
 .../js/modules/conditions/ConditionRule.vue   |  73 ++++-----
 .../js/modules/forms/ComboboxControl.vue      |   1 -
 .../modules/forms/TypeConfigurator.stories.ts | 139 ++++++++++++++++++
 .../js/modules/forms/TypeConfigurator.vue     |  90 ++++++++++++
 .../user/components/UserGroupSelect.vue       |   2 +-
 src/Cp/Components/Button.php                  |  10 ++
 11 files changed, 301 insertions(+), 63 deletions(-)
 create mode 100644 resources/js/modules/forms/TypeConfigurator.stories.ts
 create mode 100644 resources/js/modules/forms/TypeConfigurator.vue

diff --git a/packages/craftcms-ui/src/components/button/button.test.ts b/packages/craftcms-ui/src/components/button/button.test.ts
index 60aa969406d..7c3262bc39c 100644
--- a/packages/craftcms-ui/src/components/button/button.test.ts
+++ b/packages/craftcms-ui/src/components/button/button.test.ts
@@ -117,6 +117,16 @@ describe('craft-button link semantics', () => {
     expect(element.getAttribute('role')).toBe('button');
   });
 
+  it('can remain focusable when disabled', async () => {
+    const element = await createButton({
+      disabled: '',
+      'focusable-when-disabled': '',
+    });
+
+    expect(element.getAttribute('aria-disabled')).toBe('true');
+    expect(element.tabIndex).toBe(0);
+  });
+
   it('does not submit a form when a link-mode button is clicked', async () => {
     const form = document.createElement('form');
     const element = document.createElement('craft-button') as CraftButton;
diff --git a/packages/craftcms-ui/src/components/button/button.ts b/packages/craftcms-ui/src/components/button/button.ts
index 915dd7e6437..866230d78fc 100644
--- a/packages/craftcms-ui/src/components/button/button.ts
+++ b/packages/craftcms-ui/src/components/button/button.ts
@@ -143,6 +143,17 @@ export default class CraftButton extends LionButtonSubmit {
       this.syncLinkHostState();
     }
 
+    if (
+      changedProperties.has('disabled') ||
+      changedProperties.has('focusableWhenDisabled')
+    ) {
+      if (this.disabled) {
+        this.tabIndex = this.focusableWhenDisabled ? 0 : -1;
+      } else if (!this.isLink) {
+        this.tabIndex = 0;
+      }
+    }
+
     // Only while `toggle` is set: a plain button may carry an `aria-pressed`
     // its owner manages (`craft-button-group` sets one on every child), and
     // overwriting that would be worse than leaving it alone.
@@ -299,6 +310,10 @@ export default class CraftButton extends LionButtonSubmit {
   /** Show a spinner instead of the label */
   @property({reflect: true, type: Boolean}) loading: boolean = false;
 
+  /** Keep the button in the tab order when disabled. */
+  @property({attribute: 'focusable-when-disabled', type: Boolean})
+  focusableWhenDisabled: boolean = false;
+
   /** Set align-items for the content */
   @property() align: 'start' | 'end' | 'center' = 'center';
 
diff --git a/packages/craftcms-ui/src/styles/form.styles.ts b/packages/craftcms-ui/src/styles/form.styles.ts
index 28570befc85..4b4bedebf50 100644
--- a/packages/craftcms-ui/src/styles/form.styles.ts
+++ b/packages/craftcms-ui/src/styles/form.styles.ts
@@ -85,11 +85,8 @@ export const baseComboboxStyles = css`
 `;
 
 export const baseFieldStyles = css`
-  :host(:not([label-sr-only]))
-    .form-field__group-one
-    .form-field__label
-    slot:not(:empty) {
-    margin-block-end: var(--c-spacing-sm);
+  :host(:not([label-sr-only])) ::slotted(label:not(:empty)) {
+    margin-block-end: var(--c-spacing-md, 0.5rem);
   }
 
   :host([has-feedback-for='error']) {
diff --git a/resources/js/common/components/FormActions.test.ts b/resources/js/common/components/FormActions.test.ts
index 6aa65b7235f..a8d2be033d3 100644
--- a/resources/js/common/components/FormActions.test.ts
+++ b/resources/js/common/components/FormActions.test.ts
@@ -11,7 +11,7 @@ describe('FormActions', () => {
     container?.remove();
   });
 
-  it('keeps an unavailable additional action focusable with an explanation', () => {
+  it('keeps an unavailable additional action focusable with an explanation', async () => {
     const onClick = vi.fn();
     container = document.createElement('div');
     document.body.append(container);
@@ -44,10 +44,11 @@ describe('FormActions', () => {
       container.querySelector<HTMLElementTagNameMap['craft-tooltip']>(
         'craft-tooltip'
       )!;
+    await applyButton.updateComplete;
 
-    expect(applyButton.disabled).toBe(false);
-    expect(applyButton.getAttribute('aria-disabled')).toBe('true');
-    expect(applyButton.id).toBe('disabled-form-action-0');
+    expect(applyButton.disabled).toBe(true);
+    expect(applyButton.tabIndex).toBe(0);
+    expect(applyButton.id).not.toBe('');
     expect(tooltip.for).toBe(applyButton.id);
     expect(tooltip.textContent).toContain(
       'This draft must be approved before it can be applied.'
diff --git a/resources/js/common/components/FormActions.vue b/resources/js/common/components/FormActions.vue
index 37f2d170e65..030e41f293e 100644
--- a/resources/js/common/components/FormActions.vue
+++ b/resources/js/common/components/FormActions.vue
@@ -75,11 +75,9 @@
         type="button"
         :variant="button.variant ?? ButtonVariant.Solid"
         :loading="isButtonProcessing(button.label)"
-        :disabled="
-          form.processing || (button.disabled && !button.disabledReason)
-        "
-        :aria-disabled="
-          button.disabled && button.disabledReason ? 'true' : undefined
+        :disabled="form.processing || button.disabled"
+        :focusable-when-disabled="
+          button.disabled && button.disabledReason ? true : undefined
         "
         @click="handleAdditionalButtonClick(button, $event)"
       >
diff --git a/resources/js/modules/conditions/ConditionRule.vue b/resources/js/modules/conditions/ConditionRule.vue
index 25a27eba6e0..d44f22bf476 100644
--- a/resources/js/modules/conditions/ConditionRule.vue
+++ b/resources/js/modules/conditions/ConditionRule.vue
@@ -1,9 +1,16 @@
 <script setup lang="ts">
-  import {computed, inject, onBeforeUnmount, ref, shallowRef, watch} from 'vue';
+  import {
+    computed,
+    inject,
+    onBeforeUnmount,
+    ref,
+    shallowRef,
+    useTemplateRef,
+    watch,
+  } from 'vue';
   import {t} from '@craftcms/ui';
   import {useDelayedLoading} from '@/common/composables/useDelayedLoading';
-  import TypePicker from '@/common/components/TypePicker.vue';
-  import FormRenderer from '@/modules/forms/FormRenderer.vue';
+  import TypeConfigurator from '@/modules/forms/TypeConfigurator.vue';
   import {valueAt} from '@/modules/forms/runtime';
   import type {
     FormChange,
@@ -29,7 +36,7 @@
   const switching = computed(() => isLoading.value && changingType.value);
 
   const formKey = ref(0);
-  const formRenderer = ref<InstanceType<typeof FormRenderer>>();
+  const typeConfigurator = useTemplateRef('typeConfigurator');
   const latestFormPayload = shallowRef(payload.value.form);
 
   watch(
@@ -43,10 +50,11 @@
       form: {
         ...latestFormPayload.value,
         values:
-          formRenderer.value?.currentValues() ?? latestFormPayload.value.values,
+          typeConfigurator.value?.currentValues() ??
+          latestFormPayload.value.values,
       },
     }),
-    canSubmit: () => formRenderer.value?.canSubmit() ?? true,
+    canSubmit: () => typeConfigurator.value?.canSubmit() ?? true,
   });
 
   onBeforeUnmount(() => {
@@ -102,30 +110,22 @@
       role="group"
       :aria-label="payload.label"
     >
-      <div class="flex flex-wrap items-start gap-2">
-        <TypePicker
-          :key="payload.label"
+      <div class="condition-rule__content flex items-start gap-2">
+        <TypeConfigurator
+          :key="formKey"
+          ref="typeConfigurator"
+          class="min-w-0 flex-1"
           :types="editor.payload().ruleTypes"
-          :label="payload.label"
+          :selected-type-label="payload.label"
+          :form="payload.form"
+          :errors="editor.errors()"
           :disabled="!editor.editable()"
+          :form-disabled="switching"
+          :refresh="refresh"
           @select="switchType"
+          @change="change"
         />
 
-        <div
-          class="condition-rule-fields flex flex-wrap items-start gap-2 min-w-0 flex-1"
-          :inert="switching"
-        >
-          <FormRenderer
-            :key="formKey"
-            ref="formRenderer"
-            :payload="payload.form"
-            :errors="editor.errors()"
-            :disabled="!editor.editable() || switching"
-            :refresh="refresh"
-            @change="change"
-          />
-        </div>
-
         <craft-button
           v-if="editor.editable()"
           type="button"
@@ -155,32 +155,11 @@
 </template>
 
 <style scoped>
-  .condition-rule {
-    container-type: inline-size;
-  }
-
-  .condition-rule-fields :deep(craft-field) {
-    margin-block: 0;
-    min-inline-size: 0;
-    flex: 1 1 0;
-  }
-
-  .condition-rule-fields :deep(craft-field:has(craft-select)) {
-    flex: 0 0 auto;
-  }
-
-  .condition-rule-fields :deep(craft-combobox > [slot='label']) {
+  .condition-rule__content :deep(craft-combobox > [slot='label']) {
     position: absolute;
     width: 1px;
     height: 1px;
     overflow: hidden;
     clip-path: inset(50%);
   }
-
-  @container (width < 22rem) {
-    .condition-rule-fields {
-      order: 1;
-      flex-basis: 100%;
-    }
-  }
 </style>
diff --git a/resources/js/modules/forms/ComboboxControl.vue b/resources/js/modules/forms/ComboboxControl.vue
index be5a681ae69..cd47f2df8fd 100644
--- a/resources/js/modules/forms/ComboboxControl.vue
+++ b/resources/js/modules/forms/ComboboxControl.vue
@@ -50,7 +50,6 @@
 <template>
   <CraftCombobox
     :name="editable ? inputName(control.path) : ''"
-    :label="label"
     :options="control.props.options"
     :placeholder="control.props.placeholder"
     :limit="control.props.limit"
diff --git a/resources/js/modules/forms/TypeConfigurator.stories.ts b/resources/js/modules/forms/TypeConfigurator.stories.ts
new file mode 100644
index 00000000000..22328f0a7a4
--- /dev/null
+++ b/resources/js/modules/forms/TypeConfigurator.stories.ts
@@ -0,0 +1,139 @@
+import {computed, shallowRef} from 'vue';
+import type {Meta, StoryObj} from '@storybook/vue3-vite';
+import {setup} from '@storybook/vue3-vite';
+import FieldNode from './FieldNode.vue';
+import TextControl from './TextControl.vue';
+import ComboboxControl from './ComboboxControl.vue';
+import TypeConfigurator from './TypeConfigurator.vue';
+import type {FormPayload} from './types';
+
+setup((app) => {
+  app.component('craft:field', FieldNode);
+  app.component('craft:text', TextControl);
+  app.component('craft:combobox', ComboboxControl);
+});
+
+const types = [
+  {value: 'user-review', label: 'User review'},
+  {value: 'automatic-approval', label: 'Automatic approval'},
+];
+
+const userReviewForm: FormPayload = {
+  scope: ['settings'],
+  refreshable: false,
+  nodes: [
+    {
+      type: 'CraftCms\\Cms\\Form\\Nodes\\Field',
+      component: 'craft:field',
+      props: {label: 'Reviewer group', required: true},
+      control: {
+        type: 'CraftCms\\Cms\\Form\\Controls\\Combobox',
+        component: 'craft:combobox',
+        props: {
+          options: [
+            {label: 'Editors', value: 'editors'},
+            {label: 'Publishers', value: 'publishers'},
+          ],
+        },
+        path: ['settings', 'reviewerGroup'],
+        mode: 'editable',
+        deltaGroup: ['settings', 'reviewerGroup'],
+      },
+    },
+    {
+      type: 'CraftCms\\Cms\\Form\\Nodes\\Field',
+      component: 'craft:field',
+      props: {label: 'Approvals required', required: true},
+      control: {
+        type: 'CraftCms\\Cms\\Form\\Controls\\Number',
+        component: 'craft:text',
+        props: {inputType: 'number', min: 1},
+        path: ['settings', 'approvalsRequired'],
+        mode: 'editable',
+        deltaGroup: ['settings', 'approvalsRequired'],
+      },
+    },
+  ],
+  values: {
+    settings: {
+      reviewerGroup: 'editors',
+      approvalsRequired: 1,
+    },
+  },
+  errors: [],
+  globalErrors: [],
+};
+
+const meta = {
+  title: 'Forms/TypeConfigurator',
+  component: TypeConfigurator,
+  args: {
+    types,
+    selectedTypeLabel: 'User review',
+    form: userReviewForm,
+  },
+  parameters: {
+    docs: {
+      description: {
+        component:
+          'Combines a type picker with the dynamic form for configuring the selected type.',
+      },
+    },
+  },
+} satisfies Meta<typeof TypeConfigurator>;
+
+export default meta;
+type Story = StoryObj<typeof meta>;
+
+function render(initialType = 'user-review') {
+  return (args: Story['args']) => ({
+    components: {TypeConfigurator},
+    setup() {
+      const selectedType = shallowRef(initialType);
+      const selectedTypeLabel = computed(
+        () =>
+          types.find((type) => type.value === selectedType.value)?.label ?? ''
+      );
+      const form = computed(() =>
+        selectedType.value === 'user-review' ? userReviewForm : null
+      );
+
+      return {args, form, selectedType, selectedTypeLabel, types};
+    },
+    template: `
+      <TypeConfigurator
+        v-bind="args"
+        :key="selectedType"
+        :types="types"
+        :selected-type-label="selectedTypeLabel"
+        :form="form"
+        @select="selectedType = $event"
+      />
+    `,
+  });
+}
+
+export const Default: Story = {
+  args: {typeLabel: 'Type'},
+  render: render(),
+};
+
+export const AutomaticApproval: Story = {
+  args: {typeLabel: 'Type'},
+  render: render('automatic-approval'),
+};
+
+export const Disabled: Story = {
+  args: {typeLabel: 'Type', disabled: true},
+  render: render(),
+};
+
+export const Narrow: Story = {
+  args: {typeLabel: 'Type'},
+  decorators: [
+    () => ({
+      template: '<div style="max-width: 20rem"><story /></div>',
+    }),
+  ],
+  render: render(),
+};
diff --git a/resources/js/modules/forms/TypeConfigurator.vue b/resources/js/modules/forms/TypeConfigurator.vue
new file mode 100644
index 00000000000..44d539bdca5
--- /dev/null
+++ b/resources/js/modules/forms/TypeConfigurator.vue
@@ -0,0 +1,90 @@
+<script setup lang="ts">
+  import {useTemplateRef} from 'vue';
+  import TypePicker, {
+    type TypePickerOption,
+  } from '@/common/components/TypePicker.vue';
+  import FormRenderer from './FormRenderer.vue';
+  import type {FormChange, FormPayload, FormValues} from './types';
+
+  defineProps<{
+    types: TypePickerOption[];
+    selectedTypeLabel: string;
+    typeLabel?: string;
+    form?: FormPayload | null;
+    errors?: FormPayload['errors'];
+    disabled?: boolean;
+    formDisabled?: boolean;
+    refresh?: (
+      values: FormPayload['values'],
+      scope?: string[]
+    ) => Promise<FormPayload>;
+  }>();
+  defineEmits<{
+    select: [value: string];
+    change: [change: FormChange, values: FormValues];
+  }>();
+
+  const formRenderer = useTemplateRef('formRenderer');
+
+  defineExpose({
+    currentValues: () => formRenderer.value?.currentValues(),
+    canSubmit: () => formRenderer.value?.canSubmit() ?? true,
+  });
+</script>
+
+<template>
+  <div class="type-configurator flex flex-wrap items-start gap-2 min-w-0">
+    <craft-field v-if="typeLabel" :label="typeLabel" fieldset width="auto">
+      <TypePicker
+        slot="input"
+        :types="types"
+        :label="selectedTypeLabel"
+        :disabled="disabled"
+        @select="$emit('select', $event)"
+      />
+    </craft-field>
+    <TypePicker
+      v-else
+      :types="types"
+      :label="selectedTypeLabel"
+      :disabled="disabled"
+      @select="$emit('select', $event)"
+    />
+
+    <div
+      v-if="form"
+      class="type-configurator__fields flex flex-wrap items-start gap-2 min-w-0 flex-1"
+    >
+      <FormRenderer
+        ref="formRenderer"
+        :payload="form"
+        :errors="errors"
+        :disabled="disabled || formDisabled"
+        :refresh="refresh"
+        @change="(change, values) => $emit('change', change, values)"
+      />
+    </div>
+  </div>
+</template>
+
+<style scoped>
+  .type-configurator {
+    container-type: inline-size;
+  }
+
+  .type-configurator__fields :deep(craft-field) {
+    margin-block: 0;
+    min-inline-size: 0;
+    flex: 1 1 0;
+  }
+
+  .type-configurator__fields :deep(craft-field:has(craft-select)) {
+    flex: 0 0 auto;
+  }
+
+  @container (width < 22rem) {
+    .type-configurator__fields {
+      flex-basis: 100%;
+    }
+  }
+</style>
diff --git a/resources/js/modules/user/components/UserGroupSelect.vue b/resources/js/modules/user/components/UserGroupSelect.vue
index 0cd38fc28be..d9cb3a819e2 100644
--- a/resources/js/modules/user/components/UserGroupSelect.vue
+++ b/resources/js/modules/user/components/UserGroupSelect.vue
@@ -91,7 +91,7 @@
 
 <template>
   <div class="grid gap-2">
-    <div class="user-group-list">
+    <div v-if="selectedGroups.length" class="user-group-list">
       <craft-chip v-for="group in selectedGroups" :key="group.id">
         <div class="grid gap-1">
           <div class="flex gap-1">
diff --git a/src/Cp/Components/Button.php b/src/Cp/Components/Button.php
index 52b97e2b835..0e4b0d7e689 100644
--- a/src/Cp/Components/Button.php
+++ b/src/Cp/Components/Button.php
@@ -43,6 +43,8 @@ class Button extends ViewComponent
 
     protected bool $loading = false;
 
+    protected bool $focusableWhenDisabled = false;
+
     protected bool $active = false;
 
     protected bool $toggle = false;
@@ -147,6 +149,13 @@ public function loading(bool $loading = true): static
         return $this;
     }
 
+    public function focusableWhenDisabled(bool $focusableWhenDisabled = true): static
+    {
+        $this->focusableWhenDisabled = $focusableWhenDisabled;
+
+        return $this;
+    }
+
     /** Pressed/selected state (e.g. within a button group). */
     public function active(bool $active = true): static
     {
@@ -255,6 +264,7 @@ protected function hostAttributes(): array
             'icon' => $icon,
             'icon-position' => $this->iconPosition,
             'loading' => $this->loading,
+            'focusable-when-disabled' => $this->focusableWhenDisabled,
             'active' => $this->active ? 'true' : null,
             'toggle' => $this->toggle,
             'value' => $this->value,

From 739978034a723cc8d3ca6d28fe54b4ad7a87cc7a Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:24:11 +0200
Subject: [PATCH 03/32] Add workflow configuration and persistence

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 .../components/WorkflowStagesInput.test.ts    | 181 +++++++++++++
 .../components/WorkflowStagesInput.vue        | 241 ++++++++++++++++++
 .../js/pages/settings/workflows/Edit.vue      |  46 ++++
 .../js/pages/settings/workflows/Index.vue     |  73 ++++++
 scripts/copyicons.php                         |   1 +
 src/Cp/Settings.php                           |   9 +
 ...26_09_13_000000_create_workflow_tables.php |  68 +++++
 src/Database/Migrations/Install.php           |  33 +++
 src/Database/Table.php                        |   4 +
 src/Entry/Elements/Entry.php                  |  13 +-
 src/Entry/EntryTypes.php                      |   1 -
 .../Settings/SectionsController.php           |   3 +
 .../Settings/WorkflowsController.php          | 110 ++++++++
 src/Http/Requests/WorkflowRequest.php         |  88 +++++++
 src/Http/ViewModels/SectionEditViewModel.php  |  12 +
 src/Http/ViewModels/WorkflowEditViewModel.php | 146 +++++++++++
 src/ProjectConfig/ConfigRebuilder.php         |   3 +
 src/ProjectConfig/ProjectConfig.php           |   2 +
 src/ProjectConfig/ProjectConfigHelper.php     |  17 ++
 .../ProjectConfigServiceProvider.php          |   5 +
 src/Section/Data/Section.php                  |   4 +
 src/Section/Models/Section.php                |   7 +
 src/Section/Sections.php                      |  13 +
 .../Contracts/WorkflowStageInterface.php      |  41 +++
 src/Workflow/Data/WorkflowStageData.php       |  60 +++++
 src/Workflow/Models/Workflow.php              |  51 ++++
 src/Workflow/Models/WorkflowRun.php           |  71 ++++++
 src/Workflow/Stages/MissingWorkflowStage.php  |  33 +++
 src/Workflow/Stages/WorkflowStage.php         |  42 +++
 src/Workflow/WorkflowProjectConfig.php        |  97 +++++++
 src/Workflow/WorkflowStageTypes.php           |  25 ++
 .../Settings/SectionsControllerTest.php       |  12 +-
 .../TypeScriptTransformerServiceProvider.php  |  10 +
 33 files changed, 1518 insertions(+), 4 deletions(-)
 create mode 100644 resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
 create mode 100644 resources/js/modules/workflows/components/WorkflowStagesInput.vue
 create mode 100644 resources/js/pages/settings/workflows/Edit.vue
 create mode 100644 resources/js/pages/settings/workflows/Index.vue
 create mode 100644 src/Database/Migrations/2026_09_13_000000_create_workflow_tables.php
 create mode 100644 src/Http/Controllers/Settings/WorkflowsController.php
 create mode 100644 src/Http/Requests/WorkflowRequest.php
 create mode 100644 src/Http/ViewModels/WorkflowEditViewModel.php
 create mode 100644 src/Workflow/Contracts/WorkflowStageInterface.php
 create mode 100644 src/Workflow/Data/WorkflowStageData.php
 create mode 100644 src/Workflow/Models/Workflow.php
 create mode 100644 src/Workflow/Models/WorkflowRun.php
 create mode 100644 src/Workflow/Stages/MissingWorkflowStage.php
 create mode 100644 src/Workflow/Stages/WorkflowStage.php
 create mode 100644 src/Workflow/WorkflowProjectConfig.php
 create mode 100644 src/Workflow/WorkflowStageTypes.php

diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
new file mode 100644
index 00000000000..e80c6ef4bf5
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -0,0 +1,181 @@
+import {createApp, h, nextTick, shallowRef} from 'vue';
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vite-plus/test';
+import type CraftActionMenu from '@craftcms/ui/components/action-menu/action-menu';
+import WorkflowStagesInput from './WorkflowStagesInput.vue';
+
+type WorkflowStageData = CraftCms.Cms.Workflow.Data.WorkflowStageData;
+type WorkflowStage = {
+  -readonly [Key in keyof WorkflowStageData]: WorkflowStageData[Key];
+};
+
+const type = 'CraftCms\\Cms\\Workflow\\UserReview\\UserReviewStage';
+const stageTypes = [
+  {
+    type,
+    label: 'User review',
+    settings: {approvalsRequired: 1, userGroups: []},
+    settingsForm: null,
+  },
+  {
+    type: 'plugin\\AutomatedStage',
+    label: 'Automated review',
+    settings: {rule: 'passing'},
+    settingsForm: null,
+  },
+];
+
+function stage(uid: string, name: string): WorkflowStage {
+  return {
+    uid,
+    name,
+    type,
+    settings: {approvalsRequired: 1, userGroups: []},
+    settingsForm: null,
+  };
+}
+
+describe('WorkflowStagesInput', () => {
+  let app: ReturnType<typeof createApp> | undefined;
+  let container: HTMLElement | undefined;
+
+  beforeEach(() => {
+    vi.stubGlobal('crypto', {randomUUID: () => 'new-stage'});
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async () => new Response('<svg></svg>'))
+    );
+  });
+
+  afterEach(() => {
+    app?.unmount();
+    container?.remove();
+    vi.unstubAllGlobals();
+  });
+
+  function mount(stages: WorkflowStage[]) {
+    const updates: WorkflowStage[][] = [];
+    const modelValue = shallowRef(stages);
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp({
+      render: () =>
+        h(WorkflowStagesInput as never, {
+          modelValue: modelValue.value,
+          stageTypes,
+          editable: true,
+          'onUpdate:modelValue': (value: WorkflowStage[]) => {
+            modelValue.value = value;
+            updates.push(value);
+          },
+        }),
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.mount(container);
+
+    return updates;
+  }
+
+  function button(label: string): HTMLElement {
+    return container!.querySelector(`[aria-label="${label}"]`)!;
+  }
+
+  async function selectType(label: string, menuIndex: number): Promise<void> {
+    const menu =
+      container!.querySelectorAll<CraftActionMenu>('craft-action-menu')[
+        menuIndex
+      ]!;
+    await vi.waitFor(() =>
+      expect(menu.querySelector('craft-action-item')).not.toBeNull()
+    );
+
+    const item = [
+      ...menu.querySelectorAll<HTMLElement>('craft-action-item'),
+    ].find((item) => item.textContent === label)!;
+    item.click();
+    await nextTick();
+  }
+
+  it('reorders complete stages', async () => {
+    const updates = mount([
+      stage('editorial', 'Editorial'),
+      stage('legal', 'Legal'),
+    ]);
+    await nextTick();
+
+    container!.querySelector('craft-reorder-button')!.dispatchEvent(
+      new CustomEvent('reorder', {
+        detail: {direction: 'down'},
+        bubbles: true,
+      })
+    );
+
+    expect(updates.at(-1)?.map(({uid}) => uid)).toEqual(['legal', 'editorial']);
+  });
+
+  it('adds and removes stages while retaining at least one', async () => {
+    const updates = mount([stage('editorial', 'Editorial')]);
+    await nextTick();
+
+    expect((button('Remove stage') as HTMLButtonElement).disabled).toBe(true);
+    await selectType('User review', 1);
+
+    expect(updates.at(-1)).toEqual([
+      stage('editorial', 'Editorial'),
+      {
+        uid: 'new-stage',
+        name: 'Review',
+        type,
+        settings: {approvalsRequired: 1, userGroups: []},
+        settingsForm: null,
+      },
+    ]);
+
+    button('Remove stage').click();
+    expect(updates.at(-1)?.map(({uid}) => uid)).toEqual(['new-stage']);
+  });
+
+  it('confirms and resets settings when changing stage type', async () => {
+    const confirm = vi.fn(() => true);
+    Object.defineProperty(window, 'confirm', {
+      value: confirm,
+      configurable: true,
+    });
+    const updates = mount([stage('editorial', 'Editorial')]);
+    await nextTick();
+
+    await selectType('Automated review', 0);
+
+    expect(confirm).toHaveBeenCalled();
+    expect(updates.at(-1)?.[0]).toEqual({
+      uid: 'editorial',
+      name: 'Editorial',
+      type: 'plugin\\AutomatedStage',
+      settings: {rule: 'passing'},
+      settingsForm: null,
+    });
+  });
+
+  it('labels the stage type picker', async () => {
+    const settingsForm = {
+      scope: [],
+      refreshable: false,
+      nodes: [],
+      values: {},
+      errors: [],
+      globalErrors: [],
+    };
+
+    mount([{...stage('editorial', 'Editorial'), settingsForm}]);
+    await nextTick();
+
+    const typeField = container!.querySelector<
+      HTMLElement & {label: string; updateComplete: Promise<boolean>}
+    >('craft-field');
+    expect(typeField).not.toBeNull();
+    await typeField!.updateComplete;
+    expect(typeField!.label).toBe('Type');
+    expect(typeField!.getAttribute('role')).toBe('group');
+    expect(typeField!.getAttribute('aria-labelledby')).not.toBeNull();
+    expect(typeField!.textContent).toContain('User review');
+  });
+});
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
new file mode 100644
index 00000000000..01bcf94f49f
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -0,0 +1,241 @@
+<script setup lang="ts">
+  import {computed} from 'vue';
+  import {t} from '@craftcms/ui';
+  import CraftInput from '@craftcms/ui/components/input/input';
+  import TypePicker, {
+    type TypePickerOption,
+  } from '@/common/components/TypePicker.vue';
+  import {useReorderableItems} from '@/common/composables/useReorderableItems';
+  import TypeConfigurator from '@/modules/forms/TypeConfigurator.vue';
+  import type {
+    FormChange,
+    FormPayload,
+    FormValues,
+  } from '@/modules/forms/types';
+
+  type WorkflowStageData = CraftCms.Cms.Workflow.Data.WorkflowStageData;
+  type WorkflowStage = {
+    -readonly [Key in keyof WorkflowStageData]: WorkflowStageData[Key];
+  };
+  type StageType =
+    CraftCms.Cms.Http.ViewModels.WorkflowEditViewModel['stageTypes'][number];
+
+  const props = defineProps<{
+    modelValue: WorkflowStage[];
+    stageTypes: StageType[];
+    editable: boolean;
+  }>();
+  const emit = defineEmits<{
+    'update:modelValue': [value: WorkflowStage[]];
+  }>();
+  const typePickerOptions = computed<TypePickerOption[]>(() =>
+    props.stageTypes.map((type) => ({
+      value: type.type,
+      label: type.label,
+    }))
+  );
+
+  function updateStage(index: number, values: Partial<WorkflowStage>): void {
+    emit(
+      'update:modelValue',
+      props.modelValue.map((stage, stageIndex) =>
+        stageIndex === index ? {...stage, ...values} : stage
+      )
+    );
+  }
+
+  function changeSettings(
+    index: number,
+    _change: FormChange,
+    values: FormValues
+  ): void {
+    updateStage(index, {settings: values});
+  }
+
+  function changeType(index: number, type: string): void {
+    const current = props.modelValue[index];
+    const replacement = props.stageTypes.find(
+      (candidate) => candidate.type === type
+    );
+    if (!current || !replacement || current.type === type) return;
+
+    if (
+      Object.keys(current.settings).length > 0 &&
+      !window.confirm(t('Changing the stage type will reset its settings.'))
+    ) {
+      return;
+    }
+
+    updateStage(index, {
+      type: replacement.type,
+      settings: {...replacement.settings},
+      settingsForm: replacement.settingsForm,
+    });
+  }
+
+  function addStage(type: string): void {
+    const stageType = props.stageTypes.find(
+      (candidate) => candidate.type === type
+    );
+    if (!stageType) return;
+
+    emit('update:modelValue', [
+      ...props.modelValue,
+      {
+        uid: crypto.randomUUID(),
+        name: t('Review'),
+        type: stageType.type,
+        settings: {...stageType.settings},
+        settingsForm: stageType.settingsForm,
+      },
+    ]);
+  }
+
+  function removeStage(index: number): void {
+    if (props.modelValue.length === 1) return;
+    emit(
+      'update:modelValue',
+      props.modelValue.filter((_, stageIndex) => stageIndex !== index)
+    );
+  }
+
+  function moveStage(index: number, destination: number): void {
+    if (destination < 0 || destination >= props.modelValue.length) return;
+
+    const stages = [...props.modelValue];
+    const [stage] = stages.splice(index, 1);
+    if (!stage) return;
+    stages.splice(destination, 0, stage);
+    emit('update:modelValue', stages);
+  }
+
+  const {setItemRef, setHandleRef, getDragState, getDropState, getRowPosition} =
+    useReorderableItems({
+      getItemIds: () => props.modelValue.map((stage) => stage.uid),
+      enabled: () => props.editable && props.modelValue.length > 1,
+      onReorder: moveStage,
+    });
+
+  function stageTypeLabel(stage: WorkflowStage): string {
+    return (
+      props.stageTypes.find((type) => type.type === stage.type)?.label ??
+      t('Missing stage type')
+    );
+  }
+
+  function changeName(index: number, event: Event): void {
+    if (!(event.target instanceof CraftInput)) {
+      throw new TypeError('Expected a craft input event target.');
+    }
+
+    updateStage(index, {name: String(event.target.modelValue ?? '')});
+  }
+</script>
+
+<template>
+  <div class="flex flex-col gap-2">
+    <craft-pane
+      v-for="(stage, index) in modelValue"
+      :key="stage.uid"
+      :ref="(el: Parameters<typeof setItemRef>[0]) => setItemRef(el, stage.uid)"
+      padding="lg"
+      appearance="outline"
+      class="workflow-stage"
+      :class="{
+        'opacity-50': getDragState(stage.uid).type === 'is-dragging',
+        'bg-gray-100': getDropState(stage.uid).type === 'is-over',
+      }"
+      role="group"
+      :aria-label="t('Stage {num}: {name}', {num: index + 1, name: stage.name})"
+    >
+      <div
+        slot="title"
+        class="workflow-stage__title flex items-center gap-2 font-normal"
+      >
+        <span class="whitespace-nowrap">
+          {{ t('Stage {num}', {num: index + 1}) }}
+        </span>
+        <craft-input
+          :label="t('Stage {num} name', {num: index + 1})"
+          label-sr-only
+          small
+          required
+          :disabled="!editable"
+          .modelValue="stage.name"
+          @model-value-changed="changeName(index, $event)"
+        >
+          <input slot="input" />
+        </craft-input>
+      </div>
+
+      <div
+        v-if="editable"
+        slot="header-actions"
+        class="flex items-center gap-1"
+      >
+        <craft-reorder-button
+          :ref="
+            (el: Parameters<typeof setHandleRef>[0]) =>
+              setHandleRef(el, stage.uid)
+          "
+          :position="getRowPosition(index)"
+          :disabled="modelValue.length === 1"
+          :label="t('Reorder stage {num}', {num: index + 1})"
+          @reorder="
+            (event: CustomEvent<{direction: 'up' | 'down'}>) =>
+              moveStage(
+                index,
+                index + (event.detail.direction === 'up' ? -1 : 1)
+              )
+          "
+        />
+        <craft-button
+          type="button"
+          size="small"
+          variant="danger-plain"
+          icon="xmark"
+          :disabled="modelValue.length === 1"
+          :aria-label="t('Remove stage')"
+          @click="removeStage(index)"
+        />
+      </div>
+
+      <TypeConfigurator
+        :key="stage.type"
+        :types="typePickerOptions"
+        :selected-type-label="stageTypeLabel(stage)"
+        :type-label="t('Type')"
+        :form="
+          stage.settingsForm
+            ? {
+                ...(stage.settingsForm as FormPayload),
+                values: stage.settings,
+              }
+            : null
+        "
+        :disabled="!editable"
+        @select="changeType(index, $event)"
+        @change="(change, values) => changeSettings(index, change, values)"
+      />
+    </craft-pane>
+
+    <TypePicker
+      v-if="editable"
+      :types="typePickerOptions"
+      :label="t('Add stage')"
+      :disabled="!stageTypes.length"
+      adding
+      @select="addStage"
+    />
+  </div>
+</template>
+
+<style scoped>
+  .workflow-stage {
+    container-type: inline-size;
+  }
+
+  .workflow-stage__title :deep(craft-input) {
+    min-inline-size: 8rem;
+  }
+</style>
diff --git a/resources/js/pages/settings/workflows/Edit.vue b/resources/js/pages/settings/workflows/Edit.vue
new file mode 100644
index 00000000000..0d9fe641021
--- /dev/null
+++ b/resources/js/pages/settings/workflows/Edit.vue
@@ -0,0 +1,46 @@
+<script setup lang="ts">
+  import {router} from '@inertiajs/vue3';
+  import type {ActionItem} from '@/common/types';
+  import {useAppLayout} from '@/common/composables/useAppLayout';
+  import type {FormPayload, FormValue} from '@/modules/forms/types';
+  import WorkflowStagesInput from '@/modules/workflows/components/WorkflowStagesInput.vue';
+  import FormPage from '@/pages/Form.vue';
+
+  type Props = CraftCms.Cms.Http.ViewModels.WorkflowEditViewModel;
+  type WorkflowStage = CraftCms.Cms.Workflow.Data.WorkflowStageData;
+
+  const props = defineProps<Props>();
+  const formPayload = props.form as unknown as FormPayload;
+  const actions: ActionItem[] = props.deleteAction
+    ? [
+        {
+          label: props.deleteAction.label,
+          variant: 'danger',
+          onClick: () => {
+            if (window.confirm(props.deleteAction!.confirm)) {
+              router.delete(props.deleteAction!.url);
+            }
+          },
+        },
+      ]
+    : [];
+
+  useAppLayout({formActions: actions});
+
+  function stages(value: FormValue): WorkflowStage[] {
+    return Array.isArray(value) ? (value as WorkflowStage[]) : [];
+  }
+</script>
+
+<template>
+  <FormPage :form="formPayload" :submit="submit">
+    <template #stages="{value, setValue, editable}">
+      <WorkflowStagesInput
+        :model-value="stages(value)"
+        :stage-types="stageTypes"
+        :editable="editable"
+        @update:model-value="setValue($event, 'discrete')"
+      />
+    </template>
+  </FormPage>
+</template>
diff --git a/resources/js/pages/settings/workflows/Index.vue b/resources/js/pages/settings/workflows/Index.vue
new file mode 100644
index 00000000000..b0776627ab7
--- /dev/null
+++ b/resources/js/pages/settings/workflows/Index.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+  import {Link, router} from '@inertiajs/vue3';
+  import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
+  import {computed, h} from 'vue';
+  import LayoutSlot from '@/common/components/LayoutSlot.vue';
+  import Empty from '@/common/components/Empty.vue';
+  import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
+  import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
+  import {create, destroy, edit} from '@actions/Settings/WorkflowsController';
+
+  interface Workflow {
+    id: number;
+    name: string;
+    stages: number;
+  }
+
+  const props = defineProps<{
+    workflows: Workflow[];
+    readOnly: boolean;
+  }>();
+  const columnHelper = createCraftColumnHelper<Workflow>();
+  const columns = computed(() => [
+    columnHelper.link('name', {
+      header: t('Name'),
+      props: ({row}) => ({href: edit({workflow: row.original.id}).url}),
+    }),
+    columnHelper.accessor('stages', {header: t('Stages')}),
+    columnHelper.actions(({row}) => [
+      h(DeleteButton, {
+        confirm: t('Are you sure you want to delete “{name}”?', {
+          name: row.original.name,
+        }),
+        onClick: () => router.delete(destroy({workflow: row.original.id})),
+      }),
+    ]),
+  ]);
+  const table = useVueTable<Workflow>({
+    get data() {
+      return props.workflows;
+    },
+    get columns() {
+      return columns.value;
+    },
+    state: {
+      get columnVisibility() {
+        return {actions: !props.readOnly};
+      },
+    },
+    enableSorting: false,
+    getCoreRowModel: getCoreRowModel<Workflow>(),
+  });
+</script>
+
+<template>
+  <LayoutSlot v-if="!readOnly" name="actions">
+    <Link as="craft-button" :href="create().url" variant="primary" icon="plus">
+      {{ t('New workflow') }}
+    </Link>
+  </LayoutSlot>
+
+  <craft-pane padding="0" appearance="raised">
+    <AdminTable :table="table" :reorderable="false">
+      <template #empty-row>
+        <Empty
+          icon="light/clipboard-list-check"
+          :label="t('No approval workflows exist yet.')"
+        />
+      </template>
+    </AdminTable>
+  </craft-pane>
+</template>
diff --git a/scripts/copyicons.php b/scripts/copyicons.php
index 505a7ec8efd..17b01031f70 100644
--- a/scripts/copyicons.php
+++ b/scripts/copyicons.php
@@ -7,6 +7,7 @@
 require dirname(__DIR__).'/vendor/autoload.php';
 
 $lightIcons = [
+    'clipboard-list-check',
     'earth-africa',
     'earth-americas',
     'earth-asia',
diff --git a/src/Cp/Settings.php b/src/Cp/Settings.php
index 6ce433aaf67..3a6c6a2e42d 100644
--- a/src/Cp/Settings.php
+++ b/src/Cp/Settings.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use CraftCms\Cms\Config\GeneralConfig;
+use CraftCms\Cms\Edition;
 use CraftCms\Cms\Plugin\Plugins;
 use CraftCms\Cms\Support\Url;
 use Illuminate\Container\Attributes\Singleton;
@@ -120,6 +121,14 @@ public function all(): array
             'iconName' => 'light/files',
             'label' => t('Entry Types'),
         ];
+
+        if (Edition::isAtLeast(Edition::Pro)) {
+            $settings[$label]['workflows'] = [
+                'iconName' => 'light/clipboard-list-check',
+                'label' => t('Workflows'),
+            ];
+        }
+
         $settings[$label]['fields'] = [
             'iconName' => 'light/pen-to-square',
             'label' => t('Fields'),
diff --git a/src/Database/Migrations/2026_09_13_000000_create_workflow_tables.php b/src/Database/Migrations/2026_09_13_000000_create_workflow_tables.php
new file mode 100644
index 00000000000..8f08a4dd8f3
--- /dev/null
+++ b/src/Database/Migrations/2026_09_13_000000_create_workflow_tables.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+use CraftCms\Cms\Database\Migration;
+use CraftCms\Cms\Database\Table;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        if (! Schema::hasColumn(Table::SECTIONS, 'workflowId')) {
+            Schema::table(Table::SECTIONS, fn (Blueprint $table) => $table->integer('workflowId')->nullable());
+        }
+
+        if (Schema::hasTable(Table::WORKFLOWS)) {
+            return;
+        }
+
+        Schema::create(Table::WORKFLOWS, function (Blueprint $table) {
+            $table->integer('id', true);
+            $table->string('name');
+            $table->jsonb('stages');
+            $table->dateTime('dateCreated');
+            $table->dateTime('dateUpdated');
+            $table->char('uid', 36)->unique();
+        });
+
+        Schema::create(Table::WORKFLOWRUNS, function (Blueprint $table) {
+            $table->id();
+            $table->integer('workflowId')->nullable();
+            $table->integer('draftId');
+            $table->integer('authorId')->nullable();
+            $table->unsignedBigInteger('activityRootEventId');
+            $table->unsignedSmallInteger('currentStage')->default(0);
+            $table->string('currentStageResult')->nullable();
+            $table->string('status');
+            $table->jsonb('payload')->nullable();
+            $table->dateTime('dateCreated');
+            $table->dateTime('dateUpdated');
+        });
+
+        Schema::createIndex(Table::WORKFLOWRUNS, ['activityRootEventId'], unique: true);
+        Schema::createIndex(Table::WORKFLOWRUNS, ['draftId', 'dateCreated']);
+        Schema::createIndex(Table::WORKFLOWRUNS, ['draftId', 'status']);
+
+        Schema::table(Table::SECTIONS, fn (Blueprint $table) => $table->foreign('workflowId')->references('id')->on(Table::WORKFLOWS)->nullOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('activityRootEventId')->references('id')->on(Table::ACTIVITYEVENTS)->cascadeOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('workflowId')->references('id')->on(Table::WORKFLOWS)->nullOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('authorId')->references('id')->on(Table::USERS)->nullOnDelete());
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists(Table::WORKFLOWRUNS);
+
+        if (Schema::hasColumn(Table::SECTIONS, 'workflowId')) {
+            Schema::table(Table::SECTIONS, function (Blueprint $table) {
+                $table->dropForeign(['workflowId']);
+                $table->dropColumn('workflowId');
+            });
+        }
+
+        Schema::dropIfExists(Table::WORKFLOWS);
+    }
+};
diff --git a/src/Database/Migrations/Install.php b/src/Database/Migrations/Install.php
index 6c48273195e..a6d6c1cec54 100644
--- a/src/Database/Migrations/Install.php
+++ b/src/Database/Migrations/Install.php
@@ -601,6 +601,31 @@ public function createTables(?Logger $logger = null): void
             $table->char('uid', 36)->default('0');
         });
 
+        $logger?->subLabel('workflows');
+        Schema::create(Table::WORKFLOWS, function (Blueprint $table) {
+            $table->integer('id', true);
+            $table->string('name');
+            $table->jsonb('stages');
+            $table->dateTime('dateCreated');
+            $table->dateTime('dateUpdated');
+            $table->char('uid', 36)->unique();
+        });
+
+        $logger?->subLabel('workflowruns');
+        Schema::create(Table::WORKFLOWRUNS, function (Blueprint $table) {
+            $table->id();
+            $table->integer('workflowId')->nullable();
+            $table->integer('draftId');
+            $table->integer('authorId')->nullable();
+            $table->unsignedBigInteger('activityRootEventId');
+            $table->unsignedSmallInteger('currentStage')->default(0);
+            $table->string('currentStageResult')->nullable();
+            $table->string('status');
+            $table->jsonb('payload')->nullable();
+            $table->dateTime('dateCreated');
+            $table->dateTime('dateUpdated');
+        });
+
         $logger?->subLabel('fieldlayouts');
         Schema::create(Table::FIELDLAYOUTS, function (Blueprint $table) {
             $table->integer('id', true);
@@ -775,6 +800,7 @@ public function createTables(?Logger $logger = null): void
         Schema::create(Table::SECTIONS, function (Blueprint $table) {
             $table->integer('id', true);
             $table->integer('structureId')->nullable();
+            $table->integer('workflowId')->nullable();
             $table->string('name');
             $table->string('handle');
             $table->enum('type', [
@@ -1109,6 +1135,9 @@ public function createIndexes(): void
         Schema::createIndex(Table::ENTRIES, ['fieldId']);
         Schema::createIndex(Table::ENTRYTYPES, ['fieldLayoutId']);
         Schema::createIndex(Table::ENTRYTYPES, ['dateDeleted']);
+        Schema::createIndex(Table::WORKFLOWRUNS, ['activityRootEventId'], unique: true);
+        Schema::createIndex(Table::WORKFLOWRUNS, ['draftId', 'dateCreated']);
+        Schema::createIndex(Table::WORKFLOWRUNS, ['draftId', 'status']);
         Schema::createIndex(Table::FIELDLAYOUTS, ['dateDeleted']);
         Schema::createIndex(Table::FIELDLAYOUTS, ['type']);
         Schema::createIndex(Table::FIELDREFERENCES, ['fieldId', 'fieldInstanceUid', 'sourceId', 'sourceSiteId', 'targetId'], unique: true);
@@ -1254,6 +1283,10 @@ public function addForeignKeys(): void
         Schema::table(Table::ENTRIES, fn (Blueprint $table) => $table->foreign('fieldId')->references('id')->on(Table::FIELDS)->cascadeOnDelete());
         Schema::table(Table::ENTRIES, fn (Blueprint $table) => $table->foreign('primaryOwnerId')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
         Schema::table(Table::ENTRYTYPES, fn (Blueprint $table) => $table->foreign('fieldLayoutId')->references('id')->on(Table::FIELDLAYOUTS)->nullOnDelete());
+        Schema::table(Table::SECTIONS, fn (Blueprint $table) => $table->foreign('workflowId')->references('id')->on(Table::WORKFLOWS)->nullOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('activityRootEventId')->references('id')->on(Table::ACTIVITYEVENTS)->cascadeOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('workflowId')->references('id')->on(Table::WORKFLOWS)->nullOnDelete());
+        Schema::table(Table::WORKFLOWRUNS, fn (Blueprint $table) => $table->foreign('authorId')->references('id')->on(Table::USERS)->nullOnDelete());
         Schema::table(Table::FIELDREFERENCES, fn (Blueprint $table) => $table->foreign('fieldId')->references('id')->on(Table::FIELDS)->cascadeOnDelete());
         Schema::table(Table::FIELDREFERENCES, fn (Blueprint $table) => $table->foreign('sourceId')->references('id')->on(Table::ELEMENTS)->cascadeOnDelete());
         Schema::table(Table::FIELDREFERENCES, fn (Blueprint $table) => $table->foreign('sourceSiteId')->references('id')->on(Table::SITES)->cascadeOnDelete()->cascadeOnUpdate());
diff --git a/src/Database/Table.php b/src/Database/Table.php
index c777a35e6cf..0ec9e38e98f 100644
--- a/src/Database/Table.php
+++ b/src/Database/Table.php
@@ -147,4 +147,8 @@
     public const string WEBAUTHN = 'webauthn';
 
     public const string WIDGETS = 'widgets';
+
+    public const string WORKFLOWS = 'workflows';
+
+    public const string WORKFLOWRUNS = 'workflowruns';
 }
diff --git a/src/Entry/Elements/Entry.php b/src/Entry/Elements/Entry.php
index 78a740c8592..9a8c501b252 100644
--- a/src/Entry/Elements/Entry.php
+++ b/src/Entry/Elements/Entry.php
@@ -93,6 +93,8 @@
 use CraftCms\Cms\Twig\Attributes\AllowedInSandbox;
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\RulesetValidation\Attributes\Ruleset;
 use DateTimeInterface;
 use GraphQL\Type\Definition\Type;
@@ -119,7 +121,7 @@
  * @property int[] $authorIds the entry authors’ IDs
  */
 #[Ruleset(EntryRules::class)]
-class Entry extends Element implements Colorable, ExpirableElementInterface, Iconic, NestedElementInterface
+class Entry extends Element implements Colorable, ExpirableElementInterface, Iconic, NestedElementInterface, WorkflowableInterface
 {
     use LegacyConstants;
     use NestedElement {
@@ -310,7 +312,7 @@ public static function refHandle(): string
     }
 
     #[Override]
-    public static function hasDrafts(): bool
+    public static function hasDrafts(): true
     {
         return true;
     }
@@ -1570,6 +1572,13 @@ public function getType(): EntryType
         return $this->_type = $entryType;
     }
 
+    public function workflow(): ?Workflow
+    {
+        $workflowId = $this->getSection()?->workflowId;
+
+        return $workflowId === null ? null : Workflow::find($workflowId);
+    }
+
     /**
      * Returns the field's entry types without resolving nested entry owners.
      *
diff --git a/src/Entry/EntryTypes.php b/src/Entry/EntryTypes.php
index ef3fb5a3435..8e77d7adf1b 100644
--- a/src/Entry/EntryTypes.php
+++ b/src/Entry/EntryTypes.php
@@ -332,7 +332,6 @@ public function handleChangedEntryType(ConfigEvent $event): void
         ProjectConfigHelper::ensureAllFieldsProcessed();
 
         $entryTypeModel = $this->getEntryTypeModel($entryTypeUid, true);
-
         DB::beginTransaction();
 
         try {
diff --git a/src/Http/Controllers/Settings/SectionsController.php b/src/Http/Controllers/Settings/SectionsController.php
index 651cace7928..f7b26cd8f97 100644
--- a/src/Http/Controllers/Settings/SectionsController.php
+++ b/src/Http/Controllers/Settings/SectionsController.php
@@ -22,6 +22,7 @@
 use CraftCms\Cms\Section\Sections;
 use CraftCms\Cms\Site\Sites;
 use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
@@ -103,6 +104,7 @@ public function renderForm(Request $request, Sites $sites, Sections $sections):
             'values' => ['required', 'array'],
             'values.sectionId' => ['nullable', 'integer', Rule::exists(Table::SECTIONS, 'id')],
             'values.type' => ['required', Rule::enum(SectionType::class)],
+            'values.workflowId' => ['nullable', 'integer', Rule::exists(Workflow::class, 'id')],
             'scope' => ['present', 'array', 'size:0'],
         ]);
         $values = $data['values'];
@@ -140,6 +142,7 @@ public function store(
         $section->name = $request->input('name');
         $section->handle = $request->input('handle');
         $section->type = $request->enum('type', SectionType::class, SectionType::Channel);
+        $section->workflowId = $request->integer('workflowId') ?: null;
         $section->enableVersioning = $request->boolean('enableVersioning', true);
         $minAuthors = $request->input('minAuthors');
         $maxAuthors = $request->input('maxAuthors');
diff --git a/src/Http/Controllers/Settings/WorkflowsController.php b/src/Http/Controllers/Settings/WorkflowsController.php
new file mode 100644
index 00000000000..785d8f682c9
--- /dev/null
+++ b/src/Http/Controllers/Settings/WorkflowsController.php
@@ -0,0 +1,110 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Http\Controllers\Settings;
+
+use CraftCms\Cms\Config\GeneralConfig;
+use CraftCms\Cms\Http\Requests\WorkflowRequest;
+use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Http\Responses\CpScreenResponse;
+use CraftCms\Cms\Http\ViewModels\WorkflowEditViewModel;
+use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\WorkflowProjectConfig;
+use Symfony\Component\HttpFoundation\Response;
+
+use function CraftCms\Cms\t;
+
+class WorkflowsController
+{
+    use RespondsWithFlash;
+
+    private bool $readOnly;
+
+    public function __construct(
+        private readonly WorkflowProjectConfig $workflowProjectConfig,
+        GeneralConfig $generalConfig,
+    ) {
+        $this->readOnly = ! $generalConfig->allowAdminChanges;
+    }
+
+    public function index(): CpScreenResponse
+    {
+        return new CpScreenResponse()
+            ->title(t('Workflows'))
+            ->crumbs([
+                ['label' => t('Settings'), 'href' => Url::cpUrl('settings')],
+                ['label' => t('Workflows')],
+            ])
+            ->inertiaPage('settings/workflows/Index', [
+                'workflows' => Workflow::query()
+                    ->orderBy('name')
+                    ->get()
+                    ->map(fn (Workflow $workflow): array => [
+                        'id' => $workflow->id,
+                        'name' => $workflow->name,
+                        'stages' => $workflow->stages->count(),
+                    ]),
+                'readOnly' => $this->readOnly,
+            ]);
+    }
+
+    public function create(): CpScreenResponse
+    {
+        return $this->form(new Workflow);
+    }
+
+    public function edit(Workflow $workflow): CpScreenResponse
+    {
+        return $this->form($workflow);
+    }
+
+    public function store(WorkflowRequest $request): Response
+    {
+        return $this->save($request, new Workflow);
+    }
+
+    public function update(WorkflowRequest $request, Workflow $workflow): Response
+    {
+        return $this->save($request, $workflow);
+    }
+
+    public function destroy(Workflow $workflow): Response
+    {
+        if ($workflow->sections()->exists()) {
+            return $this->asFailure(t('This workflow cannot be deleted while it is assigned to a section.'));
+        }
+
+        $this->workflowProjectConfig->delete($workflow);
+
+        return $this->asSuccess(t('Workflow deleted.'), redirect: action([self::class, 'index']));
+    }
+
+    private function save(WorkflowRequest $request, Workflow $workflow): Response
+    {
+        $data = $request->workflowData();
+        $workflow->name = $data['name'];
+
+        $this->workflowProjectConfig->save($workflow, $data['stages']);
+
+        return $this->asSuccess(
+            t('Workflow saved.'),
+            redirect: action([self::class, 'edit'], $workflow->id),
+        );
+    }
+
+    private function form(Workflow $workflow): CpScreenResponse
+    {
+        $title = $workflow->exists ? $workflow->name : t('New workflow');
+
+        return new CpScreenResponse()
+            ->title($title)
+            ->addCrumb(t('Settings'), 'settings')
+            ->addCrumb(t('Workflows'), 'settings/workflows')
+            ->inertiaPage('settings/workflows/Edit', app(WorkflowEditViewModel::class, [
+                'workflow' => $workflow,
+                'readOnly' => $this->readOnly,
+            ]));
+    }
+}
diff --git a/src/Http/Requests/WorkflowRequest.php b/src/Http/Requests/WorkflowRequest.php
new file mode 100644
index 00000000000..47b9b9dcda3
--- /dev/null
+++ b/src/Http/Requests/WorkflowRequest.php
@@ -0,0 +1,88 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Http\Requests;
+
+use CraftCms\Cms\Component\ComponentHelper;
+use CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\WorkflowStageTypes;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class WorkflowRequest extends FormRequest
+{
+    /** @return array<string, list<string|object>> */
+    public function rules(WorkflowStageTypes $workflowStageTypes): array
+    {
+        $types = $workflowStageTypes->types();
+        $workflow = $this->route('workflow');
+
+        // Keep existing plugin-provided stage types valid if their plugin is unavailable.
+        if ($workflow instanceof Workflow) {
+            $types->push(...$workflow->stages->pluck('type'));
+        }
+
+        return [
+            'name' => ['required', 'string', 'max:255'],
+            'stages' => ['required', 'array', 'min:1'],
+            'stages.*.uid' => ['required', 'uuid', 'distinct'],
+            'stages.*.name' => ['required', 'string', 'max:255'],
+            'stages.*.type' => ['required', 'string', Rule::in($types->unique()->all())],
+            'stages.*.settings' => ['present', 'array'],
+        ];
+    }
+
+    /** @return list<callable(Validator): void> */
+    public function after(): array
+    {
+        return [
+            function (Validator $validator): void {
+                if ($validator->errors()->isNotEmpty()) {
+                    return;
+                }
+
+                foreach ($this->input('stages') as $index => $stage) {
+                    if (! ComponentHelper::validateComponentClass($stage['type'], WorkflowStageInterface::class)) {
+                        continue;
+                    }
+
+                    /** @var WorkflowStageInterface $component */
+                    $component = ComponentHelper::createComponent([
+                        'type' => $stage['type'],
+                        'settings' => $stage['settings'],
+                    ], WorkflowStageInterface::class);
+
+                    if ($component->validate()) {
+                        continue;
+                    }
+
+                    foreach ($component->errors()->getMessages() as $attribute => $messages) {
+                        foreach ($messages as $message) {
+                            $validator->errors()->add("stages.$index.settings.$attribute", $message);
+                        }
+                    }
+                }
+            },
+        ];
+    }
+
+    /** @return array{name: string, stages: list<WorkflowStageData>} */
+    public function workflowData(): array
+    {
+        $data = $this->validated();
+
+        return [
+            'name' => $data['name'],
+            'stages' => array_map(fn (array $stage): WorkflowStageData => new WorkflowStageData(
+                uid: $stage['uid'],
+                name: $stage['name'],
+                type: $stage['type'],
+                settings: $stage['settings'],
+            ), $data['stages']),
+        ];
+    }
+}
diff --git a/src/Http/ViewModels/SectionEditViewModel.php b/src/Http/ViewModels/SectionEditViewModel.php
index 88562ecb690..061f60454b5 100644
--- a/src/Http/ViewModels/SectionEditViewModel.php
+++ b/src/Http/ViewModels/SectionEditViewModel.php
@@ -5,6 +5,7 @@
 namespace CraftCms\Cms\Http\ViewModels;
 
 use CraftCms\Cms\Cp\SelectOptions;
+use CraftCms\Cms\Edition;
 use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Element\Enums\PropagationMethod;
 use CraftCms\Cms\Entry\Data\EntryType;
@@ -31,6 +32,7 @@
 use CraftCms\Cms\Section\Enums\DefaultPlacement;
 use CraftCms\Cms\Section\Enums\SectionType;
 use CraftCms\Cms\Site\Sites;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Support\Collection;
 
 use function CraftCms\Cms\t;
@@ -83,6 +85,15 @@ public function form(): FormPayload
                 t('Enable versioning for entries in this section'),
                 Lightswitch::make('enableVersioning'),
             ),
+            ...Edition::isAtLeast(Edition::Pro) ? [
+                Field::make(t('Workflow'), Choice::make('workflowId')
+                    ->placeholder(t('No workflow'))
+                    ->options(Workflow::query()->orderBy('name')->pluck('name', 'id')->map(fn (string $name, int $id): array => [
+                        'label' => $name,
+                        'value' => $id,
+                    ])->values()->all()))
+                    ->instructions(t('Drafts in this section must complete the selected workflow before they can be applied.')),
+            ] : [],
             $typeField,
             Separator::make('entry-types-separator'),
             Heading::make('entry-types-heading', t('Entry Types'))
@@ -233,6 +244,7 @@ private function initialValues(): array
                 fn ($entryType): int => (int) $entryType->id,
                 $this->section->entryTypes,
             ),
+            'workflowId' => $this->section->workflowId,
             'enableVersioning' => $this->section->enableVersioning,
             'minAuthors' => $this->section->minAuthors,
             'maxAuthors' => $this->section->maxAuthors ?? '',
diff --git a/src/Http/ViewModels/WorkflowEditViewModel.php b/src/Http/ViewModels/WorkflowEditViewModel.php
new file mode 100644
index 00000000000..431397cfcb5
--- /dev/null
+++ b/src/Http/ViewModels/WorkflowEditViewModel.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Http\ViewModels;
+
+use CraftCms\Cms\Component\ComponentHelper;
+use CraftCms\Cms\Form\Controls\Table;
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Enums\ControlMode;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\FormPayload;
+use CraftCms\Cms\Form\FormResolver;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Heading;
+use CraftCms\Cms\Form\Nodes\Missing;
+use CraftCms\Cms\Form\Nodes\Separator;
+use CraftCms\Cms\Http\Controllers\Settings\WorkflowsController;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Stages\MissingWorkflowStage;
+use CraftCms\Cms\Workflow\WorkflowStageTypes;
+
+use function CraftCms\Cms\t;
+
+class WorkflowEditViewModel extends ViewModel
+{
+    public function __construct(
+        private readonly Workflow $workflow,
+        private readonly bool $readOnly,
+        private readonly FormResolver $formResolver,
+        private readonly WorkflowStageTypes $workflowStageTypes,
+    ) {}
+
+    public function form(): FormPayload
+    {
+        return $this->formResolver->resolve(Form::make([
+            Field::make(t('Name'), Text::make('name')->autofocus())
+                ->instructions(t('What this workflow will be called in the control panel.'))
+                ->required(),
+            Separator::make('review-stages-separator'),
+            Heading::make('review-stages-heading', t('Stages'))
+                ->description(t('Stages run in order and decide when the workflow may advance.')),
+            Field::make(control: Table::make('stages')->allowAdd()->allowDelete()->allowReorder()->minRows(1)),
+        ]), new FormContext(
+            values: $this->initialValues(),
+            mode: $this->readOnly ? ControlMode::ReadOnly : ControlMode::Editable,
+        ));
+    }
+
+    /** @return list<array{type: string, label: string, settings: array<string, mixed>, settingsForm: FormPayload|null}> */
+    public function stageTypes(): array
+    {
+        return $this->workflowStageTypes->types()
+            ->filter(fn (string $type): bool => $type::isSelectable())
+            ->map(function (string $type): array {
+                /** @var WorkflowStageInterface $stage */
+                $stage = ComponentHelper::createComponent($type, WorkflowStageInterface::class);
+
+                return [
+                    'type' => $type,
+                    'label' => $type::displayName(),
+                    'settings' => $stage->getSettings(),
+                    'settingsForm' => $this->settingsForm($stage),
+                ];
+            })
+            ->values()
+            ->all();
+    }
+
+    /** @return array{method: 'patch'|'post', url: string} */
+    public function submit(): array
+    {
+        return [
+            'method' => $this->workflow->exists ? 'patch' : 'post',
+            'url' => $this->workflow->exists
+                ? action([WorkflowsController::class, 'update'], $this->workflow)
+                : action([WorkflowsController::class, 'store']),
+        ];
+    }
+
+    /** @return array{confirm: string, label: string, url: string}|null */
+    public function deleteAction(): ?array
+    {
+        if ($this->readOnly || ! $this->workflow->exists) {
+            return null;
+        }
+
+        return [
+            'confirm' => t('Are you sure you want to delete this workflow?'),
+            'label' => t('Delete workflow'),
+            'url' => action([WorkflowsController::class, 'destroy'], $this->workflow),
+        ];
+    }
+
+    /** @return array<string, mixed> */
+    private function initialValues(): array
+    {
+        $defaultStageType = $this->workflowStageTypes->types()
+            ->first(fn (string $type): bool => $type::isSelectable());
+
+        return [
+            'name' => $this->workflow->name ?? '',
+            'stages' => $this->workflow->stages->isEmpty() && $defaultStageType !== null
+                ? [$this->stageData(new WorkflowStageData(
+                    uid: Str::uuid7()->toString(),
+                    name: t('Review'),
+                    type: $defaultStageType,
+                    settings: ComponentHelper::createComponent($defaultStageType, WorkflowStageInterface::class)->getSettings(),
+                ))]
+                : $this->workflow->stages->map($this->stageData(...))->all(),
+        ];
+    }
+
+    private function stageData(WorkflowStageData $stage): WorkflowStageData
+    {
+        $component = $stage->component();
+
+        return new WorkflowStageData(
+            uid: $stage->uid,
+            name: $stage->name,
+            type: $stage->type,
+            settings: $stage->settings,
+            settingsForm: $this->settingsForm($component),
+        );
+    }
+
+    private function settingsForm(WorkflowStageInterface $stage): ?FormPayload
+    {
+        if ($stage instanceof MissingWorkflowStage) {
+            return $this->formResolver->resolve(
+                Form::make([Missing::make('missing-workflow-stage', $stage->expectedType)]),
+                new FormContext(values: $stage->getSettings()),
+            );
+        }
+
+        $form = $stage->settingsForm(new FormContext(values: $stage->getSettings()));
+
+        return $form === null
+            ? null
+            : $this->formResolver->resolve($form, new FormContext(values: $stage->getSettings()));
+    }
+}
diff --git a/src/ProjectConfig/ConfigRebuilder.php b/src/ProjectConfig/ConfigRebuilder.php
index ff0d2fe63b5..6e09b76c36a 100644
--- a/src/ProjectConfig/ConfigRebuilder.php
+++ b/src/ProjectConfig/ConfigRebuilder.php
@@ -20,6 +20,7 @@
 use CraftCms\Cms\Site\Sites;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\UserGroups;
+use CraftCms\Cms\Workflow\WorkflowProjectConfig;
 use Illuminate\Database\DatabaseManager;
 use InvalidArgumentException;
 use RuntimeException;
@@ -39,6 +40,7 @@ public function __construct(
         private readonly Sites $sites,
         private readonly UserGroups $userGroups,
         private readonly Volumes $volumes,
+        private readonly WorkflowProjectConfig $workflowProjectConfig,
         private readonly DatabaseManager $database,
     ) {}
 
@@ -62,6 +64,7 @@ public function build(array $config): array
         $config[ProjectConfig::PATH_SITES] = $this->components($this->sites->getAllSites(true));
         $config[ProjectConfig::PATH_SITE_GROUPS] = $this->components($this->siteGroups->getAllGroups());
         $config[ProjectConfig::PATH_VOLUMES] = $this->components($this->volumes->getAllVolumes());
+        $config[ProjectConfig::PATH_WORKFLOWS] = $this->components($this->workflowProjectConfig->getAllWorkflows());
         $config[ProjectConfig::PATH_USERS]['groups'] = $this->components($this->userGroups->getAllGroups());
         unset($config[ProjectConfig::PATH_USERS]['fieldLayouts']);
         $config[ProjectConfig::PATH_USERS] = array_replace($config[ProjectConfig::PATH_USERS], $this->fieldLayout(User::class));
diff --git a/src/ProjectConfig/ProjectConfig.php b/src/ProjectConfig/ProjectConfig.php
index 4178586505f..2eae98a325d 100644
--- a/src/ProjectConfig/ProjectConfig.php
+++ b/src/ProjectConfig/ProjectConfig.php
@@ -135,6 +135,8 @@ class ProjectConfig
 
     public const string PATH_VOLUMES = 'volumes';
 
+    public const string PATH_WORKFLOWS = 'workflows';
+
     /**
      * @var bool Whether project config changes should be written to YAML files automatically.
      *
diff --git a/src/ProjectConfig/ProjectConfigHelper.php b/src/ProjectConfig/ProjectConfigHelper.php
index a9407217d1d..44391c001e3 100644
--- a/src/ProjectConfig/ProjectConfigHelper.php
+++ b/src/ProjectConfig/ProjectConfigHelper.php
@@ -119,6 +119,23 @@ public static function ensureAllEntryTypesProcessed(): void
         }
     }
 
+    /**
+     * Ensure all workflow config changes are processed before resolving workflow references.
+     */
+    public static function ensureAllWorkflowsProcessed(): void
+    {
+        $projectConfig = app(ProjectConfig::class);
+
+        if (! $projectConfig->claimPath(ProjectConfig::PATH_WORKFLOWS)) {
+            return;
+        }
+
+        $configs = $projectConfig->get(ProjectConfig::PATH_WORKFLOWS, true) ?? [];
+        foreach ($configs as $uid => $config) {
+            $projectConfig->processConfigChanges(ProjectConfig::PATH_WORKFLOWS.'.'.$uid);
+        }
+    }
+
     /**
      * Ensure all section config changes are processed immediately in a safe manner.
      */
diff --git a/src/ProjectConfig/ProjectConfigServiceProvider.php b/src/ProjectConfig/ProjectConfigServiceProvider.php
index 75298ade759..11b8f0d1315 100644
--- a/src/ProjectConfig/ProjectConfigServiceProvider.php
+++ b/src/ProjectConfig/ProjectConfigServiceProvider.php
@@ -29,6 +29,7 @@
 use CraftCms\Cms\Support\Facades\UserPermissions;
 use CraftCms\Cms\Support\Facades\Users;
 use CraftCms\Cms\Support\Facades\Volumes;
+use CraftCms\Cms\Workflow\WorkflowProjectConfig;
 use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Foundation\Http\Events\RequestHandled;
 use Illuminate\Support\Facades\Event;
@@ -134,6 +135,10 @@ public function boot(ProjectConfig $projectConfig): void
             ->onAdd(ProjectConfig::PATH_ENTRY_TYPES.'.{uid}', fn (ConfigEvent $event) => EntryTypes::handleChangedEntryType($event))
             ->onUpdate(ProjectConfig::PATH_ENTRY_TYPES.'.{uid}', fn (ConfigEvent $event) => EntryTypes::handleChangedEntryType($event))
             ->onRemove(ProjectConfig::PATH_ENTRY_TYPES.'.{uid}', fn (ConfigEvent $event) => EntryTypes::handleDeletedEntryType($event))
+            // Workflows
+            ->onAdd(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleChanged($event))
+            ->onUpdate(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleChanged($event))
+            ->onRemove(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleDeleted($event))
             // GraphQL schemas
             ->onAdd(ProjectConfig::PATH_GRAPHQL_SCHEMAS.'.{uid}', fn (ConfigEvent $event) => Gql::handleChangedSchema($event))
             ->onUpdate(ProjectConfig::PATH_GRAPHQL_SCHEMAS.'.{uid}', fn (ConfigEvent $event) => Gql::handleChangedSchema($event))
diff --git a/src/Section/Data/Section.php b/src/Section/Data/Section.php
index bbc0c978ed2..7649feac6e5 100644
--- a/src/Section/Data/Section.php
+++ b/src/Section/Data/Section.php
@@ -22,6 +22,7 @@
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\RulesetValidation\Attributes\Ruleset;
 use Illuminate\Support\Facades\DB;
 use Stringable;
@@ -41,6 +42,8 @@ class Section extends Component implements Chippable, CpEditable, Iconic, String
 
     public ?int $structureId = null;
 
+    public ?int $workflowId = null;
+
     public ?string $name = null;
 
     public ?string $handle = null;
@@ -261,6 +264,7 @@ public function getConfig(): array
             'handle' => $this->handle,
             'type' => $this->type->value,
             'entryTypes' => array_map(fn (EntryType $entryType) => $entryType->getUsageConfig(), $this->getEntryTypes()),
+            'workflow' => Workflow::find($this->workflowId)?->uid,
             'enableVersioning' => $this->enableVersioning,
             'minAuthors' => $this->minAuthors,
             'maxAuthors' => $this->maxAuthors,
diff --git a/src/Section/Models/Section.php b/src/Section/Models/Section.php
index 715de5ea342..27fda49ee8a 100644
--- a/src/Section/Models/Section.php
+++ b/src/Section/Models/Section.php
@@ -13,6 +13,7 @@
 use CraftCms\Cms\Shared\BaseModel;
 use CraftCms\Cms\Shared\Concerns\HasUid;
 use CraftCms\Cms\Structure\Models\Structure;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
@@ -50,6 +51,12 @@ public function structure(): BelongsTo
         return $this->belongsTo(Structure::class, 'structureId');
     }
 
+    /** @return BelongsTo<Workflow, $this> */
+    public function workflow(): BelongsTo
+    {
+        return $this->belongsTo(Workflow::class, 'workflowId');
+    }
+
     /**
      * @return HasMany<SectionSiteSettings, $this>
      */
diff --git a/src/Section/Sections.php b/src/Section/Sections.php
index 07f6e2b35cd..32b64218818 100644
--- a/src/Section/Sections.php
+++ b/src/Section/Sections.php
@@ -44,6 +44,7 @@
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Update\Updates;
 use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Workflows;
 use Exception;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Container\Attributes\Scoped;
@@ -97,6 +98,7 @@ public function __construct(
         private readonly Elements $elements,
         private readonly ElementCaches $elementCaches,
         private readonly ProjectConfig $projectConfig,
+        private readonly Workflows $workflows,
     ) {}
 
     /**
@@ -196,6 +198,7 @@ private function createSectionQuery(): Builder
             ->select([
                 'sections.id',
                 'sections.structureId',
+                'sections.workflowId',
                 'sections.name',
                 'sections.handle',
                 'sections.type',
@@ -595,6 +598,7 @@ public function handleChangedSection(ConfigEvent $event): void
         ProjectConfigHelper::ensureAllSitesProcessed();
         ProjectConfigHelper::ensureAllFieldsProcessed();
         ProjectConfigHelper::ensureAllEntryTypesProcessed();
+        ProjectConfigHelper::ensureAllWorkflowsProcessed();
 
         $sectionUid = $event->tokenMatches[0];
         $data = $event->newValue;
@@ -607,11 +611,16 @@ public function handleChangedSection(ConfigEvent $event): void
             // Basic data
             $sectionModel = $this->getSectionModel($sectionUid, true);
             $oldPropagationMethod = $sectionModel->propagationMethod;
+            $oldWorkflowId = $sectionModel->workflowId;
 
             $sectionModel->uid = $sectionUid;
             $sectionModel->name = $data['name'];
             $sectionModel->handle = $data['handle'];
             $sectionModel->type = $data['type'];
+            $workflowUid = $data['workflow'] ?? null;
+            $sectionModel->workflowId = $workflowUid === null
+                ? null
+                : DB::table(Table::WORKFLOWS)->idByUid($workflowUid);
             $sectionModel->enableVersioning = (bool) $data['enableVersioning'];
             $sectionModel->minAuthors = $data['minAuthors'] ?? null;
             $sectionModel->maxAuthors = $data['maxAuthors'] ?? null;
@@ -847,6 +856,10 @@ public function handleChangedSection(ConfigEvent $event): void
         /** @var Section $section */
         $section = $this->getSectionById($sectionModel->id);
 
+        if (! $isNewSection && $oldWorkflowId !== $sectionModel->workflowId) {
+            $this->workflows->invalidateSectionRuns($sectionModel->id);
+        }
+
         // If this is a Single, ensure that the section has its one and only entry
         if (! $isNewSection && $section->type === SectionType::Single) {
             $this->ensureSingleEntry($section, $siteSettingData);
diff --git a/src/Workflow/Contracts/WorkflowStageInterface.php b/src/Workflow/Contracts/WorkflowStageInterface.php
new file mode 100644
index 00000000000..123500e7d2d
--- /dev/null
+++ b/src/Workflow/Contracts/WorkflowStageInterface.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Contracts;
+
+use CraftCms\Cms\Component\Contracts\ComponentInterface;
+use CraftCms\Cms\Component\Contracts\ConfigurableComponentInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Validation\Contracts\Validatable;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+
+interface WorkflowStageInterface extends ComponentInterface, ConfigurableComponentInterface, Validatable
+{
+    /** Whether the default review actions should be rendered alongside the action component. */
+    public bool $showDefaultActions { get; }
+
+    /** Evaluates the stage when a workflow reaches it or its state changes. */
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult;
+
+    /** Returns the registered CP component rendered for the current pending stage above the generic review controls, or null for no action UI. */
+    public function actionComponent(): ?string;
+
+    /**
+     * Returns the props passed to the action component for the current viewer.
+     *
+     * @return array<string, mixed>
+     */
+    public function actionProps(WorkflowStageContext $context, CraftUser $viewer): array;
+
+    /** Returns the registered CP component rendered after the stage events in the review timeline, or null for no summary UI. */
+    public function summaryComponent(): ?string;
+
+    /**
+     * Returns the props passed to the summary component for a stage in any current or previous run.
+     *
+     * @return array<string, mixed>
+     */
+    public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array;
+}
diff --git a/src/Workflow/Data/WorkflowStageData.php b/src/Workflow/Data/WorkflowStageData.php
new file mode 100644
index 00000000000..dc3828e8d81
--- /dev/null
+++ b/src/Workflow/Data/WorkflowStageData.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Component\ComponentHelper;
+use CraftCms\Cms\Component\Exceptions\MissingComponentException;
+use CraftCms\Cms\Form\FormPayload;
+use CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface;
+use CraftCms\Cms\Workflow\Stages\MissingWorkflowStage;
+
+readonly class WorkflowStageData
+{
+    /** @param array<string, mixed> $settings */
+    public function __construct(
+        public string $uid,
+        public string $name,
+        public string $type,
+        public array $settings,
+        public ?FormPayload $settingsForm = null,
+    ) {}
+
+    /** @param array{uid: string, name: string, type: string, settings?: array<string, mixed>} $data */
+    public static function fromArray(array $data): self
+    {
+        return new self(
+            uid: $data['uid'],
+            name: $data['name'],
+            type: $data['type'],
+            settings: $data['settings'] ?? [],
+        );
+    }
+
+    public function component(): WorkflowStageInterface
+    {
+        $config = ['type' => $this->type, 'settings' => $this->settings];
+
+        try {
+            return ComponentHelper::createComponent($config, WorkflowStageInterface::class);
+        } catch (MissingComponentException $exception) {
+            return new MissingWorkflowStage([
+                'expectedType' => $this->type,
+                'errorMessage' => $exception->getMessage(),
+                'settings' => $this->settings,
+            ]);
+        }
+    }
+
+    /** @return array{uid: string, name: string, type: string, settings: array<string, mixed>} */
+    public function getConfig(): array
+    {
+        return [
+            'uid' => $this->uid,
+            'name' => trim($this->name),
+            'type' => $this->type,
+            'settings' => $this->settings,
+        ];
+    }
+}
diff --git a/src/Workflow/Models/Workflow.php b/src/Workflow/Models/Workflow.php
new file mode 100644
index 00000000000..9ca3a6ea907
--- /dev/null
+++ b/src/Workflow/Models/Workflow.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Models;
+
+use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Section\Models\Section;
+use CraftCms\Cms\Shared\BaseModel;
+use CraftCms\Cms\Shared\Concerns\HasUid;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use Illuminate\Database\Eloquent\Casts\AsCollection;
+use Illuminate\Database\Eloquent\Relations\HasMany;
+use Illuminate\Support\Collection;
+
+/** @property Collection<int, WorkflowStageData> $stages */
+class Workflow extends BaseModel
+{
+    use HasUid;
+
+    #[\Override]
+    protected $table = Table::WORKFLOWS;
+
+    #[\Override]
+    protected $attributes = [
+        'stages' => '[]',
+    ];
+
+    /** @return HasMany<Section, $this> */
+    public function sections(): HasMany
+    {
+        return $this->hasMany(Section::class, 'workflowId');
+    }
+
+    /** @return array{name: string, stages: list<array{uid: string, name: string, type: string, settings: array<string, mixed>}>} */
+    public function getConfig(): array
+    {
+        return [
+            'name' => $this->name,
+            'stages' => $this->stages->map(fn (WorkflowStageData $stage): array => $stage->getConfig())->all(),
+        ];
+    }
+
+    #[\Override]
+    protected function casts(): array
+    {
+        return [
+            'stages' => AsCollection::of([WorkflowStageData::class, 'fromArray']),
+        ];
+    }
+}
diff --git a/src/Workflow/Models/WorkflowRun.php b/src/Workflow/Models/WorkflowRun.php
new file mode 100644
index 00000000000..636ab88a71b
--- /dev/null
+++ b/src/Workflow/Models/WorkflowRun.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Models;
+
+use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Shared\BaseModel;
+use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+use Illuminate\Support\Collection;
+
+/**
+ * @property ActivityEvent $activityRootEvent
+ * @property int $currentStage
+ * @property string|null $currentStageResult
+ * @property WorkflowStatus $status
+ * @property int $activityRootEventId
+ * @property array<string, array<string, mixed>>|null $payload
+ */
+class WorkflowRun extends BaseModel
+{
+    #[\Override]
+    protected $table = Table::WORKFLOWRUNS;
+
+    /** @return BelongsTo<ActivityEvent, $this> */
+    public function activityRootEvent(): BelongsTo
+    {
+        return $this->belongsTo(ActivityEvent::class, 'activityRootEventId');
+    }
+
+    /** @return BelongsTo<Workflow, $this> */
+    public function workflow(): BelongsTo
+    {
+        return $this->belongsTo(Workflow::class, 'workflowId');
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function author(): BelongsTo
+    {
+        return $this->belongsTo(User::class, 'authorId');
+    }
+
+    public function isPending(): bool
+    {
+        return $this->status === WorkflowStatus::Pending;
+    }
+
+    /** @return Collection<int, WorkflowStageData> */
+    public function stages(): Collection
+    {
+        return collect((array) $this->activityRootEvent->data['workflow']['stages'])
+            ->filter(fn (mixed $snapshot): bool => is_array($snapshot))
+            ->map(fn (array $snapshot): WorkflowStageData => WorkflowStageData::fromArray($snapshot))
+            ->values();
+    }
+
+    #[\Override]
+    protected function casts(): array
+    {
+        return [
+            'activityRootEventId' => 'integer',
+            'status' => WorkflowStatus::class,
+            'currentStage' => 'integer',
+            'payload' => 'array',
+        ];
+    }
+}
diff --git a/src/Workflow/Stages/MissingWorkflowStage.php b/src/Workflow/Stages/MissingWorkflowStage.php
new file mode 100644
index 00000000000..09f5a8b689e
--- /dev/null
+++ b/src/Workflow/Stages/MissingWorkflowStage.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Stages;
+
+use CraftCms\Cms\Component\Concerns\MissingComponentTrait;
+use CraftCms\Cms\Component\Contracts\MissingComponentInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+
+use function CraftCms\Cms\t;
+
+class MissingWorkflowStage extends WorkflowStage implements MissingComponentInterface
+{
+    use MissingComponentTrait;
+
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+    {
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Pending,
+            t('This stage cannot run because its type is unavailable.'),
+            $context->payload,
+        );
+    }
+
+    /** @return array<string, mixed> */
+    public function getSettings(): array
+    {
+        return $this->settings ?? [];
+    }
+}
diff --git a/src/Workflow/Stages/WorkflowStage.php b/src/Workflow/Stages/WorkflowStage.php
new file mode 100644
index 00000000000..2c415cd9e6e
--- /dev/null
+++ b/src/Workflow/Stages/WorkflowStage.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Stages;
+
+use CraftCms\Cms\Component\Component;
+use CraftCms\Cms\Component\Concerns\ConfigurableComponent;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+
+abstract class WorkflowStage extends Component implements WorkflowStageInterface
+{
+    use ConfigurableComponent;
+
+    protected bool $showDefaultReviewActions = true;
+
+    public bool $showDefaultActions {
+        get => $this->showDefaultReviewActions;
+    }
+
+    public function actionComponent(): ?string
+    {
+        return null;
+    }
+
+    public function actionProps(WorkflowStageContext $context, CraftUser $viewer): array
+    {
+        return [];
+    }
+
+    public function summaryComponent(): ?string
+    {
+        return null;
+    }
+
+    public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array
+    {
+        return [];
+    }
+}
diff --git a/src/Workflow/WorkflowProjectConfig.php b/src/Workflow/WorkflowProjectConfig.php
new file mode 100644
index 00000000000..0e60f490d41
--- /dev/null
+++ b/src/Workflow/WorkflowProjectConfig.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow;
+
+use CraftCms\Cms\ProjectConfig\Events\ConfigEvent;
+use CraftCms\Cms\ProjectConfig\ProjectConfig;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+
+class WorkflowProjectConfig
+{
+    public function __construct(
+        private readonly ProjectConfig $projectConfig,
+        private readonly Workflows $workflows,
+    ) {}
+
+    /** @return Collection<int, Workflow> */
+    public function getAllWorkflows(): Collection
+    {
+        return Workflow::query()->get();
+    }
+
+    /** @param list<WorkflowStageData> $stages */
+    public function save(Workflow $workflow, array $stages): void
+    {
+        $workflow->uid ??= Str::uuid7()->toString();
+
+        $this->projectConfig->set(
+            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
+            [
+                'name' => trim($workflow->name),
+                'stages' => array_map(fn (WorkflowStageData $stage): array => $stage->getConfig(), $stages),
+            ],
+            "Save workflow “{$workflow->name}”",
+        );
+
+        $workflow->id = Workflow::findByUid($workflow->uid)?->id;
+    }
+
+    public function delete(Workflow $workflow): void
+    {
+        $this->projectConfig->remove(
+            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
+            "Delete workflow “{$workflow->name}”",
+        );
+    }
+
+    public function handleChanged(ConfigEvent $event): void
+    {
+        $uid = $event->tokenMatches[0];
+        /** @var array{name: string, stages: list<array{uid: string, name: string, type: string, settings?: array<string, mixed>}>} $data */
+        $data = $event->newValue;
+
+        DB::transaction(function () use ($uid, $data): void {
+            $workflow = Workflow::findByUid($uid);
+            $oldExecutableConfig = $workflow === null ? [] : $this->executableConfig($workflow);
+            $workflow ??= new Workflow(['uid' => $uid]);
+            $workflow->fill([
+                'name' => $data['name'],
+                'stages' => array_map(
+                    fn (array $stage): array => WorkflowStageData::fromArray($stage)->getConfig(),
+                    $data['stages'],
+                ),
+            ])->save();
+
+            if ($oldExecutableConfig !== [] && $oldExecutableConfig !== $this->executableConfig($workflow)) {
+                $this->workflows->invalidateRuns($workflow, 'The workflow configuration changed.');
+            }
+        });
+    }
+
+    public function handleDeleted(ConfigEvent $event): void
+    {
+        $workflow = Workflow::findByUid($event->tokenMatches[0]);
+        if ($workflow === null) {
+            return;
+        }
+
+        $this->workflows->invalidateRuns($workflow, 'The workflow was deleted.');
+        $workflow->delete();
+    }
+
+    /** @return list<array{uid: string, type: string, settings: array<string, mixed>}> */
+    private function executableConfig(Workflow $workflow): array
+    {
+        return $workflow->stages->map(fn (WorkflowStageData $stage): array => [
+            'uid' => $stage->uid,
+            'type' => $stage->type,
+            'settings' => $stage->settings,
+        ])->all();
+    }
+}
diff --git a/src/Workflow/WorkflowStageTypes.php b/src/Workflow/WorkflowStageTypes.php
new file mode 100644
index 00000000000..3d036cb277c
--- /dev/null
+++ b/src/Workflow/WorkflowStageTypes.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow;
+
+use CraftCms\Cms\Component\TypeRegistry;
+use CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use Illuminate\Container\Attributes\Singleton;
+
+/**
+ * The workflow stage type registry.
+ *
+ * @extends TypeRegistry<WorkflowStageInterface>
+ */
+#[Singleton]
+class WorkflowStageTypes extends TypeRegistry
+{
+    protected const string CONTRACT = WorkflowStageInterface::class;
+
+    protected const array DEFAULT_TYPES = [
+        UserReviewStage::class,
+    ];
+}
diff --git a/tests/Feature/Http/Controllers/Settings/SectionsControllerTest.php b/tests/Feature/Http/Controllers/Settings/SectionsControllerTest.php
index 42caf36d098..bc341b28dc7 100644
--- a/tests/Feature/Http/Controllers/Settings/SectionsControllerTest.php
+++ b/tests/Feature/Http/Controllers/Settings/SectionsControllerTest.php
@@ -16,6 +16,7 @@
 use CraftCms\Cms\Support\Facades\ProjectConfig;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Support\Facades\Auth;
 use Inertia\Testing\AssertableInertia;
 
@@ -98,6 +99,7 @@
                 $paths = collect($nodes)->pluck('control.path')->filter();
 
                 return $paths->contains(['entryTypes'])
+                    && $paths->contains(['workflowId'])
                     && $paths->contains(['sites'])
                     && $paths->contains(['previewTargets']);
             }));
@@ -197,8 +199,14 @@ function validSectionData(array $overrides = []): array
 
 it('can save a section', function () {
     expect(Section::count())->toBe(1);
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
 
-    post(action([SectionsController::class, 'store']), validSectionData())
+    post(action([SectionsController::class, 'store']), validSectionData([
+        'workflowId' => $workflow->id,
+    ]))
         ->assertSessionDoesntHaveErrors()
         ->assertRedirectBack();
 
@@ -207,6 +215,8 @@ function validSectionData(array $overrides = []): array
     $section = $this->sections->getSectionByHandle('a_new_section');
     expect($section->name)->toBe('A new section');
     expect($section->type)->toBe(SectionType::Single);
+    expect($section->workflowId)->toBe($workflow->id);
+    expect(ProjectConfig::get(ProjectConfigPaths::PATH_SECTIONS.'.'.$section->uid.'.workflow'))->toBe($workflow->uid);
     expect(Arr::first($section->getSiteSettings()))->toBeInstanceOf(SectionSiteSettingsData::class);
     expect(Arr::first($section->getSiteSettings())->template)->toBe('_foo');
 });
diff --git a/workbench/app/Providers/TypeScriptTransformerServiceProvider.php b/workbench/app/Providers/TypeScriptTransformerServiceProvider.php
index defe31a8590..3562c3eef70 100644
--- a/workbench/app/Providers/TypeScriptTransformerServiceProvider.php
+++ b/workbench/app/Providers/TypeScriptTransformerServiceProvider.php
@@ -34,6 +34,7 @@
 use CraftCms\Cms\Http\ViewModels\UserPermissionsViewModel;
 use CraftCms\Cms\Http\ViewModels\UserPreferencesViewModel;
 use CraftCms\Cms\Http\ViewModels\UserSignInProvidersViewModel;
+use CraftCms\Cms\Http\ViewModels\WorkflowEditViewModel;
 use CraftCms\Cms\Image\Data\ImageTransform;
 use CraftCms\Cms\Route\Data\Route;
 use CraftCms\Cms\Update\Data\UpdaterState;
@@ -42,6 +43,10 @@
 use CraftCms\Cms\User\Data\PermissionGroup;
 use CraftCms\Cms\User\Data\UserSettings;
 use CraftCms\Cms\View\HtmlFragment;
+use CraftCms\Cms\Workflow\Data\WorkflowDraftReviewData;
+use CraftCms\Cms\Workflow\Data\WorkflowReviewData;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
 use DateTimeInterface;
 use Spatie\LaravelTypeScriptTransformer\TypeScriptTransformerApplicationServiceProvider;
 use Spatie\TypeScriptTransformer\Transformers\EnumTransformer;
@@ -99,6 +104,11 @@ protected function configure(TypeScriptTransformerConfigFactory $config): void
                     UserPreferencesViewModel::class,
                     UserSettings::class,
                     UserSignInProvidersViewModel::class,
+                    WorkflowEditViewModel::class,
+                    WorkflowDraftReviewData::class,
+                    WorkflowReviewData::class,
+                    WorkflowStageData::class,
+                    WorkflowStatus::class,
                 ],
                 [
                     new EnumTransformer,

From 5e2f510d1f64cb90ca5a3972501b280ccea996c0 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:24:44 +0200
Subject: [PATCH 04/32] Implement approval workflow execution

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 composer.json                                 |   3 +-
 composer.lock                                 |   2 +-
 routes/cp.php                                 |  27 +
 src/Element/Drafts.php                        |  81 ++
 src/Element/Elements.php                      |  24 +-
 src/Element/Operations/ElementWrites.php      |   8 +
 .../Elements/ElementDraftsController.php      | 118 ++-
 .../Elements/SaveElementController.php        |  34 +-
 .../Entries/StoreEntryController.php          |  20 +-
 .../Controllers/NestedElementsController.php  |  15 +-
 .../Settings/WorkflowsController.php          |  10 +-
 .../Workflows/UserReviewController.php        |  85 ++
 .../WorkflowTransitionsController.php         |  89 ++
 src/Http/Requests/ElementRequest.php          |   2 +
 src/Http/Responses/ElementResponse.php        |  11 +-
 src/ProjectConfig/ConfigRebuilder.php         |   6 +-
 .../ProjectConfigServiceProvider.php          |   8 +-
 src/Providers/CraftServiceProvider.php        |   4 +
 src/Support/Facades/Drafts.php                |   1 +
 src/Support/Facades/Workflows.php             |  36 +
 .../Activity/WorkflowActivityEvent.php        |  92 ++
 .../Contracts/WorkflowableInterface.php       |  15 +
 src/Workflow/Data/WorkflowDraftReviewData.php |  17 +
 src/Workflow/Data/WorkflowReviewData.php      | 105 +++
 src/Workflow/Data/WorkflowRunData.php         |  41 +
 src/Workflow/Data/WorkflowRunStageData.php    |  59 ++
 src/Workflow/Data/WorkflowStageContext.php    |  19 +
 src/Workflow/Data/WorkflowStageResult.php     |  17 +
 .../Data/WorkflowTimelineItemData.php         |  38 +
 src/Workflow/Enums/WorkflowActivityType.php   |  18 +
 src/Workflow/Enums/WorkflowStageStatus.php    |  12 +
 src/Workflow/Enums/WorkflowStatus.php         |  41 +
 src/Workflow/Enums/WorkflowTransition.php     |  17 +
 src/Workflow/Events/WorkflowCommented.php     |  24 +
 src/Workflow/Events/WorkflowTransitioned.php  |  24 +
 src/Workflow/Events/WorkflowTransitioning.php |  26 +
 src/Workflow/Exceptions/WorkflowException.php |  35 +
 src/Workflow/Models/Workflow.php              |  12 +
 .../SendUserReviewNotifications.php           | 180 ++++
 .../UserReview/UserReviewDecision.php         |  11 +
 .../UserReview/UserReviewNotification.php     |  63 ++
 .../UserReview/UserReviewServiceProvider.php  |  44 +
 src/Workflow/UserReview/UserReviewStage.php   | 193 ++++
 src/Workflow/WorkflowContentChanges.php       |  90 ++
 src/Workflow/WorkflowProjectConfig.php        |  97 --
 src/Workflow/WorkflowServiceProvider.php      |  16 +
 src/Workflow/Workflows.php                    | 780 ++++++++++++++++
 .../Element/ElementEagerLoaderTest.php        |   2 +
 .../Elements/CreateElementControllerTest.php  |   3 +-
 .../Elements/ElementDraftsControllerTest.php  | 231 ++++-
 .../Elements/SaveElementControllerTest.php    |  50 +
 .../Entries/StoreEntryControllerTest.php      |  49 +
 .../Http/Controllers/MatrixControllerTest.php |   3 +-
 .../NestedElementsControllerTest.php          |  34 +
 tests/Feature/Workflow/WorkflowsTest.php      | 860 ++++++++++++++++++
 .../ElementWrites/PropagateElementTest.php    |   6 +-
 .../ElementWrites/PropagateElementsTest.php   |   6 +-
 .../ElementWrites/ResaveElementsTest.php      |   6 +-
 58 files changed, 3751 insertions(+), 169 deletions(-)
 create mode 100644 src/Http/Controllers/Workflows/UserReviewController.php
 create mode 100644 src/Http/Controllers/Workflows/WorkflowTransitionsController.php
 create mode 100644 src/Support/Facades/Workflows.php
 create mode 100644 src/Workflow/Activity/WorkflowActivityEvent.php
 create mode 100644 src/Workflow/Contracts/WorkflowableInterface.php
 create mode 100644 src/Workflow/Data/WorkflowDraftReviewData.php
 create mode 100644 src/Workflow/Data/WorkflowReviewData.php
 create mode 100644 src/Workflow/Data/WorkflowRunData.php
 create mode 100644 src/Workflow/Data/WorkflowRunStageData.php
 create mode 100644 src/Workflow/Data/WorkflowStageContext.php
 create mode 100644 src/Workflow/Data/WorkflowStageResult.php
 create mode 100644 src/Workflow/Data/WorkflowTimelineItemData.php
 create mode 100644 src/Workflow/Enums/WorkflowActivityType.php
 create mode 100644 src/Workflow/Enums/WorkflowStageStatus.php
 create mode 100644 src/Workflow/Enums/WorkflowStatus.php
 create mode 100644 src/Workflow/Enums/WorkflowTransition.php
 create mode 100644 src/Workflow/Events/WorkflowCommented.php
 create mode 100644 src/Workflow/Events/WorkflowTransitioned.php
 create mode 100644 src/Workflow/Events/WorkflowTransitioning.php
 create mode 100644 src/Workflow/Exceptions/WorkflowException.php
 create mode 100644 src/Workflow/UserReview/SendUserReviewNotifications.php
 create mode 100644 src/Workflow/UserReview/UserReviewDecision.php
 create mode 100644 src/Workflow/UserReview/UserReviewNotification.php
 create mode 100644 src/Workflow/UserReview/UserReviewServiceProvider.php
 create mode 100644 src/Workflow/UserReview/UserReviewStage.php
 create mode 100644 src/Workflow/WorkflowContentChanges.php
 delete mode 100644 src/Workflow/WorkflowProjectConfig.php
 create mode 100644 src/Workflow/WorkflowServiceProvider.php
 create mode 100644 src/Workflow/Workflows.php
 create mode 100644 tests/Feature/Workflow/WorkflowsTest.php

diff --git a/composer.json b/composer.json
index a9cb3037df9..6aa727229bc 100644
--- a/composer.json
+++ b/composer.json
@@ -234,7 +234,8 @@
         "UserGroups": "CraftCms\\Cms\\Support\\Facades\\UserGroups",
         "UserPermissions": "CraftCms\\Cms\\Support\\Facades\\UserPermissions",
         "Users": "CraftCms\\Cms\\Support\\Facades\\Users",
-        "Volumes": "CraftCms\\Cms\\Support\\Facades\\Volumes"
+        "Volumes": "CraftCms\\Cms\\Support\\Facades\\Volumes",
+        "Workflows": "CraftCms\\Cms\\Support\\Facades\\Workflows"
       }
     }
   },
diff --git a/composer.lock b/composer.lock
index 9854d798af5..ce3cbc5445d 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "3887367016d6bd3ce5f508d6cdb58113",
+    "content-hash": "686663c3afb4226a327b8d56908b1167",
     "packages": [
         {
             "name": "bacon/bacon-qr-code",
diff --git a/routes/cp.php b/routes/cp.php
index 585c6350bbc..625eedf5c80 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -49,6 +49,7 @@
 use CraftCms\Cms\Http\Controllers\Settings\Users\UserGroupsController;
 use CraftCms\Cms\Http\Controllers\Settings\Users\UserSettingsController;
 use CraftCms\Cms\Http\Controllers\Settings\VolumesController;
+use CraftCms\Cms\Http\Controllers\Settings\WorkflowsController;
 use CraftCms\Cms\Http\Controllers\Updates\UpdaterController;
 use CraftCms\Cms\Http\Controllers\Users\AddressesController;
 use CraftCms\Cms\Http\Controllers\Users\IndexController as UsersIndexController;
@@ -66,6 +67,8 @@
 use CraftCms\Cms\Http\Controllers\Utilities\ProjectConfigController;
 use CraftCms\Cms\Http\Controllers\Utilities\SystemMessagesController;
 use CraftCms\Cms\Http\Controllers\Utilities\UtilitiesController;
+use CraftCms\Cms\Http\Controllers\Workflows\UserReviewController;
+use CraftCms\Cms\Http\Controllers\Workflows\WorkflowTransitionsController;
 use CraftCms\Cms\Http\Middleware\EnsureTwoFactorChallengeIsRecent;
 use CraftCms\Cms\Http\Middleware\RequireAdmin;
 use CraftCms\Cms\Http\Middleware\RequireAdminChanges;
@@ -121,6 +124,16 @@
 
     Route::post('notifications/mark-read', [NotificationsController::class, 'markRead']);
 
+    Route::prefix('workflows')->group(function () {
+        Route::post('submit', [WorkflowTransitionsController::class, 'submit']);
+        Route::post('{workflowRun}/override', [WorkflowTransitionsController::class, 'override']);
+        Route::prefix('{workflowRun}/stages/{stage}')->group(function () {
+            Route::post('comment', [WorkflowTransitionsController::class, 'comment']);
+            Route::post('user-review/approve', [UserReviewController::class, 'approve']);
+            Route::post('user-review/request-changes', [UserReviewController::class, 'requestChanges']);
+        });
+    });
+
     Route::get('utilities', [UtilitiesController::class, 'index']);
 
     // DeprecationErrors
@@ -287,6 +300,20 @@
             Route::get('{entryType}', [EntryTypesController::class, 'edit']);
         });
 
+        // Workflows
+        Route::prefix('settings/workflows')->middleware(RequireEdition::class.':'.Edition::Pro->value)->group(function () {
+            Route::get('/', [WorkflowsController::class, 'index']);
+
+            Route::middleware(RequireAdminChanges::class)->group(function () {
+                Route::get('new', [WorkflowsController::class, 'create']);
+                Route::post('/', [WorkflowsController::class, 'store']);
+                Route::patch('{workflow}', [WorkflowsController::class, 'update']);
+                Route::delete('{workflow}', [WorkflowsController::class, 'destroy']);
+            });
+
+            Route::get('{workflow}', [WorkflowsController::class, 'edit']);
+        });
+
         // Fields
         Route::prefix('settings/fields')->group(function () {
             Route::get('/', [FieldsController::class, 'index']);
diff --git a/src/Element/Drafts.php b/src/Element/Drafts.php
index bb5d0275995..fa008e34ab8 100644
--- a/src/Element/Drafts.php
+++ b/src/Element/Drafts.php
@@ -22,6 +22,8 @@
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\Support\Facades\Structures;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Workflows;
 use Exception;
 use Illuminate\Container\Attributes\Singleton;
 use Illuminate\Support\Collection;
@@ -44,6 +46,7 @@
     public function __construct(
         private Elements $elements,
         private DraftActivity $activity,
+        private Workflows $workflows,
     ) {}
 
     /**
@@ -73,6 +76,36 @@ public function getEditableDrafts(ElementInterface $element, ?string $permission
         return collect($query->all());
     }
 
+    /** @return list<int> */
+    public function getDraftIdsForElement(ElementInterface $element): array
+    {
+        if (! $element->id) {
+            return [];
+        }
+
+        $ids = [(int) $element->id];
+        $unresolvedIds = $ids;
+
+        while ($unresolvedIds !== []) {
+            $ownerIds = DB::table(Table::ELEMENTS_OWNERS)
+                ->whereIn('elementId', $unresolvedIds)
+                ->pluck('ownerId')
+                ->map(fn ($id): int => (int) $id)
+                ->all();
+            $unresolvedIds = array_values(array_diff($ownerIds, $ids));
+            array_push($ids, ...$unresolvedIds);
+        }
+
+        return DB::table(Table::ELEMENTS)
+            ->whereIn('id', $ids)
+            ->whereNotNull('draftId')
+            ->pluck('draftId')
+            ->map(fn ($id): int => (int) $id)
+            ->unique()
+            ->values()
+            ->all();
+    }
+
     /**
      * Creates a new draft for the given element.
      *
@@ -239,6 +272,51 @@ public function saveElementAsDraft(ElementInterface $element, ?int $creatorId =
      * @throws Throwable
      */
     public function applyDraft(ElementInterface $draft, array $newAttributes = []): ElementInterface
+    {
+        if (! $draft instanceof WorkflowableInterface || ! $this->workflows->requiresApproval($draft)) {
+            return $this->applyDraftInternal($draft, $newAttributes);
+        }
+
+        $hasExpectedWorkflow = array_key_exists('workflowRunId', $newAttributes);
+        $expectedRunId = Arr::pull($newAttributes, 'workflowRunId');
+        $expectedStage = Arr::pull($newAttributes, 'workflowCurrentStage');
+
+        $latestRun = $this->workflows->latestRun($draft);
+        $runId = null;
+        $stage = null;
+
+        if (! $hasExpectedWorkflow) {
+            $runId = $latestRun?->id;
+            $stage = $latestRun?->currentStage;
+        }
+
+        if (is_numeric($expectedRunId)) {
+            $runId = (int) $expectedRunId;
+        }
+
+        if (is_numeric($expectedStage)) {
+            $stage = (int) $expectedStage;
+        }
+
+        return $this->workflows->applyDraft(
+            draft: $draft,
+            actor: currentUser(),
+            expectedRunId: $runId,
+            expectedStage: $stage,
+            apply: fn (ElementInterface $freshDraft): ElementInterface => $this->applyDraftInternal($freshDraft, $newAttributes),
+        );
+    }
+
+    /**
+     * @template T of ElementInterface
+     *
+     * @param  T  $draft
+     * @param  array<string,mixed>  $newAttributes
+     * @return T
+     *
+     * @throws Throwable
+     */
+    private function applyDraftInternal(ElementInterface $draft, array $newAttributes): ElementInterface
     {
         $canonical = $draft->getCanonical(true);
         $originalDraft = $draft;
@@ -283,6 +361,7 @@ public function applyDraft(ElementInterface $draft, array $newAttributes = []):
 
                 // "Duplicate" the draft with the canonical element’s ID and UID
                 $newCanonical = $this->elements->updateCanonicalElement($draft, array_merge($newAttributes, [
+                    'applyingDraft' => true,
                     'revisionNotes' => $draftNotes ?: t('Applied “{name}”', ['name' => $draft->draftName]),
                 ]));
 
@@ -323,6 +402,8 @@ public function applyDraft(ElementInterface $draft, array $newAttributes = []):
             throw $e;
         }
 
+        $newCanonical->applyingDraft = false;
+
         // if we were on another site when the applyDraft was triggered,
         // ensure we return the canonical element for the site we were on
         if ($newCanonical->siteId !== $originalDraft->siteId) {
diff --git a/src/Element/Elements.php b/src/Element/Elements.php
index 0f6750cae49..ee58fdd20b0 100644
--- a/src/Element/Elements.php
+++ b/src/Element/Elements.php
@@ -23,7 +23,9 @@
 use CraftCms\Cms\Element\Queries\Exceptions\ElementNotFoundException;
 use CraftCms\Cms\Entry\Elements\Entry;
 use CraftCms\Cms\Shared\Exceptions\OperationAbortedException;
+use CraftCms\Cms\Support\Facades\Drafts;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Support\Facades\Workflows;
 use CraftCms\Cms\Support\Typecast;
 use CraftCms\Cms\User\Elements\User;
 use Illuminate\Database\Query\Builder;
@@ -755,19 +757,27 @@ public function reorderNestedElements(
         $allIds = array_diff(array_keys($oldSortOrders), $elementIds);
         array_splice($allIds, $offset, 0, $elementIds);
 
-        // Update all the incorrect sort orders
+        $updates = [];
         foreach ($allIds as $i => $id) {
             $sortOrder = $i + 1;
             if (! isset($oldSortOrders[$id]) || $sortOrder !== $oldSortOrders[$id]) {
-                DB::table(Table::ELEMENTS_OWNERS)
-                    ->where('ownerId', $owner->id)
-                    ->where('elementId', $id)
-                    ->update([
-                        'sortOrder' => $sortOrder,
-                    ]);
+                $updates[(int) $id] = $sortOrder;
             }
         }
 
+        if ($updates !== []) {
+            Workflows::withContentChangeLock(Drafts::getDraftIdsForElement($owner), function () use ($owner, $updates): void {
+                foreach ($updates as $id => $sortOrder) {
+                    DB::table(Table::ELEMENTS_OWNERS)
+                        ->where('ownerId', $owner->id)
+                        ->where('elementId', $id)
+                        ->update([
+                            'sortOrder' => $sortOrder,
+                        ]);
+                }
+            });
+        }
+
         $this->elementCaches->invalidateForElement($owner);
     }
 
diff --git a/src/Element/Operations/ElementWrites.php b/src/Element/Operations/ElementWrites.php
index 1cf2f0919e3..3f5793408dc 100644
--- a/src/Element/Operations/ElementWrites.php
+++ b/src/Element/Operations/ElementWrites.php
@@ -7,6 +7,7 @@
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Contracts\NestedElementInterface;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\ElementCaches;
 use CraftCms\Cms\Element\ElementHelper;
 use CraftCms\Cms\Element\Elements;
@@ -42,6 +43,7 @@
 use CraftCms\Cms\Support\Query;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Workflows;
 use Exception;
 use Illuminate\Container\Attributes\Singleton;
 use Illuminate\Database\Query\Builder;
@@ -64,10 +66,12 @@
 
     public function __construct(
         private Elements $elements,
+        private Drafts $drafts,
         private ElementUris $elementUris,
         private ElementCaches $elementCaches,
         private Search $search,
         private Sites $sites,
+        private Workflows $workflows,
     ) {
         $this->propagationSites = new WeakMap;
     }
@@ -443,6 +447,7 @@ protected function saveInternal(
 
             $fieldLayout = $element->getFieldLayout();
             $dirtyFields = $element->getDirtyFields();
+            $draftIdsToLock = $this->drafts->getDraftIdsForElement($element);
 
             if (! $isNewElement && ! $element->isNewForSite) {
                 $siteSettingsRecord = ElementSiteSettings::query()
@@ -494,6 +499,7 @@ protected function saveInternal(
                 $originalPropagateAll,
                 $originalDateUpdated,
                 $inheritedUpdateSearchIndex,
+                $draftIdsToLock,
                 &$dirtyAttributes,
                 &$siteSettingsRecord,
             ) {
@@ -504,6 +510,8 @@ protected function saveInternal(
                 DB::beginTransaction();
 
                 try {
+                    $this->workflows->lockDraftIds($draftIdsToLock);
+
                     $this->updateModel($element, $isNewElement, $forceTouch, $fieldLayout, $trackChanges, $dirtyAttributes);
 
                     if ($siteSettingsRecord === null) {
diff --git a/src/Http/Controllers/Elements/ElementDraftsController.php b/src/Http/Controllers/Elements/ElementDraftsController.php
index 14a3148b0b9..524b1cee94e 100644
--- a/src/Http/Controllers/Elements/ElementDraftsController.php
+++ b/src/Http/Controllers/Elements/ElementDraftsController.php
@@ -26,6 +26,10 @@
 use CraftCms\Cms\Support\Facades\I18N;
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
@@ -50,6 +54,7 @@ public function __construct(
         private readonly Drafts $drafts,
         private readonly Elements $elements,
         private readonly ElementActivity $elementActivity,
+        private readonly Workflows $workflows,
     ) {}
 
     public function store(): Response
@@ -67,6 +72,10 @@ public function store(): Response
         }
 
         $provisional = $this->request->boolean('provisional');
+        $convertedByWorkflow = $this->request->boolean('workflowSave')
+            && $element instanceof WorkflowableInterface
+            && $this->workflows->forElement($element) !== null
+            && (! $element->getIsDraft() || $element->isProvisionalDraft);
 
         if (! $element->getIsDraft() && ! $provisional) {
             Gate::authorize('createDrafts', $element);
@@ -101,6 +110,7 @@ public function store(): Response
         });
 
         DB::beginTransaction();
+        $applyWithoutReview = false;
 
         try {
             // Are we creating the draft here?
@@ -122,36 +132,51 @@ public function store(): Response
 
             $this->applyParamsToElement($element);
 
-            // Make sure nothing just changed that would prevent the user from saving
-            if (! $this->canSave($element, $this->request->craftUser())) {
-                abort(403, 'User not authorized to save this element.');
-            }
+            // The editor actions reflect the status at render time. Re-evaluate
+            // the posted status so disabling a live element can save directly.
+            if ($convertedByWorkflow && ! $this->workflows->requiresApproval($element)) {
+                $applyWithoutReview = true;
+                DB::commit();
+            } else {
+                // Make sure nothing just changed that would prevent the user from saving
+                if (! $this->canSave($element, $this->request->craftUser())) {
+                    abort(403, 'User not authorized to save this element.');
+                }
 
-            if ($this->request->boolean('dropProvisional')) {
-                $element->isProvisionalDraft = false;
-            }
+                if ($this->request->boolean('dropProvisional')) {
+                    $element->isProvisionalDraft = false;
+                }
 
-            $element->ruleset->useScenario(ElementRules::SCENARIO_ESSENTIALS);
+                $element->ruleset->useScenario(ElementRules::SCENARIO_ESSENTIALS);
 
-            // If the field layout ID changed, save all content
-            $saveContent = $element->getFieldLayout()?->id !== $oldFieldLayoutId;
+                // If the field layout ID changed, save all content
+                $saveContent = $element->getFieldLayout()?->id !== $oldFieldLayoutId;
 
-            if (! $this->elements->saveElement($element, saveContent: $saveContent)) {
-                DB::rollBack();
+                if (! $this->elements->saveElement($element, saveContent: $saveContent)) {
+                    DB::rollBack();
 
-                return new ElementResponse()->failure($element, mb_ucfirst(t('Couldn’t save {type}.', [
-                    'type' => t('draft'),
-                ])));
-            }
+                    return new ElementResponse()->failure($element, mb_ucfirst(t('Couldn’t save {type}.', [
+                        'type' => t('draft'),
+                    ])));
+                }
 
-            DB::commit();
+                DB::commit();
+            }
         } catch (Throwable $e) {
             DB::rollBack();
             throw $e;
         }
 
+        if ($applyWithoutReview) {
+            return $this->applyElementDraft($element, $oldFieldLayoutId);
+        }
+
         $this->elementActivity->trackActivity($element, ElementActivityType::Save);
 
+        if ($convertedByWorkflow) {
+            session()->flash('workflowDraftCreated', $element->draftId);
+        }
+
         $data = [
             'canonicalId' => $element->getCanonicalId(),
             'elementId' => $element->id,
@@ -199,7 +224,7 @@ public function store(): Response
 
         return new ElementResponse()->success($element, t('{type} saved.', [
             'type' => t('Draft'),
-        ]), $data, true);
+        ]), $data, true, $element->isProvisionalDraft ? null : $element->getCpEditUrl());
     }
 
     /**
@@ -296,11 +321,57 @@ public function apply(): Response
             abort(400, 'No draft was identified by the request.');
         }
 
+        $paramsApplied = false;
+        if (
+            $element instanceof WorkflowableInterface &&
+            $element->isProvisionalDraft &&
+            $this->workflows->forElement($element) !== null
+        ) {
+            $this->applyParamsToElement($element);
+            $paramsApplied = true;
+
+            if ($this->workflows->requiresApproval($element)) {
+                $this->request->merge(['dropProvisional' => true]);
+
+                return $this->store();
+            }
+        }
+
         // keep track of the original field layout ID, in case it changes here
         $oldFieldLayoutId = $element->getFieldLayout()?->id;
 
-        $this->applyParamsToElement($element);
+        if (
+            $element instanceof WorkflowableInterface &&
+            ! $element->isProvisionalDraft &&
+            $this->workflows->requiresApproval($element)
+        ) {
+            $runId = $this->request->input('workflowRunId');
+            $currentStage = $this->request->input('workflowCurrentStage');
+
+            return $this->workflows->withApplicationLock(
+                $element,
+                is_numeric($runId) ? (int) $runId : null,
+                is_numeric($currentStage) ? (int) $currentStage : null,
+                function (WorkflowRun $run) use ($element, $oldFieldLayoutId): Response {
+                    $applyApproved = $run->status === WorkflowStatus::Approved;
+                    if (! $applyApproved) {
+                        $this->applyParamsToElement($element);
+                    }
+
+                    return $this->applyElementDraft($element, $oldFieldLayoutId);
+                },
+            );
+        }
+
+        if (! $paramsApplied) {
+            $this->applyParamsToElement($element);
+        }
 
+        return $this->applyElementDraft($element, $oldFieldLayoutId);
+    }
+
+    private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayoutId): Response
+    {
         Gate::authorize('save', $element);
 
         $isUnpublishedDraft = $element->getIsUnpublishedDraft();
@@ -360,6 +431,11 @@ public function apply(): Response
 
         $attributes = [];
 
+        if ($this->request->exists('workflowRunId')) {
+            $attributes['workflowRunId'] = $this->request->integer('workflowRunId');
+            $attributes['workflowCurrentStage'] = $this->request->integer('workflowCurrentStage');
+        }
+
         if ($element instanceof NestedElementInterface) {
             $attributes['updateSearchIndexForOwner'] = true;
         }
@@ -367,8 +443,8 @@ public function apply(): Response
         try {
             $element->propagateRequired = false;
             $canonical = $this->drafts->applyDraft($element, $attributes);
-        } catch (InvalidElementException) {
-            return new ElementResponse()->applyDraftFailure($element);
+        } catch (InvalidElementException $exception) {
+            return new ElementResponse()->applyDraftFailure($exception->element);
         } finally {
             if (! $isUnpublishedDraft) {
                 $mutex->release();
diff --git a/src/Http/Controllers/Elements/SaveElementController.php b/src/Http/Controllers/Elements/SaveElementController.php
index 394d7bb388b..d553130146d 100644
--- a/src/Http/Controllers/Elements/SaveElementController.php
+++ b/src/Http/Controllers/Elements/SaveElementController.php
@@ -10,12 +10,14 @@
 use CraftCms\Cms\Element\ElementActivity;
 use CraftCms\Cms\Element\Elements;
 use CraftCms\Cms\Element\Enums\ElementActivityType;
+use CraftCms\Cms\Element\Exceptions\InvalidElementException;
 use CraftCms\Cms\Element\Exceptions\UnsupportedSiteException;
 use CraftCms\Cms\Element\Validation\ElementRules;
 use CraftCms\Cms\Http\Controllers\Elements\Concerns\SavesElement;
 use CraftCms\Cms\Http\Requests\ElementRequest;
 use CraftCms\Cms\Http\Responses\ElementResponse;
 use CraftCms\Cms\Site\Sites;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Database\Query\Builder;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
@@ -35,6 +37,7 @@ public function __construct(
         private ElementActivity $elementActivity,
         private Elements $elements,
         private Sites $sites,
+        private Workflows $workflows,
     ) {}
 
     public function store(): Response
@@ -62,6 +65,7 @@ public function store(): Response
         }
 
         $isNotNew = $element->id;
+        $saveAsDraft = $this->workflows->requiresApproval($element);
         if ($isNotNew) {
             $mutex = Cache::lock("element:$element->id", 15);
             if (! $mutex->get()) {
@@ -75,15 +79,25 @@ public function store(): Response
 
         try {
             $namespace = $this->request->header('X-Craft-Namespace');
-            // crossSiteValidate only if it's multisite, element supports drafts and we're not in a slideout
-            $success = $this->elements->saveElement(
-                $element,
-                crossSiteValidate: (
-                    $namespace === null
-                    && $this->sites->isMultiSite()
-                    && Gate::check('createDrafts', $element)
-                ),
-            );
+            if ($saveAsDraft && $isNotNew) {
+                $element = $this->drafts->createDraft($element, $this->request->craftUser()?->getCraftUserId());
+                $success = true;
+            } elseif ($saveAsDraft) {
+                $success = $this->drafts->saveElementAsDraft($element, $this->request->craftUser()?->getCraftUserId());
+            } else {
+                // crossSiteValidate only if it's multisite, element supports drafts and we're not in a slideout
+                $success = $this->elements->saveElement(
+                    $element,
+                    crossSiteValidate: (
+                        $namespace === null
+                        && $this->sites->isMultiSite()
+                        && Gate::check('createDrafts', $element)
+                    ),
+                );
+            }
+        } catch (InvalidElementException $e) {
+            $element = $e->element;
+            $success = false;
         } catch (UnsupportedSiteException $e) {
             $element->errors()->add('siteId', $e->getMessage());
             $success = false;
@@ -102,7 +116,7 @@ public function store(): Response
         $this->elementActivity->trackActivity($element, ElementActivityType::Save);
 
         // See if the user happens to have a provisional element. If so delete it.
-        $provisional = $element::find()
+        $provisional = $saveAsDraft ? null : $element::find()
             ->provisionalDrafts()
             ->draftOf($element->id)
             ->draftCreator($this->request->craftUser()?->asElement())
diff --git a/src/Http/Controllers/Entries/StoreEntryController.php b/src/Http/Controllers/Entries/StoreEntryController.php
index 6a8ac4813d3..33f44b844c1 100644
--- a/src/Http/Controllers/Entries/StoreEntryController.php
+++ b/src/Http/Controllers/Entries/StoreEntryController.php
@@ -6,6 +6,7 @@
 
 use CraftCms\Cms\Auth\Concerns\EnforcesPermissions;
 use CraftCms\Cms\Cp\Html\ElementHtml;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Elements;
 use CraftCms\Cms\Element\Exceptions\InvalidElementException;
 use CraftCms\Cms\Element\Exceptions\UnsupportedSiteException;
@@ -16,6 +17,7 @@
 use CraftCms\Cms\Site\Sites;
 use CraftCms\Cms\Support\DateTimeHelper;
 use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Workflows;
 use Exception;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Http\Request;
@@ -32,9 +34,11 @@
 
     public function __construct(
         private Request $request,
+        private Drafts $drafts,
         private Elements $elements,
         private Entries $entries,
         private Sites $sites,
+        private Workflows $workflows,
     ) {}
 
     public function __invoke(): Response
@@ -78,6 +82,7 @@ public function __invoke(): Response
         }
 
         $isNotNew = (bool) $entry->id;
+        $saveAsDraft = ! $duplicate && $this->workflows->requiresApproval($entry);
         if ($isNotNew) {
             $lockKey = "entry:$entry->id";
             $mutex = Cache::lock($lockKey, 15);
@@ -87,7 +92,18 @@ public function __invoke(): Response
         }
 
         try {
-            $success = $this->elements->saveElement($entry);
+            if ($saveAsDraft && $isNotNew) {
+                $entry = $this->drafts->createDraft($entry, $currentUser->getCraftUserId());
+                $success = true;
+            } elseif ($saveAsDraft) {
+                $success = $this->drafts->saveElementAsDraft($entry, $currentUser->getCraftUserId());
+            } else {
+                $success = $this->elements->saveElement($entry);
+            }
+        } catch (InvalidElementException $e) {
+            /** @var Entry $entry */
+            $entry = $e->element;
+            $success = false;
         } catch (UnsupportedSiteException $e) {
             $entry->errors()->add('siteId', $e->getMessage());
             $success = false;
@@ -107,7 +123,7 @@ public function __invoke(): Response
 
         // See if the user happens to have a provisional entry. If so delete it.
         /** @var Entry|null $provisional */
-        $provisional = Entry::find()
+        $provisional = $saveAsDraft ? null : Entry::find()
             ->provisionalDrafts()
             ->draftOf($entry->id)
             ->draftCreator($currentUser->getCraftUserId())
diff --git a/src/Http/Controllers/NestedElementsController.php b/src/Http/Controllers/NestedElementsController.php
index ca5e2e66b9f..7db349fed4d 100644
--- a/src/Http/Controllers/NestedElementsController.php
+++ b/src/Http/Controllers/NestedElementsController.php
@@ -5,9 +5,11 @@
 namespace CraftCms\Cms\Http\Controllers;
 
 use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Elements;
 use CraftCms\Cms\Http\Requests\NestedElementsRequest;
 use CraftCms\Cms\Http\RespondsWithFlash;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Gate;
 use Symfony\Component\HttpFoundation\Response;
@@ -20,6 +22,8 @@
 
     public function __construct(
         private Elements $elements,
+        private Drafts $drafts,
+        private Workflows $workflows,
     ) {}
 
     public function reorder(NestedElementsRequest $request): Response
@@ -45,10 +49,13 @@ public function destroy(NestedElementsRequest $request): Response
 
         // If the element primarily belongs to a different element, just delete the ownership
         if ($element->getPrimaryOwnerId() !== $request->owner()->id) {
-            DB::table(Table::ELEMENTS_OWNERS)
-                ->where('ownerId', $request->owner()->id)
-                ->where('elementId', $element->id)
-                ->delete();
+            $draftIds = $this->drafts->getDraftIdsForElement($request->owner());
+            $this->workflows->withContentChangeLock($draftIds, function () use ($element, $request): void {
+                DB::table(Table::ELEMENTS_OWNERS)
+                    ->where('ownerId', $request->owner()->id)
+                    ->where('elementId', $element->id)
+                    ->delete();
+            });
 
             $success = true;
         } else {
diff --git a/src/Http/Controllers/Settings/WorkflowsController.php b/src/Http/Controllers/Settings/WorkflowsController.php
index 785d8f682c9..8ea19b894a3 100644
--- a/src/Http/Controllers/Settings/WorkflowsController.php
+++ b/src/Http/Controllers/Settings/WorkflowsController.php
@@ -11,7 +11,7 @@
 use CraftCms\Cms\Http\ViewModels\WorkflowEditViewModel;
 use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\Workflow\Models\Workflow;
-use CraftCms\Cms\Workflow\WorkflowProjectConfig;
+use CraftCms\Cms\Workflow\Workflows;
 use Symfony\Component\HttpFoundation\Response;
 
 use function CraftCms\Cms\t;
@@ -23,7 +23,7 @@ class WorkflowsController
     private bool $readOnly;
 
     public function __construct(
-        private readonly WorkflowProjectConfig $workflowProjectConfig,
+        private readonly Workflows $workflows,
         GeneralConfig $generalConfig,
     ) {
         $this->readOnly = ! $generalConfig->allowAdminChanges;
@@ -76,7 +76,7 @@ public function destroy(Workflow $workflow): Response
             return $this->asFailure(t('This workflow cannot be deleted while it is assigned to a section.'));
         }
 
-        $this->workflowProjectConfig->delete($workflow);
+        $this->workflows->deleteWorkflow($workflow);
 
         return $this->asSuccess(t('Workflow deleted.'), redirect: action([self::class, 'index']));
     }
@@ -84,9 +84,9 @@ public function destroy(Workflow $workflow): Response
     private function save(WorkflowRequest $request, Workflow $workflow): Response
     {
         $data = $request->workflowData();
-        $workflow->name = $data['name'];
+        $workflow->fill($data);
 
-        $this->workflowProjectConfig->save($workflow, $data['stages']);
+        $this->workflows->saveWorkflow($workflow);
 
         return $this->asSuccess(
             t('Workflow saved.'),
diff --git a/src/Http/Controllers/Workflows/UserReviewController.php b/src/Http/Controllers/Workflows/UserReviewController.php
new file mode 100644
index 00000000000..e5e7ad6af78
--- /dev/null
+++ b/src/Http/Controllers/Workflows/UserReviewController.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Http\Controllers\Workflows;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Http\Requests\ElementRequest;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\UserReview\UserReviewDecision;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use CraftCms\Cms\Workflow\Workflows;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Validation\Rule;
+use Symfony\Component\HttpFoundation\Response;
+
+use function CraftCms\Cms\t;
+
+class UserReviewController
+{
+    public function __construct(
+        private readonly ElementRequest $request,
+        private readonly Workflows $workflows,
+    ) {}
+
+    public function approve(WorkflowRun $workflowRun, string $stage): JsonResponse
+    {
+        return $this->decide($workflowRun, $stage, UserReviewDecision::Approved);
+    }
+
+    public function requestChanges(WorkflowRun $workflowRun, string $stage): JsonResponse
+    {
+        return $this->decide($workflowRun, $stage, UserReviewDecision::Rejected);
+    }
+
+    private function decide(WorkflowRun $workflowRun, string $stage, UserReviewDecision $decision): JsonResponse
+    {
+        $draft = $this->draft();
+        $data = $this->request->validate([
+            'message' => [
+                Rule::when($decision === UserReviewDecision::Rejected, 'required', 'nullable'),
+                'string',
+                'max:5000',
+            ],
+        ]);
+
+        $message = $data['message'] ?? null;
+        $transition = match ($decision) {
+            UserReviewDecision::Approved => WorkflowTransition::Approve,
+            UserReviewDecision::Rejected => WorkflowTransition::Reject,
+        };
+
+        $this->workflows->reportStageResult(
+            runId: $workflowRun->id,
+            stageUid: $stage,
+            result: function (WorkflowStageContext $context) use ($decision, $message) {
+                $component = $context->stage->component();
+                if (! $component instanceof UserReviewStage) {
+                    throw new WorkflowException('The current workflow stage does not accept user reviews.');
+                }
+
+                return $component->decide($decision, $message, $context, $this->request->craftUser());
+            },
+            actor: $this->request->craftUser(),
+            activityTransition: $transition,
+            activityNote: trim((string) $message) ?: null,
+        );
+
+        return new JsonResponse([
+            'workflowReview' => $this->workflows->reviewData($draft, $this->request->craftUser()),
+            'message' => t('Review updated.'),
+        ]);
+    }
+
+    private function draft(): ElementInterface
+    {
+        $element = $this->request->element();
+        abort_unless($element instanceof ElementInterface && $element->getIsDraft(), Response::HTTP_BAD_REQUEST, 'A draft element is required.');
+
+        return $element;
+    }
+}
diff --git a/src/Http/Controllers/Workflows/WorkflowTransitionsController.php b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
new file mode 100644
index 00000000000..b6d35f4269b
--- /dev/null
+++ b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Http\Controllers\Workflows;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Http\Requests\ElementRequest;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\Workflows;
+use Illuminate\Http\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+
+use function CraftCms\Cms\t;
+
+class WorkflowTransitionsController
+{
+    public function __construct(
+        private readonly ElementRequest $request,
+        private readonly Workflows $workflows,
+    ) {}
+
+    public function submit(): JsonResponse
+    {
+        $draft = $this->draft();
+        $data = $this->request->validate([
+            'note' => ['nullable', 'string', 'max:5000'],
+        ]);
+
+        $this->workflows->submitForReview(
+            draft: $draft,
+            note: $data['note'] ?? null,
+        );
+
+        return $this->response($draft, t('Review submitted.'));
+    }
+
+    public function comment(WorkflowRun $workflowRun, string $stage): JsonResponse
+    {
+        $draft = $this->draft();
+        $data = $this->request->validate([
+            'note' => ['required', 'string', 'max:5000'],
+        ]);
+
+        $this->workflows->addComment(
+            draft: $draft,
+            runId: $workflowRun->id,
+            stage: $stage,
+            note: $data['note'],
+        );
+
+        return $this->response($draft, t('Comment added.'));
+    }
+
+    public function override(WorkflowRun $workflowRun): JsonResponse
+    {
+        $draft = $this->draft();
+        $data = $this->request->validate([
+            'note' => ['nullable', 'string', 'max:5000'],
+        ]);
+
+        $this->workflows->overrideApproval(
+            draft: $draft,
+            runId: $workflowRun->id,
+            reason: $data['note'] ?? null,
+        );
+
+        return $this->response($draft, t('Workflow approval overridden.'));
+    }
+
+    private function draft(): ElementInterface
+    {
+        $element = $this->request->element();
+        abort_unless($element instanceof ElementInterface && $element->getIsDraft(), Response::HTTP_BAD_REQUEST, 'A draft element is required.');
+
+        return $element;
+    }
+
+    private function response(ElementInterface $draft, ?string $message = null): JsonResponse
+    {
+        return new JsonResponse([
+            'workflowReview' => $this->workflows->reviewData(
+                draft: $draft,
+                viewer: $this->request->craftUser(),
+            ),
+            ...($message !== null ? ['message' => $message] : []),
+        ]);
+    }
+}
diff --git a/src/Http/Requests/ElementRequest.php b/src/Http/Requests/ElementRequest.php
index a2d4b7cb93b..4dbd2b7a9d4 100644
--- a/src/Http/Requests/ElementRequest.php
+++ b/src/Http/Requests/ElementRequest.php
@@ -79,6 +79,8 @@ public function rules(): array
             'failMessage' => ['exclude'],
             'redirect' => ['exclude'],
             'successMessage' => ['exclude'],
+            'workflowRunId' => ['exclude'],
+            'workflowCurrentStage' => ['exclude'],
             $fieldsLocation => ['exclude'],
         ];
     }
diff --git a/src/Http/Responses/ElementResponse.php b/src/Http/Responses/ElementResponse.php
index 9ea3e91056f..c0ad82d51a6 100644
--- a/src/Http/Responses/ElementResponse.php
+++ b/src/Http/Responses/ElementResponse.php
@@ -25,15 +25,20 @@ class ElementResponse
     use RespondsWithFlash;
 
     /** @param array<string, mixed> $data */
-    public function success(ElementInterface $element, string $message, array $data = [], bool $supportsAddAnother = false): Response
-    {
+    public function success(
+        ElementInterface $element,
+        string $message,
+        array $data = [],
+        bool $supportsAddAnother = false,
+        ?string $redirect = null,
+    ): Response {
         // Don't call asModelSuccess() here so we can avoid including custom fields in the element data
         $data += [
             'modelName' => 'element',
             'element' => $element->toArray($element->attributes()),
         ];
 
-        $response = $this->asSuccess($message, $data, $this->getPostedRedirectUrl($element), [
+        $response = $this->asSuccess($message, $data, $this->getPostedRedirectUrl($element) ?? $redirect, [
             'details' => ! $element->dateDeleted
                 ? app(ElementHtml::class)->elementChipHtml($element, ['hyperlink' => true])
                 : null,
diff --git a/src/ProjectConfig/ConfigRebuilder.php b/src/ProjectConfig/ConfigRebuilder.php
index 6e09b76c36a..84a7635d5dc 100644
--- a/src/ProjectConfig/ConfigRebuilder.php
+++ b/src/ProjectConfig/ConfigRebuilder.php
@@ -20,7 +20,7 @@
 use CraftCms\Cms\Site\Sites;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\UserGroups;
-use CraftCms\Cms\Workflow\WorkflowProjectConfig;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Database\DatabaseManager;
 use InvalidArgumentException;
 use RuntimeException;
@@ -40,7 +40,7 @@ public function __construct(
         private readonly Sites $sites,
         private readonly UserGroups $userGroups,
         private readonly Volumes $volumes,
-        private readonly WorkflowProjectConfig $workflowProjectConfig,
+        private readonly Workflows $workflows,
         private readonly DatabaseManager $database,
     ) {}
 
@@ -64,7 +64,7 @@ public function build(array $config): array
         $config[ProjectConfig::PATH_SITES] = $this->components($this->sites->getAllSites(true));
         $config[ProjectConfig::PATH_SITE_GROUPS] = $this->components($this->siteGroups->getAllGroups());
         $config[ProjectConfig::PATH_VOLUMES] = $this->components($this->volumes->getAllVolumes());
-        $config[ProjectConfig::PATH_WORKFLOWS] = $this->components($this->workflowProjectConfig->getAllWorkflows());
+        $config[ProjectConfig::PATH_WORKFLOWS] = $this->components($this->workflows->getAllWorkflows());
         $config[ProjectConfig::PATH_USERS]['groups'] = $this->components($this->userGroups->getAllGroups());
         unset($config[ProjectConfig::PATH_USERS]['fieldLayouts']);
         $config[ProjectConfig::PATH_USERS] = array_replace($config[ProjectConfig::PATH_USERS], $this->fieldLayout(User::class));
diff --git a/src/ProjectConfig/ProjectConfigServiceProvider.php b/src/ProjectConfig/ProjectConfigServiceProvider.php
index 11b8f0d1315..f6bb75f576e 100644
--- a/src/ProjectConfig/ProjectConfigServiceProvider.php
+++ b/src/ProjectConfig/ProjectConfigServiceProvider.php
@@ -29,7 +29,7 @@
 use CraftCms\Cms\Support\Facades\UserPermissions;
 use CraftCms\Cms\Support\Facades\Users;
 use CraftCms\Cms\Support\Facades\Volumes;
-use CraftCms\Cms\Workflow\WorkflowProjectConfig;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Console\Events\CommandFinished;
 use Illuminate\Foundation\Http\Events\RequestHandled;
 use Illuminate\Support\Facades\Event;
@@ -136,9 +136,9 @@ public function boot(ProjectConfig $projectConfig): void
             ->onUpdate(ProjectConfig::PATH_ENTRY_TYPES.'.{uid}', fn (ConfigEvent $event) => EntryTypes::handleChangedEntryType($event))
             ->onRemove(ProjectConfig::PATH_ENTRY_TYPES.'.{uid}', fn (ConfigEvent $event) => EntryTypes::handleDeletedEntryType($event))
             // Workflows
-            ->onAdd(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleChanged($event))
-            ->onUpdate(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleChanged($event))
-            ->onRemove(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(WorkflowProjectConfig::class)->handleDeleted($event))
+            ->onAdd(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(Workflows::class)->handleChangedWorkflow($event))
+            ->onUpdate(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(Workflows::class)->handleChangedWorkflow($event))
+            ->onRemove(ProjectConfig::PATH_WORKFLOWS.'.{uid}', fn (ConfigEvent $event) => app(Workflows::class)->handleDeletedWorkflow($event))
             // GraphQL schemas
             ->onAdd(ProjectConfig::PATH_GRAPHQL_SCHEMAS.'.{uid}', fn (ConfigEvent $event) => Gql::handleChangedSchema($event))
             ->onUpdate(ProjectConfig::PATH_GRAPHQL_SCHEMAS.'.{uid}', fn (ConfigEvent $event) => Gql::handleChangedSchema($event))
diff --git a/src/Providers/CraftServiceProvider.php b/src/Providers/CraftServiceProvider.php
index 31264ab1e10..3c16ff76b70 100644
--- a/src/Providers/CraftServiceProvider.php
+++ b/src/Providers/CraftServiceProvider.php
@@ -29,6 +29,8 @@
 use CraftCms\Cms\Update\UpdatesServiceProvider;
 use CraftCms\Cms\User\UserServiceProvider;
 use CraftCms\Cms\View\ViewServiceProvider;
+use CraftCms\Cms\Workflow\UserReview\UserReviewServiceProvider;
+use CraftCms\Cms\Workflow\WorkflowServiceProvider;
 use Illuminate\Support\AggregateServiceProvider;
 use Override;
 
@@ -61,6 +63,8 @@ class CraftServiceProvider extends AggregateServiceProvider
         FieldLayoutServiceProvider::class,
         SectionServiceProvider::class,
         EntryServiceProvider::class,
+        WorkflowServiceProvider::class,
+        UserReviewServiceProvider::class,
         StructureServiceProvider::class,
         QueueServiceProvider::class,
     ];
diff --git a/src/Support/Facades/Drafts.php b/src/Support/Facades/Drafts.php
index 8db17ecd4c3..d91a550ca2c 100644
--- a/src/Support/Facades/Drafts.php
+++ b/src/Support/Facades/Drafts.php
@@ -9,6 +9,7 @@
 
 /**
  * @method static \Illuminate\Support\Collection getEditableDrafts(\CraftCms\Cms\Element\Contracts\ElementInterface $element, string|null $permission = null)
+ * @method static list<int> getDraftIdsForElement(\CraftCms\Cms\Element\Contracts\ElementInterface $element)
  * @method static \CraftCms\Cms\Element\Contracts\ElementInterface createDraft(\CraftCms\Cms\Element\Contracts\ElementInterface $canonical, int|null $creatorId = null, string|null $name = null, string|null $notes = null, array $newAttributes = [], bool $provisional = false)
  * @method static string generateDraftName(int $canonicalId)
  * @method static bool saveElementAsDraft(\CraftCms\Cms\Element\Contracts\ElementInterface $element, int|null $creatorId = null, string|null $name = null, string|null $notes = null, bool $markAsSaved = true)
diff --git a/src/Support/Facades/Workflows.php b/src/Support/Facades/Workflows.php
new file mode 100644
index 00000000000..8a23fce43a5
--- /dev/null
+++ b/src/Support/Facades/Workflows.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Support\Facades;
+
+use Illuminate\Support\Facades\Facade;
+use Override;
+
+/**
+ * @method static \CraftCms\Cms\Workflow\Models\Workflow|null forElement(\CraftCms\Cms\Element\Contracts\ElementInterface $element)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun|null latestRun(\CraftCms\Cms\Element\Contracts\ElementInterface $draft)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun submitForReview(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, string|null $note = null)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun|null reportStageResult(int $runId, string $stageUid, \CraftCms\Cms\Workflow\Data\WorkflowStageResult|\Closure $result, \CraftCms\Cms\User\Contracts\CraftUser|null $actor = null, \CraftCms\Cms\Workflow\Enums\WorkflowTransition|null $activityTransition = null, string|null $activityNote = null)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun addComment(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int $runId, int|string $stage, string $note)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun overrideApproval(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int $runId, string|null $reason = null)
+ * @method static \CraftCms\Cms\Workflow\Data\WorkflowReviewData|null reviewData(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, \CraftCms\Cms\User\Contracts\CraftUser $viewer)
+ * @method static \CraftCms\Cms\Element\Contracts\ElementInterface applyDraft(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, \CraftCms\Cms\User\Contracts\CraftUser|null $actor, int|null $expectedRunId, int|null $expectedStage, \Closure $apply)
+ * @method static void contentChanged(\CraftCms\Cms\Element\Contracts\ElementInterface $draft)
+ * @method static void contentChangedByDraftIds(array $draftIds)
+ * @method static void invalidateRuns(\CraftCms\Cms\Workflow\Models\Workflow $workflow, string $reason)
+ * @method static void invalidateSectionRuns(int $sectionId)
+ * @method static mixed withContentChangeLock(array $draftIds, \Closure $callback)
+ * @method static void lockDraftIds(array $draftIds)
+ * @method static mixed withApplicationLock(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int|null $expectedRunId, int|null $expectedStage, \Closure $callback)
+ *
+ * @see \CraftCms\Cms\Workflow\Workflows
+ */
+class Workflows extends Facade
+{
+    #[Override]
+    protected static function getFacadeAccessor(): string
+    {
+        return \CraftCms\Cms\Workflow\Workflows::class;
+    }
+}
diff --git a/src/Workflow/Activity/WorkflowActivityEvent.php b/src/Workflow/Activity/WorkflowActivityEvent.php
new file mode 100644
index 00000000000..726e24e7583
--- /dev/null
+++ b/src/Workflow/Activity/WorkflowActivityEvent.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Activity;
+
+use CraftCms\Cms\Activity\ActivityEventType;
+use CraftCms\Cms\Activity\Contracts\ShouldBeRetained;
+use CraftCms\Cms\Activity\Data\ActivityActor;
+use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Markdown\Markdown as MarkdownService;
+use CraftCms\Cms\Support\Facades\HtmlSanitizers;
+use CraftCms\Cms\Support\Facades\Markdown;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Enums\WorkflowActivityType;
+use Illuminate\Contracts\Support\Htmlable;
+
+use function CraftCms\Cms\t;
+
+class WorkflowActivityEvent extends ActivityEventType implements ShouldBeRetained
+{
+    protected const string LABEL = 'Workflow review';
+
+    protected const string ICON = 'clipboard-list-check';
+
+    public function __construct(
+        ElementInterface $subject,
+        private readonly WorkflowActivityType $type,
+        private readonly ?string $stage = null,
+        private readonly ?int $stageNumber = null,
+        private readonly ?string $note = null,
+        /** @var array{id: int, uid: string, name: string, stages: list<array{uid: string, name: string, type: string, settings: array<string, mixed>}>}|null */
+        private readonly ?array $workflow = null,
+        /** @var array{elementId: int, draftId: int, elementType: string, siteId: int}|null */
+        private readonly ?array $draft = null,
+        CraftUser|ActivityActor|null $actor = null,
+    ) {
+        parent::__construct(subject: $subject, actor: $actor);
+    }
+
+    public function data(): array
+    {
+        return [
+            'type' => $this->type->value,
+            'stage' => $this->stage,
+            'stageNumber' => $this->stageNumber,
+            'note' => $this->note,
+            ...($this->workflow === null ? [] : ['workflow' => $this->workflow]),
+            ...($this->draft === null ? [] : ['draft' => $this->draft]),
+        ];
+    }
+
+    public static function format(ActivityEvent $event): string|Htmlable
+    {
+        $stage = $event->data['stage'] ?? null;
+        $translatedStage = $stage === null ? null : t($stage);
+        $type = WorkflowActivityType::from($event->data['type']);
+
+        return match ($type) {
+            WorkflowActivityType::Submit => t('Submitted for review in “{workflow}”.', ['workflow' => $event->data['workflow']['name']]),
+            WorkflowActivityType::Comment => t('Commented on the “{stage}” review stage.', ['stage' => $translatedStage]),
+            WorkflowActivityType::Override => t('Overrode the workflow approval.'),
+            WorkflowActivityType::Approve => t('Approved the “{stage}” review stage.', ['stage' => $translatedStage]),
+            WorkflowActivityType::Reject => t('Requested changes during the “{stage}” review stage.', ['stage' => $translatedStage]),
+            WorkflowActivityType::StageApproved => t('The “{stage}” stage was approved.', ['stage' => $translatedStage]),
+            WorkflowActivityType::StageFailed => t('The “{stage}” stage failed.', ['stage' => $translatedStage]),
+            WorkflowActivityType::Invalidate => t('Invalidated the review by changing the draft.'),
+            WorkflowActivityType::Publish => t('Published the approved draft.'),
+        };
+    }
+
+    public static function component(): string
+    {
+        return 'craft:workflow-activity-event';
+    }
+
+    public static function props(ActivityEvent $event): array
+    {
+        $note = $event->data['note'] ?? null;
+
+        if (! $note) {
+            return ['noteHtml' => null];
+        }
+
+        return [
+            'noteHtml' => HtmlSanitizers::sanitize(
+                Markdown::parse($note, MarkdownService::FLAVOR_GFM_COMMENT),
+            ),
+        ];
+    }
+}
diff --git a/src/Workflow/Contracts/WorkflowableInterface.php b/src/Workflow/Contracts/WorkflowableInterface.php
new file mode 100644
index 00000000000..8127e33b626
--- /dev/null
+++ b/src/Workflow/Contracts/WorkflowableInterface.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Contracts;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Workflow\Models\Workflow;
+
+interface WorkflowableInterface extends ElementInterface
+{
+    public static function hasDrafts(): true;
+
+    public function workflow(): ?Workflow;
+}
diff --git a/src/Workflow/Data/WorkflowDraftReviewData.php b/src/Workflow/Data/WorkflowDraftReviewData.php
new file mode 100644
index 00000000000..cbf7eaf95e5
--- /dev/null
+++ b/src/Workflow/Data/WorkflowDraftReviewData.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+readonly class WorkflowDraftReviewData
+{
+    public function __construct(
+        public string $name,
+        public string $requester,
+        public string $stage,
+        public string $statusLabel,
+        public string $statusIndicator,
+        public string $url,
+    ) {}
+}
diff --git a/src/Workflow/Data/WorkflowReviewData.php b/src/Workflow/Data/WorkflowReviewData.php
new file mode 100644
index 00000000000..afa134bfef7
--- /dev/null
+++ b/src/Workflow/Data/WorkflowReviewData.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
+
+use function CraftCms\Cms\t;
+
+/** @implements Arrayable<string, mixed> */
+readonly class WorkflowReviewData implements Arrayable
+{
+    /**
+     * @param  list<WorkflowRunData>  $runs
+     */
+    public function __construct(
+        public WorkflowStatus $status,
+        public string $statusLabel,
+        public string $statusIndicator,
+        public string $submitLabel,
+        public ?string $applyDisabledReason,
+        public ?int $runId,
+        public ?int $currentStage,
+        public ?string $stageUid,
+        public ?string $actionComponent,
+        public bool $showDefaultActions,
+        /** @var array<string, mixed> */
+        public array $actionProps,
+        public array $runs,
+        public bool $canSubmit,
+        public bool $canComment,
+        public bool $canOverride,
+        public bool $canApply,
+    ) {}
+
+    /**
+     * @param  Collection<int, WorkflowRun>  $runs
+     * @param  Collection<int, WorkflowTimelineItemData>  $timelineItems
+     */
+    public static function from(
+        ElementInterface $draft,
+        CraftUser $viewer,
+        ?WorkflowRun $run,
+        Collection $runs,
+        Collection $timelineItems,
+    ): self {
+        $status = $run->status ?? WorkflowStatus::NotSubmitted;
+        $stage = $run?->stages()->get($run->currentStage);
+        $context = $run !== null && $stage !== null ? new WorkflowStageContext(
+            $draft,
+            $run,
+            $stage,
+            $run->payload[$stage->uid] ?? [],
+        ) : null;
+        $component = $run?->isPending() && $context !== null ? $stage->component() : null;
+        $canSubmit = $draft->enabled && $draft->getEnabledForSite()
+            && $draft->getIsDraft() && ! $draft->isProvisionalDraft && (bool) $draft->draftId
+            && $draft->markDraftAsSaved
+            && ! in_array($run?->status, [WorkflowStatus::Pending, WorkflowStatus::Approved], true)
+            && Gate::forUser($viewer)->allows('save', $draft);
+        $canComment = $stage !== null
+            && $run?->status !== WorkflowStatus::Published
+            && Gate::forUser($viewer)->allows('view', $draft);
+        $canOverride = $viewer->isAdmin()
+            && in_array($run?->status, [WorkflowStatus::Pending, WorkflowStatus::Failed], true);
+        $canApply = $run?->status === WorkflowStatus::Approved
+            && Gate::forUser($viewer)->allows('save', $draft)
+            && Gate::forUser($viewer)->allows('saveCanonical', $draft);
+
+        return new self(
+            status: $status,
+            statusLabel: $status->label(),
+            statusIndicator: $status->indicator(),
+            submitLabel: $status === WorkflowStatus::Failed ? t('Resubmit for review') : t('Submit for review'),
+            applyDisabledReason: $canApply ? null : t('This draft must be approved before it can be applied.'),
+            runId: $run?->id,
+            currentStage: $run?->currentStage,
+            stageUid: $stage?->uid,
+            actionComponent: $component?->actionComponent(),
+            showDefaultActions: $component->showDefaultActions ?? true,
+            actionProps: $component?->actionProps($context, $viewer) ?? [],
+            runs: $runs->map(fn (WorkflowRun $historyRun): WorkflowRunData => WorkflowRunData::from($historyRun, $run, $draft, $viewer, $timelineItems))->values()->all(),
+            canSubmit: $canSubmit,
+            canComment: $canComment,
+            canOverride: $canOverride,
+            canApply: $canApply,
+        );
+    }
+
+    /** @return array<string, mixed> */
+    public function toArray(): array
+    {
+        return [
+            ...get_object_vars($this),
+            'status' => $this->status->value,
+        ];
+    }
+}
diff --git a/src/Workflow/Data/WorkflowRunData.php b/src/Workflow/Data/WorkflowRunData.php
new file mode 100644
index 00000000000..ff30360708e
--- /dev/null
+++ b/src/Workflow/Data/WorkflowRunData.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Support\Collection;
+
+readonly class WorkflowRunData
+{
+    /** @param list<WorkflowRunStageData> $stages */
+    public function __construct(
+        public int $id,
+        public bool $current,
+        public string $statusLabel,
+        public string $statusIndicator,
+        public WorkflowTimelineItemData $submission,
+        public array $stages,
+    ) {}
+
+    /** @param Collection<int, WorkflowTimelineItemData> $events */
+    public static function from(WorkflowRun $run, ?WorkflowRun $currentRun, ElementInterface $draft, CraftUser $viewer, Collection $events): self
+    {
+        $runEvents = $events->filter(fn (WorkflowTimelineItemData $event): bool => $event->belongsToRun($run->id));
+
+        return new self(
+            id: $run->id,
+            current: $run->id === $currentRun?->id,
+            statusLabel: $run->status->label(),
+            statusIndicator: $run->status->indicator(),
+            submission: $runEvents->sole(fn (WorkflowTimelineItemData $event): bool => $event->type === 'submission'),
+            stages: $run->stages()
+                ->map(fn (WorkflowStageData $stage, int $stageIndex): WorkflowRunStageData => WorkflowRunStageData::from($stage, $stageIndex, $run, $draft, $viewer, $runEvents))
+                ->values()
+                ->all(),
+        );
+    }
+}
diff --git a/src/Workflow/Data/WorkflowRunStageData.php b/src/Workflow/Data/WorkflowRunStageData.php
new file mode 100644
index 00000000000..b996eb7d26d
--- /dev/null
+++ b/src/Workflow/Data/WorkflowRunStageData.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Support\Collection;
+
+use function CraftCms\Cms\t;
+
+readonly class WorkflowRunStageData
+{
+    /** @param list<WorkflowTimelineItemData> $events */
+    public function __construct(
+        public string $name,
+        public bool $current,
+        public bool $approved,
+        public string $icon,
+        public ?string $message,
+        public ?string $summaryComponent,
+        /** @var array<string, mixed> */
+        public array $summaryProps,
+        public array $events,
+    ) {}
+
+    /** @param Collection<int, WorkflowTimelineItemData> $runEvents */
+    public static function from(WorkflowStageData $stage, int $stageIndex, WorkflowRun $run, ElementInterface $draft, CraftUser $viewer, Collection $runEvents): self
+    {
+        $component = $stage->component();
+        $context = new WorkflowStageContext($draft, $run, $stage, $run->payload[$stage->uid] ?? []);
+        $isCurrent = $stageIndex === $run->currentStage;
+        $isApproved = $stageIndex < $run->currentStage
+            || ($isCurrent && in_array($run->status, [WorkflowStatus::Approved, WorkflowStatus::Published], true));
+        $events = $runEvents
+            ->filter(fn (WorkflowTimelineItemData $event): bool => $event->belongsToStage($stageIndex + 1))
+            ->values();
+
+        return new self(
+            name: t($stage->name),
+            current: $run->isPending() && $isCurrent,
+            approved: $isApproved,
+            icon: match (true) {
+                $events->contains(fn (WorkflowTimelineItemData $event): bool => in_array($event->decision, [WorkflowStageStatus::Failed->value, 'rejected'], true)) => 'xmark',
+                $isApproved => 'check',
+                $run->isPending() && $isCurrent => 'clock',
+                default => 'minus',
+            },
+            message: $isCurrent ? $run->currentStageResult : null,
+            summaryComponent: $component->summaryComponent(),
+            summaryProps: $component->summaryProps($context, $viewer),
+            events: $events->all(),
+        );
+    }
+}
diff --git a/src/Workflow/Data/WorkflowStageContext.php b/src/Workflow/Data/WorkflowStageContext.php
new file mode 100644
index 00000000000..6983a15f392
--- /dev/null
+++ b/src/Workflow/Data/WorkflowStageContext.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+
+readonly class WorkflowStageContext
+{
+    /** @param array<string, mixed> $payload */
+    public function __construct(
+        public ElementInterface $draft,
+        public WorkflowRun $run,
+        public WorkflowStageData $stage,
+        public array $payload,
+    ) {}
+}
diff --git a/src/Workflow/Data/WorkflowStageResult.php b/src/Workflow/Data/WorkflowStageResult.php
new file mode 100644
index 00000000000..9309568d9e8
--- /dev/null
+++ b/src/Workflow/Data/WorkflowStageResult.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+
+readonly class WorkflowStageResult
+{
+    /** @param array<string, mixed> $payload */
+    public function __construct(
+        public WorkflowStageStatus $status,
+        public string $message,
+        public array $payload,
+    ) {}
+}
diff --git a/src/Workflow/Data/WorkflowTimelineItemData.php b/src/Workflow/Data/WorkflowTimelineItemData.php
new file mode 100644
index 00000000000..ea36f7115a2
--- /dev/null
+++ b/src/Workflow/Data/WorkflowTimelineItemData.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+readonly class WorkflowTimelineItemData
+{
+    /**
+     * @param  array{label: string, url: string|null, deleted: bool}  $actor
+     * @param  array{label: string, url: string|null, deleted: bool}|null  $impersonator
+     * @param  array{date: string, dateLabel: string, time: string, full: string}  $formattedOccurredAt
+     */
+    public function __construct(
+        public string $id,
+        public string $type,
+        public string $icon,
+        public string $description,
+        public array $actor,
+        public ?array $impersonator,
+        public ?string $decision,
+        public ?string $noteHtml,
+        public string $occurredAt,
+        public array $formattedOccurredAt,
+        private int $runId,
+        private ?int $stageNumber,
+    ) {}
+
+    public function belongsToRun(int $runId): bool
+    {
+        return $this->runId === $runId;
+    }
+
+    public function belongsToStage(int $stageNumber): bool
+    {
+        return $this->stageNumber === $stageNumber;
+    }
+}
diff --git a/src/Workflow/Enums/WorkflowActivityType.php b/src/Workflow/Enums/WorkflowActivityType.php
new file mode 100644
index 00000000000..2b78594d5f3
--- /dev/null
+++ b/src/Workflow/Enums/WorkflowActivityType.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Enums;
+
+enum WorkflowActivityType: string
+{
+    case Submit = 'submit';
+    case Comment = 'comment';
+    case Override = 'override';
+    case Approve = 'approve';
+    case Reject = 'reject';
+    case StageApproved = 'stage-approved';
+    case StageFailed = 'stage-failed';
+    case Invalidate = 'invalidate';
+    case Publish = 'publish';
+}
diff --git a/src/Workflow/Enums/WorkflowStageStatus.php b/src/Workflow/Enums/WorkflowStageStatus.php
new file mode 100644
index 00000000000..37e8204617a
--- /dev/null
+++ b/src/Workflow/Enums/WorkflowStageStatus.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Enums;
+
+enum WorkflowStageStatus: string
+{
+    case Pending = 'pending';
+    case Approved = 'approved';
+    case Failed = 'failed';
+}
diff --git a/src/Workflow/Enums/WorkflowStatus.php b/src/Workflow/Enums/WorkflowStatus.php
new file mode 100644
index 00000000000..b327edefd49
--- /dev/null
+++ b/src/Workflow/Enums/WorkflowStatus.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Enums;
+
+use function CraftCms\Cms\t;
+
+enum WorkflowStatus: string
+{
+    case NotSubmitted = 'notSubmitted';
+    case Pending = 'pending';
+    case Approved = 'approved';
+    case Failed = 'failed';
+    case Invalidated = 'invalidated';
+    case Published = 'published';
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::NotSubmitted => t('Not submitted'),
+            self::Pending => t('Awaiting approval'),
+            self::Approved => t('Approved'),
+            self::Failed => t('Changes requested'),
+            self::Invalidated => t('Approval reset'),
+            self::Published => t('Published'),
+        };
+    }
+
+    public function indicator(): string
+    {
+        return match ($this) {
+            self::NotSubmitted => 'disabled',
+            self::Pending => 'pending',
+            self::Failed,
+            self::Invalidated => 'expired',
+            self::Approved => 'enabled',
+            self::Published => 'live',
+        };
+    }
+}
diff --git a/src/Workflow/Enums/WorkflowTransition.php b/src/Workflow/Enums/WorkflowTransition.php
new file mode 100644
index 00000000000..b993bdb3079
--- /dev/null
+++ b/src/Workflow/Enums/WorkflowTransition.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Enums;
+
+enum WorkflowTransition: string
+{
+    case Submit = 'submit';
+    case Override = 'override';
+    case Approve = 'approve';
+    case Reject = 'reject';
+    case StageApproved = 'stage-approved';
+    case StageFailed = 'stage-failed';
+    case Invalidate = 'invalidate';
+    case Publish = 'publish';
+}
diff --git a/src/Workflow/Events/WorkflowCommented.php b/src/Workflow/Events/WorkflowCommented.php
new file mode 100644
index 00000000000..5b2b6aa94df
--- /dev/null
+++ b/src/Workflow/Events/WorkflowCommented.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Events;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class WorkflowCommented
+{
+    use Dispatchable;
+
+    public function __construct(
+        public readonly ElementInterface $draft,
+        public readonly CraftUser $actor,
+        public readonly WorkflowRun $run,
+        public readonly WorkflowStageData $stage,
+        public readonly string $note,
+    ) {}
+}
diff --git a/src/Workflow/Events/WorkflowTransitioned.php b/src/Workflow/Events/WorkflowTransitioned.php
new file mode 100644
index 00000000000..a22237f2037
--- /dev/null
+++ b/src/Workflow/Events/WorkflowTransitioned.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Events;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class WorkflowTransitioned
+{
+    use Dispatchable;
+
+    public function __construct(
+        public readonly WorkflowTransition $transition,
+        public readonly ElementInterface $draft,
+        public readonly ?CraftUser $actor,
+        public readonly WorkflowRun $run,
+        public readonly ?string $note = null,
+    ) {}
+}
diff --git a/src/Workflow/Events/WorkflowTransitioning.php b/src/Workflow/Events/WorkflowTransitioning.php
new file mode 100644
index 00000000000..d85025fd933
--- /dev/null
+++ b/src/Workflow/Events/WorkflowTransitioning.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Events;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Foundation\Events\Dispatchable;
+
+class WorkflowTransitioning
+{
+    use Dispatchable;
+
+    public bool $cancel = false;
+
+    public function __construct(
+        public readonly WorkflowTransition $transition,
+        public readonly ElementInterface $draft,
+        public readonly ?CraftUser $actor,
+        public readonly ?WorkflowRun $run = null,
+        public readonly ?string $note = null,
+    ) {}
+}
diff --git a/src/Workflow/Exceptions/WorkflowException.php b/src/Workflow/Exceptions/WorkflowException.php
new file mode 100644
index 00000000000..5634235546f
--- /dev/null
+++ b/src/Workflow/Exceptions/WorkflowException.php
@@ -0,0 +1,35 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Exceptions;
+
+use Illuminate\Contracts\Debug\ShouldntReport;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+class WorkflowException extends HttpException implements ShouldntReport
+{
+    public function __construct(string $message)
+    {
+        parent::__construct(Response::HTTP_UNPROCESSABLE_ENTITY, $message);
+    }
+
+    public function render(Request $request): JsonResponse|RedirectResponse|bool
+    {
+        if ($request->expectsJson()) {
+            return new JsonResponse(['message' => $this->getMessage()], $this->getStatusCode());
+        }
+
+        if (! $request->isCpRequest()) {
+            return false;
+        }
+
+        return back()
+            ->with('error', $this->getMessage())
+            ->withErrors(['workflow' => $this->getMessage()]);
+    }
+}
diff --git a/src/Workflow/Models/Workflow.php b/src/Workflow/Models/Workflow.php
index 9ca3a6ea907..748b912b640 100644
--- a/src/Workflow/Models/Workflow.php
+++ b/src/Workflow/Models/Workflow.php
@@ -41,6 +41,18 @@ public function getConfig(): array
         ];
     }
 
+    /** @return array{stages: list<array{uid: string, type: string, settings: array<string, mixed>}>} */
+    public function getExecutionConfig(): array
+    {
+        return [
+            'stages' => $this->stages->map(fn (WorkflowStageData $stage): array => [
+                'uid' => $stage->uid,
+                'type' => $stage->type,
+                'settings' => $stage->settings,
+            ])->all(),
+        ];
+    }
+
     #[\Override]
     protected function casts(): array
     {
diff --git a/src/Workflow/UserReview/SendUserReviewNotifications.php b/src/Workflow/UserReview/SendUserReviewNotifications.php
new file mode 100644
index 00000000000..55134a3e818
--- /dev/null
+++ b/src/Workflow/UserReview/SendUserReviewNotifications.php
@@ -0,0 +1,180 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Events\WorkflowCommented;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioned;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Uri;
+
+use function CraftCms\Cms\t;
+
+class SendUserReviewNotifications
+{
+    public function handleTransition(WorkflowTransitioned $event): void
+    {
+        $run = $event->run->loadMissing('activityRootEvent', 'author');
+        $stage = $run->stages()->get($run->currentStage);
+
+        match ($event->transition) {
+            WorkflowTransition::Approve => $run->status === WorkflowStatus::Approved
+                ? $this->sendApproved($event, $stage)
+                : $this->sendReviewRequested($event, $stage),
+            WorkflowTransition::Submit, WorkflowTransition::StageApproved => $this->sendReviewRequested($event, $stage),
+            WorkflowTransition::Reject => $this->sendChangesRequested($event, $stage),
+            WorkflowTransition::Invalidate => $this->sendInvalidated($event, $stage),
+            default => null,
+        };
+    }
+
+    public function handleComment(WorkflowCommented $event): void
+    {
+        $event->run->loadMissing('activityRootEvent', 'author');
+        $this->sendCommented($event);
+    }
+
+    private function sendApproved(WorkflowTransitioned $event, ?WorkflowStageData $stage): void
+    {
+        $recipients = User::find()
+            ->status(User::STATUS_ACTIVE)
+            ->collect()
+            ->filter(fn (User $user): bool => Gate::forUser($user)->allows('saveCanonical', $event->draft));
+        $recipients->push($event->run->author->asElement());
+
+        $this->send(
+            $event,
+            $stage,
+            $recipients,
+            'workflow_approved',
+            t('Draft approved'),
+            t('“{entry}” completed its approval workflow.', ['entry' => $event->draft->title]),
+        );
+    }
+
+    private function sendChangesRequested(WorkflowTransitioned $event, ?WorkflowStageData $stage): void
+    {
+        $this->send(
+            $event,
+            $stage,
+            collect([$event->run->author]),
+            'workflow_changes_requested',
+            t('Changes requested'),
+            t('Changes were requested for “{entry}”.', ['entry' => $event->draft->title]),
+        );
+    }
+
+    private function sendReviewRequested(WorkflowTransitioned $event, ?WorkflowStageData $stage): void
+    {
+        $context = $this->stageContext($event, $stage);
+        $component = $stage?->component();
+
+        if (! $event->run->isPending() || ! $component instanceof UserReviewStage || $context === null || $this->decisions($context) !== []) {
+            return;
+        }
+
+        $this->send(
+            $event,
+            $stage,
+            $component->reviewers($context),
+            'workflow_review_requested',
+            t('Review requested'),
+            t('“{entry}” is awaiting your approval in {stage}.', [
+                'entry' => $event->draft->title,
+                'stage' => t($stage->name),
+            ]),
+        );
+    }
+
+    private function sendCommented(WorkflowCommented $event): void
+    {
+        $recipients = $event->actor->getCraftUserId() === $event->run->authorId
+            ? $this->outstandingReviewers($event)
+            : collect([$event->run->author]);
+
+        $this->send(
+            $event,
+            $event->stage,
+            $recipients,
+            'workflow_review_commented',
+            t('New review comment'),
+            t('A comment was added to the review for “{entry}”.', ['entry' => $event->draft->title]),
+        );
+    }
+
+    private function sendInvalidated(WorkflowTransitioned $event, ?WorkflowStageData $stage): void
+    {
+        $this->send(
+            $event,
+            $stage,
+            collect([$event->run->author]),
+            'workflow_invalidated',
+            t('Approval reset'),
+            t('The review for “{entry}” was reset because the draft changed.', ['entry' => $event->draft->title]),
+        );
+    }
+
+    /** @return Collection<int, User> */
+    private function outstandingReviewers(WorkflowCommented $event): Collection
+    {
+        $context = $this->stageContext($event, $event->stage);
+        $component = $event->stage->component();
+
+        if (! $component instanceof UserReviewStage || $context === null) {
+            return collect();
+        }
+
+        $reviewerIds = collect($this->decisions($context))->pluck('reviewerId');
+
+        return $component->reviewers($context)->whereNotIn('id', $reviewerIds);
+    }
+
+    private function stageContext(WorkflowTransitioned|WorkflowCommented $event, ?WorkflowStageData $stage): ?WorkflowStageContext
+    {
+        return $stage === null ? null : new WorkflowStageContext(
+            $event->draft,
+            $event->run,
+            $stage,
+            $event->run->payload[$stage->uid] ?? [],
+        );
+    }
+
+    /** @return list<array<string, mixed>> */
+    private function decisions(WorkflowStageContext $context): array
+    {
+        return is_array($context->payload['decisions'] ?? null) ? $context->payload['decisions'] : [];
+    }
+
+    /** @param Collection<int, mixed> $recipients */
+    private function send(WorkflowTransitioned|WorkflowCommented $event, ?WorkflowStageData $stage, Collection $recipients, string $messageKey, string $title, string $message): void
+    {
+        $recipients = $recipients
+            ->filter(fn ($user): bool => $user instanceof CraftUser && $user->getCraftUserId() !== $event->actor?->getCraftUserId())
+            ->unique(fn (CraftUser $user): ?int => $user->getCraftUserId())
+            ->values();
+
+        if ($recipients->isEmpty()) {
+            return;
+        }
+
+        Notification::send($recipients, new UserReviewNotification(
+            messageKey: $messageKey,
+            title: $title,
+            message: $message,
+            workflowName: (string) $event->run->activityRootEvent->data['workflow']['name'],
+            entryTitle: (string) $event->draft->title,
+            entryUrl: Uri::of($event->draft->getCpEditUrl())->withFragment('workflow')->value(),
+            stageName: $stage === null ? null : t($stage->name),
+            note: $event->note,
+        ));
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewDecision.php b/src/Workflow/UserReview/UserReviewDecision.php
new file mode 100644
index 00000000000..ba59d4d5203
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewDecision.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+enum UserReviewDecision: string
+{
+    case Approved = 'approved';
+    case Rejected = 'rejected';
+}
diff --git a/src/Workflow/UserReview/UserReviewNotification.php b/src/Workflow/UserReview/UserReviewNotification.php
new file mode 100644
index 00000000000..3ba51a34e5f
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewNotification.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\Cms;
+use CraftCms\Cms\Cp\Notifications\CpNotification;
+use CraftCms\Cms\Support\Template;
+use CraftCms\Cms\SystemMessage\Mailables\SystemMessageMailable;
+use CraftCms\Cms\SystemMessage\SystemMessages;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use Illuminate\Bus\Queueable;
+use Illuminate\Contracts\Queue\ShouldQueueAfterCommit;
+use Illuminate\Notifications\Channels\MailChannel;
+
+class UserReviewNotification extends CpNotification implements ShouldQueueAfterCommit
+{
+    use Queueable;
+
+    public int $tries = 3;
+
+    public function __construct(
+        public readonly string $messageKey,
+        string $title,
+        string $message,
+        public readonly string $workflowName,
+        public readonly string $entryTitle,
+        public readonly string $entryUrl,
+        public readonly ?string $stageName = null,
+        public readonly ?string $note = null,
+    ) {
+        parent::__construct($message);
+
+        $this->queue = Cms::config()->queueName;
+        $this
+            ->title($title)
+            ->icon('clipboard-list-check')
+            ->url($entryUrl);
+    }
+
+    /** @return class-string[] */
+    #[\Override]
+    public function via(CraftUser $notifiable): array
+    {
+        return [...parent::via($notifiable), MailChannel::class];
+    }
+
+    public function toMail(CraftUser $notifiable): SystemMessageMailable
+    {
+        return app(SystemMessages::class)->mailable(
+            key: $this->messageKey,
+            user: $notifiable->asElement(),
+            variables: [
+                'workflow' => $this->workflowName,
+                'entry' => $this->entryTitle,
+                'stage' => $this->stageName,
+                'note' => $this->note,
+                'link' => Template::raw($this->entryUrl),
+            ],
+        );
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewServiceProvider.php b/src/Workflow/UserReview/UserReviewServiceProvider.php
new file mode 100644
index 00000000000..c641fc7f576
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewServiceProvider.php
@@ -0,0 +1,44 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\SystemMessage\Models\SystemMessage;
+use CraftCms\Cms\SystemMessage\SystemMessages;
+use CraftCms\Cms\Workflow\Events\WorkflowCommented;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioned;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\ServiceProvider;
+
+use function CraftCms\Cms\t;
+
+class UserReviewServiceProvider extends ServiceProvider
+{
+    public function boot(SystemMessages $messages): void
+    {
+        Event::listen(WorkflowTransitioned::class, [SendUserReviewNotifications::class, 'handleTransition']);
+        Event::listen(WorkflowCommented::class, [SendUserReviewNotifications::class, 'handleComment']);
+
+        foreach ($this->messageDefinitions() as $key => [$heading, $subject, $body]) {
+            $messages->register($key, fn () => new SystemMessage([
+                'key' => $key,
+                'heading' => $heading,
+                'subject' => $subject,
+                'body' => $body,
+            ]));
+        }
+    }
+
+    /** @return array<string, array{string, string, string}> */
+    private function messageDefinitions(): array
+    {
+        return [
+            'workflow_review_requested' => [t('When a workflow review is requested:'), t('Review requested for “{{entry}}”'), "{{entry}} is awaiting your approval in {{stage}}.\n\n<{{link}}>"],
+            'workflow_review_commented' => [t('When a workflow review is commented on:'), t('New review comment on “{{entry}}”'), "A reviewer commented on {{entry}} during {{stage}}.\n\n{{note}}\n\n<{{link}}>"],
+            'workflow_changes_requested' => [t('When changes are requested:'), t('Changes requested for “{{entry}}”'), "Changes were requested for {{entry}}.\n\n{{note}}\n\n<{{link}}>"],
+            'workflow_approved' => [t('When a workflow is approved:'), t('“{{entry}}” is approved'), "{{entry}} completed its approval workflow and can now be published.\n\n<{{link}}>"],
+            'workflow_invalidated' => [t('When a workflow review is invalidated:'), t('Approval reset for “{{entry}}”'), "The review was reset because {{entry}} changed.\n\n<{{link}}>"],
+        ];
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
new file mode 100644
index 00000000000..d8cebdf2e22
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -0,0 +1,193 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Form\Controls\Number;
+use CraftCms\Cms\Form\Controls\UserGroupSelect;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Support\Facades\UserGroups;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use CraftCms\Cms\Workflow\Stages\WorkflowStage;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
+use Illuminate\Validation\Rule;
+
+use function CraftCms\Cms\t;
+
+class UserReviewStage extends WorkflowStage
+{
+    #[\Override]
+    protected bool $showDefaultReviewActions = false;
+
+    public int $approvalsRequired = 1;
+
+    /** @var list<string> */
+    public array $userGroups = [];
+
+    public static function displayName(): string
+    {
+        return t('User review');
+    }
+
+    public function getRules(): array
+    {
+        return [
+            'userGroups' => ['required', 'array', 'min:1'],
+            'userGroups.*' => ['required', 'string', 'distinct', Rule::exists(Table::USERGROUPS, 'uid')],
+            'approvalsRequired' => ['required', 'integer', 'min:1'],
+        ];
+    }
+
+    public function settingsForm(FormContext $context = new FormContext): Form
+    {
+        return Form::make([
+            Field::make(t('Reviewer groups'), UserGroupSelect::make('userGroups'))
+                ->required(),
+            Field::make(t('Approvals required'), Number::make('approvalsRequired')->min(1))
+                ->required(),
+        ]);
+    }
+
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+    {
+        $decisions = $this->decisions($context->payload);
+        $failed = collect($decisions)->contains(fn (array $decision): bool => $decision['decision'] === UserReviewDecision::Rejected->value);
+
+        if ($failed) {
+            return new WorkflowStageResult(WorkflowStageStatus::Failed, t('Changes requested'), $context->payload);
+        }
+
+        $reviewerIds = $this->reviewers($context)->pluck('id')->all();
+        $approvals = collect($decisions)->filter(fn (array $decision): bool => $decision['decision'] === UserReviewDecision::Approved->value &&
+            in_array($decision['reviewerId'], $reviewerIds, true)
+        )->count();
+
+        if (count($reviewerIds) < $this->approvalsRequired) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                t('Not enough eligible reviewers are available.'),
+                $context->payload,
+            );
+        }
+
+        if ($approvals >= $this->approvalsRequired) {
+            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $context->payload);
+        }
+
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Pending,
+            t('{count} of {required} approvals', ['count' => $approvals, 'required' => $this->approvalsRequired]),
+            $context->payload,
+        );
+    }
+
+    public function actionComponent(): string
+    {
+        return 'craft:user-review-workflow-stage-actions';
+    }
+
+    public function actionProps(WorkflowStageContext $context, CraftUser $viewer): array
+    {
+        return [
+            'canReview' => $this->canReview($context, $viewer),
+        ];
+    }
+
+    public function summaryComponent(): string
+    {
+        return 'craft:user-review-workflow-stage-summary';
+    }
+
+    public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array
+    {
+        $reviewers = $this->reviewers($context);
+        $reviewerIds = $reviewers->pluck('id');
+        $approvals = collect($this->decisions($context->payload))
+            ->where('decision', UserReviewDecision::Approved->value)
+            ->whereIn('reviewerId', $reviewerIds)
+            ->count();
+
+        return [
+            'approvalsRequired' => $this->approvalsRequired,
+            'approvals' => $approvals,
+            'reviewers' => $reviewers->map(fn (User $reviewer): array => ['name' => $reviewer->name])->all(),
+        ];
+    }
+
+    public function decide(UserReviewDecision $decision, ?string $message, WorkflowStageContext $context, CraftUser $reviewer): WorkflowStageResult
+    {
+        if (! $this->canReview($context, $reviewer)) {
+            throw new WorkflowException('This stage action is not available to you.');
+        }
+
+        $message = trim((string) $message);
+        if ($decision === UserReviewDecision::Rejected && $message === '') {
+            throw new WorkflowException('A message is required when requesting changes.');
+        }
+
+        $payload = $context->payload;
+        $payload['decisions'] = [
+            ...$this->decisions($payload),
+            [
+                'reviewerId' => $reviewer->getCraftUserId(),
+                'decision' => $decision->value,
+                'message' => $message !== '' ? $message : null,
+                'decidedAt' => now()->toIso8601String(),
+            ],
+        ];
+
+        return $this->evaluate(new WorkflowStageContext(
+            draft: $context->draft,
+            run: $context->run,
+            stage: $context->stage,
+            payload: $payload,
+        ));
+    }
+
+    private function canReview(WorkflowStageContext $context, CraftUser $reviewer): bool
+    {
+        $reviewerId = $reviewer->getCraftUserId();
+
+        return $reviewerId !== null
+            && $reviewerId !== $context->run->authorId
+            && $this->reviewers($context)->contains('id', $reviewerId)
+            && collect($this->decisions($context->payload))->doesntContain('reviewerId', $reviewerId);
+    }
+
+    /** @return Collection<int, User> */
+    public function reviewers(WorkflowStageContext $context): Collection
+    {
+        $groupIds = array_filter(array_map(
+            fn (string $uid): ?int => UserGroups::getGroupByUid($uid)?->id,
+            $this->userGroups,
+        ));
+
+        return User::find()
+            ->groupId($groupIds)
+            ->status(User::STATUS_ACTIVE)
+            ->id(['not', $context->run->authorId])
+            ->can('accessCp')
+            ->collect()
+            ->filter(fn (User $user): bool => Gate::forUser($user)->allows('view', $context->draft))
+            ->values();
+    }
+
+    /**
+     * @param  array<string, mixed>  $payload
+     * @return list<array{reviewerId: int, decision: string, message: string|null, decidedAt: string}>
+     */
+    private function decisions(array $payload): array
+    {
+        return is_array($payload['decisions'] ?? null) ? $payload['decisions'] : [];
+    }
+}
diff --git a/src/Workflow/WorkflowContentChanges.php b/src/Workflow/WorkflowContentChanges.php
new file mode 100644
index 00000000000..aea22d0490f
--- /dev/null
+++ b/src/Workflow/WorkflowContentChanges.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\Drafts;
+use CraftCms\Cms\Element\Events\ElementLifecycleDeleted;
+use CraftCms\Cms\Element\Events\ElementLifecycleDeleting;
+use CraftCms\Cms\Element\Events\ElementPersisted;
+use CraftCms\Cms\Element\Events\ElementSaving;
+use Illuminate\Container\Attributes\Singleton;
+use WeakMap;
+
+/** @internal */
+#[Singleton]
+readonly class WorkflowContentChanges
+{
+    /** @var WeakMap<ElementInterface, array{draftIds: list<int>, mergingCanonicalChanges: bool}> */
+    private WeakMap $writes;
+
+    /** @var WeakMap<ElementInterface, list<int>> */
+    private WeakMap $deletions;
+
+    public function __construct(
+        private Drafts $drafts,
+        private Workflows $workflows,
+    ) {
+        $this->writes = new WeakMap;
+        $this->deletions = new WeakMap;
+    }
+
+    public function handleElementSaving(ElementSaving $event): void
+    {
+        $draftIds = $this->drafts->getDraftIdsForElement($event->element);
+
+        if ($draftIds === []) {
+            unset($this->writes[$event->element]);
+
+            return;
+        }
+
+        $this->writes[$event->element] = [
+            'draftIds' => $draftIds,
+            'mergingCanonicalChanges' => $event->element->mergingCanonicalChanges,
+        ];
+    }
+
+    public function handleElementPersisted(ElementPersisted $event): void
+    {
+        $write = $this->writes[$event->element] ?? null;
+        unset($this->writes[$event->element]);
+
+        if (
+            $write === null ||
+            (! $write['mergingCanonicalChanges'] &&
+                $event->element->getDirtyAttributes() === [] &&
+                $event->element->getDirtyFields() === [])
+        ) {
+            return;
+        }
+
+        $this->workflows->contentChangedByDraftIds($write['draftIds']);
+    }
+
+    public function handleElementLifecycleDeleting(ElementLifecycleDeleting $event): void
+    {
+        $this->deletions[$event->element] = $this->drafts->getDraftIdsForElement($event->element);
+    }
+
+    public function handleElementLifecycleDeleted(ElementLifecycleDeleted $event): void
+    {
+        $draftIds = $this->deletions[$event->element] ?? [];
+        unset($this->deletions[$event->element]);
+
+        $this->workflows->contentChangedByDraftIds($draftIds);
+    }
+
+    /** @return array<class-string, string> */
+    public function subscribe(): array
+    {
+        return [
+            ElementSaving::class => 'handleElementSaving',
+            ElementPersisted::class => 'handleElementPersisted',
+            ElementLifecycleDeleting::class => 'handleElementLifecycleDeleting',
+            ElementLifecycleDeleted::class => 'handleElementLifecycleDeleted',
+        ];
+    }
+}
diff --git a/src/Workflow/WorkflowProjectConfig.php b/src/Workflow/WorkflowProjectConfig.php
deleted file mode 100644
index 0e60f490d41..00000000000
--- a/src/Workflow/WorkflowProjectConfig.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace CraftCms\Cms\Workflow;
-
-use CraftCms\Cms\ProjectConfig\Events\ConfigEvent;
-use CraftCms\Cms\ProjectConfig\ProjectConfig;
-use CraftCms\Cms\Support\Str;
-use CraftCms\Cms\Workflow\Data\WorkflowStageData;
-use CraftCms\Cms\Workflow\Models\Workflow;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-
-class WorkflowProjectConfig
-{
-    public function __construct(
-        private readonly ProjectConfig $projectConfig,
-        private readonly Workflows $workflows,
-    ) {}
-
-    /** @return Collection<int, Workflow> */
-    public function getAllWorkflows(): Collection
-    {
-        return Workflow::query()->get();
-    }
-
-    /** @param list<WorkflowStageData> $stages */
-    public function save(Workflow $workflow, array $stages): void
-    {
-        $workflow->uid ??= Str::uuid7()->toString();
-
-        $this->projectConfig->set(
-            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
-            [
-                'name' => trim($workflow->name),
-                'stages' => array_map(fn (WorkflowStageData $stage): array => $stage->getConfig(), $stages),
-            ],
-            "Save workflow “{$workflow->name}”",
-        );
-
-        $workflow->id = Workflow::findByUid($workflow->uid)?->id;
-    }
-
-    public function delete(Workflow $workflow): void
-    {
-        $this->projectConfig->remove(
-            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
-            "Delete workflow “{$workflow->name}”",
-        );
-    }
-
-    public function handleChanged(ConfigEvent $event): void
-    {
-        $uid = $event->tokenMatches[0];
-        /** @var array{name: string, stages: list<array{uid: string, name: string, type: string, settings?: array<string, mixed>}>} $data */
-        $data = $event->newValue;
-
-        DB::transaction(function () use ($uid, $data): void {
-            $workflow = Workflow::findByUid($uid);
-            $oldExecutableConfig = $workflow === null ? [] : $this->executableConfig($workflow);
-            $workflow ??= new Workflow(['uid' => $uid]);
-            $workflow->fill([
-                'name' => $data['name'],
-                'stages' => array_map(
-                    fn (array $stage): array => WorkflowStageData::fromArray($stage)->getConfig(),
-                    $data['stages'],
-                ),
-            ])->save();
-
-            if ($oldExecutableConfig !== [] && $oldExecutableConfig !== $this->executableConfig($workflow)) {
-                $this->workflows->invalidateRuns($workflow, 'The workflow configuration changed.');
-            }
-        });
-    }
-
-    public function handleDeleted(ConfigEvent $event): void
-    {
-        $workflow = Workflow::findByUid($event->tokenMatches[0]);
-        if ($workflow === null) {
-            return;
-        }
-
-        $this->workflows->invalidateRuns($workflow, 'The workflow was deleted.');
-        $workflow->delete();
-    }
-
-    /** @return list<array{uid: string, type: string, settings: array<string, mixed>}> */
-    private function executableConfig(Workflow $workflow): array
-    {
-        return $workflow->stages->map(fn (WorkflowStageData $stage): array => [
-            'uid' => $stage->uid,
-            'type' => $stage->type,
-            'settings' => $stage->settings,
-        ])->all();
-    }
-}
diff --git a/src/Workflow/WorkflowServiceProvider.php b/src/Workflow/WorkflowServiceProvider.php
new file mode 100644
index 00000000000..fbddd662540
--- /dev/null
+++ b/src/Workflow/WorkflowServiceProvider.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow;
+
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\ServiceProvider;
+
+class WorkflowServiceProvider extends ServiceProvider
+{
+    public function boot(): void
+    {
+        Event::subscribe(WorkflowContentChanges::class);
+    }
+}
diff --git a/src/Workflow/Workflows.php b/src/Workflow/Workflows.php
new file mode 100644
index 00000000000..9b3db2a7eab
--- /dev/null
+++ b/src/Workflow/Workflows.php
@@ -0,0 +1,780 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow;
+
+use Closure;
+use CraftCms\Cms\Activity\ActivityTimelinePresenter;
+use CraftCms\Cms\Activity\Data\ActivityActor;
+use CraftCms\Cms\Activity\Data\ActivitySubject;
+use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Edition;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\ElementHelper;
+use CraftCms\Cms\ProjectConfig\Events\ConfigEvent;
+use CraftCms\Cms\ProjectConfig\ProjectConfig;
+use CraftCms\Cms\Support\Facades\Activities;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Activity\WorkflowActivityEvent;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowReviewData;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Data\WorkflowTimelineItemData;
+use CraftCms\Cms\Workflow\Enums\WorkflowActivityType;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Events\WorkflowCommented;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioned;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioning;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Container\Attributes\Singleton;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Gate;
+
+use function CraftCms\Cms\currentUser;
+use function CraftCms\Cms\t;
+
+#[Singleton]
+class Workflows
+{
+    public function __construct(
+        private readonly ActivityTimelinePresenter $activityTimelinePresenter,
+        private readonly ProjectConfig $projectConfig,
+    ) {}
+
+    /** @return Collection<int, Workflow> */
+    public function getAllWorkflows(): Collection
+    {
+        return Workflow::query()->get();
+    }
+
+    public function saveWorkflow(Workflow $workflow): void
+    {
+        $workflow->uid ??= Str::uuid7()->toString();
+        $workflow->name = trim($workflow->name);
+
+        $this->projectConfig->set(
+            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
+            $workflow->getConfig(),
+            "Save workflow “{$workflow->name}”",
+        );
+
+        $workflow->id = Workflow::findByUid($workflow->uid)?->id;
+    }
+
+    public function deleteWorkflow(Workflow $workflow): void
+    {
+        $this->projectConfig->remove(
+            ProjectConfig::PATH_WORKFLOWS.'.'.$workflow->uid,
+            "Delete workflow “{$workflow->name}”",
+        );
+    }
+
+    public function handleChangedWorkflow(ConfigEvent $event): void
+    {
+        $uid = $event->tokenMatches[0];
+        /** @var array{name: string, stages: list<array{uid: string, name: string, type: string, settings?: array<string, mixed>}>} $data */
+        $data = $event->newValue;
+
+        DB::transaction(function () use ($uid, $data): void {
+            $workflow = Workflow::findByUid($uid);
+            $oldExecutionConfig = $workflow?->getExecutionConfig();
+            $workflow ??= new Workflow(['uid' => $uid]);
+            $workflow->fill([
+                'name' => $data['name'],
+                'stages' => array_map(
+                    fn (array $stage): array => WorkflowStageData::fromArray($stage)->getConfig(),
+                    $data['stages'],
+                ),
+            ])->save();
+
+            if ($oldExecutionConfig !== null && $oldExecutionConfig !== $workflow->getExecutionConfig()) {
+                $this->invalidateRuns($workflow, 'The workflow configuration changed.');
+            }
+        });
+    }
+
+    public function handleDeletedWorkflow(ConfigEvent $event): void
+    {
+        $workflow = Workflow::findByUid($event->tokenMatches[0]);
+        if ($workflow === null) {
+            return;
+        }
+
+        $this->invalidateRuns($workflow, 'The workflow was deleted.');
+        $workflow->delete();
+    }
+
+    public function forElement(ElementInterface $element): ?Workflow
+    {
+        if (! Edition::isAtLeast(Edition::Pro) || ! $element instanceof WorkflowableInterface) {
+            return null;
+        }
+
+        return $element->workflow();
+    }
+
+    public function requiresApproval(ElementInterface $element): bool
+    {
+        return $element->enabled
+            && $element->getEnabledForSite()
+            && $this->forElement($element) !== null;
+    }
+
+    public function latestRun(ElementInterface $draft): ?WorkflowRun
+    {
+        if (! $draft->draftId) {
+            return null;
+        }
+
+        return WorkflowRun::query()
+            ->where('draftId', $draft->draftId)
+            ->with('activityRootEvent')
+            ->latest('id')
+            ->first();
+    }
+
+    public function submitForReview(ElementInterface $draft, ?string $note = null): WorkflowRun
+    {
+        $this->ensureAvailable();
+        $author = $this->actor();
+        $submittedDraft = $draft;
+
+        $run = DB::transaction(function () use ($draft, $author, $note, &$submittedDraft): WorkflowRun {
+            $this->lockDraft($draft);
+            $submittedDraft = $draft::find()
+                ->draftId($draft->draftId)
+                ->provisionalDrafts(null)
+                ->siteId($draft->siteId)
+                ->status(null)
+                ->one()
+                ?? throw new WorkflowException('This draft could not be found.');
+            $this->ensureReviewableDraft($submittedDraft);
+
+            if (! Gate::forUser($author)->allows('save', $submittedDraft)) {
+                throw new WorkflowException('You are not allowed to edit this draft.');
+            }
+
+            $workflow = $this->forElement($submittedDraft)
+                ?? throw new WorkflowException('This element does not have an approval workflow.');
+            $latestRun = $this->latestRun($submittedDraft);
+
+            if ($latestRun?->isPending()) {
+                throw new WorkflowException('This draft is already in review.');
+            }
+
+            if ($latestRun?->status === WorkflowStatus::Approved) {
+                throw new WorkflowException('This draft is already approved.');
+            }
+
+            if ($workflow->stages->isEmpty()) {
+                throw new WorkflowException('A workflow must contain at least one stage.');
+            }
+
+            $this->beforeTransition(WorkflowTransition::Submit, $submittedDraft, $author, note: $note);
+            $rootEvent = $this->recordSubmission($submittedDraft, $author, $workflow, $note);
+            $run = WorkflowRun::query()->create([
+                'workflowId' => $workflow->id,
+                'draftId' => $draft->draftId,
+                'authorId' => $author->getCraftUserId(),
+                'activityRootEventId' => $rootEvent->id,
+                'currentStage' => 0,
+                'currentStageResult' => null,
+                'status' => WorkflowStatus::Pending,
+                'payload' => [],
+            ]);
+
+            $this->advance($submittedDraft, $run);
+
+            return $run->refresh()->load('activityRootEvent');
+        });
+
+        $this->afterTransition(WorkflowTransition::Submit, $submittedDraft, $author, $run, $note);
+
+        return $run;
+    }
+
+    /** @param WorkflowStageResult|Closure(WorkflowStageContext): WorkflowStageResult $result */
+    public function reportStageResult(
+        int $runId,
+        string $stageUid,
+        WorkflowStageResult|Closure $result,
+        ?CraftUser $actor = null,
+        ?WorkflowTransition $activityTransition = null,
+        ?string $activityNote = null,
+    ): ?WorkflowRun {
+        $this->ensureAvailable();
+        $run = WorkflowRun::query()->with('activityRootEvent')->find($runId);
+        if ($run === null) {
+            return null;
+        }
+
+        $draft = $this->draftForRun($run);
+        if ($draft === null) {
+            return $run;
+        }
+
+        $stageCompleted = false;
+        $completedTransition = $activityTransition;
+        $run = DB::transaction(function () use ($draft, $runId, $stageUid, $result, $actor, $activityTransition, $activityNote, &$stageCompleted, &$completedTransition): ?WorkflowRun {
+            $this->lockDraft($draft);
+            $run = WorkflowRun::query()
+                ->whereKey($runId)
+                ->with('activityRootEvent')
+                ->lockForUpdate()
+                ->first();
+
+            if ($run === null) {
+                return null;
+            }
+
+            if (! $run->isPending()) {
+                return $run;
+            }
+
+            $stage = $this->currentStage($run);
+            if ($stage->uid !== $stageUid) {
+                return $run;
+            }
+
+            $context = $this->stageContext($draft, $run, $stage);
+            if ($activityTransition !== null) {
+                $this->beforeTransition($activityTransition, $draft, $actor, $run, $activityNote);
+            }
+
+            $resolvedResult = value($result, $context);
+            if ($activityTransition === null) {
+                $this->recordAutomatedTransition($draft, $run, $stage, $resolvedResult);
+                $completedTransition = match ($resolvedResult->status) {
+                    WorkflowStageStatus::Approved => WorkflowTransition::StageApproved,
+                    WorkflowStageStatus::Failed => WorkflowTransition::StageFailed,
+                    WorkflowStageStatus::Pending => null,
+                };
+            } else {
+                $this->recordTransition($draft, $actor, $run, $activityTransition, $stage, $activityNote);
+            }
+            if ($this->advanceFromResult($run, $stage, $resolvedResult)) {
+                $this->advance($draft, $run);
+            }
+            $stageCompleted = true;
+
+            return $run->refresh()->load('activityRootEvent');
+        });
+
+        if ($stageCompleted && $completedTransition !== null && $run !== null) {
+            $this->afterTransition($completedTransition, $draft, $actor, $run, $activityNote);
+        }
+
+        return $run;
+    }
+
+    public function addComment(ElementInterface $draft, int $runId, int|string $stage, string $note): WorkflowRun
+    {
+        if (trim($note) === '') {
+            throw new WorkflowException('A comment is required.');
+        }
+
+        $actor = $this->actor();
+
+        return DB::transaction(function () use ($draft, $runId, $stage, $note, $actor): WorkflowRun {
+            $run = $this->lockedRun($draft, $runId);
+            $workflowStage = is_int($stage) ? $this->stage($runId, $stage) : $run->stages()->firstWhere('uid', $stage);
+            $stageIndex = $workflowStage === null
+                ? false
+                : $run->stages()->search(fn (WorkflowStageData $candidate): bool => $candidate->uid === $workflowStage->uid);
+            if ($workflowStage === null || $stageIndex === false || $stageIndex > $run->currentStage) {
+                throw new WorkflowException('This review stage has not been reached.');
+            }
+
+            if ($run->status === WorkflowStatus::Published || ! Gate::forUser($actor)->allows('view', $draft)) {
+                throw new WorkflowException('You cannot comment on this review.');
+            }
+
+            $this->recordActivity($draft, $actor, $run, WorkflowActivityType::Comment, $workflowStage, $note);
+            DB::afterCommit(fn () => event(new WorkflowCommented($draft, $actor, $run, $workflowStage, $note)));
+
+            return $run;
+        });
+    }
+
+    public function overrideApproval(ElementInterface $draft, int $runId, ?string $reason = null): WorkflowRun
+    {
+        $reason = $reason !== null && trim($reason) !== '' ? $reason : null;
+
+        $actor = $this->actor();
+        if (! $actor->isAdmin()) {
+            throw new WorkflowException('You do not have permission to override this workflow.');
+        }
+
+        $run = DB::transaction(function () use ($draft, $runId, $reason, $actor): WorkflowRun {
+            $this->lockDraft($draft);
+            $run = $this->lockedRun($draft, $runId);
+
+            if (! in_array($run->status, [WorkflowStatus::Pending, WorkflowStatus::Failed], true)) {
+                throw new WorkflowException('This review can no longer be overridden.');
+            }
+
+            $this->beforeTransition(WorkflowTransition::Override, $draft, $actor, $run, $reason);
+            $run->update([
+                'status' => WorkflowStatus::Approved,
+                'currentStageResult' => null,
+            ]);
+            $this->recordTransition($draft, $actor, $run, WorkflowTransition::Override, note: $reason);
+
+            return $run->refresh()->load('activityRootEvent');
+        });
+
+        $this->afterTransition(WorkflowTransition::Override, $draft, $actor, $run, $reason);
+
+        return $run;
+    }
+
+    public function reviewData(ElementInterface $draft, CraftUser $viewer): ?WorkflowReviewData
+    {
+        $workflow = $this->forElement($draft);
+        if ($workflow === null) {
+            return null;
+        }
+
+        $run = $this->latestRun($draft);
+        $runs = $run === null ? collect() : WorkflowRun::query()
+            ->where('draftId', $draft->draftId)
+            ->with('activityRootEvent')
+            ->latest('id')
+            ->get();
+        $timelineItems = collect($this->timelineItems($draft, $viewer, $runs));
+
+        return WorkflowReviewData::from($draft, $viewer, $run, $runs, $timelineItems);
+    }
+
+    /**
+     * @template T of ElementInterface
+     *
+     * @param  T  $draft
+     * @param  Closure(T): T  $apply
+     * @return T
+     */
+    public function applyDraft(ElementInterface $draft, ?CraftUser $actor, ?int $expectedRunId, ?int $expectedStage, Closure $apply): ElementInterface
+    {
+        if ($this->forElement($draft) === null) {
+            return $apply($draft);
+        }
+
+        $run = $this->latestRun($draft);
+        if ($run === null) {
+            throw new WorkflowException('This draft must be approved before it can be applied.');
+        }
+        if ($run->id !== $expectedRunId || $run->currentStage !== $expectedStage) {
+            throw new WorkflowException('The approval workflow has changed. Refresh and try again.');
+        }
+        if ($run->status !== WorkflowStatus::Approved) {
+            throw new WorkflowException('This draft must be approved before it can be applied.');
+        }
+        if (ElementHelper::isOutdated($draft)) {
+            throw new WorkflowException('This draft has changed since it was approved. Refresh and submit it for review again.');
+        }
+
+        $canonical = $apply($draft);
+        $run->update(['status' => WorkflowStatus::Published]);
+        $this->recordTransition($draft, $actor, $run, WorkflowTransition::Publish);
+
+        return $canonical;
+    }
+
+    public function contentChanged(ElementInterface $draft): void
+    {
+        $this->contentChangedByDraftIds([(int) $draft->draftId]);
+    }
+
+    /** @param list<int> $draftIds */
+    public function contentChangedByDraftIds(array $draftIds): void
+    {
+        $this->invalidateActiveRuns(
+            WorkflowRun::query()->whereIn('draftId', $draftIds),
+            'The draft changed.',
+        );
+    }
+
+    public function invalidateRuns(Workflow $workflow, string $reason): void
+    {
+        $this->invalidateActiveRuns(
+            WorkflowRun::query()->where('workflowId', $workflow->id),
+            $reason,
+        );
+    }
+
+    public function invalidateSectionRuns(int $sectionId): void
+    {
+        $draftIds = DB::table(Table::ENTRIES)
+            ->join(Table::ELEMENTS, Table::ELEMENTS.'.id', '=', Table::ENTRIES.'.id')
+            ->where(Table::ENTRIES.'.sectionId', $sectionId)
+            ->whereNotNull(Table::ELEMENTS.'.draftId')
+            ->pluck(Table::ELEMENTS.'.draftId');
+
+        $this->invalidateActiveRuns(
+            WorkflowRun::query()->whereIn('draftId', $draftIds),
+            'The workflow assignment changed.',
+        );
+    }
+
+    /**
+     * @template T
+     *
+     * @param  list<int>  $draftIds
+     * @param  Closure(): T  $callback
+     * @return T
+     */
+    public function withContentChangeLock(array $draftIds, Closure $callback): mixed
+    {
+        return DB::transaction(function () use ($draftIds, $callback): mixed {
+            $this->lockDraftIds($draftIds);
+            $result = $callback();
+            $this->contentChangedByDraftIds($draftIds);
+
+            return $result;
+        });
+    }
+
+    /** @param list<int> $draftIds */
+    public function lockDraftIds(array $draftIds): void
+    {
+        DB::table(Table::DRAFTS)->whereIn('id', $draftIds)->orderBy('id')->lockForUpdate()->get(['id']);
+    }
+
+    /**
+     * @template T
+     *
+     * @param  Closure(WorkflowRun): T  $callback
+     * @return T
+     */
+    public function withApplicationLock(ElementInterface $draft, ?int $expectedRunId, ?int $expectedStage, Closure $callback): mixed
+    {
+        return DB::transaction(function () use ($draft, $expectedRunId, $expectedStage, $callback): mixed {
+            $this->lockDraft($draft);
+            $run = $this->latestRun($draft);
+            if ($run === null) {
+                throw new WorkflowException('This draft must be approved before it can be applied.');
+            }
+            if ($run->id !== $expectedRunId || $run->currentStage !== $expectedStage) {
+                throw new WorkflowException('The approval workflow has changed. Refresh and try again.');
+            }
+
+            return $callback($run);
+        });
+    }
+
+    private function advance(ElementInterface $draft, WorkflowRun $run): void
+    {
+        while ($run->isPending()) {
+            $stage = $this->currentStage($run);
+            $context = $this->stageContext($draft, $run, $stage);
+            $result = $stage->component()->evaluate($context);
+            $this->recordAutomatedTransition($draft, $run, $stage, $result);
+
+            if (! $this->advanceFromResult($run, $stage, $result)) {
+                return;
+            }
+        }
+    }
+
+    private function advanceFromResult(WorkflowRun $run, WorkflowStageData $stage, WorkflowStageResult $result): bool
+    {
+        $this->storeStageResult($run, $stage, $result);
+
+        if ($result->status === WorkflowStageStatus::Pending) {
+            return false;
+        }
+
+        if ($result->status === WorkflowStageStatus::Failed) {
+            $run->update(['status' => WorkflowStatus::Failed]);
+
+            return false;
+        }
+
+        if ($run->currentStage >= $run->stages()->count() - 1) {
+            $run->update(['status' => WorkflowStatus::Approved]);
+
+            return false;
+        }
+
+        $run->increment('currentStage');
+        $run->refresh();
+
+        return true;
+    }
+
+    private function storeStageResult(WorkflowRun $run, WorkflowStageData $stage, WorkflowStageResult $result): void
+    {
+        $payload = $run->payload ?? [];
+        $payload[$stage->uid] = $result->payload;
+        $run->update(['payload' => $payload, 'currentStageResult' => $result->message]);
+    }
+
+    private function recordAutomatedTransition(
+        ElementInterface $draft,
+        WorkflowRun $run,
+        WorkflowStageData $stage,
+        WorkflowStageResult $result,
+    ): void {
+        $transition = match ($result->status) {
+            WorkflowStageStatus::Approved => WorkflowTransition::StageApproved,
+            WorkflowStageStatus::Failed => WorkflowTransition::StageFailed,
+            WorkflowStageStatus::Pending => null,
+        };
+
+        if ($transition === null) {
+            return;
+        }
+
+        $this->recordTransition(
+            draft: $draft,
+            actor: ActivityActor::system(),
+            run: $run,
+            transition: $transition,
+            stage: $stage,
+            note: $result->message,
+        );
+    }
+
+    /** @param Builder<WorkflowRun> $query */
+    private function invalidateActiveRuns($query, string $reason): void
+    {
+        $query->whereIn('status', [WorkflowStatus::Pending, WorkflowStatus::Approved])
+            ->with('activityRootEvent')
+            ->get()
+            ->each(function (WorkflowRun $run) use ($reason): void {
+                $draft = $this->draftForRun($run);
+                $run->update([
+                    'status' => WorkflowStatus::Invalidated,
+                    'currentStageResult' => null,
+                ]);
+
+                if ($draft === null) {
+                    return;
+                }
+
+                $actor = currentUser();
+                $this->recordTransition($draft, $actor, $run, WorkflowTransition::Invalidate, note: $reason);
+                $this->afterTransition(WorkflowTransition::Invalidate, $draft, $actor, $run, $reason);
+            });
+    }
+
+    private function draftForRun(WorkflowRun $run): ?ElementInterface
+    {
+        $type = $run->activityRootEvent->data['draft']['elementType'] ?? null;
+        $siteId = $run->activityRootEvent->data['draft']['siteId'] ?? null;
+        if (! is_string($type) || ! is_a($type, ElementInterface::class, true) || ! is_int($siteId)) {
+            return null;
+        }
+
+        /** @var class-string<ElementInterface> $type */
+        return $type::find()
+            ->draftId($run->draftId)
+            ->siteId($siteId)
+            ->status(null)
+            ->one();
+    }
+
+    private function stageContext(ElementInterface $draft, WorkflowRun $run, WorkflowStageData $stage): WorkflowStageContext
+    {
+        return new WorkflowStageContext($draft, $run, $stage, $run->payload[$stage->uid] ?? []);
+    }
+
+    private function lockedRun(ElementInterface $draft, int $runId): WorkflowRun
+    {
+        return WorkflowRun::query()->whereKey($runId)->where('draftId', $draft->draftId)
+            ->with('activityRootEvent')->lockForUpdate()->first()
+            ?? throw new WorkflowException('This review could not be found.');
+    }
+
+    private function currentStage(WorkflowRun $run): WorkflowStageData
+    {
+        return $run->stages()->get($run->currentStage)
+            ?? throw new WorkflowException('The current workflow stage could not be found.');
+    }
+
+    private function stage(int $runId, int $index): WorkflowStageData
+    {
+        $run = WorkflowRun::query()->with('activityRootEvent')->findOrFail($runId);
+
+        return $run->stages()->get($index)
+            ?? throw new WorkflowException('The workflow stage could not be found.');
+    }
+
+    private function lockDraft(ElementInterface $draft): void
+    {
+        DB::table(Table::DRAFTS)->where('id', $draft->draftId)->lockForUpdate()->value('id');
+    }
+
+    private function ensureAvailable(): void
+    {
+        if (! Edition::isAtLeast(Edition::Pro)) {
+            throw new WorkflowException('Approval workflows require Craft Pro or Enterprise.');
+        }
+    }
+
+    private function ensureReviewableDraft(ElementInterface $draft): void
+    {
+        if (! $draft->getIsDraft() || $draft->isProvisionalDraft || ! $draft->draftId || ! $draft->markDraftAsSaved || ! $draft::hasDrafts()) {
+            throw new WorkflowException('Only saved named drafts can be submitted for review.');
+        }
+
+        if (! $this->requiresApproval($draft)) {
+            throw new WorkflowException('Only enabled drafts with an approval workflow can be submitted for review.');
+        }
+    }
+
+    private function actor(): CraftUser
+    {
+        return currentUser() ?? throw new WorkflowException('You must be signed in to update an approval workflow.');
+    }
+
+    private function beforeTransition(WorkflowTransition $transition, ElementInterface $draft, ?CraftUser $actor, ?WorkflowRun $run = null, ?string $note = null): void
+    {
+        $event = new WorkflowTransitioning($transition, $draft, $actor, $run, $note);
+        event($event);
+        if ($event->cancel) {
+            throw new WorkflowException('The workflow transition was cancelled.');
+        }
+    }
+
+    private function afterTransition(WorkflowTransition $transition, ElementInterface $draft, ?CraftUser $actor, WorkflowRun $run, ?string $note = null): void
+    {
+        DB::afterCommit(fn () => event(new WorkflowTransitioned($transition, $draft, $actor, $run, $note)));
+    }
+
+    private function recordSubmission(ElementInterface $draft, CraftUser $actor, Workflow $workflow, ?string $note): ActivityEvent
+    {
+        return Activities::record(new WorkflowActivityEvent(
+            subject: $draft->getCanonical(),
+            type: WorkflowActivityType::Submit,
+            note: $note,
+            workflow: [
+                'id' => $workflow->id,
+                'uid' => $workflow->uid,
+                'name' => $workflow->name,
+                'stages' => $workflow->stages->map(fn (WorkflowStageData $stage): array => [
+                    'uid' => $stage->uid,
+                    'name' => $stage->name,
+                    'type' => $stage->type,
+                    'settings' => $stage->settings,
+                ])->values()->all(),
+            ],
+            draft: [
+                'elementId' => (int) $draft->id,
+                'draftId' => (int) $draft->draftId,
+                'elementType' => $draft::class,
+                'siteId' => (int) $draft->siteId,
+            ],
+            actor: $actor,
+        ));
+    }
+
+    private function recordTransition(
+        ElementInterface $draft,
+        CraftUser|ActivityActor|null $actor,
+        WorkflowRun $run,
+        WorkflowTransition $transition,
+        ?WorkflowStageData $stage = null,
+        ?string $note = null,
+    ): void {
+        $this->recordActivity(
+            $draft,
+            $actor,
+            $run,
+            WorkflowActivityType::from($transition->value),
+            $stage,
+            $note,
+        );
+    }
+
+    private function recordActivity(
+        ElementInterface $draft,
+        CraftUser|ActivityActor|null $actor,
+        WorkflowRun $run,
+        WorkflowActivityType $type,
+        ?WorkflowStageData $stage = null,
+        ?string $note = null,
+    ): void {
+        $stageIndex = $stage === null
+            ? false
+            : $run->stages()->search(fn (WorkflowStageData $candidate): bool => $candidate->uid === $stage->uid);
+
+        Activities::record(new WorkflowActivityEvent(
+            subject: $draft->getCanonical(),
+            type: $type,
+            stage: $stage?->name,
+            stageNumber: $stageIndex === false ? null : $stageIndex + 1,
+            note: $note,
+            actor: $actor,
+        ), $run->activityRootEventId);
+    }
+
+    /**
+     * @param  Collection<int, WorkflowRun>  $runs
+     * @return list<WorkflowTimelineItemData>
+     */
+    private function timelineItems(ElementInterface $draft, CraftUser $viewer, Collection $runs): array
+    {
+        if ($runs->isEmpty()) {
+            return [];
+        }
+
+        $runIdsByRootEvent = $runs->mapWithKeys(fn (WorkflowRun $run): array => [$run->activityRootEventId => $run->id]);
+        $rootEventIds = $runIdsByRootEvent->keys();
+        $events = ActivityEvent::query()->subject(ActivitySubject::fromElement($draft))->eventTypes(WorkflowActivityEvent::class)
+            ->where(fn (Builder $query) => $query->whereIn('id', $rootEventIds)->orWhereIn('rootEventId', $rootEventIds))
+            ->oldest('occurredAt')->orderBy('id')->get();
+        $presented = $this->activityTimelinePresenter->events($events, $viewer->asElement())->keyBy('id');
+
+        return $events->map(function (ActivityEvent $event) use ($presented, $runIdsByRootEvent): WorkflowTimelineItemData {
+            $presentation = $presented->get($event->id);
+            $type = WorkflowActivityType::from($event->data['type']);
+            $rootEventId = $event->rootEventId ?? $event->id;
+            $impersonator = $presentation['impersonator'];
+
+            return new WorkflowTimelineItemData(
+                id: (string) $event->id,
+                type: $type === WorkflowActivityType::Submit ? 'submission' : ($type === WorkflowActivityType::Comment ? 'comment' : 'review'),
+                icon: match ($type) {
+                    WorkflowActivityType::Submit => 'clipboard-list-check',
+                    WorkflowActivityType::Comment => 'comment',
+                    WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => 'check',
+                    WorkflowActivityType::Reject, WorkflowActivityType::StageFailed => 'xmark',
+                    default => 'rotate',
+                },
+                description: match ($type) {
+                    WorkflowActivityType::Submit => t('requested review'),
+                    WorkflowActivityType::Comment => t('commented.'),
+                    WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => t('approved'),
+                    WorkflowActivityType::Reject => t('requested changes'),
+                    WorkflowActivityType::StageFailed => t('failed the stage'),
+                    default => t('updated the workflow stage'),
+                },
+                actor: (array) $presentation['actor'],
+                impersonator: is_array($impersonator) ? $impersonator : null,
+                decision: match ($type) {
+                    WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => WorkflowStageStatus::Approved->value,
+                    WorkflowActivityType::Reject => 'rejected',
+                    WorkflowActivityType::StageFailed => WorkflowStageStatus::Failed->value,
+                    default => null,
+                },
+                noteHtml: $presentation['props']['noteHtml'] ?? null,
+                occurredAt: $presentation['occurredAt'],
+                formattedOccurredAt: (array) $presentation['formattedOccurredAt'],
+                runId: (int) $runIdsByRootEvent->get($rootEventId),
+                stageNumber: isset($event->data['stageNumber']) ? (int) $event->data['stageNumber'] : null,
+            );
+        })->all();
+    }
+}
diff --git a/tests/Feature/Element/ElementEagerLoaderTest.php b/tests/Feature/Element/ElementEagerLoaderTest.php
index b58aa2d7c48..fa75c539ac9 100644
--- a/tests/Feature/Element/ElementEagerLoaderTest.php
+++ b/tests/Feature/Element/ElementEagerLoaderTest.php
@@ -21,6 +21,7 @@
 use CraftCms\Cms\Tests\TestClasses\Element\ElementEagerLoader\TestElementEagerLoaderResolvedTargetElement;
 use CraftCms\Cms\Tests\TestClasses\Element\ElementEagerLoader\TestElementEagerLoaderSourceElement;
 use CraftCms\Cms\Tests\TestClasses\Element\ElementEagerLoader\TestElementEagerLoaderTargetElement;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 
@@ -372,6 +373,7 @@ function invokeElementEagerLoaderMethod(ElementEagerLoader $loader, string $meth
     $loader = app(ElementEagerLoader::class, ['drafts' => new TestElementEagerLoaderDrafts(
         app(Elements::class),
         app(DraftActivity::class),
+        app(Workflows::class),
     )]);
     $source = new TestElementEagerLoaderSourceElement(['id' => 1]);
 
diff --git a/tests/Feature/Http/Controllers/Elements/CreateElementControllerTest.php b/tests/Feature/Http/Controllers/Elements/CreateElementControllerTest.php
index 9ca218c8e1e..b33b5c0513b 100644
--- a/tests/Feature/Http/Controllers/Elements/CreateElementControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/CreateElementControllerTest.php
@@ -13,6 +13,7 @@
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Testing\Fluent\AssertableJson;
 
@@ -71,7 +72,7 @@ function createElementControllerPayload(object $section, object $entryType, arra
 });
 
 it('returns a failure response when saving the draft fails', function () {
-    app()->instance(Drafts::class, new readonly class(app(Elements::class), app(DraftActivity::class)) extends Drafts
+    app()->instance(Drafts::class, new readonly class(app(Elements::class), app(DraftActivity::class), app(Workflows::class)) extends Drafts
     {
         public function saveElementAsDraft(
             ElementInterface $element,
diff --git a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
index 407bc952cba..371ed78cbaf 100644
--- a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
@@ -19,20 +19,27 @@
 use CraftCms\Cms\Http\Requests\ElementRequest;
 use CraftCms\Cms\Section\Models\Section;
 use CraftCms\Cms\Support\Facades\Elements as ElementsFacade;
+use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Testing\Fluent\AssertableJson;
 use Symfony\Component\HttpKernel\Exception\HttpException;
+use Workbench\App\Workflow\AutomaticApprovalStage;
 
 use function CraftCms\Cms\cp_url;
 use function CraftCms\Cms\currentUser;
 use function CraftCms\Cms\t;
 use function Pest\Laravel\actingAs;
+use function Pest\Laravel\from;
 use function Pest\Laravel\post;
 use function Pest\Laravel\postJson;
 
@@ -342,10 +349,16 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
         $entry = EntryModel::factory()->createElement([
             'title' => 'Canonical Title',
         ]);
+        $workflow = Workflow::query()->create([
+            'name' => 'Editorial workflow',
+            'uid' => Str::uuid7()->toString(),
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
         /** @var Entry $draft */
         $draft = app(Drafts::class)->createDraft($entry, auth()->id(), provisional: true);
 
-        postJson(action([ElementDraftsController::class, 'store']), [
+        $response = postJson(cp_url('actions/elements/save-draft'), [
             'elementType' => Entry::class,
             'draftId' => $draft->draftId,
             'siteId' => $draft->siteId,
@@ -361,7 +374,42 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
             ->one();
 
         expect($savedDraft->isProvisionalDraft)->toBeFalse()
-            ->and($savedDraft->title)->toBe('Saved Draft Title');
+            ->and($savedDraft->title)->toBe('Saved Draft Title')
+            ->and($response->json('screen.isProvisionalDraft'))->toBeFalse()
+            ->and($response->json('screen.workflow.configured'))->toBeTrue()
+            ->and($response->json('screen.workflow.current.canSubmit'))->toBeTrue()
+            ->and(collect($response->json('screen.headerActions'))->pluck('label'))->not->toContain('Create a draft');
+    });
+
+    it('redirects to the named draft after promoting a provisional draft for review', function () {
+        $entry = EntryModel::factory()->createElement([
+            'title' => 'Canonical Title',
+        ]);
+        $workflow = Workflow::query()->create([
+            'name' => 'Editorial workflow',
+            'uid' => Str::uuid7()->toString(),
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        /** @var Entry $draft */
+        $draft = app(Drafts::class)->createDraft($entry, auth()->id(), provisional: true);
+
+        $response = from($entry->getCpEditUrl())->post(cp_url('actions/elements/save-draft'), [
+            'elementType' => Entry::class,
+            'draftId' => $draft->draftId,
+            'siteId' => $draft->siteId,
+            'dropProvisional' => true,
+            'title' => 'Saved Draft Title',
+        ]);
+
+        /** @var Entry $namedDraft */
+        $namedDraft = Entry::find()
+            ->draftId($draft->draftId)
+            ->siteId($draft->siteId)
+            ->status(null)
+            ->one();
+
+        $response->assertRedirect($namedDraft->getCpEditUrl());
     });
 
     it('includes cp editor payload fields on the control panel action route', function () {
@@ -613,7 +661,7 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
         $request->setUserResolver(fn () => currentUser());
         app()->instance('request', $request);
 
-        $controller = new class($request, app(Drafts::class), app(Elements::class), app(ElementActivity::class)) extends ElementDraftsController
+        $controller = new class($request, app(Drafts::class), app(Elements::class), app(ElementActivity::class), app(Workflows::class)) extends ElementDraftsController
         {
             private int $canSaveCalls = 0;
 
@@ -690,6 +738,183 @@ protected function canSave(ElementInterface $element, CraftUser $user): bool
             ->and(Entry::find()->draftId($draft->draftId)->status(null)->one())->toBeNull();
     });
 
+    it('applies an approved first workflow stage', function () {
+        $entry = EntryModel::factory()->createElement(['title' => 'Canonical Title']);
+        $workflow = Workflow::query()->create([
+            'name' => 'Automatic workflow',
+            'uid' => Str::uuid7()->toString(),
+            'stages' => [[
+                'uid' => Str::uuid7()->toString(),
+                'name' => 'Automatic approval',
+                'type' => AutomaticApprovalStage::class,
+                'settings' => [],
+            ]],
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        /** @var Entry $draft */
+        $draft = app(Drafts::class)->createDraft($entry, auth()->id(), name: 'Reviewed draft');
+        $draft->title = 'Approved Title';
+        expect(ElementsFacade::saveElement($draft))->toBeTrue();
+        $run = app(Workflows::class)->submitForReview($draft);
+
+        postJson(action([ElementDraftsController::class, 'apply']), [
+            'elementType' => Entry::class,
+            'draftId' => $draft->draftId,
+            'siteId' => $draft->siteId,
+            'workflowRunId' => $run->id,
+            'workflowCurrentStage' => 0,
+        ])->assertOk();
+
+        expect(Entry::find()->id($entry->id)->status(null)->one()->title)->toBe('Approved Title')
+            ->and($run->fresh()->status)->toBe(WorkflowStatus::Published);
+    });
+
+    it('preserves approval when the approved draft fails live validation', function () {
+        $entry = EntryModel::factory()->createElement(['title' => 'Canonical Title']);
+        $workflow = Workflow::query()->create([
+            'name' => 'Automatic workflow',
+            'uid' => Str::uuid7()->toString(),
+            'stages' => [[
+                'uid' => Str::uuid7()->toString(),
+                'name' => 'Automatic approval',
+                'type' => AutomaticApprovalStage::class,
+                'settings' => [],
+            ]],
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        /** @var Entry $draft */
+        $draft = app(Drafts::class)->createDraft($entry, auth()->id(), name: 'Reviewed draft');
+        $draft->title = null;
+        expect(ElementsFacade::saveElement($draft))->toBeTrue();
+        $run = app(Workflows::class)->submitForReview($draft);
+
+        postJson(action([ElementDraftsController::class, 'apply']), [
+            'elementType' => Entry::class,
+            'draftId' => $draft->draftId,
+            'siteId' => $draft->siteId,
+            'workflowRunId' => $run->id,
+            'workflowCurrentStage' => 0,
+        ])->assertBadRequest()
+            ->assertJsonValidationErrors('title');
+
+        expect($run->fresh()->status)->toBe(WorkflowStatus::Approved)
+            ->and(Entry::find()->id($entry->id)->status(null)->one()->title)->toBe('Canonical Title');
+    });
+
+    it('promotes provisional changes to a workflow draft instead of applying them', function () {
+        $entry = EntryModel::factory()->createElement([
+            'title' => 'Canonical Title',
+            'slug' => 'canonical-title',
+        ]);
+        $workflow = Workflow::query()->create([
+            'name' => 'Editorial workflow',
+            'uid' => Str::uuid7()->toString(),
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        /** @var Entry $draft */
+        $draft = app(Drafts::class)->createDraft($entry, auth()->id(), provisional: true);
+
+        $response = postJson(action([ElementDraftsController::class, 'apply']), [
+            'elementType' => Entry::class,
+            'draftId' => $draft->draftId,
+            'siteId' => $draft->siteId,
+            'provisional' => true,
+            'workflowSave' => true,
+            'title' => 'Changed Title',
+            'slug' => 'changed-title',
+        ])->assertOk();
+
+        /** @var Entry $savedDraft */
+        $savedDraft = Entry::find()
+            ->draftId($draft->draftId)
+            ->siteId($draft->siteId)
+            ->status(null)
+            ->one();
+        /** @var Entry $canonical */
+        $canonical = Entry::find()
+            ->id($entry->id)
+            ->siteId($entry->siteId)
+            ->status(null)
+            ->one();
+
+        expect($canonical->title)->toBe('Canonical Title')
+            ->and($savedDraft->isProvisionalDraft)->toBeFalse()
+            ->and($savedDraft->title)->toBe('Changed Title')
+            ->and($response->json('screen.draftId'))->toBe($draft->draftId)
+            ->and($response->json('screen.workflow.configured'))->toBeTrue()
+            ->and($response->json('screen.workflow.convertedToDraft'))->toBeTrue()
+            ->and($response->json('screen.workflow.current.canSubmit'))->toBeTrue();
+    });
+
+    it('applies a disabled provisional workflow entry without requiring review', function () {
+        $entry = EntryModel::factory()->createElement([
+            'title' => 'Canonical Title',
+            'slug' => 'canonical-title',
+        ]);
+        $workflow = Workflow::query()->create([
+            'name' => 'Editorial workflow',
+            'uid' => Str::uuid7()->toString(),
+        ]);
+        Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        /** @var Entry $draft */
+        $draft = app(Drafts::class)->createDraft($entry, auth()->id(), provisional: true);
+
+        postJson(action([ElementDraftsController::class, 'apply']), [
+            'elementType' => Entry::class,
+            'draftId' => $draft->draftId,
+            'siteId' => $draft->siteId,
+            'provisional' => true,
+            'workflowSave' => true,
+            'enabled' => false,
+            'title' => 'Changed Title',
+            'slug' => 'changed-title',
+        ])->assertOk();
+
+        /** @var Entry $canonical */
+        $canonical = Entry::find()->id($entry->id)->siteId($entry->siteId)->status(null)->one();
+        expect($canonical->title)->toBe('Changed Title')
+            ->and($canonical->enabled)->toBeFalse()
+            ->and(Entry::find()->draftOf($entry->id)->drafts()->status(null)->count())->toBe(0);
+    });
+
+    it('disables a live workflow entry without requiring review', function () {
+        $entryType = EntryType::factory()->create();
+        $section = Section::factory()->withEntryTypes($entryType)->create();
+        $workflow = Workflow::query()->create([
+            'name' => 'Editorial workflow',
+            'uid' => Str::uuid7()->toString(),
+        ]);
+        $section->update(['workflowId' => $workflow->id]);
+        Sections::refreshSections();
+        $entry = EntryModel::factory()
+            ->forSection($section)
+            ->forEntryType($entryType)
+            ->createElement([
+                'title' => 'Live Title',
+                'slug' => 'live-title',
+            ]);
+
+        postJson(action([ElementDraftsController::class, 'store']), [
+            'elementType' => Entry::class,
+            'elementId' => $entry->id,
+            'siteId' => $entry->siteId,
+            'workflowSave' => true,
+            'enabled' => false,
+            'title' => 'Disabled Title',
+            'slug' => 'disabled-title',
+        ])->assertOk();
+
+        /** @var Entry $canonical */
+        $canonical = Entry::find()->id($entry->id)->siteId($entry->siteId)->status(null)->one();
+        expect($canonical->title)->toBe('Disabled Title')
+            ->and($canonical->enabled)->toBeFalse()
+            ->and(Entry::find()->draftOf($entry->id)->drafts()->status(null)->count())->toBe(0);
+    });
+
     it('applies email changes from unpublished user drafts', function () {
         $admin = UserModel::factory()->admin()->createElement();
 
diff --git a/tests/Feature/Http/Controllers/Elements/SaveElementControllerTest.php b/tests/Feature/Http/Controllers/Elements/SaveElementControllerTest.php
index 46fddedc2c3..6ba3acff924 100644
--- a/tests/Feature/Http/Controllers/Elements/SaveElementControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/SaveElementControllerTest.php
@@ -29,9 +29,11 @@
 use CraftCms\Cms\Support\Facades\Elements;
 use CraftCms\Cms\Support\Facades\EntryTypes as EntryTypesFacade;
 use CraftCms\Cms\Support\Facades\Fields as FieldsFacade;
+use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Facades\Sites;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
@@ -173,6 +175,54 @@ function createSaveElementMatrixFixture(): array
     ];
 }
 
+it('saves canonical workflow changes as a draft', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $entry = EntryModel::factory()
+        ->forSection($this->section)
+        ->forEntryType($this->entryType)
+        ->createElement(['title' => 'Canonical Title']);
+
+    $response = postJson(action([SaveElementController::class, 'store']), [
+        'elementType' => Entry::class,
+        'elementId' => $entry->id,
+        'siteId' => $entry->siteId,
+        'title' => 'Draft Title',
+    ])->assertOk();
+
+    /** @var Entry $draft */
+    $draft = Entry::find()->draftOf($entry->id)->drafts()->status(null)->one();
+    expect(Entry::find()->id($entry->id)->status(null)->one()->title)->toBe('Canonical Title')
+        ->and($draft->title)->toBe('Draft Title')
+        ->and($draft->isProvisionalDraft)->toBeFalse()
+        ->and($response->json('element.id'))->toBe($draft->id);
+});
+
+it('saves disabled workflow entries without requiring review', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $entry = disabledEntry($this->section, $this->entryType);
+
+    postJson(action([SaveElementController::class, 'store']), [
+        'elementType' => Entry::class,
+        'elementId' => $entry->id,
+        'siteId' => $entry->siteId,
+        'enabled' => false,
+        'title' => 'Updated while disabled',
+    ])->assertOk();
+
+    expect(Entry::find()->id($entry->id)->status(null)->one()->title)->toBe('Updated while disabled')
+        ->and(Entry::find()->draftOf($entry->id)->drafts()->status(null)->count())->toBe(0);
+});
+
 describe('store', function () {
     it('requires authentication', function () {
         Auth::logout();
diff --git a/tests/Feature/Http/Controllers/Entries/StoreEntryControllerTest.php b/tests/Feature/Http/Controllers/Entries/StoreEntryControllerTest.php
index 996d34aa3f9..afcc3997b62 100644
--- a/tests/Feature/Http/Controllers/Entries/StoreEntryControllerTest.php
+++ b/tests/Feature/Http/Controllers/Entries/StoreEntryControllerTest.php
@@ -23,8 +23,10 @@
 use CraftCms\Cms\Support\Facades\Elements;
 use CraftCms\Cms\Support\Facades\EntryTypes;
 use CraftCms\Cms\Support\Facades\Fields;
+use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\Workflow\Models\Workflow;
 use Illuminate\Contracts\Cache\Lock;
 use Illuminate\Contracts\Cache\LockTimeoutException;
 use Illuminate\Support\Facades\Auth;
@@ -138,6 +140,53 @@ function createContentBlockSettings(Field $field): array
     expect($entry->title)->toBe('Updated Title');
 });
 
+it('saves canonical workflow changes as a draft', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $entry = EntryModel::factory()->forSection($this->section)->forEntryType($this->entryType)->createElement([
+        'title' => 'Canonical Title',
+    ]);
+
+    $response = postJson(action(StoreEntryController::class), [
+        'entryId' => $entry->id,
+        'title' => 'Draft Title',
+    ])->assertOk();
+
+    /** @var Entry $draft */
+    $draft = Entry::find()->draftOf($entry->id)->drafts()->status(null)->one();
+    expect(Entry::find()->id($entry->id)->status(null)->one()->title)->toBe('Canonical Title')
+        ->and($draft->title)->toBe('Draft Title')
+        ->and($draft->isProvisionalDraft)->toBeFalse()
+        ->and($response->json('id'))->toBe($draft->id);
+});
+
+it('creates disabled workflow entries without requiring review', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+
+    $response = postJson(action(StoreEntryController::class), [
+        'sectionId' => $this->section->id,
+        'typeId' => $this->entryType->id,
+        'title' => 'Disabled Entry',
+        'slug' => 'disabled-entry',
+        'enabled' => false,
+    ])->assertOk();
+
+    /** @var Entry $entry */
+    $entry = Entry::find()->id($response->json('id'))->status(null)->one();
+    expect($entry->getIsCanonical())->toBeTrue()
+        ->and($entry->enabled)->toBeFalse()
+        ->and(Entry::find()->draftOf($entry->id)->drafts()->status(null)->count())->toBe(0);
+});
+
 it('clears existing plain text field values', function () {
     $field = Field::factory()->create([
         'name' => 'Body Field',
diff --git a/tests/Feature/Http/Controllers/MatrixControllerTest.php b/tests/Feature/Http/Controllers/MatrixControllerTest.php
index d962cd9995e..226f966fac7 100644
--- a/tests/Feature/Http/Controllers/MatrixControllerTest.php
+++ b/tests/Feature/Http/Controllers/MatrixControllerTest.php
@@ -27,6 +27,7 @@
 use CraftCms\Cms\Support\Facades\Fields as FieldsFacade;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Elements\User as UserElement;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Gate;
 use Symfony\Component\DomCrawler\Crawler;
@@ -280,7 +281,7 @@ function refreshMatrixControllerFixture(array $fixture): array
 });
 
 it('returns a failure response when saving a new matrix draft fails', function () {
-    app()->instance(Drafts::class, new readonly class(app(Elements::class), app(DraftActivity::class)) extends Drafts
+    app()->instance(Drafts::class, new readonly class(app(Elements::class), app(DraftActivity::class), app(Workflows::class)) extends Drafts
     {
         public function saveElementAsDraft(ElementInterface $element, ?int $creatorId = null, ?string $name = null, ?string $notes = null, bool $markAsSaved = true): bool
         {
diff --git a/tests/Feature/Http/Controllers/NestedElementsControllerTest.php b/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
index b3d33a74f7e..dff494a18f6 100644
--- a/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
+++ b/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
@@ -17,9 +17,14 @@
 use CraftCms\Cms\Support\Facades\Elements;
 use CraftCms\Cms\Support\Facades\Fields;
 use CraftCms\Cms\Support\Facades\Sections;
+use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Event;
+use Workbench\App\Workflow\AutomaticApprovalStage;
 
 use function CraftCms\Cms\t;
 use function Pest\Laravel\actingAs;
@@ -356,3 +361,32 @@ function nestedElementsControllerOwnerSortOrders(int $ownerId): array
     expect(DB::table(Table::ELEMENTS)->where('id', $nestedEntry->id)->value('dateDeleted'))
         ->not->toBeNull();
 });
+
+it('invalidates a review when a primary nested element is deleted', function () {
+    ['owner' => $owner, 'field' => $field, 'entryType' => $entryType] = nestedElementsControllerCreateMatrixOwnerFixture();
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [[
+            'uid' => Str::uuid7()->toString(),
+            'name' => 'External review',
+            'type' => AutomaticApprovalStage::class,
+            'settings' => [],
+        ]],
+    ]);
+    SectionModel::query()->whereKey($owner->sectionId)->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    /** @var EntryElement $draft */
+    $draft = app(Drafts::class)->createDraft($owner, auth()->id(), name: 'Reviewed draft');
+    $nestedEntry = nestedElementsControllerCreateMatrixNestedEntry($draft, $field, $entryType, 1, 'Draft block');
+    $run = app(Workflows::class)->submitForReview($draft);
+
+    $this->withSession([
+        SessionAuth::$authAccessParam => [sprintf('manageNestedElements::%s::%s', $owner->id, 'field:matrixField')],
+    ])->postJson(action([NestedElementsController::class, 'destroy']), [
+        ...nestedElementsControllerPayload($draft, 'field:matrixField'),
+        'elementId' => $nestedEntry->id,
+    ])->assertOk();
+
+    expect($run->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+});
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
new file mode 100644
index 00000000000..e017efa6b9c
--- /dev/null
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -0,0 +1,860 @@
+<?php
+
+declare(strict_types=1);
+
+use CraftCms\Cms\Activity\ActivityTimelinePresenter;
+use CraftCms\Cms\Activity\Data\ActivityActor;
+use CraftCms\Cms\Activity\Data\ActivitySubject;
+use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Edition;
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\Drafts;
+use CraftCms\Cms\Element\ElementHelper;
+use CraftCms\Cms\Entry\Elements\Entry;
+use CraftCms\Cms\Entry\Models\Entry as EntryModel;
+use CraftCms\Cms\Http\Controllers\Settings\WorkflowsController;
+use CraftCms\Cms\Http\Controllers\Workflows\UserReviewController;
+use CraftCms\Cms\Http\ViewModels\WorkflowEditViewModel;
+use CraftCms\Cms\Section\Models\Section;
+use CraftCms\Cms\Support\Facades\Elements;
+use CraftCms\Cms\Support\Facades\Sections;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\User\Models\UserGroup;
+use CraftCms\Cms\Workflow\Activity\WorkflowActivityEvent;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowActivityType;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Events\WorkflowCommented;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioned;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\Stages\MissingWorkflowStage;
+use CraftCms\Cms\Workflow\Stages\WorkflowStage as BaseWorkflowStage;
+use CraftCms\Cms\Workflow\UserReview\UserReviewDecision;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use CraftCms\Cms\Workflow\Workflows;
+use CraftCms\Cms\Workflow\WorkflowStageTypes;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
+use Inertia\Testing\AssertableInertia;
+use Workbench\App\Workflow\AutomaticApprovalStage;
+
+use function Pest\Laravel\actingAs;
+use function Pest\Laravel\delete;
+use function Pest\Laravel\get;
+use function Pest\Laravel\postJson;
+
+class TestAutomatedWorkflowStage extends BaseWorkflowStage
+{
+    public string $outcome = 'approved';
+
+    public function getRules(): array
+    {
+        return [
+            'outcome' => ['required', 'in:approved,pending,failed'],
+        ];
+    }
+
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+    {
+        $payload = [
+            ...$context->payload,
+            'evaluations' => (int) ($context->payload['evaluations'] ?? 0) + 1,
+        ];
+
+        return new WorkflowStageResult(
+            WorkflowStageStatus::from($this->outcome),
+            "Automated check {$this->outcome}",
+            $payload,
+        );
+    }
+}
+
+beforeEach(function () {
+    Edition::set(Edition::Pro);
+
+    $this->author = UserModel::factory()->admin()->createElement(['fullName' => 'Draft Author']);
+    $this->reviewers = collect([
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer One']),
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer Two']),
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer Three']),
+    ]);
+    $this->entry = EntryModel::factory()->createElement(['title' => 'Canonical title']);
+    $this->draft = app(Drafts::class)->createDraft($this->entry, $this->author->id, name: 'Campaign draft');
+    $this->draft->title = 'Reviewed title';
+    actingAs($this->author);
+    expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
+
+    $this->workflows = app(Workflows::class);
+});
+
+it('registers and hydrates workflow stage components', function () {
+    $types = app(WorkflowStageTypes::class);
+    $types->register(TestAutomatedWorkflowStage::class);
+    $stage = new WorkflowStageData(
+        uid: Str::uuid7()->toString(),
+        name: 'Automated review',
+        type: TestAutomatedWorkflowStage::class,
+        settings: ['outcome' => 'pending'],
+    );
+
+    expect($types->types())->toContain(UserReviewStage::class, TestAutomatedWorkflowStage::class)
+        ->and($stage->component())->toBeInstanceOf(TestAutomatedWorkflowStage::class)
+        ->and($stage->component()->getSettings())->toBe(['outcome' => 'pending']);
+});
+
+it('preserves settings for unavailable stage types', function () {
+    $stage = new WorkflowStageData(
+        uid: Str::uuid7()->toString(),
+        name: 'Missing review',
+        type: 'plugin\\MissingStage',
+        settings: ['endpoint' => 'https://example.test/review'],
+    );
+
+    expect($stage->component())->toBeInstanceOf(MissingWorkflowStage::class)
+        ->and($stage->component()->getSettings())->toBe(['endpoint' => 'https://example.test/review']);
+});
+
+it('renders registered stage types and inline settings forms', function () {
+    $payload = app(WorkflowEditViewModel::class, [
+        'workflow' => new Workflow,
+        'readOnly' => false,
+    ])->toArray();
+    $userReview = collect($payload['stageTypes'])->firstWhere('type', UserReviewStage::class);
+    $automaticApproval = collect($payload['stageTypes'])->firstWhere('type', AutomaticApprovalStage::class);
+
+    expect($userReview['label'])->toBe('User review')
+        ->and($userReview['settings'])->toBe([
+            'approvalsRequired' => 1,
+            'userGroups' => [],
+        ])
+        ->and($userReview['settingsForm'])->not->toBeNull()
+        ->and($userReview['settingsForm']->nodes[0]->control->component)->toBe('craft:user-group-select')
+        ->and($automaticApproval)->toMatchArray([
+            'label' => 'Automatic approval',
+            'settings' => [],
+            'settingsForm' => null,
+        ]);
+});
+
+it('runs a workbench-provided stage type without core registration', function () {
+    workflowFor($this->entry, [[
+        'name' => 'External approval',
+        'type' => AutomaticApprovalStage::class,
+        'settings' => [],
+    ]]);
+
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    expect($run->status)->toBe(WorkflowStatus::Approved)
+        ->and($run->currentStageResult)->toBe('Automatically approved');
+});
+
+it('saves a settings-free workflow stage through project config', function () {
+    postJson(action([WorkflowsController::class, 'store']), [
+        'name' => 'Automated workflow',
+        'stages' => [[
+            'uid' => Str::uuid7()->toString(),
+            'name' => 'External approval',
+            'type' => AutomaticApprovalStage::class,
+            'settings' => [],
+        ]],
+    ])->assertOk();
+
+    expect(Workflow::query()->where('name', 'Automated workflow')->firstOrFail()
+        ->stages->sole()->settings)->toBe([]);
+});
+
+it('persists typed stages and assigns workflows from sections', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $stageUid = Str::uuid7()->toString();
+
+    postJson(action([WorkflowsController::class, 'store']), [
+        'name' => 'Editorial workflow',
+        'stages' => [[
+            'uid' => $stageUid,
+            'name' => 'Editorial',
+            'type' => UserReviewStage::class,
+            'settings' => [
+                'approvalsRequired' => 1,
+                'userGroups' => [$group->uid],
+            ],
+        ]],
+    ])->assertOk();
+
+    $workflow = Workflow::query()->where('name', 'Editorial workflow')->firstOrFail();
+    assignWorkflow($this->entry, $workflow);
+    $stage = $workflow->stages->sole();
+
+    expect($stage)->toBeInstanceOf(WorkflowStageData::class)
+        ->and($stage)->toMatchObject([
+            'uid' => $stageUid,
+            'name' => 'Editorial',
+            'type' => UserReviewStage::class,
+        ])->and(json_decode($workflow->getRawOriginal('stages'), true))->toBe([[
+            'uid' => $stageUid,
+            'name' => 'Editorial',
+            'type' => UserReviewStage::class,
+            'settings' => [
+                'approvalsRequired' => 1,
+                'userGroups' => [$group->uid],
+            ],
+        ]])->and($this->draft->workflow()?->is($workflow))->toBeTrue();
+});
+
+it('validates settings with the registered stage type', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+
+    postJson(action([WorkflowsController::class, 'store']), [
+        'name' => 'Automated workflow',
+        'stages' => [[
+            'uid' => Str::uuid7()->toString(),
+            'name' => 'Automated review',
+            'type' => TestAutomatedWorkflowStage::class,
+            'settings' => ['outcome' => 'unexpected'],
+        ]],
+    ])->assertUnprocessable()
+        ->assertJsonValidationErrors('stages.0.settings.outcome');
+});
+
+it('cascades approved automated stages and stores each complete payload by stage uid', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    $workflow = workflowFor($this->entry, [
+        automatedStage('lint', 'approved'),
+        automatedStage('policy', 'approved'),
+    ]);
+
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    expect($run->status)->toBe(WorkflowStatus::Approved)
+        ->and($run->currentStage)->toBe(1)
+        ->and($run->payload)->toBe([
+            $workflow->stages[0]->uid => ['evaluations' => 1],
+            $workflow->stages[1]->uid => ['evaluations' => 1],
+        ]);
+});
+
+it('keeps pending automated stages pending with their status message', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    workflowFor($this->entry, [automatedStage('External check', 'pending')]);
+
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and($run->currentStageResult)->toBe('Automated check pending')
+        ->and($run->payload)->each->toBe(['evaluations' => 1])
+        ->and($this->workflows->reviewData($this->draft, $this->author)->actionComponent)->toBeNull();
+});
+
+it('completes a pending automated stage and advances the workflow', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    $workflow = workflowFor($this->entry, [automatedStage('External check', 'pending')]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    $completed = $this->workflows->reportStageResult(
+        runId: $run->id,
+        stageUid: $workflow->stages->sole()->uid,
+        result: new WorkflowStageResult(
+            WorkflowStageStatus::Approved,
+            'Automated check approved',
+            ['evaluations' => 1, 'summary' => 'No issues found.'],
+        ),
+    );
+
+    expect($completed->status)->toBe(WorkflowStatus::Approved)
+        ->and($completed->currentStageResult)->toBe('Automated check approved')
+        ->and($completed->payload)->each->toBe([
+            'evaluations' => 1,
+            'summary' => 'No issues found.',
+        ]);
+
+    $event = workflowEvents($this->entry, WorkflowTransition::StageApproved)->sole();
+    expect($event->actorType)->toBe(ActivityActor::TYPE_SYSTEM)
+        ->and($event->data['stage'])->toBe('External check')
+        ->and($event->data['note'])->toBe('Automated check approved')
+        ->and(WorkflowActivityEvent::format($event))->toContain('External check');
+
+    $stageData = collect($this->workflows->reviewData($this->draft, $this->author)->runs)
+        ->firstWhere('current')->stages[0];
+    expect($stageData->events)->toHaveCount(1)
+        ->and($stageData->icon)->toBe('check')
+        ->and($stageData->events[0]->actor['label'])->toBe('Craft CMS')
+        ->and($stageData->events[0]->decision)->toBe('approved')
+        ->and($stageData->events[0]->icon)->toBe('check')
+        ->and($stageData->events[0]->description)->toBe('approved')
+        ->and($stageData->events[0]->noteHtml)->toContain('Automated check approved');
+});
+
+it('records a failed automatic stage with its result message', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    workflowFor($this->entry, [automatedStage('Policy check', 'failed')]);
+
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    $event = workflowEvents($this->entry, WorkflowTransition::StageFailed)->sole();
+
+    expect($run->status)->toBe(WorkflowStatus::Failed)
+        ->and($event->actorType)->toBe(ActivityActor::TYPE_SYSTEM)
+        ->and($event->data['note'])->toBe('Automated check failed');
+
+    $stageData = collect($this->workflows->reviewData($this->draft, $this->author)->runs)
+        ->firstWhere('current')->stages[0];
+    expect($stageData->events[0]->decision)->toBe('failed');
+});
+
+it('ignores stale automated stage completions', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    $workflow = workflowFor($this->entry, [automatedStage('External check', 'pending')]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    $result = new WorkflowStageResult(
+        WorkflowStageStatus::Approved,
+        'Automated check approved',
+        ['evaluations' => 1, 'summary' => 'No issues found.'],
+    );
+
+    $completed = $this->workflows->reportStageResult(
+        runId: $run->id,
+        stageUid: 'stale-stage',
+        result: $result,
+    );
+
+    expect($completed->status)->toBe(WorkflowStatus::Pending)
+        ->and($completed->currentStageResult)->toBe('Automated check pending')
+        ->and($completed->payload)->each->toBe(['evaluations' => 1]);
+
+    $this->workflows->contentChanged($this->draft);
+    $completed = $this->workflows->reportStageResult(
+        runId: $run->id,
+        stageUid: $workflow->stages->sole()->uid,
+        result: $result,
+    );
+
+    expect($completed->status)->toBe(WorkflowStatus::Invalidated)
+        ->and($completed->payload)->each->toBe(['evaluations' => 1]);
+
+    expect($this->workflows->reportStageResult(
+        runId: PHP_INT_MAX,
+        stageUid: 'missing',
+        result: $result,
+    ))->toBeNull();
+});
+
+it('requires live eligible reviewers and excludes the requester', function () {
+    $group = reviewerGroup([$this->author, $this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group, approvals: 1)]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    $stage = $workflow->stages->sole();
+
+    expect($this->workflows->reviewData($this->draft, $this->author)->actionProps['canReview'])->toBeFalse();
+
+    $group->users()->detach($this->reviewers[0]->id);
+    expect(fn () => reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $stage,
+        UserReviewDecision::Approved,
+    ))->toThrow(WorkflowException::class, 'not available');
+
+    $group->users()->attach($this->reviewers[1]->id);
+    $run = reviewStageAs(
+        $this->workflows,
+        $this->reviewers[1],
+        $run,
+        $stage,
+        UserReviewDecision::Approved,
+    );
+
+    expect($run->status)->toBe(WorkflowStatus::Approved);
+});
+
+it('fails on a change request and preserves history when resubmitted', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $stage = $workflow->stages->sole();
+    $firstRun = submitAs($this->workflows, $this->draft, $this->author, 'Ready for review');
+
+    $firstRun = reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $firstRun,
+        $stage,
+        UserReviewDecision::Rejected,
+        'Clarify the claim.',
+    );
+    $this->workflows->addComment($this->draft, $firstRun->id, $stage->uid, 'I will revise it.');
+    $secondRun = submitAs($this->workflows, $this->draft, $this->author, 'Revised.');
+    $review = $this->workflows->reviewData($this->draft, $this->author);
+
+    expect($firstRun->status)->toBe(WorkflowStatus::Failed)
+        ->and($secondRun->id)->not->toBe($firstRun->id)
+        ->and($secondRun->activityRootEventId)->not->toBe($firstRun->activityRootEventId)
+        ->and($review->runs)->toHaveCount(2)
+        ->and(collect($review->runs)->last()->stages[0]->icon)->toBe('xmark')
+        ->and(collect($review->runs)->last()->stages[0]->events)->toHaveCount(2)
+        ->and(collect($review->runs)->last()->stages[0]->events[0]->icon)->toBe('xmark')
+        ->and(collect($review->runs)->last()->stages[0]->events[0]->description)->toBe('requested changes')
+        ->and(collect($review->runs)->last()->stages[0]->events[1]->icon)->toBe('comment')
+        ->and(collect($review->runs)->last()->stages[0]->events[1]->description)->toBe('commented.')
+        ->and(collect($review->runs)->first()->submission->icon)->toBe('clipboard-list-check')
+        ->and(collect($review->runs)->first()->submission->description)->toBe('requested review');
+});
+
+it('groups activity under a submission root and snapshots the workflow definition', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Editorial review', $group)]);
+    $stage = $workflow->stages->sole();
+    $run = submitAs($this->workflows, $this->draft, $this->author, 'Ready for review.');
+
+    reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $stage,
+        UserReviewDecision::Approved,
+        'Approved.',
+    );
+
+    $events = ActivityEvent::query()
+        ->subject(ActivitySubject::fromElement($this->entry))
+        ->eventTypes(WorkflowActivityEvent::class)
+        ->oldest('occurredAt')
+        ->orderBy('id')
+        ->get();
+    $root = $events->firstWhere('data.type', WorkflowActivityType::Submit->value);
+
+    expect($root)->not->toBeNull()
+        ->and($run->fresh()->activityRootEventId)->toBe($root->id)
+        ->and($root->rootEventId)->toBeNull()
+        ->and($events->whereNull('rootEventId'))->toHaveCount(1)
+        ->and($root->data)->not->toHaveKey('runId')
+        ->and($root->data['draft'])->toMatchArray([
+            'elementId' => $this->draft->id,
+            'draftId' => $this->draft->draftId,
+            'elementType' => Entry::class,
+            'siteId' => $this->draft->siteId,
+        ])
+        ->and($root->data['workflow'])->toMatchArray([
+            'id' => $workflow->id,
+            'uid' => $workflow->uid,
+            'name' => 'Editorial workflow',
+            'stages' => [[
+                'uid' => $stage->uid,
+                'name' => 'Editorial review',
+                'type' => UserReviewStage::class,
+                'settings' => [
+                    'approvalsRequired' => 1,
+                    'userGroups' => [$group->uid],
+                ],
+            ]],
+        ]);
+
+    $childEvents = $events->whereNotNull('rootEventId');
+    expect($childEvents)->not->toBeEmpty()
+        ->and($childEvents->pluck('rootEventId')->unique()->values()->all())->toBe([$root->id])
+        ->and($childEvents->every(fn (ActivityEvent $event): bool => ! array_key_exists('runId', $event->data)))->toBeTrue();
+
+    $presentedRoot = app(ActivityTimelinePresenter::class)
+        ->events(collect([$root]), $this->author)
+        ->sole();
+
+    expect($presentedRoot['component'])->toBe('craft:workflow-activity-event')
+        ->and($presentedRoot['props']['noteHtml'])->toContain('Ready for review.');
+
+    $workflow->stages = $workflow->stages->map(fn (WorkflowStageData $workflowStage): array => [
+        'uid' => $workflowStage->uid,
+        'name' => $workflowStage->uid === $stage->uid ? 'Renamed review' : $workflowStage->name,
+        'type' => $workflowStage->type,
+        'settings' => $workflowStage->settings,
+    ])->all();
+    $workflow->save();
+    $review = $this->workflows->reviewData($this->draft, $this->author);
+
+    expect(collect($review->runs)->firstWhere('current')->stages[0]->name)->toBe('Editorial review')
+        ->and($run->fresh()->status)->toBe(WorkflowStatus::Approved);
+});
+
+it('lets any viewer comment but only the stage offers review actions', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $stage = $workflow->stages->sole();
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    $viewer = $this->reviewers[1];
+
+    $review = $this->workflows->reviewData($this->draft, $viewer);
+    expect($review->canComment)->toBeTrue()
+        ->and($review->actionProps['canReview'])->toBeFalse();
+
+    Event::fake([WorkflowCommented::class, WorkflowTransitioned::class]);
+    actAs($viewer, fn () => $this->workflows->addComment($this->draft, $run->id, $stage->uid, 'A useful note.'));
+    expect(workflowEvents($this->entry, WorkflowActivityType::Comment))->toHaveCount(1);
+    Event::assertDispatched(WorkflowCommented::class);
+    Event::assertNotDispatched(WorkflowTransitioned::class);
+});
+
+it('invalidates pending and approved runs when publishable content changes', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $stage = $workflow->stages->sole();
+    $pending = submitAs($this->workflows, $this->draft, $this->author);
+
+    $this->draft->title = 'Changed during review';
+    expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
+    expect($pending->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+
+    $approved = submitAs($this->workflows, $this->draft, $this->author);
+    reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $approved,
+        $stage,
+        UserReviewDecision::Approved,
+    );
+    $this->draft->title = 'Changed after approval';
+    expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
+
+    expect($approved->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+});
+
+it('invalidates an approved run when its workflow assignment changes', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->sole(),
+        UserReviewDecision::Approved,
+    );
+
+    Section::query()->whereKey($this->entry->sectionId)->update(['workflowId' => null]);
+    Sections::refreshSections();
+    $this->workflows->invalidateSectionRuns($this->entry->sectionId);
+
+    expect($run->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+});
+
+it('reloads the draft after locking it for review submission', function () {
+    workflowFor($this->entry, [automatedStage('Review', 'pending')]);
+    DB::table(Table::DRAFTS)->where('id', $this->draft->draftId)->update(['provisional' => true]);
+
+    expect(fn () => submitAs($this->workflows, $this->draft, $this->author))
+        ->toThrow(WorkflowException::class, 'Only saved named drafts');
+});
+
+it('does not submit disabled drafts for review', function () {
+    workflowFor($this->entry, [automatedStage('Review', 'pending')]);
+    $this->draft->enabled = false;
+    expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
+
+    expect(fn () => submitAs($this->workflows, $this->draft, $this->author))
+        ->toThrow(WorkflowException::class, 'Only enabled drafts');
+});
+
+it('gates only draft application and permits an admin override without a reason', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $applied = false;
+
+    expect(fn () => $this->workflows->applyDraft(
+        $this->draft,
+        $this->author,
+        null,
+        null,
+        function (ElementInterface $draft) use (&$applied): ElementInterface {
+            $applied = true;
+
+            return $draft;
+        },
+    ))->toThrow(WorkflowException::class, 'must be approved')
+        ->and($applied)->toBeFalse();
+
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    expect(fn () => $this->workflows->applyDraft(
+        $this->draft,
+        $this->author,
+        $run->id,
+        $run->currentStage,
+        function (ElementInterface $draft) use (&$applied): ElementInterface {
+            $applied = true;
+
+            return $draft;
+        },
+    ))->toThrow(WorkflowException::class, 'must be approved')
+        ->and($applied)->toBeFalse();
+
+    $run = $this->workflows->overrideApproval($this->draft, $run->id);
+    expect($run->currentStageResult)->toBeNull();
+    $this->workflows->applyDraft(
+        $this->draft,
+        $this->author,
+        $run->id,
+        $run->currentStage,
+        function (ElementInterface $draft) use (&$applied): ElementInterface {
+            $applied = true;
+
+            return $draft;
+        },
+    );
+
+    expect($applied)->toBeTrue()
+        ->and($run->fresh()->status)->toBe(WorkflowStatus::Published)
+        ->and(workflowEvents($this->entry, WorkflowTransition::Publish))->toHaveCount(1);
+});
+
+it('does not apply an approved draft that became outdated', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    $run = $this->workflows->overrideApproval($this->draft, $run->id);
+    $this->draft->getCanonical()->dateUpdated = now()->addDay();
+    expect(ElementHelper::isOutdated($this->draft))->toBeTrue();
+    $applied = false;
+
+    expect(fn () => $this->workflows->applyDraft(
+        $this->draft,
+        $this->author,
+        $run->id,
+        $run->currentStage,
+        function (ElementInterface $draft) use (&$applied): ElementInterface {
+            $applied = true;
+
+            return $draft;
+        },
+    ))->toThrow(WorkflowException::class, 'changed since it was approved')
+        ->and($applied)->toBeFalse()
+        ->and($run->fresh()->status)->toBe(WorkflowStatus::Approved);
+});
+
+it('exposes stage components and safely handles user review decisions', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    $stage = $workflow->stages->sole();
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+    actingAs($this->reviewers[0]);
+
+    $review = $this->workflows->reviewData($this->draft, $this->reviewers[0]);
+    expect($review->actionComponent)->toBe('craft:user-review-workflow-stage-actions')
+        ->and($review->showDefaultActions)->toBeFalse()
+        ->and($review->actionProps)->toBe(['canReview' => true]);
+
+    postJson(action([UserReviewController::class, 'approve'], [
+        'workflowRun' => $run,
+        'stage' => $stage->uid,
+    ]), elementIdentity($this->entry, $this->draft, ['message' => 'Looks good.']))
+        ->assertOk()
+        ->assertJsonPath('workflowReview.status', 'approved')
+        ->assertJsonPath('workflowReview.actionComponent', null)
+        ->assertJsonPath('workflowReview.showDefaultActions', true)
+        ->assertJsonPath('workflowReview.actionProps', []);
+
+    $event = workflowEvents($this->entry, WorkflowTransition::Approve)->sole();
+    expect($event->actorId)->toBe($this->reviewers[0]->id)
+        ->and($this->author->notifications()->latest()->firstOrFail()->data['title'])->toBe('Draft approved');
+});
+
+it('blocks workflow deletion while a section references it', function () {
+    $workflow = workflowFor($this->entry, [automatedStage('Review', 'pending')]);
+
+    delete(action([WorkflowsController::class, 'destroy'], $workflow))
+        ->assertSessionHas('error', 'This workflow cannot be deleted while it is assigned to a section.');
+
+    expect($workflow->fresh())->not->toBeNull();
+});
+
+it('links review notifications to the workflow panel', function () {
+    $group = reviewerGroup([$this->reviewers[0]]);
+    workflowFor($this->entry, [userReviewStage('Review', $group)]);
+    submitAs($this->workflows, $this->draft, $this->author);
+
+    $notification = $this->reviewers[0]->notifications()->latest()->firstOrFail();
+    expect($notification->data['title'])->toBe('Review requested')
+        ->and($notification->data['url'])->toEndWith('#workflow');
+});
+
+it('requests user review after an asynchronous stage advances', function () {
+    app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
+    $group = reviewerGroup([$this->reviewers[0]]);
+    $workflow = workflowFor($this->entry, [
+        automatedStage('External check', 'pending'),
+        userReviewStage('Editorial review', $group),
+    ]);
+    $run = submitAs($this->workflows, $this->draft, $this->author);
+
+    expect($this->reviewers[0]->notifications()->count())->toBe(0);
+
+    $this->workflows->reportStageResult(
+        runId: $run->id,
+        stageUid: $workflow->stages->first()->uid,
+        result: new WorkflowStageResult(
+            WorkflowStageStatus::Approved,
+            'Automated check approved',
+            ['evaluations' => 1],
+        ),
+    );
+
+    expect($this->reviewers[0]->notifications()->latest()->firstOrFail()->data['title'])->toBe('Review requested');
+});
+
+it('shows workflow settings routes with separate store and update targets', function () {
+    $workflow = workflowFor($this->entry, [automatedStage('Review', 'pending')]);
+
+    get(action([WorkflowsController::class, 'create']))
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('submit.method', 'post')
+            ->where('submit.url', action([WorkflowsController::class, 'store']))
+            ->etc());
+
+    get(action([WorkflowsController::class, 'edit'], $workflow))
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('submit.method', 'patch')
+            ->where('submit.url', action([WorkflowsController::class, 'update'], $workflow))
+            ->etc());
+});
+
+/** @param list<array{name: string, type: string, settings: array<string, mixed>}> $stages */
+function workflowFor(Entry $entry, array $stages): Workflow
+{
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => array_map(fn (array $stage): array => [
+            ...$stage,
+            'uid' => Str::uuid7()->toString(),
+        ], $stages),
+    ]);
+
+    assignWorkflow($entry, $workflow);
+
+    return $workflow->refresh();
+}
+
+function assignWorkflow(Entry $entry, Workflow $workflow): void
+{
+    Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+}
+
+/** @return array{name: string, type: string, settings: array<string, mixed>} */
+function userReviewStage(string $name, UserGroup $group, int $approvals = 1): array
+{
+    return [
+        'name' => $name,
+        'type' => UserReviewStage::class,
+        'settings' => [
+            'approvalsRequired' => $approvals,
+            'userGroups' => [$group->uid],
+        ],
+    ];
+}
+
+/** @return array{name: string, type: string, settings: array<string, mixed>} */
+function automatedStage(string $name, string $outcome): array
+{
+    return [
+        'name' => $name,
+        'type' => TestAutomatedWorkflowStage::class,
+        'settings' => ['outcome' => $outcome],
+    ];
+}
+
+function submitAs(Workflows $workflows, Entry $draft, User $author, ?string $note = null): WorkflowRun
+{
+    return actAs($author, fn () => $workflows->submitForReview($draft, $note));
+}
+
+function reviewStageAs(
+    Workflows $workflows,
+    User $reviewer,
+    WorkflowRun $run,
+    WorkflowStageData $stage,
+    UserReviewDecision $decision,
+    ?string $message = null,
+): WorkflowRun {
+    return actAs($reviewer, function () use ($workflows, $reviewer, $run, $stage, $decision, $message): WorkflowRun {
+        $transition = $decision === UserReviewDecision::Approved
+            ? WorkflowTransition::Approve
+            : WorkflowTransition::Reject;
+
+        return $workflows->reportStageResult(
+            runId: $run->id,
+            stageUid: $stage->uid,
+            result: function (WorkflowStageContext $context) use ($reviewer, $decision, $message): WorkflowStageResult {
+                $component = $context->stage->component();
+                expect($component)->toBeInstanceOf(UserReviewStage::class);
+
+                return $component->decide($decision, $message, $context, $reviewer);
+            },
+            actor: $reviewer,
+            activityTransition: $transition,
+            activityNote: trim((string) $message) ?: null,
+        );
+    });
+}
+
+/**
+ * @template TResult
+ *
+ * @param  Closure(): TResult  $callback
+ * @return TResult
+ */
+function actAs(User $actor, Closure $callback): mixed
+{
+    $previousUser = Auth::user();
+    Auth::guard()->setUser($actor);
+
+    try {
+        return $callback();
+    } finally {
+        if ($previousUser === null) {
+            Auth::logout();
+        } else {
+            Auth::guard()->setUser($previousUser);
+        }
+    }
+}
+
+/** @param list<User> $reviewers */
+function reviewerGroup(array $reviewers): UserGroup
+{
+    $group = UserGroup::factory()->create();
+    $group->users()->sync(collect($reviewers)->pluck('id'));
+
+    return $group;
+}
+
+/** @return array<string, mixed> */
+function elementIdentity(Entry $entry, Entry $draft, array $extra = []): array
+{
+    return [
+        'elementType' => Entry::class,
+        'elementId' => $entry->id,
+        'siteId' => $draft->siteId,
+        'draftId' => $draft->draftId,
+        ...$extra,
+    ];
+}
+
+/** @return Collection<int, ActivityEvent> */
+function workflowEvents(Entry $entry, WorkflowActivityType|WorkflowTransition $type): Collection
+{
+    return ActivityEvent::query()
+        ->subject(ActivitySubject::fromElement($entry))
+        ->eventTypes(WorkflowActivityEvent::class)
+        ->get()
+        ->filter(fn (ActivityEvent $event): bool => $event->data['type'] === $type->value)
+        ->values();
+}
diff --git a/tests/Unit/Element/ElementWrites/PropagateElementTest.php b/tests/Unit/Element/ElementWrites/PropagateElementTest.php
index 73ff4d39b37..6cdcb0cdbaa 100644
--- a/tests/Unit/Element/ElementWrites/PropagateElementTest.php
+++ b/tests/Unit/Element/ElementWrites/PropagateElementTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use CraftCms\Cms\Activity\ElementWriteActivity;
 use CraftCms\Cms\Cms;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Element\ElementCaches;
 use CraftCms\Cms\Element\Elements;
@@ -25,6 +25,7 @@
 use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Contracts\Auth\Guard;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Log;
@@ -37,11 +38,12 @@
 
     $this->executor = new TestPropagateElementWrites(
         $this->elements,
+        Mockery::mock(Drafts::class),
         $this->uris,
         Mockery::mock(ElementCaches::class),
         Mockery::mock(Search::class),
         $this->sites,
-        Mockery::mock(ElementWriteActivity::class),
+        Mockery::mock(Workflows::class),
     );
 
     $this->primarySite = new Site([
diff --git a/tests/Unit/Element/ElementWrites/PropagateElementsTest.php b/tests/Unit/Element/ElementWrites/PropagateElementsTest.php
index 486670cf58d..c8378e3053e 100644
--- a/tests/Unit/Element/ElementWrites/PropagateElementsTest.php
+++ b/tests/Unit/Element/ElementWrites/PropagateElementsTest.php
@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-use CraftCms\Cms\Activity\ElementWriteActivity;
 use CraftCms\Cms\Element\BulkOp\BulkOps;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Element\ElementCaches;
 use CraftCms\Cms\Element\Elements;
@@ -22,6 +22,7 @@
 use CraftCms\Cms\Site\Data\Site;
 use CraftCms\Cms\Site\Sites as SitesService;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Facade;
@@ -119,11 +120,12 @@ public function getCurrentSite(): Site
 
     $this->action = new TestPropagateElementsWrites(
         $this->elements,
+        Mockery::mock(Drafts::class),
         Mockery::mock(ElementUris::class),
         $this->elementCaches,
         Mockery::mock(Search::class),
         app(SitesService::class),
-        Mockery::mock(ElementWriteActivity::class),
+        Mockery::mock(Workflows::class),
     );
     $this->writes = $this->action;
 });
diff --git a/tests/Unit/Element/ElementWrites/ResaveElementsTest.php b/tests/Unit/Element/ElementWrites/ResaveElementsTest.php
index 3eab5d33c7d..f180182cafc 100644
--- a/tests/Unit/Element/ElementWrites/ResaveElementsTest.php
+++ b/tests/Unit/Element/ElementWrites/ResaveElementsTest.php
@@ -2,10 +2,10 @@
 
 declare(strict_types=1);
 
-use CraftCms\Cms\Activity\ElementWriteActivity;
 use CraftCms\Cms\Element\BulkOp\BulkOps as BulkOpsService;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Element\Contracts\NestedElementInterface;
+use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Element\ElementCaches;
 use CraftCms\Cms\Element\Elements;
@@ -23,6 +23,7 @@
 use CraftCms\Cms\Field\Contracts\ElementContainerFieldInterface;
 use CraftCms\Cms\Search\Search;
 use CraftCms\Cms\Site\Sites;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\LazyCollection;
 
@@ -38,11 +39,12 @@
 
     $this->action = new TestResaveElementWrites(
         Mockery::mock(Elements::class),
+        Mockery::mock(Drafts::class),
         Mockery::mock(ElementUris::class),
         Mockery::mock(ElementCaches::class),
         Mockery::mock(Search::class),
         Mockery::mock(Sites::class),
-        Mockery::mock(ElementWriteActivity::class),
+        Mockery::mock(Workflows::class),
     );
     $this->saveElementAction = $this->action;
 });

From d69886bcaa1682b60206fd1c8514eab5aae228a6 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:25:08 +0200
Subject: [PATCH 05/32] Add the workflow review experience

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 .gitignore                                    |   1 +
 resources/js/bootstrap/cp-app.ts              |   3 +
 .../js/bootstrap/element-details-tabs.ts      |  19 +-
 .../js/common/components/FormActions.test.ts  |  29 +
 .../js/common/components/FormActions.vue      |   5 +-
 .../js/common/composables/useAppLayout.ts     |   1 +
 .../js/common/layouts/screens/PageScreen.vue  |   1 +
 .../common/layouts/screens/SlideoutScreen.vue |   6 +-
 resources/js/common/layouts/screens/types.ts  |   2 +
 .../components/ElementActivityTimeline.vue    |   4 +-
 .../components/ElementDetailsTabs.test.ts     | 110 ++-
 .../components/ElementDetailsTabs.vue         |  78 +-
 .../elements/components/ElementEditScreen.vue |  72 +-
 .../elements/components/ElementEditor.vue     |  64 +-
 .../composables/useElementEditor.test.ts      | 235 +++++-
 .../elements/composables/useElementEditor.ts  | 114 ++-
 .../js/modules/workflows/components/Run.vue   | 133 ++++
 .../js/modules/workflows/components/Stage.vue | 147 ++++
 .../modules/workflows/components/Timeline.vue |  31 +
 .../workflows/components/TimelineItem.vue     |  56 ++
 .../WorkflowActivityTimelineEvent.vue         |  45 ++
 .../components/WorkflowDefaultActions.vue     | 273 +++++++
 .../components/WorkflowDetailsTab.test.ts     | 168 +++++
 .../components/WorkflowDetailsTab.vue         | 106 +++
 .../components/WorkflowDraftReviews.vue       |  88 +++
 .../components/WorkflowDraftsStatus.vue       |  96 +++
 .../components/WorkflowEditLockCallout.vue    |  28 +
 .../components/WorkflowReviewPanel.test.ts    | 701 ++++++++++++++++++
 .../components/WorkflowReviewPanel.vue        |  87 +++
 .../js/modules/workflows/register.test.ts     |  73 ++
 resources/js/modules/workflows/register.ts    |  45 ++
 .../user-review/WorkflowUserReviewActions.vue | 382 ++++++++++
 .../user-review/WorkflowUserReviewSummary.vue | 110 +++
 resources/js/pages/content/Edit.vue           |   3 +-
 src/Element/ElementEditorActions.php          | 258 +++++++
 .../Workflows/UserReviewController.php        |  11 +-
 .../WorkflowTransitionsController.php         |  15 +-
 src/Http/ViewModels/ElementEditViewModel.php  | 195 ++---
 src/Http/ViewModels/EntryEditViewModel.php    |  79 ++
 src/Http/ViewModels/UserEditViewModel.php     |   2 +-
 src/Workflow/Data/WorkflowRunStageData.php    |  15 +-
 src/Workflow/UserReview/UserReviewStage.php   |   2 +-
 .../Elements/ElementDraftsControllerTest.php  |   9 +-
 .../Entries/EditEntryControllerTest.php       | 261 ++++++-
 tests/Feature/Workflow/WorkflowsTest.php      | 101 +--
 45 files changed, 3951 insertions(+), 313 deletions(-)
 create mode 100644 resources/js/modules/workflows/components/Run.vue
 create mode 100644 resources/js/modules/workflows/components/Stage.vue
 create mode 100644 resources/js/modules/workflows/components/Timeline.vue
 create mode 100644 resources/js/modules/workflows/components/TimelineItem.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowActivityTimelineEvent.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowDefaultActions.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
 create mode 100644 resources/js/modules/workflows/components/WorkflowDetailsTab.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowDraftReviews.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowDraftsStatus.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
 create mode 100644 resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
 create mode 100644 resources/js/modules/workflows/components/WorkflowReviewPanel.vue
 create mode 100644 resources/js/modules/workflows/register.test.ts
 create mode 100644 resources/js/modules/workflows/register.ts
 create mode 100644 resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
 create mode 100644 resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
 create mode 100644 src/Element/ElementEditorActions.php

diff --git a/.gitignore b/.gitignore
index 80d32241d0a..931fde135c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,7 @@ vendor/
 cpresources/*
 .ddev/
 test-results/
+tests/Browser/Screenshots/
 resources/hot
 
 # Test database(s)
diff --git a/resources/js/bootstrap/cp-app.ts b/resources/js/bootstrap/cp-app.ts
index 990b2d49f2c..4a919eb0f2f 100644
--- a/resources/js/bootstrap/cp-app.ts
+++ b/resources/js/bootstrap/cp-app.ts
@@ -17,9 +17,11 @@ import AssetIndexes from '@/modules/utilities/components/asset-indexes/AssetInde
 import SystemMessages from '@/modules/utilities/components/system-messages/SystemMessages.vue';
 import CpLink from '@/common/components/CpLink.vue';
 import {cpComponentRegistry} from './components';
+import {elementDetailsTabRegistry} from './element-details-tabs';
 import {registerFormComponents} from '@/modules/forms/register';
 import {registerWidgetComponents} from '@/modules/dashboard/register';
 import {registerActivityComponents} from '@/modules/activity/register';
+import {registerWorkflowComponents} from '@/modules/workflows/register';
 
 export const config = ConfigService.getInstance();
 export const queue = QueueService.getInstance();
@@ -27,6 +29,7 @@ export const queue = QueueService.getInstance();
 registerFormComponents(cpComponentRegistry);
 registerWidgetComponents(cpComponentRegistry);
 registerActivityComponents(cpComponentRegistry);
+registerWorkflowComponents(cpComponentRegistry, elementDetailsTabRegistry);
 
 export function installCpApp(app: App): void {
   app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
diff --git a/resources/js/bootstrap/element-details-tabs.ts b/resources/js/bootstrap/element-details-tabs.ts
index 344c0844056..c5c8dd395fb 100644
--- a/resources/js/bootstrap/element-details-tabs.ts
+++ b/resources/js/bootstrap/element-details-tabs.ts
@@ -1,6 +1,21 @@
 import {shallowReactive} from 'vue';
 import type {Component} from 'vue';
-import type {ElementEditPayload} from '@/modules/elements/composables/useElementEditor';
+import type {
+  ElementEditPayload,
+  ElementEditPayloadUpdater,
+} from '@/modules/elements/composables/useElementEditor';
+
+export interface ElementDetailsTabContext {
+  payload: ElementEditPayload;
+  active: boolean;
+  refreshToken: number;
+  updatePayload: ElementEditPayloadUpdater;
+}
+
+export interface ElementDetailsTabStatus {
+  label: string;
+  indicator: string;
+}
 
 export interface ElementDetailsTabDescriptor {
   /** A plugin-scoped identifier that remains stable across registrations. */
@@ -10,6 +25,8 @@ export interface ElementDetailsTabDescriptor {
   component: Component;
   order?: number;
   visible?: (payload: ElementEditPayload) => boolean;
+  status?: (payload: ElementEditPayload) => ElementDetailsTabStatus | null;
+  props?: (context: ElementDetailsTabContext) => Record<string, unknown>;
 }
 
 export interface ElementDetailsTabRegistry {
diff --git a/resources/js/common/components/FormActions.test.ts b/resources/js/common/components/FormActions.test.ts
index a8d2be033d3..39f4e516cc0 100644
--- a/resources/js/common/components/FormActions.test.ts
+++ b/resources/js/common/components/FormActions.test.ts
@@ -58,4 +58,33 @@ describe('FormActions', () => {
 
     expect(onClick).not.toHaveBeenCalled();
   });
+
+  it('hides save controls without hiding non-save actions', () => {
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp({
+      render: () =>
+        h(FormActions, {
+          form: {
+            processing: false,
+            recentlySuccessful: false,
+            hasErrors: false,
+          },
+          saveDisabled: true,
+          actionItems: [{label: 'Save and continue editing'}],
+          additionalActions: [{label: 'Duplicate'}],
+          additionalButtons: [{label: 'View'}],
+        }),
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.mount(container);
+
+    expect(container.querySelector('[type="submit"]')).toBeNull();
+    expect(container.textContent).toContain('View');
+    expect(
+      container.querySelector<HTMLElementTagNameMap['craft-action-menu']>(
+        'craft-action-menu'
+      )?.actions
+    ).toEqual([expect.objectContaining({label: 'Duplicate'})]);
+  });
 });
diff --git a/resources/js/common/components/FormActions.vue b/resources/js/common/components/FormActions.vue
index 030e41f293e..ada7d154607 100644
--- a/resources/js/common/components/FormActions.vue
+++ b/resources/js/common/components/FormActions.vue
@@ -14,6 +14,7 @@
     /** Overrides the submit button's text (e.g. "Save draft"). */
     submitLabel?: string;
     readOnly?: boolean;
+    saveDisabled?: boolean;
   }>();
 
   defineSlots<{
@@ -96,7 +97,7 @@
       </craft-tooltip>
     </template>
 
-    <craft-button-group v-if="actionItems?.length">
+    <craft-button-group v-if="!saveDisabled && actionItems?.length">
       <slot name="submit-button">
         <craft-button
           type="submit"
@@ -121,7 +122,7 @@
       </ActionMenu>
     </craft-button-group>
 
-    <slot v-else name="submit-button">
+    <slot v-else-if="!saveDisabled" name="submit-button">
       <craft-button
         type="submit"
         :variant="ButtonVariant.Primary"
diff --git a/resources/js/common/composables/useAppLayout.ts b/resources/js/common/composables/useAppLayout.ts
index 1518ef1839b..d4c3ef78db0 100644
--- a/resources/js/common/composables/useAppLayout.ts
+++ b/resources/js/common/composables/useAppLayout.ts
@@ -10,6 +10,7 @@ import type {
 
 export interface UseAppLayoutOptions {
   title?: string;
+  saveDisabled?: boolean;
   form?: InertiaForm<any> | null;
   defaultFormActions?: Array<'saveAndContinueEditing'>;
   formActions?: Array<ActionItem>;
diff --git a/resources/js/common/layouts/screens/PageScreen.vue b/resources/js/common/layouts/screens/PageScreen.vue
index 182e2420cf9..53bdf8da2b5 100644
--- a/resources/js/common/layouts/screens/PageScreen.vue
+++ b/resources/js/common/layouts/screens/PageScreen.vue
@@ -333,6 +333,7 @@
                               :additional-buttons="formAdditionalButtons"
                               :submit-label="submitButtonLabel"
                               :read-only="readOnly"
+                              :save-disabled="saveDisabled"
                             >
                               <template
                                 v-if="slots['submit-button']"
diff --git a/resources/js/common/layouts/screens/SlideoutScreen.vue b/resources/js/common/layouts/screens/SlideoutScreen.vue
index de4dd649988..8b2cfb70bab 100644
--- a/resources/js/common/layouts/screens/SlideoutScreen.vue
+++ b/resources/js/common/layouts/screens/SlideoutScreen.vue
@@ -317,6 +317,10 @@
   }
 
   function save(event: Event) {
+    if (props.value.saveDisabled) {
+      return;
+    }
+
     if (elementEditor.active.value) {
       void elementEditor.submit(event);
 
@@ -453,7 +457,7 @@
         <LayoutSlotOutlet name="submit-button">
           <slot name="submit-button">
             <craft-button
-              v-if="canSave && !readOnly"
+              v-if="canSave && !readOnly && !props.saveDisabled"
               type="submit"
               :variant="ButtonVariant.Primary"
               :loading="
diff --git a/resources/js/common/layouts/screens/types.ts b/resources/js/common/layouts/screens/types.ts
index 776a47c5342..aeca6b91da9 100644
--- a/resources/js/common/layouts/screens/types.ts
+++ b/resources/js/common/layouts/screens/types.ts
@@ -18,6 +18,8 @@ export type DefaultFormAction = 'saveAndContinueEditing';
 export interface ScreenProps {
   title?: string;
   debug?: any;
+  /** Hides save controls without hiding non-save element actions. */
+  saveDisabled?: boolean;
   form?: InertiaForm<any> | null;
   defaultFormActions?: Array<DefaultFormAction>;
   formActions?: Array<ActionItem>;
diff --git a/resources/js/modules/elements/components/ElementActivityTimeline.vue b/resources/js/modules/elements/components/ElementActivityTimeline.vue
index 4a19f6efcac..487c7bf53ee 100644
--- a/resources/js/modules/elements/components/ElementActivityTimeline.vue
+++ b/resources/js/modules/elements/components/ElementActivityTimeline.vue
@@ -4,14 +4,14 @@
 
   defineProps<{
     payload: ElementEditPayload;
-    activeTabId: string | null;
+    active: boolean;
     refreshToken: number;
   }>();
 </script>
 
 <template>
   <ActivityTimeline
-    :active="activeTabId === 'activity'"
+    :active="active"
     :url="payload.activityTimelineUrl!"
     :element-type="payload.elementType"
     :element-id="payload.canonicalId"
diff --git a/resources/js/modules/elements/components/ElementDetailsTabs.test.ts b/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
index 7b78cdcf555..0c16df1d283 100644
--- a/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
+++ b/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
@@ -30,8 +30,17 @@ function payload(): ElementEditPayload {
     statusLabelHtml: null,
     saveUrl: '',
     applyDraftUrl: '',
-    formActions: [],
-    headerActions: [],
+    editorActions: {
+      primary: {
+        label: 'Save',
+        actionUrl: null,
+        params: {},
+        redirect: null,
+        tabId: null,
+      },
+      menu: [],
+      buttons: [],
+    },
     autosaveUrl: '',
     discardDraftUrl: '',
     isProvisionalDraft: false,
@@ -40,7 +49,6 @@ function payload(): ElementEditPayload {
     notice: null,
     mergeNotice: null,
     canDiscardDraft: false,
-    submitButtonLabel: 'Save',
     actionMenu: [],
     previewTargets: [],
     elementDisplayName: 'Entry',
@@ -49,6 +57,10 @@ function payload(): ElementEditPayload {
     activityPageUrl: null,
     updatedTimestamps: {element: null, canonical: null},
     contextMenu: null,
+    workflow: {
+      current: null,
+      draftReviews: [],
+    },
   };
 }
 
@@ -72,6 +84,7 @@ afterEach(() => {
   container?.remove();
   app = undefined;
   container = undefined;
+  window.history.replaceState({}, '', '/');
 });
 
 describe('ElementDetailsTabs', () => {
@@ -79,13 +92,13 @@ describe('ElementDetailsTabs', () => {
     const PluginTab = defineComponent({
       props: {
         payload: Object,
-        activeTabId: String,
+        active: Boolean,
       },
       setup: (props) => () =>
         h(
           'div',
           {class: 'plugin-content'},
-          `${props.payload?.elementId}:${props.activeTabId}`
+          `${props.payload?.elementId}:${props.active}`
         ),
     });
     const HiddenTab = defineComponent({render: () => null});
@@ -113,6 +126,7 @@ describe('ElementDetailsTabs', () => {
                 payload: payload(),
                 activityTimelineVersion: 0,
                 availableWidth: width.value,
+                updatePayload: vi.fn(),
               },
               {info: () => h('div', {class: 'info-content'}, 'Info content')}
             );
@@ -127,12 +141,16 @@ describe('ElementDetailsTabs', () => {
       'element-details-tab-revisions',
     ]);
 
+    select(1);
+    expect(window.location.hash).toBe('');
+
     elementDetailsTabRegistry.register({
       id: 'plugin:details',
       label: 'Plugin details',
       icon: 'puzzle-piece',
       component: PluginTab,
       order: 5,
+      props: ({payload, active}) => ({payload, active}),
     });
     await nextTick();
 
@@ -149,6 +167,7 @@ describe('ElementDetailsTabs', () => {
       component: PluginTab,
       order: 6,
       visible: () => conditionalVisible.value,
+      props: ({payload, active}) => ({payload, active}),
     });
     await nextTick();
 
@@ -169,6 +188,7 @@ describe('ElementDetailsTabs', () => {
       component: PluginTab,
       order: 30,
       visible: () => finalVisible.value,
+      props: ({payload, active}) => ({payload, active}),
     });
     await nextTick();
     await nextTick();
@@ -187,7 +207,7 @@ describe('ElementDetailsTabs', () => {
     await nextTick();
 
     expect(container.querySelector('.plugin-content')?.textContent).toBe(
-      '1:plugin:details'
+      '1:true'
     );
 
     select(2);
@@ -204,7 +224,7 @@ describe('ElementDetailsTabs', () => {
     ]);
     expect(tabs().selectedIndex).toBe(0);
     expect(container.querySelector('.plugin-content')?.textContent).toBe(
-      '1:info'
+      '1:false'
     );
 
     select(4);
@@ -224,4 +244,80 @@ describe('ElementDetailsTabs', () => {
     await nextTick();
     expect(tabs().selectedIndex).toBe(-1);
   });
+
+  it('persists the selected full-page tab in the URL', async () => {
+    elementDetailsTabRegistry.register({
+      id: 'workflow',
+      label: 'Workflow',
+      icon: 'clipboard-list-check',
+      component: defineComponent({render: () => null}),
+      order: 5,
+    });
+    window.history.replaceState({}, '', '/entries/1#workflow');
+
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp(ElementDetailsTabs, {
+      payload: payload(),
+      activityTimelineVersion: 0,
+      updatePayload: vi.fn(),
+      syncLocationHash: true,
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.mount(container);
+    await nextTick();
+    await nextTick();
+
+    const workflowIndex = tabIds().indexOf('element-details-tab-workflow');
+    const revisionsIndex = tabIds().indexOf('element-details-tab-revisions');
+
+    expect(tabs().selectedIndex).toBe(workflowIndex);
+
+    select(revisionsIndex);
+    expect(window.location.hash).toBe('#revisions');
+
+    window.location.hash = 'workflow';
+    window.dispatchEvent(new HashChangeEvent('hashchange'));
+    await nextTick();
+    await nextTick();
+    expect(tabs().selectedIndex).toBe(workflowIndex);
+  });
+
+  it('allows its host to select a visible tab', async () => {
+    elementDetailsTabRegistry.register({
+      id: 'host-selectable',
+      label: 'Host selectable',
+      icon: 'clipboard-list-check',
+      component: defineComponent({render: () => null}),
+      order: 5,
+    });
+    const detailsTabs = ref<{select: (tabId: string) => void} | null>(null);
+
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp(
+      defineComponent({
+        setup: () => () =>
+          h(ElementDetailsTabs, {
+            ref: detailsTabs,
+            payload: payload(),
+            activityTimelineVersion: 0,
+            updatePayload: vi.fn(),
+            syncLocationHash: true,
+          }),
+      })
+    );
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.mount(container);
+    await nextTick();
+
+    detailsTabs.value?.select('host-selectable');
+    await nextTick();
+    await nextTick();
+
+    expect(tabs().selectedIndex).toBe(
+      tabIds().indexOf('element-details-tab-host-selectable')
+    );
+    expect(window.location.hash).toBe('#host-selectable');
+  });
 });
diff --git a/resources/js/modules/elements/components/ElementDetailsTabs.vue b/resources/js/modules/elements/components/ElementDetailsTabs.vue
index d326587951a..f1aca03c983 100644
--- a/resources/js/modules/elements/components/ElementDetailsTabs.vue
+++ b/resources/js/modules/elements/components/ElementDetailsTabs.vue
@@ -1,24 +1,30 @@
 <script setup lang="ts">
   import {t} from '@craftcms/ui';
+  import {useEventListener} from '@vueuse/core';
   import {computed, nextTick, shallowRef, useTemplateRef, watch} from 'vue';
   import type {Component} from 'vue';
   import {
     elementDetailsTabRegistry,
     type ElementDetailsTabDescriptor,
+    type ElementDetailsTabStatus,
   } from '@/bootstrap/element-details-tabs';
   import ElementActivityTimeline from '@/modules/elements/components/ElementActivityTimeline.vue';
   import RevisionsList from '@/modules/elements/components/RevisionsList.vue';
   import type {ElementEditPayload} from '@/modules/elements/composables/useElementEditor';
+  import type {ElementEditPayloadUpdater} from '@/modules/elements/composables/useElementEditor';
 
   type ElementDetailsTab = Omit<ElementDetailsTabDescriptor, 'component'> & {
     component?: Component;
     slot?: string;
+    statusData?: ElementDetailsTabStatus | null;
   };
 
   const props = defineProps<{
     payload: ElementEditPayload;
     activityTimelineVersion: number;
+    updatePayload: ElementEditPayloadUpdater;
     pane?: boolean;
+    syncLocationHash?: boolean;
     /**
      * How much room the editor body has. The column folds itself away when
      * that runs short — see {@link COLLAPSE_WIDTH}.
@@ -41,6 +47,11 @@
       component: ElementActivityTimeline,
       order: 10,
       visible: (payload) => payload.activityTimelineUrl !== null,
+      props: ({payload, active, refreshToken}) => ({
+        payload,
+        active,
+        refreshToken,
+      }),
     },
     {
       id: 'revisions',
@@ -48,6 +59,7 @@
       icon: 'clock-rotate-left',
       component: RevisionsList,
       order: 20,
+      props: ({payload}) => ({payload}),
     },
   ];
 
@@ -57,6 +69,10 @@
       .sort(
         (firstTab, secondTab) => (firstTab.order ?? 0) - (secondTab.order ?? 0)
       )
+      .map((tab) => ({
+        ...tab,
+        statusData: tab.status?.(props.payload) ?? null,
+      }))
   );
 
   /**
@@ -71,7 +87,11 @@
    */
   const COLLAPSE_WIDTH = 880;
   const tabs = useTemplateRef<HTMLElement & {selectedIndex: number}>('tabs');
-  const selectedTabId = shallowRef<string | null>('info');
+  const selectedTabId = shallowRef<string | null>(
+    props.syncLocationHash && window.location.hash
+      ? window.location.hash.slice(1)
+      : 'info'
+  );
   /** Whether the last collapse was ours, so a deliberate one is left alone. */
   let collapsedByWidth = false;
 
@@ -98,7 +118,7 @@
   });
 
   watch(
-    [tabs, visibleTabs],
+    [tabs, visibleTabs, selectedTabId],
     async ([element, tabs]) => {
       if (!element || !selectedTabId.value) {
         return;
@@ -123,12 +143,15 @@
     {flush: 'post'}
   );
 
-  function componentProps(): Record<string, unknown> {
-    return {
+  function componentProps(tab: ElementDetailsTab): Record<string, unknown> {
+    const context = {
       payload: props.payload,
-      activeTabId: selectedTabId.value,
+      active: selectedTabId.value === tab.id,
       refreshToken: props.activityTimelineVersion,
+      updatePayload: props.updatePayload,
     };
+
+    return tab.props?.(context) ?? {};
   }
 
   function onSelectedChanged(event: Event): void {
@@ -138,7 +161,39 @@
       selectedIndex === undefined || selectedIndex < 0
         ? null
         : (visibleTabs.value[selectedIndex]?.id ?? null);
+
+    updateLocationHash();
+  }
+
+  function select(tabId: string): void {
+    if (!visibleTabs.value.some((tab) => tab.id === tabId)) {
+      return;
+    }
+
+    selectedTabId.value = tabId;
+    updateLocationHash();
+  }
+
+  function updateLocationHash(): void {
+    if (props.syncLocationHash && selectedTabId.value) {
+      const url = new URL(window.location.href);
+      url.hash = selectedTabId.value;
+      window.history.replaceState(window.history.state, '', url);
+    }
   }
+
+  useEventListener(window, 'hashchange', () => {
+    if (!props.syncLocationHash) {
+      return;
+    }
+
+    const tabId = window.location.hash.slice(1);
+    if (visibleTabs.value.some((tab) => tab.id === tabId)) {
+      selectedTabId.value = tabId;
+    }
+  });
+
+  defineExpose({select});
 </script>
 
 <template>
@@ -167,14 +222,23 @@
         <div
           v-if="pane"
           slot="header"
-          class="px-2 py-1 border-b border-b-(--c-color-neutral-border-quiet)"
+          class="flex items-center gap-1 px-2 py-1 border-b border-b-(--c-color-neutral-border-quiet)"
         >
           <h3 slot="title" class="text-xs/4">{{ tab.label }}</h3>
+          <span v-if="tab.statusData" class="ms-auto flex items-center gap-1">
+            <craft-status
+              :status="tab.statusData.indicator"
+              :label="tab.statusData.label"
+            ></craft-status>
+            <span class="text-xs/4 text-neutral-text-quiet">
+              {{ tab.statusData.label }}
+            </span>
+          </span>
         </div>
         <component
           v-if="tab.component"
           :is="tab.component"
-          v-bind="componentProps()"
+          v-bind="componentProps(tab)"
         />
       </component>
     </div>
diff --git a/resources/js/modules/elements/components/ElementEditScreen.vue b/resources/js/modules/elements/components/ElementEditScreen.vue
index 3591fd939cb..421e6f5d629 100644
--- a/resources/js/modules/elements/components/ElementEditScreen.vue
+++ b/resources/js/modules/elements/components/ElementEditScreen.vue
@@ -6,7 +6,7 @@
    * for hosts that supply their own chrome, e.g. a slideout panel.
    */
   import {t} from '@craftcms/ui';
-  import {computed, ref, useSlots} from 'vue';
+  import {computed, provide, ref, useSlots, useTemplateRef} from 'vue';
   import {useElementSize} from '@vueuse/core';
   import {router} from '@inertiajs/vue3';
   import AppLayout from '@/common/layouts/AppLayout.vue';
@@ -15,11 +15,16 @@
   import FormActions from '@/common/components/FormActions.vue';
   import ErrorSummary from '@/common/form/ErrorSummary.vue';
   import FormRenderer from '@/modules/forms/FormRenderer.vue';
-  import {useElementEditor} from '@/modules/elements/composables/useElementEditor';
+  import {
+    elementFormActionSubmitterKey,
+    useElementEditor,
+  } from '@/modules/elements/composables/useElementEditor';
   import {useElementActionMenu} from '@/modules/elements/composables/useElementActionMenu';
   import AutosaveMessage from '@/modules/elements/components/AutosaveMessage.vue';
   import ElementDetailsTabs from '@/modules/elements/components/ElementDetailsTabs.vue';
   import {elementDetailsTabRegistry} from '@/bootstrap/element-details-tabs';
+  import WorkflowDraftsStatus from '@/modules/workflows/components/WorkflowDraftsStatus.vue';
+  import WorkflowEditLockCallout from '@/modules/workflows/components/WorkflowEditLockCallout.vue';
   import type {FormValues} from '@/modules/forms/types';
 
   const props = defineProps<{
@@ -55,25 +60,33 @@
     sidebarErrors,
     sidebarPayload,
     sidebarRenderer,
+    startEditingReviewedDraft,
     submitAction,
+    updatePayload,
+    workflowReviewLocked,
   } = useElementEditor({saveData: props.saveData});
 
+  provide(elementFormActionSubmitterKey, submitAction);
+
   const crumbs = computed(
     () => (payload.crumbs ?? []) as Array<BreadcrumbItem>
   );
 
   // Alternate saves in the Save button's menu, and the buttons beside it.
   const formActionItems = computed(() =>
-    payload.formActions.map((action) => ({
+    payload.editorActions.menu.map((action) => ({
       label: action.label,
+      shortcut: action.shortcut ? {key: 'S', shift: action.shift} : undefined,
       onClick: () => submitAction(action),
     }))
   );
 
   const headerButtons = computed(() =>
-    payload.headerActions.map((action) => ({
+    payload.editorActions.buttons.map((action) => ({
       label: action.label,
       variant: action.variant,
+      disabled: action.disabled,
+      disabledReason: action.disabledReason,
       onClick: () => submitAction(action),
     }))
   );
@@ -105,6 +118,9 @@
 
   /** Measured here because this component owns the body; see ElementDetailsTabs. */
   const editorBody = ref<HTMLElement | null>(null);
+  const detailsTabs = useTemplateRef<{select: (tabId: string) => void}>(
+    'detailsTabs'
+  );
   const {width: bodyWidth} = useElementSize(editorBody);
   const slots = useSlots();
 
@@ -116,7 +132,6 @@
       elementDetailsTabRegistry.hasVisible(payload)
   );
   const hasSidebar = computed(() => Boolean(slots.sidebar));
-
   // Mirrors the legacy wording: a changed draft names the draft, anything else
   // names the element type.
   const staleMessage = computed(() =>
@@ -133,6 +148,19 @@
   function reload(): void {
     router.reload();
   }
+
+  function primaryAction(): void {
+    if (workflowReviewLocked.value) {
+      return;
+    }
+
+    if (payload.editorActions.primary.tabId) {
+      detailsTabs.value?.select(payload.editorActions.primary.tabId);
+      return;
+    }
+
+    save();
+  }
 </script>
 
 <template>
@@ -146,7 +174,7 @@
         <!-- No drafts-and-revisions switcher beside the crumbs: the Revisions
         tab in the details column is that list now. -->
 
-        <form method="post" @submit.prevent="save()">
+        <form method="post" @submit.prevent="primaryAction">
           <!-- Below the overlay band (slideout shade 99, panels and modal
             shade 100) so the header never paints over a slideout or the image
             editor modal, which stack above the page. -->
@@ -194,6 +222,11 @@
                       v-html="entry.userThumb"
                     />
                   </div>
+
+                  <WorkflowDraftsStatus
+                    v-if="payload.workflow.draftReviews.length"
+                    :drafts="payload.workflow.draftReviews"
+                  />
                 </div>
 
                 <FormActions
@@ -201,12 +234,32 @@
                   :action-items="formActionItems"
                   :additional-actions="actionMenuItems"
                   :additional-buttons="additionalButtons"
-                  :submit-label="payload.submitButtonLabel"
+                  :submit-label="payload.editorActions.primary.label"
                   :read-only="payload.readOnly"
+                  :save-disabled="workflowReviewLocked"
                 />
               </div>
             </header>
             <div class="element-notices">
+              <craft-callout
+                v-if="payload.workflow.convertedToDraft"
+                variant="warning"
+                icon="triangle-exclamation"
+                rounded="none"
+                appearance="fill"
+              >
+                {{
+                  t(
+                    'Your changes are saved in a draft and won’t be published until the draft is approved and applied.'
+                  )
+                }}
+              </craft-callout>
+
+              <WorkflowEditLockCallout
+                v-if="workflowReviewLocked"
+                @start-editing="startEditingReviewedDraft"
+              />
+
               <craft-callout
                 v-if="payload.notice"
                 variant="info"
@@ -297,6 +350,7 @@
                       :payload="formPayload"
                       :errors="errors"
                       :modified="autosave.modified.value"
+                      :disabled="workflowReviewLocked"
                       @update:mutation="onMutation"
                     />
 
@@ -311,9 +365,12 @@
               class="element-editor__details"
             >
               <ElementDetailsTabs
+                ref="detailsTabs"
                 :payload="payload"
                 :activity-timeline-version="activityTimelineVersion"
                 :available-width="bodyWidth"
+                :update-payload="updatePayload"
+                sync-location-hash
                 pane
               >
                 <template #info>
@@ -335,6 +392,7 @@
                             :payload="sidebarPayload"
                             :errors="sidebarErrors"
                             :modified="autosave.modified.value"
+                            :disabled="workflowReviewLocked"
                             @update:mutation="onSidebarMutation"
                           />
                         </craft-field-group>
diff --git a/resources/js/modules/elements/components/ElementEditor.vue b/resources/js/modules/elements/components/ElementEditor.vue
index f87ba654ba5..bf5687fecaf 100644
--- a/resources/js/modules/elements/components/ElementEditor.vue
+++ b/resources/js/modules/elements/components/ElementEditor.vue
@@ -6,18 +6,23 @@
    * full-page counterpart.
    */
   import {t} from '@craftcms/ui';
-  import {computed} from 'vue';
+  import {computed, provide, useTemplateRef} from 'vue';
   import {router} from '@inertiajs/vue3';
   import DynamicHtmlRenderer from '@/common/components/DynamicHtmlRenderer.vue';
   import ElementContextMenu from '@/modules/elements/components/ElementContextMenu.vue';
   import LayoutSlot from '@/common/components/LayoutSlot.vue';
   import {useAppLayout} from '@/common/composables/useAppLayout';
   import FormRenderer from '@/modules/forms/FormRenderer.vue';
-  import {useElementEditor} from '@/modules/elements/composables/useElementEditor';
+  import {
+    elementFormActionSubmitterKey,
+    useElementEditor,
+  } from '@/modules/elements/composables/useElementEditor';
   import {useElementActionMenu} from '@/modules/elements/composables/useElementActionMenu';
   import type {FormValues} from '@/modules/forms/types';
   import ElementDetailsTabs from '@/modules/elements/components/ElementDetailsTabs.vue';
   import {elementDetailsTabRegistry} from '@/bootstrap/element-details-tabs';
+  import type {FormSaveOptions} from '@/common/types';
+  import WorkflowEditLockCallout from '@/modules/workflows/components/WorkflowEditLockCallout.vue';
 
   const props = defineProps<{
     /**
@@ -43,9 +48,14 @@
     sidebarErrors,
     sidebarPayload,
     sidebarRenderer,
+    startEditingReviewedDraft,
     submitAction,
+    updatePayload,
+    workflowReviewLocked,
   } = useElementEditor({saveData: props.saveData});
 
+  provide(elementFormActionSubmitterKey, submitAction);
+
   const hasDetails = computed(
     () =>
       Boolean(sidebarPayload.value) ||
@@ -53,19 +63,24 @@
       Boolean(payload.activityTimelineUrl) ||
       elementDetailsTabRegistry.hasVisible(payload)
   );
-
+  const detailsTabs = useTemplateRef<{select: (tabId: string) => void}>(
+    'detailsTabs'
+  );
   // Alternate saves in the Save button's menu, and the buttons beside it.
   const formActionItems = computed(() =>
-    payload.formActions.map((action) => ({
+    payload.editorActions.menu.map((action) => ({
       label: action.label,
+      shortcut: action.shortcut ? {key: 'S', shift: action.shift} : undefined,
       onClick: () => submitAction(action),
     }))
   );
 
   const headerButtons = computed(() =>
-    payload.headerActions.map((action) => ({
+    payload.editorActions.buttons.map((action) => ({
       label: action.label,
       variant: action.variant,
+      disabled: action.disabled,
+      disabledReason: action.disabledReason,
       onClick: () => submitAction(action),
     }))
   );
@@ -111,6 +126,15 @@
     router.reload();
   }
 
+  function primaryAction(options?: FormSaveOptions): void {
+    if (payload.editorActions.primary.tabId) {
+      detailsTabs.value?.select(payload.editorActions.primary.tabId);
+      return;
+    }
+
+    save(options);
+  }
+
   const autosaveMessage = computed(() => {
     switch (autosave.status.value) {
       case 'saving':
@@ -136,8 +160,9 @@
   useAppLayout(() => ({
     title: payload.title,
     form,
-    onSave: save,
-    submitButtonLabel: payload.submitButtonLabel,
+    onSave: workflowReviewLocked.value ? undefined : primaryAction,
+    saveDisabled: workflowReviewLocked.value,
+    submitButtonLabel: payload.editorActions.primary.label,
     // The element supplies its own full set of alternate saves — including its
     // own "Save and continue editing" — so the layout's default would duplicate.
     defaultFormActions: [],
@@ -206,6 +231,27 @@
     </div>
   </LayoutSlot>
 
+  <craft-callout
+    v-if="payload.workflow.convertedToDraft"
+    variant="warning"
+    icon="triangle-exclamation"
+    class="mb-4"
+    rounded="none"
+    appearance="fill"
+  >
+    {{
+      t(
+        'Your changes are saved in a draft and won’t be published until the draft is approved and applied.'
+      )
+    }}
+  </craft-callout>
+
+  <WorkflowEditLockCallout
+    v-if="workflowReviewLocked"
+    class="mb-4"
+    @start-editing="startEditingReviewedDraft"
+  />
+
   <craft-callout
     v-if="activity.isStale.value"
     variant="warning"
@@ -267,6 +313,7 @@
     :payload="formPayload"
     :errors="errors"
     :modified="autosave.modified.value"
+    :disabled="workflowReviewLocked"
     @update:mutation="onMutation"
   />
 
@@ -274,8 +321,10 @@
 
   <LayoutSlot v-if="hasDetails || $slots['details-header']" name="details">
     <ElementDetailsTabs
+      ref="detailsTabs"
       :payload="payload"
       :activity-timeline-version="activityTimelineVersion"
+      :update-payload="updatePayload"
     >
       <template #info>
         <!-- Anything the element type shows above its meta fields, e.g. an
@@ -292,6 +341,7 @@
           :payload="sidebarPayload"
           :errors="sidebarErrors"
           :modified="autosave.modified.value"
+          :disabled="workflowReviewLocked"
           @update:mutation="onSidebarMutation"
         />
 
diff --git a/resources/js/modules/elements/composables/useElementEditor.test.ts b/resources/js/modules/elements/composables/useElementEditor.test.ts
index 3d4425d6aa1..7f5dacc148d 100644
--- a/resources/js/modules/elements/composables/useElementEditor.test.ts
+++ b/resources/js/modules/elements/composables/useElementEditor.test.ts
@@ -66,17 +66,29 @@ function payload(
     notice: undefined,
     mergeNotice: undefined,
     canDiscardDraft: undefined,
-    submitButtonLabel: undefined,
     activityUrl: null,
     activityTimelineUrl: undefined,
     activityPageUrl: undefined,
     updatedTimestamps: {element: 1, canonical: 1},
-    formActions: [],
-    headerActions: [],
+    editorActions: {
+      primary: {
+        label: 'Save',
+        actionUrl: null,
+        params: {},
+        redirect: null,
+        tabId: null,
+      },
+      menu: [],
+      buttons: [],
+    },
     actionMenu: [],
     previewTargets: [],
     elementDisplayName: undefined,
     contextMenu: undefined,
+    workflow: {
+      current: null,
+      draftReviews: [],
+    },
     ...overrides,
   };
 }
@@ -186,6 +198,54 @@ describe('useElementEditor', () => {
     return {editor, page};
   }
 
+  it('updates the editor payload from a details tab', () => {
+    const {editor} = mount(payload({title: 'Original title'}));
+
+    editor.updatePayload((current) => ({
+      title: `${current.title} updated`,
+    }));
+
+    expect(editor.props.title).toBe('Original title updated');
+    expect(editor.activityTimelineVersion.value).toBe(1);
+  });
+
+  it.each(['pending', 'approved'] as const)(
+    'locks a %s workflow review until editing is explicitly started',
+    async (status) => {
+      const {editor} = mount(
+        payload({
+          workflow: {
+            current: {status} as CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+            draftReviews: [],
+          },
+        })
+      );
+
+      expect(editor.workflowReviewLocked.value).toBe(true);
+
+      editor.startEditingReviewedDraft();
+      await nextTick();
+
+      expect(editor.workflowReviewLocked.value).toBe(false);
+    }
+  );
+
+  it.each(['failed', 'invalidated'] as const)(
+    'keeps a %s workflow draft editable',
+    (status) => {
+      const {editor} = mount(
+        payload({
+          workflow: {
+            current: {status} as CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+            draftReviews: [],
+          },
+        })
+      );
+
+      expect(editor.workflowReviewLocked.value).toBe(false);
+    }
+  );
+
   /** A one-field layout, the smallest thing that can hold an unsaved value. */
   function fieldLayout(title: string): FormPayload {
     return {
@@ -252,7 +312,17 @@ describe('useElementEditor', () => {
           isProvisionalDraft: true,
           canDiscardDraft: true,
           notice: 'Showing your unsaved changes.',
-          submitButtonLabel: 'Save',
+          editorActions: {
+            primary: {
+              label: 'Save',
+              actionUrl: null,
+              params: {},
+              redirect: null,
+              tabId: null,
+            },
+            menu: [],
+            buttons: [],
+          },
         },
       },
     });
@@ -668,6 +738,98 @@ describe('useElementEditor', () => {
     vi.useRealTimers();
   });
 
+  it('starts a workflow draft when Save beats the autosave debounce', async () => {
+    vi.useFakeTimers();
+
+    const {editor} = mount(
+      payload({
+        canAutosave: true,
+        form: fieldLayout('Canonical title'),
+        workflow: {
+          current: null,
+          draftReviews: [],
+        },
+        editorActions: {
+          primary: {
+            label: 'Save',
+            actionUrl: '/actions/elements/save-draft',
+            params: {
+              elementType: 'craft\\elements\\Entry',
+              elementId: 12,
+              siteId: 1,
+              dropProvisional: 1,
+              workflowSave: 1,
+            },
+            redirect: null,
+            tabId: null,
+          },
+          menu: [],
+          buttons: [],
+        },
+      })
+    );
+
+    await typeTitle('Edited title');
+
+    const save = interceptSave();
+    editor.save();
+
+    expect(save.last().url).toBe('/actions/elements/save-draft');
+    expect(save.last().data).toMatchObject({
+      elementType: 'craft\\elements\\Entry',
+      elementId: 12,
+      siteId: 1,
+      dropProvisional: 1,
+      workflowSave: 1,
+    });
+    expect(save.last().data).not.toHaveProperty('draftId');
+
+    await vi.advanceTimersByTimeAsync(5000);
+    expect(postSpy).not.toHaveBeenCalled();
+
+    save.restore();
+    vi.useRealTimers();
+  });
+
+  it('saves a workflow draft with Cmd+S when the primary button opens its review tab', () => {
+    mount(
+      payload({
+        draftId: 9,
+        editorActions: {
+          primary: {
+            label: 'Request review',
+            actionUrl: '/actions/elements/save-draft',
+            params: {
+              elementType: 'craft\\elements\\Entry',
+              elementId: 12,
+              siteId: 1,
+              dropProvisional: 1,
+              workflowSave: 1,
+            },
+            redirect: null,
+            tabId: 'workflow',
+          },
+          menu: [],
+          buttons: [],
+        },
+      })
+    );
+    const save = interceptSave();
+
+    window.dispatchEvent(
+      new KeyboardEvent('keydown', {key: 's', metaKey: true})
+    );
+
+    expect(save.last().url).toBe('/actions/elements/save-draft');
+    expect(save.last().data).toMatchObject({
+      draftId: 9,
+      dropProvisional: 1,
+      workflowSave: 1,
+    });
+
+    save.restore();
+  });
+
   /** Same for "Save and continue editing", which stays on the screen. */
   it('drops the provisional draft state when saving without redirecting', async () => {
     postSpy.mockResolvedValue({
@@ -710,7 +872,7 @@ describe('useElementEditor', () => {
    * screen is more of a draft afterwards, not less — the pointer has to follow
    * the server rather than being cleared because a save succeeded.
    */
-  it('follows the server onto the draft an alternate action created', async () => {
+  it('follows the server onto the workflow draft an alternate action created', async () => {
     postSpy.mockResolvedValue({
       data: {
         draftId: 7,
@@ -751,22 +913,77 @@ describe('useElementEditor', () => {
         draftId: 9,
         isProvisionalDraft: false,
         form: fieldLayout('Edited title'),
+        workflow: {
+          current: {} as CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+          draftReviews: [],
+        },
+        editorActions: {
+          primary: {
+            label: 'Save draft',
+            actionUrl: '/actions/elements/save-draft',
+            params: {
+              elementType: 'craft\\elements\\Entry',
+              elementId: 12,
+              siteId: 1,
+              dropProvisional: 1,
+              workflowSave: 1,
+            },
+            redirect: null,
+            tabId: null,
+          },
+          menu: [],
+          buttons: [],
+        },
       })
     );
 
     expect(editor.autosave.draftId.value).toBe(9);
 
-    // From here the screen edits that named draft: saves target it, and none
-    // of them claim it's provisional.
+    // From here ordinary saves preserve the named draft for review rather than
+    // applying it to the canonical element.
     editor.save();
 
-    expect(save.last().url).toBe('/actions/elements/apply-draft');
-    expect(save.last().data).toMatchObject({draftId: 9});
+    expect(save.last().url).toBe('/actions/elements/save-draft');
+    expect(save.last().data).toMatchObject({draftId: 9, dropProvisional: 1});
     expect(save.last().data).not.toHaveProperty('provisional');
 
     save.restore();
   });
 
+  it('submits an approved draft action without resaving form values', async () => {
+    const {editor} = mount(
+      payload({
+        draftId: 9,
+        form: fieldLayout('Reviewed title'),
+      })
+    );
+    const save = interceptSave();
+
+    await typeTitle('Unapproved browser value');
+    editor.submitAction({
+      label: 'Apply approved draft',
+      actionUrl: '/actions/elements/apply-draft',
+      params: {
+        workflowRunId: 4,
+        workflowCurrentStage: 1,
+      },
+      redirect: null,
+      includeFormData: false,
+    });
+
+    expect(save.last().url).toBe('/actions/elements/apply-draft');
+    expect(save.last().data).toEqual({
+      elementType: 'craft\\elements\\Entry',
+      elementId: 12,
+      draftId: 9,
+      siteId: 1,
+      workflowRunId: 4,
+      workflowCurrentStage: 1,
+    });
+
+    save.restore();
+  });
+
   it('leaves the base page’s navigation to itself inside a slideout', () => {
     const on = vi.spyOn(router, 'on');
 
diff --git a/resources/js/modules/elements/composables/useElementEditor.ts b/resources/js/modules/elements/composables/useElementEditor.ts
index 2261ea5ff8f..d476120424f 100644
--- a/resources/js/modules/elements/composables/useElementEditor.ts
+++ b/resources/js/modules/elements/composables/useElementEditor.ts
@@ -1,7 +1,15 @@
 import {toReactive, useEventListener} from '@vueuse/core';
 import {router, useForm} from '@inertiajs/vue3';
 import {actionClient, t} from '@craftcms/ui';
-import {computed, nextTick, onBeforeUnmount, ref, shallowRef, watch} from 'vue';
+import {
+  computed,
+  nextTick,
+  onBeforeUnmount,
+  ref,
+  shallowRef,
+  watch,
+  type InjectionKey,
+} from 'vue';
 import {useScreenPageProps} from '@/common/composables/screen';
 import {useSlideout} from '@/common/slideouts/useSlideout';
 import type {
@@ -21,6 +29,8 @@ export interface ElementEditFormData {
   enabled?: string | number | boolean | null;
   enabledForSite?: Record<string, string | number | boolean | null>;
   provisional?: number;
+  dropProvisional?: number;
+  workflowSave?: number;
   redirect?: string;
 }
 
@@ -35,6 +45,9 @@ export interface ElementFormAction {
   label: string;
   actionUrl: string | null;
   params: FormValues;
+  includeFormData?: boolean;
+  disabled?: boolean;
+  disabledReason?: string | null;
   /** Pre-encrypted by the server; the save controllers decrypt it. */
   redirect: string | null;
   variant?: string;
@@ -42,6 +55,20 @@ export interface ElementFormAction {
   shift?: boolean;
 }
 
+export const elementFormActionSubmitterKey: InjectionKey<
+  (action: ElementFormAction) => void
+> = Symbol('elementFormActionSubmitter');
+
+export interface ElementPrimaryAction extends ElementFormAction {
+  tabId: string | null;
+}
+
+export interface ElementEditorActions {
+  primary: ElementPrimaryAction;
+  menu: Array<ElementFormAction>;
+  buttons: Array<ElementFormAction>;
+}
+
 /**
  * An entry in the drafts-and-revisions switcher. Groups arrive flattened, with
  * `heading` rows standing in for the nesting the action menu has no shape for.
@@ -72,8 +99,7 @@ export interface ElementEditPayload {
   statusLabelHtml: string | null;
   saveUrl: string;
   applyDraftUrl: string;
-  formActions: Array<ElementFormAction>;
-  headerActions: Array<ElementFormAction>;
+  editorActions: ElementEditorActions;
   autosaveUrl: string;
   discardDraftUrl: string;
   isProvisionalDraft: boolean;
@@ -82,7 +108,6 @@ export interface ElementEditPayload {
   notice: string | null;
   mergeNotice: string | null;
   canDiscardDraft: boolean;
-  submitButtonLabel: string;
   actionMenu: Array<ElementActionMenuItem>;
   previewTargets: Array<{label: string; url: string}>;
   elementDisplayName: string;
@@ -94,8 +119,19 @@ export interface ElementEditPayload {
     label: string;
     items: Array<ElementContextMenuItem>;
   } | null;
+  workflow: {
+    convertedToDraft?: boolean;
+    current: CraftCms.Cms.Workflow.Data.WorkflowReviewData | null;
+    draftReviews: CraftCms.Cms.Workflow.Data.WorkflowDraftReviewData[];
+  };
 }
 
+export type ElementEditPayloadUpdater = (
+  patch:
+    | Partial<ElementEditPayload>
+    | ((payload: ElementEditPayload) => Partial<ElementEditPayload>)
+) => void;
+
 /*
  * `origin/6.x` added an `isElementEditPayload()` guard here that threw when the
  * merged payload was missing any key. It is dropped rather than merged: this
@@ -146,6 +182,29 @@ export function useElementEditor({saveData}: Options = {}) {
     }))
   );
 
+  const editingReviewedDraft = shallowRef(false);
+  const workflowReviewLocked = computed(
+    () =>
+      !editingReviewedDraft.value &&
+      ['pending', 'approved'].includes(props.workflow.current?.status ?? '')
+  );
+
+  watch(
+    () => props.workflow.current?.status,
+    (status, previousStatus) => {
+      if (
+        status !== previousStatus &&
+        (status === 'pending' || status === 'approved')
+      ) {
+        editingReviewedDraft.value = false;
+      }
+    }
+  );
+
+  function startEditingReviewedDraft(): void {
+    editingReviewedDraft.value = true;
+  }
+
   // The field layout comes back on the response separately from the screen
   // payload — scoped to whatever the request asked for — and applying it is the
   // only way a nested element the save just created (a new Matrix entry or
@@ -322,12 +381,10 @@ export function useElementEditor({saveData}: Options = {}) {
 
   const {save} = useSettingsSave(
     form,
-    // Applying a draft and saving the element are different endpoints, and
-    // which one applies depends on whether autosave has created a draft by the
-    // time the user submits — not on how the page was first rendered.
     () => ({
       url:
         pendingAction.value?.actionUrl ??
+        props.editorActions.primary.actionUrl ??
         (autosave.draftId.value !== null ? props.applyDraftUrl : props.saveUrl),
       method: 'post' as const,
     }),
@@ -336,28 +393,28 @@ export function useElementEditor({saveData}: Options = {}) {
         // Identity first, so the form wins where they overlap: the entry type
         // can be changed in the sidebar, and `saveData()` only knows the one
         // the page was rendered with.
-        const transformed = {...saveData?.(), ...data};
-        // Once autosave has created a provisional draft, the submission has to
-        // target it — otherwise applying would save the canonical element and
-        // strand the draft holding the newer values.
-        //
-        // This posts to a shared `elements/*` action rather than the element
-        // type's own, so it needs the generic identity params: the type-specific
-        // ones (an entry's `entryId`) mean nothing there.
+        const transformed =
+          pendingAction.value?.includeFormData === false
+            ? {}
+            : {...saveData?.(), ...data};
+        // Shared `elements/*` actions need generic identity params: the
+        // type-specific ones (an entry's `entryId`) mean nothing there.
         if (autosave.draftId.value !== null) {
           Object.assign(transformed, {
             elementType: props.elementType,
             elementId: props.canonicalId,
-            draftId: autosave.draftId.value,
+            siteId: props.siteId,
           });
-          if (draftIsProvisional.value) transformed.provisional = 1;
+          if (autosave.draftId.value !== null) {
+            Object.assign(transformed, {draftId: autosave.draftId.value});
+            if (draftIsProvisional.value) transformed.provisional = 1;
+          }
         }
 
-        // An alternate action's own params win — "Create a draft" has to be
-        // able to override the provisional targeting above.
-        Object.assign(transformed, pendingAction.value?.params);
-        if (pendingAction.value?.redirect) {
-          transformed.redirect = pendingAction.value.redirect;
+        const action = pendingAction.value ?? props.editorActions.primary;
+        Object.assign(transformed, action.params);
+        if (action.redirect) {
+          transformed.redirect = action.redirect;
         }
 
         return transformed;
@@ -401,6 +458,16 @@ export function useElementEditor({saveData}: Options = {}) {
     void nextTick(() => (pendingAction.value = null));
   }
 
+  const updatePayload: ElementEditPayloadUpdater = (patch): void => {
+    const updatedPayload = typeof patch === 'function' ? patch(props) : patch;
+
+    savedScreen.value = {
+      ...savedScreen.value,
+      ...updatedPayload,
+    };
+    activityTimelineVersion.value++;
+  };
+
   /**
    * Re-seeds both renderers from the payload the screen currently holds,
    * dropping the unsaved values on top of it and re-baselining the form.
@@ -542,6 +609,9 @@ export function useElementEditor({saveData}: Options = {}) {
     sidebarErrors,
     sidebarPayload,
     sidebarRenderer,
+    startEditingReviewedDraft,
+    updatePayload,
     values,
+    workflowReviewLocked,
   };
 }
diff --git a/resources/js/modules/workflows/components/Run.vue b/resources/js/modules/workflows/components/Run.vue
new file mode 100644
index 00000000000..e3900ae2348
--- /dev/null
+++ b/resources/js/modules/workflows/components/Run.vue
@@ -0,0 +1,133 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+  import '@craftcms/ui/components/disclosure/disclosure';
+  import Stage from './Stage.vue';
+  import TimelineItem from './TimelineItem.vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowRun = WorkflowReviewData['runs'][number];
+
+  const props = defineProps<{
+    run: WorkflowRun;
+    number: number;
+    collapsible: boolean;
+  }>();
+</script>
+
+<template>
+  <component
+    :is="collapsible ? 'craft-disclosure' : 'section'"
+    class="workflow-review-run"
+    :class="{'workflow-review-run--collapsible': collapsible}"
+    :opened.prop="collapsible ? run.current : undefined"
+  >
+    <craft-button
+      v-if="collapsible"
+      slot="invoker"
+      type="button"
+      variant="plain"
+      align="start"
+      class="workflow-review-run__heading"
+    >
+      <strong>{{ t('Review {number}', {number}) }}</strong>
+      <span slot="suffix" class="workflow-review-run__status">
+        <craft-status
+          :status="run.statusIndicator"
+          :label="run.statusLabel"
+        ></craft-status>
+        {{ run.statusLabel }}
+        <craft-icon class="workflow-review-run__chevron" name="chevron-down" />
+      </span>
+    </craft-button>
+
+    <div
+      :slot="collapsible ? 'content' : undefined"
+      class="workflow-review-run__content"
+    >
+      <ol class="workflow-review-events workflow-review-submission">
+        <li>
+          <TimelineItem :event="run.submission" last />
+        </li>
+      </ol>
+
+      <ol class="workflow-review-stages">
+        <li
+          v-for="(stage, stageIndex) in run.stages"
+          :key="stageIndex"
+          :aria-current="stage.current ? 'step' : undefined"
+        >
+          <Stage
+            :run="run"
+            :stage="stage"
+            :number="stageIndex + 1"
+            :collapsible="run.stages.length > 1"
+          />
+        </li>
+      </ol>
+    </div>
+  </component>
+</template>
+
+<style scoped>
+  .workflow-review-run {
+    display: block;
+  }
+
+  .workflow-review-run--collapsible {
+    border-block-end: 1px solid var(--c-color-neutral-border-quiet);
+  }
+
+  .workflow-review-run__heading {
+    width: 100%;
+    --c-button-height: var(--c-size-touch-target);
+    --c-button-spacing-inline: var(--c-spacing-xs);
+  }
+
+  .workflow-review-run__heading::part(content) {
+    gap: var(--c-spacing-xs);
+  }
+
+  .workflow-review-run__heading::part(label) {
+    flex: 1;
+    min-width: 0;
+    text-align: start;
+  }
+
+  .workflow-review-run__status {
+    display: flex;
+    align-items: center;
+    gap: var(--c-spacing-xs);
+    color: var(--c-text-quiet);
+    font-size: var(--c-text-sm);
+  }
+
+  .workflow-review-run__chevron {
+    transition: transform 100ms ease;
+  }
+
+  .workflow-review-run[opened] .workflow-review-run__chevron {
+    transform: rotate(180deg);
+  }
+
+  .workflow-review-run__content,
+  .workflow-review-stages,
+  .workflow-review-events {
+    display: grid;
+    gap: var(--c-spacing-sm);
+  }
+
+  .workflow-review-stages,
+  .workflow-review-events {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .workflow-review-run__content {
+    padding-block-end: var(--c-spacing-sm);
+  }
+
+  .workflow-review-submission {
+    padding-inline: var(--c-spacing-xs);
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/Stage.vue b/resources/js/modules/workflows/components/Stage.vue
new file mode 100644
index 00000000000..c1352218b26
--- /dev/null
+++ b/resources/js/modules/workflows/components/Stage.vue
@@ -0,0 +1,147 @@
+<script setup lang="ts">
+  import '@craftcms/ui/components/disclosure/disclosure';
+  import TimelineItem from './TimelineItem.vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowRun = WorkflowReviewData['runs'][number];
+  type WorkflowStage = WorkflowRun['stages'][number];
+
+  const props = defineProps<{
+    run: WorkflowRun;
+    stage: WorkflowStage;
+    number: number;
+    collapsible: boolean;
+  }>();
+</script>
+
+<template>
+  <component
+    :is="collapsible ? 'craft-disclosure' : 'section'"
+    class="workflow-review-stage"
+    :opened.prop="collapsible ? stage.current : undefined"
+  >
+    <craft-button
+      v-if="collapsible"
+      slot="invoker"
+      type="button"
+      variant="plain"
+      align="start"
+      class="workflow-review-stage__heading"
+    >
+      <craft-icon
+        slot="prefix"
+        :name="stage.icon"
+        appearance="badge"
+        :data-color="stage.iconColor"
+      />
+      <strong>{{ number }}. {{ stage.name }}</strong>
+      <craft-icon
+        slot="suffix"
+        class="workflow-review-stage__chevron"
+        name="chevron-down"
+      />
+    </craft-button>
+
+    <div
+      v-else
+      class="workflow-review-stage__heading workflow-review-stage__heading--static"
+    >
+      <craft-icon
+        :name="stage.icon"
+        appearance="badge"
+        :data-color="stage.iconColor"
+      />
+      <strong>{{ number }}. {{ stage.name }}</strong>
+    </div>
+
+    <div
+      :slot="collapsible ? 'content' : undefined"
+      class="workflow-review-stage__content"
+    >
+      <p v-if="stage.message" class="workflow-review-stage__message">
+        {{ stage.message }}
+      </p>
+
+      <ol v-if="stage.events.length" class="workflow-review-events">
+        <li v-for="(event, eventIndex) in stage.events" :key="event.id">
+          <TimelineItem
+            :event="event"
+            :last="
+              eventIndex === stage.events.length - 1 &&
+              stage.summaryComponent === null
+            "
+          />
+        </li>
+      </ol>
+
+      <component
+        :is="stage.summaryComponent"
+        v-if="stage.summaryComponent"
+        v-bind="stage.summaryProps"
+        :run="run"
+        :stage="stage"
+      />
+    </div>
+  </component>
+</template>
+
+<style scoped>
+  .workflow-review-stage__heading {
+    width: 100%;
+    --c-button-height: var(--c-size-touch-target);
+    --c-button-spacing-inline: var(--c-spacing-xs);
+  }
+
+  .workflow-review-stage__heading::part(content) {
+    gap: var(--c-spacing-sm);
+  }
+
+  .workflow-review-stage__heading::part(label) {
+    flex: 1;
+    min-width: 0;
+    text-align: start;
+  }
+
+  .workflow-review-stage__heading--static {
+    display: grid;
+    align-items: center;
+    gap: var(--c-spacing-sm);
+    grid-template-columns: auto minmax(0, 1fr);
+    min-height: var(--c-size-touch-target);
+    padding: var(--c-spacing-xs);
+  }
+
+  .workflow-review-stage__chevron {
+    transition: transform 100ms ease;
+  }
+
+  .workflow-review-stage[opened] .workflow-review-stage__chevron {
+    transform: rotate(180deg);
+  }
+
+  .workflow-review-stage__content,
+  .workflow-review-events {
+    display: grid;
+    gap: var(--c-spacing-sm);
+  }
+
+  .workflow-review-stage__content {
+    margin-block-start: var(--c-spacing-xs);
+    padding-block-end: var(--c-spacing-sm);
+    padding-inline-start: 0;
+    border-inline-start: 0;
+  }
+
+  .workflow-review-events {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .workflow-review-stage__message {
+    margin: 0;
+    padding-inline: var(--c-spacing-xs);
+    color: var(--c-text-quiet);
+    font-size: var(--c-text-sm);
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/Timeline.vue b/resources/js/modules/workflows/components/Timeline.vue
new file mode 100644
index 00000000000..a7250e986c4
--- /dev/null
+++ b/resources/js/modules/workflows/components/Timeline.vue
@@ -0,0 +1,31 @@
+<script setup lang="ts">
+  import Run from './Run.vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+  const props = defineProps<{
+    review: WorkflowReviewData;
+  }>();
+</script>
+
+<template>
+  <ol class="workflow-review-runs">
+    <li v-for="(run, runIndex) in review.runs" :key="run.id">
+      <Run
+        :run="run"
+        :number="review.runs.length - runIndex"
+        :collapsible="review.runs.length > 1"
+      />
+    </li>
+  </ol>
+</template>
+
+<style scoped>
+  .workflow-review-runs {
+    display: grid;
+    gap: var(--c-spacing-sm);
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/TimelineItem.vue b/resources/js/modules/workflows/components/TimelineItem.vue
new file mode 100644
index 00000000000..621276d4dd2
--- /dev/null
+++ b/resources/js/modules/workflows/components/TimelineItem.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+  import '@craftcms/ui/components/timeline-item/timeline-item';
+  import ActivityCommentCard from '@/modules/activity/components/ActivityCommentCard.vue';
+  import ActivityTimelineActor from '@/modules/activity/components/ActivityTimelineActor.vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowRun = WorkflowReviewData['runs'][number];
+  type TimelineEvent =
+    | WorkflowRun['submission']
+    | WorkflowRun['stages'][number]['events'][number];
+
+  const props = withDefaults(
+    defineProps<{
+      event: TimelineEvent;
+      last?: boolean;
+    }>(),
+    {last: false}
+  );
+</script>
+
+<template>
+  <craft-timeline-item :last.prop="last">
+    <craft-icon slot="marker" :name="event.icon" />
+    <div v-if="!event.noteHtml" slot="heading" class="workflow-review-summary">
+      <ActivityTimelineActor
+        :actor="event.actor"
+        :impersonator="event.impersonator"
+      />
+      {{ event.description }}
+    </div>
+    <time
+      v-if="!event.noteHtml"
+      slot="meta"
+      :datetime="event.occurredAt"
+      :title="event.formattedOccurredAt.full"
+    >
+      {{ event.formattedOccurredAt.time }}
+    </time>
+    <ActivityCommentCard
+      v-if="event.noteHtml"
+      class="workflow-review-comment"
+      :actor="event.actor"
+      :impersonator="event.impersonator"
+      :description-text="event.description"
+      :html="event.noteHtml"
+      :occurred-at="event.occurredAt"
+      :formatted-occurred-at="event.formattedOccurredAt"
+    />
+  </craft-timeline-item>
+</template>
+
+<style scoped>
+  .workflow-review-summary {
+    min-width: 0;
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowActivityTimelineEvent.vue b/resources/js/modules/workflows/components/WorkflowActivityTimelineEvent.vue
new file mode 100644
index 00000000000..d747017dd7f
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowActivityTimelineEvent.vue
@@ -0,0 +1,45 @@
+<script setup lang="ts">
+  import '@craftcms/ui/components/timeline-item/timeline-item';
+  import type {ActivityEvent} from '@/modules/activity/composables/useActivityTimeline';
+  import ActivityCommentCard from '@/modules/activity/components/ActivityCommentCard.vue';
+  import ActivityTimelineEvent from '@/modules/activity/components/ActivityTimelineEvent.vue';
+
+  const props = defineProps<{
+    event: ActivityEvent;
+    elementType: string;
+    elementId: number | null;
+    siteId: number | null;
+    last: boolean;
+    noteHtml: string | null;
+  }>();
+</script>
+
+<template>
+  <ActivityTimelineEvent
+    v-if="!noteHtml"
+    :event="event"
+    :element-type="elementType"
+    :element-id="elementId"
+    :site-id="siteId"
+    :last="last"
+  />
+
+  <article
+    v-else
+    :data-activity-event="event.id"
+    class="activity-timeline__event"
+  >
+    <craft-timeline-item :last="last">
+      <craft-icon slot="marker" :name="event.icon ?? 'wave-pulse'" />
+      <ActivityCommentCard
+        :actor="event.actor"
+        :impersonator="event.impersonator"
+        :description-html="event.description.html"
+        :description-text="event.description.text"
+        :html="noteHtml"
+        :occurred-at="event.occurredAt"
+        :formatted-occurred-at="event.formattedOccurredAt"
+      />
+    </craft-timeline-item>
+  </article>
+</template>
diff --git a/resources/js/modules/workflows/components/WorkflowDefaultActions.vue b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
new file mode 100644
index 00000000000..2c4c0c2ee0f
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
@@ -0,0 +1,273 @@
+<script setup lang="ts">
+  import {ButtonVariant, t} from '@craftcms/ui';
+  import {HttpResponseError} from '@inertiajs/core';
+  import {useHttp} from '@inertiajs/vue3';
+  import {computed, shallowRef, useId} from 'vue';
+  import controller from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/WorkflowTransitionsController';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
+  import {commentToolbarButtons} from '@/modules/markdown-field/commentToolbarButtons';
+  import '../../markdown-field/markdown-field';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowIdentity = {
+    elementType: string;
+    elementId: number | null;
+    draftId: number | null;
+    siteId: number | null;
+  };
+  type WorkflowTransitionRequest = WorkflowIdentity & {
+    note?: string;
+  };
+  type WorkflowResponse = {
+    workflowReview: WorkflowReviewData;
+    editorActions: ElementEditorActions;
+    message?: string;
+  };
+
+  const props = defineProps<{
+    review: WorkflowReviewData;
+    elementType: string;
+    elementId: number | null;
+    draftId: number | null;
+    siteId: number | null;
+  }>();
+
+  const emit = defineEmits<{
+    reviewUpdated: [
+      review: WorkflowReviewData,
+      editorActions: ElementEditorActions,
+    ];
+  }>();
+
+  const note = shallowRef('');
+  const error = shallowRef<string | null>(null);
+  const {flash} = useFlashMessages();
+  const transitionRequest = useHttp<
+    WorkflowTransitionRequest,
+    WorkflowResponse
+  >(identity());
+  const id = useId();
+  const noteId = `workflow-review-note-${id}`;
+  const commentId = `workflow-review-comment-${id}`;
+  const busy = computed(() => transitionRequest.processing);
+  const noteIsEmpty = computed(() => !note.value.trim());
+  const canShowActions = computed(
+    () =>
+      props.review.canSubmit ||
+      props.review.canComment ||
+      props.review.canOverride
+  );
+
+  function identity(): WorkflowIdentity {
+    return {
+      elementType: props.elementType,
+      elementId: props.elementId,
+      draftId: props.draftId,
+      siteId: props.siteId,
+    };
+  }
+
+  async function transition(url: string): Promise<void> {
+    error.value = null;
+    transitionRequest.transform(() => ({
+      ...identity(),
+      note: note.value,
+    }));
+
+    try {
+      const data = await transitionRequest.post(url);
+      emit('reviewUpdated', data.workflowReview, data.editorActions);
+      note.value = '';
+      if (data.message) {
+        flash('success', data.message);
+      }
+    } catch (exception) {
+      error.value =
+        responseMessage(exception) ??
+        (exception instanceof Error
+          ? exception.message
+          : t('The workflow could not be updated.'));
+    }
+  }
+
+  async function submitForReview(): Promise<void> {
+    await transition(controller.submit.url());
+  }
+
+  function onNoteKeydown(event: KeyboardEvent): void {
+    if (
+      event.key !== 'Enter' ||
+      (!event.metaKey && !event.ctrlKey) ||
+      !props.review.canSubmit ||
+      busy.value
+    ) {
+      return;
+    }
+
+    event.preventDefault();
+    void submitForReview();
+  }
+
+  async function addComment(): Promise<void> {
+    if (noteIsEmpty.value || busy.value) {
+      return;
+    }
+
+    const runId = props.review.runId;
+    const stageUid = props.review.stageUid;
+    if (runId === null || stageUid === null) {
+      staleReview();
+      return;
+    }
+
+    await transition(
+      controller.comment.url({workflowRun: runId, stage: stageUid})
+    );
+  }
+
+  async function overrideApproval(): Promise<void> {
+    if (busy.value) {
+      return;
+    }
+
+    if (
+      !window.confirm(
+        t(
+          'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
+        )
+      )
+    ) {
+      return;
+    }
+
+    const runId = props.review.runId;
+    if (runId === null) {
+      staleReview();
+      return;
+    }
+
+    await transition(controller.override.url({workflowRun: runId}));
+  }
+
+  function staleReview(): void {
+    error.value = t('This review is no longer current. Refresh and try again.');
+  }
+
+  function responseMessage(exception: unknown): string | null {
+    if (!(exception instanceof HttpResponseError)) {
+      return null;
+    }
+
+    try {
+      const response = JSON.parse(exception.response.data) as {
+        message?: unknown;
+      };
+
+      return typeof response.message === 'string' ? response.message : null;
+    } catch {
+      return null;
+    }
+  }
+</script>
+
+<template>
+  <section v-if="canShowActions" class="workflow-default-actions">
+    <label class="visually-hidden" :for="noteId">
+      {{ t('Leave a comment') }}
+    </label>
+    <craft-markdown-field
+      :id="noteId"
+      class="markdown-field"
+      :rows="3"
+      :max-length="5000"
+      :placeholder="t('Leave a comment')"
+      sanitize-html
+      show-toolbar
+      .toolbarButtons="commentToolbarButtons"
+      .value="note"
+      :disabled="busy"
+      @input="note = ($event.target as HTMLTextAreaElement).value"
+      @keydown="onNoteKeydown"
+    />
+
+    <div class="workflow-default-actions__buttons">
+      <craft-button
+        v-if="review.canSubmit"
+        type="button"
+        :variant="ButtonVariant.Primary"
+        :disabled="busy"
+        @click="submitForReview"
+      >
+        {{ review.submitLabel }}
+      </craft-button>
+
+      <template v-if="review.canComment">
+        <span class="workflow-default-actions__button">
+          <craft-button
+            :id="commentId"
+            type="button"
+            :variant="ButtonVariant.Solid"
+            :disabled="busy || noteIsEmpty"
+            focusable-when-disabled
+            @click="addComment"
+          >
+            {{ t('Comment') }}
+          </craft-button>
+        </span>
+        <craft-tooltip v-if="noteIsEmpty" :for="commentId">
+          {{ t('Enter a comment before submitting.') }}
+        </craft-tooltip>
+      </template>
+
+      <span v-if="review.canOverride" class="workflow-default-actions__button">
+        <craft-button
+          type="button"
+          :variant="ButtonVariant.DangerPlain"
+          :disabled="busy"
+          @click="overrideApproval"
+        >
+          {{ t('Override approval') }}
+        </craft-button>
+      </span>
+    </div>
+
+    <craft-callout
+      v-if="error"
+      role="alert"
+      variant="danger"
+      icon="triangle-exclamation"
+    >
+      {{ error }}
+    </craft-callout>
+  </section>
+</template>
+
+<style scoped>
+  .workflow-default-actions {
+    display: grid;
+    gap: var(--c-spacing-md);
+  }
+
+  .workflow-default-actions__buttons,
+  .workflow-default-actions__button {
+    display: flex;
+    align-items: center;
+  }
+
+  .workflow-default-actions craft-markdown-field {
+    contain: inline-size;
+    display: block;
+    width: 100%;
+  }
+
+  .workflow-default-actions :deep(.overtype-toolbar) {
+    flex-wrap: wrap;
+  }
+
+  .workflow-default-actions__buttons {
+    flex-wrap: wrap;
+    justify-content: flex-end;
+    gap: var(--c-spacing-xs);
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts b/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
new file mode 100644
index 00000000000..9de5bea5f57
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
@@ -0,0 +1,168 @@
+import {createApp, h, nextTick, shallowRef} from 'vue';
+import {http} from '@inertiajs/vue3';
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vite-plus/test';
+import type {
+  ElementEditPayload,
+  ElementEditPayloadUpdater,
+} from '@/modules/elements/composables/useElementEditor';
+import {elementFormActionSubmitterKey} from '@/modules/elements/composables/useElementEditor';
+import WorkflowUserReviewActions from '../user-review/WorkflowUserReviewActions.vue';
+import WorkflowDetailsTab from './WorkflowDetailsTab.vue';
+
+type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+const requestSpy = vi.spyOn(http.getClient(), 'request');
+
+function review(
+  overrides: Partial<WorkflowReviewData> = {}
+): WorkflowReviewData {
+  return {
+    status: 'pending',
+    statusLabel: 'Awaiting approval',
+    statusIndicator: 'pending',
+    submitLabel: 'Request new review',
+    applyDisabledReason:
+      'This draft must be approved before it can be applied.',
+    runId: 40,
+    currentStage: 0,
+    stageUid: 'publishers-stage',
+    actionComponent: 'craft:user-review-workflow-stage-actions',
+    showDefaultActions: false,
+    actionProps: {canReview: true},
+    runs: [],
+    canSubmit: false,
+    canComment: false,
+    canOverride: false,
+    canApply: false,
+    ...overrides,
+  };
+}
+
+describe('WorkflowDetailsTab', () => {
+  let app: ReturnType<typeof createApp> | undefined;
+  let container: HTMLElement | undefined;
+
+  beforeEach(() => {
+    requestSpy.mockReset();
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async () => new Response('<svg></svg>'))
+    );
+  });
+
+  afterEach(() => {
+    app?.unmount();
+    container?.remove();
+    vi.unstubAllGlobals();
+  });
+
+  it('enables applying a draft after its review is approved', async () => {
+    const approvedReview = review({
+      status: 'approved',
+      statusLabel: 'Approved',
+      statusIndicator: 'enabled',
+      applyDisabledReason: null,
+      runId: 41,
+      currentStage: 1,
+      actionComponent: null,
+      showDefaultActions: true,
+      actionProps: {},
+      canApply: true,
+    });
+    const approvedEditorActions = {
+      primary: {
+        label: 'Save draft',
+        actionUrl: '/actions/elements/save-draft',
+        params: {},
+        redirect: null,
+        tabId: null,
+      },
+      menu: [],
+      buttons: [
+        {
+          label: 'Apply draft',
+          actionUrl: '/actions/elements/apply-draft',
+          params: {workflowRunId: 41, workflowCurrentStage: 1},
+          redirect: null,
+          disabled: false,
+          disabledReason: null,
+          includeFormData: false,
+        },
+      ],
+    };
+    const pendingEditorActions = {
+      ...approvedEditorActions,
+      buttons: [
+        {
+          ...approvedEditorActions.buttons[0],
+          params: {workflowRunId: 40, workflowCurrentStage: 0},
+          disabled: true,
+          disabledReason: 'Approval is required.',
+          includeFormData: true,
+        },
+      ],
+    };
+    requestSpy.mockResolvedValue({
+      status: 200,
+      headers: {},
+      data: JSON.stringify({
+        workflowReview: approvedReview,
+        editorActions: approvedEditorActions,
+      }),
+    });
+
+    const elementPayload = shallowRef({
+      workflow: {
+        current: review(),
+        draftReviews: [],
+      },
+      applyDraftUrl: '/actions/elements/apply-draft',
+      draftId: 7,
+      isProvisionalDraft: false,
+      elementType: 'craft\\elements\\Entry',
+      canonicalId: 12,
+      siteId: 1,
+      editorActions: pendingEditorActions,
+    } as unknown as ElementEditPayload);
+    const updatePayload: ElementEditPayloadUpdater = (update) => {
+      const patch =
+        typeof update === 'function' ? update(elementPayload.value) : update;
+      elementPayload.value = {...elementPayload.value, ...patch};
+    };
+    const submitAction = vi.fn();
+
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp({
+      render: () =>
+        h(WorkflowDetailsTab, {
+          payload: elementPayload.value,
+          updatePayload,
+        }),
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.component(
+      'craft:user-review-workflow-stage-actions',
+      WorkflowUserReviewActions
+    );
+    app.provide(elementFormActionSubmitterKey, submitAction);
+    app.mount(container);
+
+    const submitReview = [
+      ...container.querySelectorAll<HTMLElement>('craft-button'),
+    ].find((button) => button.textContent?.trim() === 'Submit review')!;
+    submitReview.click();
+
+    await vi.waitFor(() =>
+      expect(elementPayload.value.workflow.current).toEqual(approvedReview)
+    );
+    await nextTick();
+
+    const applyDraft = [
+      ...container.querySelectorAll<HTMLElement>('craft-button'),
+    ].find((button) => button.textContent?.trim() === 'Apply draft')!;
+    expect(applyDraft).toBeTruthy();
+    applyDraft.click();
+    expect(submitAction).toHaveBeenCalledWith(approvedEditorActions.buttons[0]);
+  });
+});
diff --git a/resources/js/modules/workflows/components/WorkflowDetailsTab.vue b/resources/js/modules/workflows/components/WorkflowDetailsTab.vue
new file mode 100644
index 00000000000..089bf85ebb5
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDetailsTab.vue
@@ -0,0 +1,106 @@
+<script setup lang="ts">
+  import {ButtonVariant, t} from '@craftcms/ui';
+  import {computed, inject} from 'vue';
+  import type {
+    ElementEditorActions,
+    ElementEditPayload,
+    ElementEditPayloadUpdater,
+  } from '@/modules/elements/composables/useElementEditor';
+  import {elementFormActionSubmitterKey} from '@/modules/elements/composables/useElementEditor';
+  import WorkflowDraftReviews from './WorkflowDraftReviews.vue';
+  import WorkflowReviewPanel from './WorkflowReviewPanel.vue';
+
+  const props = defineProps<{
+    payload: ElementEditPayload;
+    updatePayload: ElementEditPayloadUpdater;
+  }>();
+
+  const submitAction = inject(elementFormActionSubmitterKey);
+
+  if (!submitAction) {
+    throw new Error('WorkflowDetailsTab requires an element editor.');
+  }
+
+  const applyDraftAction = computed(() =>
+    props.payload.workflow.current?.canApply
+      ? (props.payload.editorActions.buttons.find(
+          (action) => action.actionUrl === props.payload.applyDraftUrl
+        ) ?? null)
+      : null
+  );
+
+  function updateWorkflowReview(
+    workflowReview: CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+    editorActions: ElementEditorActions
+  ): void {
+    props.updatePayload((payload) => ({
+      workflow: {
+        ...payload.workflow,
+        current: workflowReview,
+      },
+      editorActions,
+    }));
+  }
+</script>
+
+<template>
+  <div class="workflow-details-tab">
+    <div
+      v-if="
+        payload.workflow.current &&
+        payload.draftId !== null &&
+        !payload.isProvisionalDraft
+      "
+      class="workflow-details-tab__review"
+    >
+      <WorkflowReviewPanel
+        :review="payload.workflow.current"
+        :element-type="payload.elementType"
+        :element-id="payload.canonicalId"
+        :draft-id="payload.draftId"
+        :site-id="payload.siteId"
+        @review-updated="updateWorkflowReview"
+      >
+        <div v-if="applyDraftAction">
+          <craft-button
+            type="button"
+            :variant="ButtonVariant.Primary"
+            @click="submitAction(applyDraftAction)"
+          >
+            {{ applyDraftAction.label }}
+          </craft-button>
+        </div>
+      </WorkflowReviewPanel>
+    </div>
+
+    <section
+      v-if="payload.workflow.draftReviews.length"
+      class="workflow-details-tab__drafts"
+    >
+      <h3>{{ t('Drafts in review') }}</h3>
+      <WorkflowDraftReviews :drafts="payload.workflow.draftReviews" />
+    </section>
+  </div>
+</template>
+
+<style scoped>
+  .workflow-details-tab,
+  .workflow-details-tab__review {
+    display: grid;
+  }
+
+  .workflow-details-tab__drafts {
+    display: grid;
+    gap: var(--c-spacing-sm);
+    padding: var(--c-spacing-md);
+  }
+
+  .workflow-details-tab__review + .workflow-details-tab__drafts {
+    border-block-start: 1px solid var(--c-color-neutral-border-quiet);
+  }
+
+  .workflow-details-tab__drafts h3 {
+    margin: 0;
+    font-size: var(--c-text-sm);
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowDraftReviews.vue b/resources/js/modules/workflows/components/WorkflowDraftReviews.vue
new file mode 100644
index 00000000000..b04904223f1
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDraftReviews.vue
@@ -0,0 +1,88 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+
+  defineProps<{
+    drafts: CraftCms.Cms.Workflow.Data.WorkflowDraftReviewData[];
+  }>();
+</script>
+
+<template>
+  <ul class="workflow-drafts">
+    <li v-for="draft in drafts" :key="draft.url" class="workflow-draft">
+      <div class="workflow-draft__details">
+        <div class="workflow-draft__heading">
+          <strong>{{ draft.name }}</strong>
+          <span class="workflow-draft__status">
+            <craft-status
+              :status="draft.statusIndicator"
+              :label="draft.statusLabel"
+            ></craft-status>
+            {{ draft.statusLabel }}
+          </span>
+        </div>
+        <p>
+          {{
+            t('Requested by {requester} for {stage}.', {
+              requester: draft.requester,
+              stage: draft.stage,
+            })
+          }}
+        </p>
+      </div>
+      <craft-button :href="draft.url" variant="outline" size="small">
+        {{ t('View draft') }}
+      </craft-button>
+    </li>
+  </ul>
+</template>
+
+<style scoped>
+  .workflow-drafts {
+    display: grid;
+    gap: var(--c-spacing-sm);
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .workflow-draft {
+    display: flex;
+    flex-wrap: wrap;
+    align-items: center;
+    justify-content: space-between;
+    gap: var(--c-spacing-sm);
+    padding-block: var(--c-spacing-xs);
+  }
+
+  .workflow-draft + .workflow-draft {
+    border-block-start: 1px solid var(--c-color-neutral-border-quiet);
+  }
+
+  .workflow-draft__details {
+    display: grid;
+    flex: 1 1 14rem;
+    gap: var(--c-spacing-xs);
+    min-width: 0;
+  }
+
+  .workflow-draft__heading,
+  .workflow-draft__status {
+    display: flex;
+    align-items: center;
+    gap: var(--c-spacing-xs);
+  }
+
+  .workflow-draft__heading {
+    flex-wrap: wrap;
+  }
+
+  .workflow-draft__status,
+  .workflow-draft p {
+    color: var(--c-text-quiet);
+    font-size: var(--c-text-sm);
+  }
+
+  .workflow-draft p {
+    margin: 0;
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowDraftsStatus.vue b/resources/js/modules/workflows/components/WorkflowDraftsStatus.vue
new file mode 100644
index 00000000000..51b7995dcbc
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDraftsStatus.vue
@@ -0,0 +1,96 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+  import {computed, ref, useId} from 'vue';
+  import WorkflowDraftReviews from './WorkflowDraftReviews.vue';
+
+  const props = defineProps<{
+    drafts: CraftCms.Cms.Workflow.Data.WorkflowDraftReviewData[];
+  }>();
+
+  const opened = ref(false);
+  const headingId = `workflow-drafts-${useId()}`;
+  const label = computed(() =>
+    props.drafts.length === 1
+      ? t('1 draft in review')
+      : t('{count} drafts in review', {count: props.drafts.length})
+  );
+</script>
+
+<template>
+  <craft-popover
+    placement="bottom-end"
+    :opened="opened"
+    @opened-changed="opened = $event.detail.opened"
+  >
+    <button
+      slot="invoker"
+      type="button"
+      class="workflow-drafts-status"
+      :aria-expanded="opened"
+    >
+      <craft-status status="pending" :label="label"></craft-status>
+      <span>{{ label }}</span>
+      <craft-icon name="chevron-down" aria-hidden="true"></craft-icon>
+    </button>
+
+    <div
+      slot="content-body"
+      role="region"
+      :aria-labelledby="headingId"
+      class="workflow-drafts-popover"
+    >
+      <h2 :id="headingId">{{ t('Drafts in review') }}</h2>
+      <WorkflowDraftReviews :drafts="drafts" />
+    </div>
+  </craft-popover>
+</template>
+
+<style scoped>
+  .workflow-drafts-status {
+    display: inline-flex;
+    align-items: center;
+    gap: var(--c-spacing-xs);
+    min-block-size: 2rem;
+    padding: var(--c-spacing-xs);
+    border: 0;
+    border-radius: var(--c-radius-md);
+    background: transparent;
+    color: var(--c-text-quiet);
+    cursor: pointer;
+    font: inherit;
+    white-space: nowrap;
+  }
+
+  .workflow-drafts-status:hover {
+    background: var(--c-color-neutral-fill-quiet);
+    color: var(--c-text);
+  }
+
+  .workflow-drafts-status:focus-visible {
+    outline: 2px solid var(--c-color-focus-ring);
+    outline-offset: 2px;
+  }
+
+  .workflow-drafts-status > craft-icon {
+    transition: transform 100ms ease;
+  }
+
+  .workflow-drafts-status[aria-expanded='true'] > craft-icon {
+    transform: rotate(180deg);
+  }
+
+  .workflow-drafts-popover {
+    display: grid;
+    gap: var(--c-spacing-sm);
+  }
+
+  .workflow-drafts-popover h2 {
+    margin: 0;
+    font-size: var(--c-text-base);
+  }
+
+  craft-popover::part(popup) {
+    width: min(24rem, calc(100vw - 2rem));
+    max-width: none;
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
new file mode 100644
index 00000000000..8365f80ec09
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
@@ -0,0 +1,28 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+
+  defineEmits<{
+    startEditing: [];
+  }>();
+</script>
+
+<template>
+  <craft-callout variant="warning" icon="lock" appearance="fill">
+    {{
+      t(
+        'This draft is in review. Editing it will invalidate the current review and require a new review.'
+      )
+    }}
+
+    <craft-button
+      slot="action"
+      type="button"
+      appearance="outline"
+      size="small"
+      inherit
+      @click="$emit('startEditing')"
+    >
+      {{ t('Start editing') }}
+    </craft-button>
+  </craft-callout>
+</template>
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
new file mode 100644
index 00000000000..679971ae0d8
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
@@ -0,0 +1,701 @@
+import {createApp, defineComponent, h, nextTick} from 'vue';
+import {http} from '@inertiajs/vue3';
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vite-plus/test';
+import {useFlashMessages} from '@/common/composables/useFlashMessages';
+import WorkflowDefaultActions from './WorkflowDefaultActions.vue';
+import WorkflowReviewPanel from './WorkflowReviewPanel.vue';
+import WorkflowUserReviewActions from '../user-review/WorkflowUserReviewActions.vue';
+import WorkflowUserReviewSummary from '../user-review/WorkflowUserReviewSummary.vue';
+
+const requestSpy = vi.spyOn(http.getClient(), 'request');
+
+type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+type WorkflowRun = WorkflowReviewData['runs'][number];
+type WorkflowTimelineItem = WorkflowRun['stages'][number]['events'][number];
+
+function activityTarget(label: string): WorkflowTimelineItem['actor'] {
+  return {label, url: null, deleted: false};
+}
+
+function timelineItem(
+  overrides: Partial<WorkflowTimelineItem> = {}
+): WorkflowTimelineItem {
+  return {
+    id: 'review',
+    type: 'review',
+    icon: 'rotate',
+    description: 'updated the workflow stage',
+    actor: activityTarget('Ada'),
+    impersonator: null,
+    decision: null,
+    noteHtml: null,
+    occurredAt: '2026-09-15T09:41:00+00:00',
+    formattedOccurredAt: {
+      date: '2026-09-15',
+      dateLabel: 'Sep 15, 2026',
+      time: '9:41 AM',
+      full: 'September 15, 2026 at 9:41 AM UTC',
+    },
+    ...overrides,
+  };
+}
+
+function submission(
+  overrides: Partial<WorkflowRun['submission']> = {}
+): WorkflowRun['submission'] {
+  return {
+    id: 'submission',
+    type: 'submission',
+    icon: 'clipboard-list-check',
+    description: 'requested review',
+    actor: activityTarget('Ada'),
+    impersonator: null,
+    decision: null,
+    noteHtml: null,
+    occurredAt: '2026-09-15T09:41:00+00:00',
+    formattedOccurredAt: {
+      date: '2026-09-15',
+      dateLabel: 'Sep 15, 2026',
+      time: '9:41 AM',
+      full: 'September 15, 2026 at 9:41 AM UTC',
+    },
+    ...overrides,
+  };
+}
+
+function workflowRun(overrides: Partial<WorkflowRun> = {}): WorkflowRun {
+  return {
+    id: 41,
+    current: true,
+    statusLabel: 'Awaiting approval',
+    statusIndicator: 'pending',
+    submission: submission(),
+    stages: [
+      {
+        name: 'Publishers',
+        current: true,
+        approved: false,
+        icon: 'clock',
+        iconColor: 'warning',
+        message: null,
+        summaryComponent: 'craft:user-review-workflow-stage-summary',
+        summaryProps: {
+          approvalsRequired: 1,
+          approvals: 0,
+          reviewers: [{name: 'Ada'}],
+        },
+        events: [],
+      },
+    ],
+    ...overrides,
+  };
+}
+
+function response(data: unknown, status = 200) {
+  return {
+    status,
+    headers: {},
+    data: JSON.stringify(data),
+  };
+}
+
+function requests() {
+  return requestSpy.mock.calls.map(([request]) => ({
+    method: request.method,
+    url: request.url,
+    data: JSON.parse(request.data as string),
+  }));
+}
+
+function review(
+  overrides: Partial<WorkflowReviewData> = {}
+): WorkflowReviewData {
+  return {
+    status: 'pending',
+    statusLabel: 'Awaiting approval',
+    statusIndicator: 'pending',
+    submitLabel: 'Request new review',
+    applyDisabledReason:
+      'This draft must be approved before it can be applied.',
+    runId: 41,
+    currentStage: 1,
+    stageUid: 'publishers-stage',
+    actionComponent: 'craft:user-review-workflow-stage-actions',
+    showDefaultActions: false,
+    actionProps: {canReview: true},
+    runs: [workflowRun()],
+    canSubmit: false,
+    canComment: true,
+    canOverride: false,
+    canApply: false,
+    ...overrides,
+  };
+}
+
+describe('WorkflowReviewPanel', () => {
+  let app: ReturnType<typeof createApp> | undefined;
+  let container: HTMLElement | undefined;
+
+  beforeEach(() => {
+    requestSpy.mockReset();
+    useFlashMessages().clearAll();
+    vi.stubGlobal(
+      'confirm',
+      vi.fn(() => true)
+    );
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async () => new Response('<svg></svg>'))
+    );
+  });
+
+  afterEach(() => {
+    app?.unmount();
+    container?.remove();
+    vi.unstubAllGlobals();
+  });
+
+  function mount(
+    workflowReview: WorkflowReviewData,
+    components: Record<string, ReturnType<typeof defineComponent>> = {}
+  ) {
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp({
+      render: () =>
+        h(WorkflowReviewPanel, {
+          review: workflowReview,
+          elementType: 'CraftCms\\Cms\\Entry\\Elements\\Entry',
+          elementId: 12,
+          draftId: 7,
+          siteId: 1,
+        }),
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.component('craft:workflow-default-actions', WorkflowDefaultActions);
+    app.component(
+      'craft:user-review-workflow-stage-actions',
+      WorkflowUserReviewActions
+    );
+    app.component(
+      'craft:user-review-workflow-stage-summary',
+      WorkflowUserReviewSummary
+    );
+    for (const [name, component] of Object.entries(components)) {
+      app.component(name, component);
+    }
+    app.mount(container);
+  }
+
+  function actionButton(label: string): HTMLElement {
+    return [
+      ...container!.querySelectorAll<HTMLElement>(
+        '.workflow-review craft-button'
+      ),
+    ].find((element) => element.textContent?.trim() === label)!;
+  }
+
+  async function enterNote(value: string): Promise<void> {
+    const textarea = container!.querySelector<HTMLTextAreaElement>(
+      'textarea[id^="workflow-review-note"]'
+    )!;
+    textarea.value = value;
+    textarea.dispatchEvent(new Event('input', {bubbles: true}));
+    await nextTick();
+  }
+
+  async function enterReviewMessage(value: string): Promise<void> {
+    const textarea = container!.querySelector<HTMLTextAreaElement>(
+      'textarea[id^="workflow-user-review-message"]'
+    )!;
+    textarea.value = value;
+    textarea.dispatchEvent(new Event('input', {bubbles: true}));
+    await nextTick();
+  }
+
+  async function chooseReviewDecision(value: string): Promise<void> {
+    container!
+      .querySelector<HTMLInputElement>(`input[type="radio"][value="${value}"]`)!
+      .click();
+    await nextTick();
+  }
+
+  it('lets reviewers approve, request changes, and comment with the required messages', async () => {
+    const overridableReview = review({canOverride: true});
+    requestSpy
+      .mockResolvedValueOnce(
+        response({
+          message: 'Comment added.',
+          workflowReview: overridableReview,
+        })
+      )
+      .mockResolvedValueOnce(
+        response({
+          message: 'Approval recorded.',
+          workflowReview: overridableReview,
+        })
+      )
+      .mockResolvedValueOnce(
+        response({
+          message: 'Changes requested.',
+          workflowReview: overridableReview,
+        })
+      )
+      .mockResolvedValueOnce(
+        response({message: 'Workflow approved.', workflowReview: review()})
+      );
+    mount(overridableReview);
+
+    expect(
+      (
+        container!.querySelector('craft-callout') as HTMLElement & {
+          title: string;
+        }
+      ).title
+    ).toBe('Your input is needed');
+    expect(container!.textContent).toContain(
+      'Choose an action for Publishers.'
+    );
+    expect(
+      container!.querySelector('textarea[id^="workflow-review-note"]')
+    ).toBeNull();
+    expect(container!.textContent).toContain(
+      'Submit general feedback without approving.'
+    );
+    expect(container!.textContent).toContain(
+      'Approve this stage of the workflow.'
+    );
+    expect(container!.textContent).toContain(
+      'Submit feedback that must be addressed.'
+    );
+    const submit = actionButton(
+      'Submit review'
+    ) as HTMLElementTagNameMap['craft-button'];
+    await submit.updateComplete;
+    expect(submit.disabled).toBe(true);
+    expect(submit.tabIndex).toBe(0);
+    expect(container!.querySelector('craft-tooltip')?.textContent).toContain(
+      'Enter a comment before submitting.'
+    );
+
+    await enterReviewMessage('Please clarify this section.');
+    expect(submit.disabled).toBe(false);
+    container!
+      .querySelector<HTMLTextAreaElement>(
+        'textarea[id^="workflow-user-review-message"]'
+      )!
+      .dispatchEvent(
+        new KeyboardEvent('keydown', {
+          key: 'Enter',
+          ctrlKey: true,
+          bubbles: true,
+          composed: true,
+        })
+      );
+    await vi.waitFor(() =>
+      expect(useFlashMessages().messages.value.success).toBe('Comment added.')
+    );
+
+    await chooseReviewDecision('approve');
+    expect(submit.disabled).toBe(false);
+    submit.click();
+    await vi.waitFor(() =>
+      expect(useFlashMessages().messages.value.success).toBe(
+        'Approval recorded.'
+      )
+    );
+
+    await chooseReviewDecision('requestChanges');
+    await enterReviewMessage('The legal claim needs support.');
+    submit.click();
+    await vi.waitFor(() =>
+      expect(useFlashMessages().messages.value.success).toBe(
+        'Changes requested.'
+      )
+    );
+
+    const override = actionButton(
+      'Override approval'
+    ) as HTMLElementTagNameMap['craft-button'];
+    await override.updateComplete;
+    expect(override.disabled).toBe(false);
+
+    await enterReviewMessage('Reviewed outside the normal approval path.');
+    vi.mocked(window.confirm).mockReturnValueOnce(false);
+    override.click();
+    await nextTick();
+
+    expect(requests()).toHaveLength(3);
+    expect(window.confirm).toHaveBeenCalledWith(
+      'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
+    );
+
+    override.click();
+    await vi.waitFor(() => {
+      expect(useFlashMessages().messages.value.success).toBe(
+        'Workflow approved.'
+      );
+    });
+
+    expect(requests()).toEqual([
+      expect.objectContaining({
+        method: 'post',
+        url: '/admin/workflows/41/stages/publishers-stage/comment',
+        data: expect.objectContaining({
+          note: 'Please clarify this section.',
+        }),
+      }),
+      expect.objectContaining({
+        method: 'post',
+        url: '/admin/workflows/41/stages/publishers-stage/user-review/approve',
+      }),
+      expect.objectContaining({
+        method: 'post',
+        url: '/admin/workflows/41/stages/publishers-stage/user-review/request-changes',
+        data: expect.objectContaining({
+          message: 'The legal claim needs support.',
+        }),
+      }),
+      expect.objectContaining({
+        method: 'post',
+        url: '/admin/workflows/41/override',
+        data: expect.objectContaining({
+          note: 'Reviewed outside the normal approval path.',
+        }),
+      }),
+    ]);
+  });
+
+  it('omits review choices when commenting is the only available action', () => {
+    mount(
+      review({
+        actionProps: {canReview: false},
+        canComment: true,
+        canOverride: false,
+      })
+    );
+
+    expect(container!.textContent).not.toContain('Approve this stage');
+    expect(container!.textContent).not.toContain('Request changes');
+    expect(actionButton('Comment')).toBeTruthy();
+  });
+
+  it('comments after a partial approval removes the reviewers remaining actions', async () => {
+    const partialApproval = review({
+      actionProps: {canReview: false},
+      canComment: true,
+      runs: [
+        workflowRun({
+          stages: [
+            {
+              ...workflowRun().stages[0]!,
+              summaryProps: {
+                approvalsRequired: 2,
+                approvals: 1,
+                reviewers: [{name: 'Ada'}, {name: 'Grace'}],
+              },
+            },
+          ],
+        }),
+      ],
+    });
+    requestSpy
+      .mockResolvedValueOnce(
+        response({
+          message: 'Approval recorded.',
+          workflowReview: partialApproval,
+        })
+      )
+      .mockResolvedValueOnce(
+        response({message: 'Comment added.', workflowReview: partialApproval})
+      );
+    mount(review());
+
+    await chooseReviewDecision('approve');
+    actionButton('Submit review').click();
+    await vi.waitFor(() => expect(actionButton('Comment')).toBeTruthy());
+    await enterReviewMessage('A follow-up note.');
+    actionButton('Comment').click();
+    await vi.waitFor(() => expect(requests()).toHaveLength(2));
+
+    expect(requests()[1]).toEqual(
+      expect.objectContaining({
+        url: '/admin/workflows/41/stages/publishers-stage/comment',
+        data: expect.objectContaining({note: 'A follow-up note.'}),
+      })
+    );
+  });
+
+  it('lets plugin stages compose the default actions into their UI', () => {
+    const PluginStage = defineComponent({
+      props: {prompt: {type: String, required: true}},
+      inheritAttrs: false,
+      template: `
+        <div>
+          <button type="button">{{ prompt }}</button>
+          <component :is="'craft:workflow-default-actions'" v-bind="$attrs" />
+        </div>
+      `,
+    });
+    mount(
+      review({
+        actionComponent: 'plugin:compliance-stage',
+        showDefaultActions: false,
+        actionProps: {prompt: 'Attest compliance'},
+      }),
+      {'plugin:compliance-stage': PluginStage}
+    );
+
+    expect(container!.textContent).toContain('Attest compliance');
+    expect(actionButton('Comment')).toBeTruthy();
+  });
+
+  it('lets the requester comment without offering review decisions', async () => {
+    mount(
+      review({
+        actionComponent: null,
+        showDefaultActions: true,
+        actionProps: {canReview: false},
+      })
+    );
+
+    expect(container!.textContent).not.toContain('Approve');
+    expect(container!.textContent).not.toContain('Request changes');
+    await (actionButton('Comment') as HTMLElementTagNameMap['craft-button'])
+      .updateComplete;
+    expect(
+      (actionButton('Comment') as HTMLElementTagNameMap['craft-button'])
+        .disabled
+    ).toBe(true);
+    expect(actionButton('Comment').tabIndex).toBe(0);
+
+    await enterNote('One more detail for the reviewers.');
+    expect(
+      (actionButton('Comment') as HTMLElementTagNameMap['craft-button'])
+        .disabled
+    ).toBe(false);
+  });
+
+  it('shows the workflow message returned by a failed transition', async () => {
+    requestSpy.mockResolvedValue(
+      response(
+        {
+          message:
+            'Every stage needs enough eligible reviewers to meet its approval threshold.',
+        },
+        422
+      )
+    );
+    mount(
+      review({
+        status: 'notSubmitted',
+        statusLabel: 'Not submitted',
+        statusIndicator: 'disabled',
+        applyDisabledReason: 'Submit this draft for review before applying it.',
+        submitLabel: 'Submit for review',
+        runId: null,
+        currentStage: null,
+        stageUid: null,
+        actionComponent: null,
+        showDefaultActions: true,
+        actionProps: {canReview: false},
+        runs: [],
+        canSubmit: true,
+      })
+    );
+
+    const textarea = container!.querySelector<HTMLTextAreaElement>(
+      'textarea[id^="workflow-review-note"]'
+    )!;
+    textarea.dispatchEvent(
+      new KeyboardEvent('keydown', {
+        key: 'Enter',
+        metaKey: true,
+        bubbles: true,
+      })
+    );
+    await vi.waitFor(() =>
+      expect(container!.textContent).toContain(
+        'Every stage needs enough eligible reviewers to meet its approval threshold.'
+      )
+    );
+    expect(container!.querySelector('[role="alert"]')).not.toBeNull();
+  });
+
+  it('shows the review request, decisions, and comments as timeline items', () => {
+    mount(
+      review({
+        actionComponent: null,
+        showDefaultActions: true,
+        actionProps: {canReview: false},
+        runs: [
+          workflowRun({
+            id: 42,
+            submission: submission({
+              id: 'second-submission',
+              actor: activityTarget('Rias'),
+              noteHtml: '<p>Ready for review.</p>',
+            }),
+            stages: [],
+          }),
+          workflowRun({
+            id: 41,
+            current: false,
+            statusLabel: 'Changes requested',
+            statusIndicator: 'expired',
+            submission: submission({
+              id: 'first-submission',
+              actor: activityTarget('Rias'),
+            }),
+            stages: [
+              {
+                name: 'Editorial',
+                current: false,
+                approved: false,
+                icon: 'xmark',
+                iconColor: 'danger',
+                message: 'Changes requested',
+                summaryComponent: 'craft:user-review-workflow-stage-summary',
+                summaryProps: {
+                  approvalsRequired: 2,
+                  approvals: 1,
+                  reviewers: [{name: 'Ada'}, {name: 'Grace'}, {name: 'Lin'}],
+                },
+                events: [
+                  timelineItem({
+                    id: 'approval',
+                    icon: 'check',
+                    description: 'approved',
+                    actor: activityTarget('Ada'),
+                    decision: 'approved',
+                    noteHtml: '<p>Looks good.</p>',
+                  }),
+                  timelineItem({
+                    id: 'change-request',
+                    icon: 'xmark',
+                    description: 'requested changes',
+                    actor: activityTarget('Grace'),
+                    decision: 'rejected',
+                    noteHtml: '<p>Please revise this.</p>',
+                  }),
+                  timelineItem({
+                    id: 'comment',
+                    type: 'comment',
+                    icon: 'comment',
+                    description: 'commented.',
+                    actor: activityTarget('Lin'),
+                    decision: null,
+                    noteHtml: '<p>Can you clarify this?</p>',
+                  }),
+                  timelineItem({
+                    id: 'automated-failure',
+                    icon: 'xmark',
+                    description: 'failed the stage',
+                    actor: activityTarget('Craft CMS'),
+                    decision: 'failed',
+                    noteHtml: '<p>Unsupported claims were found.</p>',
+                  }),
+                ],
+              },
+            ],
+          }),
+        ],
+      })
+    );
+
+    const text = container!.textContent?.replace(/\s+/g, ' ');
+    expect(text).toContain('Review 2');
+    expect(text).toContain('Review 1');
+    expect(text).toContain('Rias requested review');
+    expect(text).toContain('Ready for review.');
+    expect(text).toContain('Ada approved');
+    expect(text).toContain('Looks good.');
+    expect(text).toContain('Grace requested changes');
+    expect(text).toContain('Please revise this.');
+    expect(text).toContain('Lin commented.');
+    expect(text).toContain('Can you clarify this?');
+    expect(text).toContain('Craft CMS failed the stage');
+    expect(text).toContain('Unsupported claims were found.');
+  });
+
+  it('shows each stage summary and expands the current stage', async () => {
+    mount(
+      review({
+        runs: [
+          workflowRun({
+            stages: [
+              {
+                name: 'Editorial',
+                current: false,
+                approved: true,
+                icon: 'check',
+                iconColor: 'success',
+                message: null,
+                summaryComponent: 'craft:user-review-workflow-stage-summary',
+                summaryProps: {
+                  approvalsRequired: 1,
+                  approvals: 1,
+                  reviewers: [{name: 'Ada'}],
+                },
+                events: [
+                  timelineItem({
+                    icon: 'check',
+                    description: 'approved',
+                    decision: 'approved',
+                  }),
+                ],
+              },
+              {
+                name: 'Legal',
+                current: true,
+                approved: false,
+                icon: 'clock',
+                iconColor: 'warning',
+                message: null,
+                summaryComponent: 'craft:user-review-workflow-stage-summary',
+                summaryProps: {
+                  approvalsRequired: 2,
+                  approvals: 0,
+                  reviewers: [{name: 'Grace'}, {name: 'Lin'}],
+                },
+                events: [],
+              },
+              {
+                name: 'Automated policy check',
+                current: false,
+                approved: false,
+                icon: 'minus',
+                iconColor: 'neutral',
+                message: 'Waiting for the external policy service.',
+                summaryComponent: null,
+                summaryProps: {},
+                events: [],
+              },
+            ],
+          }),
+        ],
+      })
+    );
+    await nextTick();
+
+    const disclosures = [...container!.querySelectorAll('craft-disclosure')];
+    const editorial = disclosures.find((item) =>
+      item.textContent?.includes('Editorial')
+    )!;
+    const legal = disclosures.find((item) =>
+      item.textContent?.includes('Legal')
+    )!;
+    const automatedCheck = disclosures.find((item) =>
+      item.textContent?.includes('Automated policy check')
+    )!;
+
+    expect(editorial.opened).toBe(false);
+    expect(legal.opened).toBe(true);
+    expect(legal.textContent).toContain('Grace');
+    expect(legal.textContent).toContain('Lin');
+    expect(legal.textContent).toContain('0 of 2 approved');
+    expect(automatedCheck.textContent).toContain(
+      'Waiting for the external policy service.'
+    );
+  });
+});
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.vue b/resources/js/modules/workflows/components/WorkflowReviewPanel.vue
new file mode 100644
index 00000000000..6bef581a4a8
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.vue
@@ -0,0 +1,87 @@
+<script setup lang="ts">
+  import {computed, shallowRef, watch} from 'vue';
+  import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
+  import WorkflowDefaultActions from './WorkflowDefaultActions.vue';
+  import Timeline from './Timeline.vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+  const props = defineProps<{
+    review: WorkflowReviewData;
+    elementType: string;
+    elementId: number | null;
+    draftId: number | null;
+    siteId: number | null;
+  }>();
+
+  const emit = defineEmits<{
+    reviewUpdated: [
+      review: WorkflowReviewData,
+      editorActions: ElementEditorActions,
+    ];
+  }>();
+
+  const review = shallowRef(props.review);
+  const actionComponent = computed(() => review.value.actionComponent ?? null);
+  const actionProps = computed(() => review.value.actionProps ?? {});
+
+  watch(
+    () => props.review,
+    (value) => {
+      review.value = value;
+    }
+  );
+
+  function updateReview(
+    value: WorkflowReviewData,
+    editorActions: ElementEditorActions
+  ): void {
+    review.value = value;
+    emit('reviewUpdated', value, editorActions);
+  }
+</script>
+
+<template>
+  <div class="workflow-review">
+    <section class="workflow-review__body">
+      <component
+        :is="actionComponent"
+        v-if="actionComponent"
+        v-bind="actionProps"
+        :review="review"
+        :element-type="elementType"
+        :element-id="elementId"
+        :draft-id="draftId"
+        :site-id="siteId"
+        @review-updated="updateReview"
+      />
+
+      <WorkflowDefaultActions
+        v-if="review.showDefaultActions"
+        :review="review"
+        :element-type="elementType"
+        :element-id="elementId"
+        :draft-id="draftId"
+        :site-id="siteId"
+        @review-updated="updateReview"
+      />
+
+      <Timeline v-if="review.runs.length" :review="review" />
+
+      <slot />
+    </section>
+  </div>
+</template>
+
+<style scoped>
+  .workflow-review {
+    display: grid;
+    gap: var(--c-spacing-md);
+    padding: var(--c-spacing-md);
+  }
+
+  .workflow-review__body {
+    display: grid;
+    gap: var(--c-spacing-md);
+  }
+</style>
diff --git a/resources/js/modules/workflows/register.test.ts b/resources/js/modules/workflows/register.test.ts
new file mode 100644
index 00000000000..6ec90e86902
--- /dev/null
+++ b/resources/js/modules/workflows/register.test.ts
@@ -0,0 +1,73 @@
+import {createApp} from 'vue';
+import {describe, expect, it} from 'vite-plus/test';
+import {createCpComponentRegistry} from '@/bootstrap/components';
+import {createElementDetailsTabRegistry} from '@/bootstrap/element-details-tabs';
+import {registerWorkflowComponents} from './register';
+
+describe('workflow registration', () => {
+  it('registers the workflow details tab for reviews and drafts in review', () => {
+    const app = createApp({render: () => null});
+    const components = createCpComponentRegistry();
+    const tabs = createElementDetailsTabRegistry();
+
+    components.install(app);
+    registerWorkflowComponents(components, tabs);
+
+    expect(app.component('craft:workflow-default-actions')).toBeTruthy();
+    expect(
+      app.component('craft:user-review-workflow-stage-actions')
+    ).toBeTruthy();
+    expect(
+      app.component('craft:user-review-workflow-stage-summary')
+    ).toBeTruthy();
+    expect(app.component('craft:workflow-activity-event')).toBeTruthy();
+
+    const tab = tabs.tabs[0]!;
+    const payload = {
+      workflow: {
+        current: null,
+        draftReviews: [],
+      },
+    } as unknown as Parameters<NonNullable<typeof tab.visible>>[0];
+
+    expect(tab).toMatchObject({
+      id: 'workflow',
+      icon: 'clipboard-list-check',
+      order: 5,
+    });
+    expect(tab.visible!(payload)).toBe(false);
+    expect(tab.status!(payload)).toBeNull();
+    expect(
+      tab.status!({
+        ...payload,
+        workflow: {
+          ...payload.workflow,
+          current: {
+            statusLabel: 'Awaiting approval',
+            statusIndicator: 'pending',
+          } as CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+        },
+      })
+    ).toEqual({label: 'Awaiting approval', indicator: 'pending'});
+    expect(
+      tab.visible!({
+        ...payload,
+        workflow: {
+          ...payload.workflow,
+          current: {} as CraftCms.Cms.Workflow.Data.WorkflowReviewData,
+        },
+      })
+    ).toBe(true);
+    expect(
+      tab.visible!({
+        ...payload,
+        workflow: {
+          ...payload.workflow,
+          draftReviews: [
+            {} as CraftCms.Cms.Workflow.Data.WorkflowDraftReviewData,
+          ],
+        },
+      })
+    ).toBe(true);
+  });
+});
diff --git a/resources/js/modules/workflows/register.ts b/resources/js/modules/workflows/register.ts
new file mode 100644
index 00000000000..4cce797be92
--- /dev/null
+++ b/resources/js/modules/workflows/register.ts
@@ -0,0 +1,45 @@
+import type {CpComponentRegistry} from '@/bootstrap/components';
+import type {ElementDetailsTabRegistry} from '@/bootstrap/element-details-tabs';
+import {t} from '@craftcms/ui';
+import WorkflowDefaultActions from './components/WorkflowDefaultActions.vue';
+import WorkflowDetailsTab from './components/WorkflowDetailsTab.vue';
+import WorkflowUserReviewActions from './user-review/WorkflowUserReviewActions.vue';
+import WorkflowUserReviewSummary from './user-review/WorkflowUserReviewSummary.vue';
+
+export function registerWorkflowComponents(
+  components: Pick<CpComponentRegistry, 'register'>,
+  elementDetailsTabs: Pick<ElementDetailsTabRegistry, 'register'>
+): void {
+  components.register('craft:workflow-default-actions', WorkflowDefaultActions);
+  components.register(
+    'craft:user-review-workflow-stage-actions',
+    WorkflowUserReviewActions
+  );
+  components.register(
+    'craft:user-review-workflow-stage-summary',
+    WorkflowUserReviewSummary
+  );
+  components.register(
+    'craft:workflow-activity-event',
+    () => import('./components/WorkflowActivityTimelineEvent.vue')
+  );
+  elementDetailsTabs.register({
+    id: 'workflow',
+    get label() {
+      return t('Workflow');
+    },
+    icon: 'clipboard-list-check',
+    component: WorkflowDetailsTab,
+    order: 5,
+    visible: (payload) =>
+      Boolean(payload.workflow.current || payload.workflow.draftReviews.length),
+    status: (payload) =>
+      payload.workflow.current
+        ? {
+            label: payload.workflow.current.statusLabel,
+            indicator: payload.workflow.current.statusIndicator,
+          }
+        : null,
+    props: ({payload, updatePayload}) => ({payload, updatePayload}),
+  });
+}
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
new file mode 100644
index 00000000000..0946a9b8f52
--- /dev/null
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
@@ -0,0 +1,382 @@
+<script setup lang="ts">
+  import {ButtonVariant, t} from '@craftcms/ui';
+  import {HttpResponseError} from '@inertiajs/core';
+  import {useHttp} from '@inertiajs/vue3';
+  import {computed, shallowRef, useId} from 'vue';
+  import transitionsController from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/WorkflowTransitionsController';
+  import userReviewController from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/UserReviewController';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
+  import {commentToolbarButtons} from '@/modules/markdown-field/commentToolbarButtons';
+  import {isModifierKeyPressed} from '@/modules/markdown-field/behaviors/utilities';
+  import '@/modules/markdown-field/markdown-field';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowIdentity = {
+    elementType: string;
+    elementId: number | null;
+    draftId: number | null;
+    siteId: number | null;
+  };
+  type ReviewDecision = 'comment' | 'approve' | 'requestChanges';
+  type WorkflowActionRequest = WorkflowIdentity & {
+    message?: string;
+    note?: string;
+  };
+  type WorkflowResponse = {
+    workflowReview: WorkflowReviewData;
+    editorActions: ElementEditorActions;
+    message?: string;
+  };
+
+  const props = defineProps<{
+    review: WorkflowReviewData;
+    canReview: boolean;
+    elementType: string;
+    elementId: number | null;
+    draftId: number | null;
+    siteId: number | null;
+  }>();
+
+  const emit = defineEmits<{
+    reviewUpdated: [
+      review: WorkflowReviewData,
+      editorActions: ElementEditorActions,
+    ];
+  }>();
+
+  const message = shallowRef('');
+  const decision = shallowRef<ReviewDecision>(
+    props.review.canComment ? 'comment' : 'approve'
+  );
+  const error = shallowRef<string | null>(null);
+  const {flash} = useFlashMessages();
+  const actionRequest = useHttp<WorkflowActionRequest, WorkflowResponse>({
+    ...identity(),
+  });
+  const id = useId();
+  const messageIsEmpty = computed(() => !message.value.trim());
+  const currentRun = computed(() =>
+    props.review.runs.find((run) => run.current)
+  );
+  const currentStage = computed(() =>
+    currentRun.value?.stages.find((stage) => stage.current)
+  );
+  const displayedStageName = computed(
+    () => currentStage.value?.name ?? t('this stage')
+  );
+  const selectedDecision = computed<ReviewDecision>(() =>
+    props.canReview ? decision.value : 'comment'
+  );
+  const requiresMessage = computed(() => selectedDecision.value !== 'approve');
+  const disabledReason = computed(() => {
+    if (!requiresMessage.value || !messageIsEmpty.value) {
+      return null;
+    }
+
+    return t('Enter a comment before submitting.');
+  });
+  const canShowActions = computed(
+    () => props.canReview || props.review.canComment || props.review.canOverride
+  );
+  const submitLabel = computed(() =>
+    !props.canReview && props.review.canComment
+      ? t('Comment')
+      : t('Submit review')
+  );
+
+  function identity(): WorkflowIdentity {
+    return {
+      elementType: props.elementType,
+      elementId: props.elementId,
+      draftId: props.draftId,
+      siteId: props.siteId,
+    };
+  }
+
+  async function submitReview(): Promise<void> {
+    error.value = null;
+    if (disabledReason.value || actionRequest.processing) {
+      return;
+    }
+
+    if (props.review.runId === null || props.review.stageUid === null) {
+      staleReview();
+      return;
+    }
+
+    const url =
+      selectedDecision.value === 'comment'
+        ? transitionsController.comment.url({
+            workflowRun: props.review.runId,
+            stage: props.review.stageUid,
+          })
+        : userReviewController[selectedDecision.value].url({
+            workflowRun: props.review.runId,
+            stage: props.review.stageUid,
+          });
+    await transition(
+      url,
+      selectedDecision.value === 'comment'
+        ? {note: message.value}
+        : {message: message.value}
+    );
+  }
+
+  function onMessageKeydown(event: KeyboardEvent): void {
+    if (event.key !== 'Enter' || !isModifierKeyPressed(event)) {
+      return;
+    }
+
+    event.preventDefault();
+    void submitReview();
+  }
+
+  function staleReview(): void {
+    error.value = t('This review is no longer current. Refresh and try again.');
+  }
+
+  async function overrideApproval(): Promise<void> {
+    error.value = null;
+    if (actionRequest.processing) {
+      return;
+    }
+
+    if (
+      !window.confirm(
+        t(
+          'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
+        )
+      )
+    ) {
+      return;
+    }
+
+    if (props.review.runId === null) {
+      staleReview();
+      return;
+    }
+
+    await transition(
+      transitionsController.override.url({workflowRun: props.review.runId}),
+      {note: message.value}
+    );
+  }
+
+  async function transition(
+    url: string,
+    values: Partial<Pick<WorkflowActionRequest, 'message' | 'note'>>
+  ): Promise<void> {
+    actionRequest.transform(() => ({...identity(), ...values}));
+
+    try {
+      const data = await actionRequest.post(url);
+      emit('reviewUpdated', data.workflowReview, data.editorActions);
+      message.value = '';
+      if (data.message) {
+        flash('success', data.message);
+      }
+    } catch (exception) {
+      error.value =
+        responseMessage(exception) ??
+        (exception instanceof Error
+          ? exception.message
+          : t('The workflow could not be updated.'));
+    }
+  }
+
+  function responseMessage(exception: unknown): string | null {
+    if (!(exception instanceof HttpResponseError)) {
+      return null;
+    }
+
+    try {
+      const response = JSON.parse(exception.response.data) as {
+        message?: unknown;
+      };
+
+      return typeof response.message === 'string' ? response.message : null;
+    } catch {
+      return null;
+    }
+  }
+</script>
+
+<template>
+  <section v-if="canShowActions" class="workflow-user-review-actions">
+    <craft-callout
+      v-if="canReview"
+      :title="t('Your input is needed')"
+      variant="info"
+      icon="user-group"
+    >
+      {{
+        t('Choose an action for {stage}.', {
+          stage: displayedStageName,
+        })
+      }}
+    </craft-callout>
+
+    <label class="visually-hidden" :for="`workflow-user-review-message-${id}`">
+      {{ t('Review comment') }}
+    </label>
+    <craft-markdown-field
+      :id="`workflow-user-review-message-${id}`"
+      class="markdown-field"
+      :rows="3"
+      :max-length="5000"
+      :placeholder="t('Review comment')"
+      sanitize-html
+      show-toolbar
+      .toolbarButtons="commentToolbarButtons"
+      .value="message"
+      :disabled="actionRequest.processing"
+      @input="message = ($event.target as HTMLTextAreaElement).value"
+      @keydown="onMessageKeydown"
+    />
+
+    <fieldset v-if="canReview" class="workflow-user-review-actions__choices">
+      <legend class="visually-hidden">{{ t('Review action') }}</legend>
+
+      <label
+        v-if="review.canComment"
+        class="workflow-user-review-actions__choice"
+      >
+        <input
+          v-model="decision"
+          type="radio"
+          :name="`workflow-review-decision-${id}`"
+          value="comment"
+        />
+        <span>
+          <strong>{{ t('Comment') }}</strong>
+          <small>{{ t('Submit general feedback without approving.') }}</small>
+        </span>
+      </label>
+
+      <label v-if="canReview" class="workflow-user-review-actions__choice">
+        <input
+          v-model="decision"
+          type="radio"
+          :name="`workflow-review-decision-${id}`"
+          value="approve"
+        />
+        <span>
+          <strong>{{ t('Approve') }}</strong>
+          <small>{{ t('Approve this stage of the workflow.') }}</small>
+        </span>
+      </label>
+
+      <label v-if="canReview" class="workflow-user-review-actions__choice">
+        <input
+          v-model="decision"
+          type="radio"
+          :name="`workflow-review-decision-${id}`"
+          value="requestChanges"
+        />
+        <span>
+          <strong>{{ t('Request changes') }}</strong>
+          <small>{{ t('Submit feedback that must be addressed.') }}</small>
+        </span>
+      </label>
+    </fieldset>
+
+    <div class="workflow-user-review-actions__footer">
+      <craft-button
+        v-if="review.canOverride"
+        type="button"
+        :variant="ButtonVariant.DangerPlain"
+        .disabled="actionRequest.processing"
+        @click="overrideApproval"
+      >
+        {{ t('Override approval') }}
+      </craft-button>
+      <span
+        :id="`workflow-user-review-submit-${id}`"
+        class="workflow-user-review-actions__submit"
+      >
+        <craft-button
+          type="button"
+          :variant="ButtonVariant.Primary"
+          .disabled="actionRequest.processing || Boolean(disabledReason)"
+          focusable-when-disabled
+          @click="submitReview"
+        >
+          {{ submitLabel }}
+        </craft-button>
+      </span>
+      <craft-tooltip
+        v-if="disabledReason"
+        :for="`workflow-user-review-submit-${id}`"
+      >
+        {{ disabledReason }}
+      </craft-tooltip>
+    </div>
+
+    <craft-callout
+      v-if="error"
+      role="alert"
+      variant="danger"
+      icon="triangle-exclamation"
+    >
+      {{ error }}
+    </craft-callout>
+  </section>
+</template>
+
+<style scoped>
+  .workflow-user-review-actions {
+    display: grid;
+    gap: var(--c-spacing-md);
+  }
+
+  .workflow-user-review-actions craft-markdown-field {
+    contain: inline-size;
+    display: block;
+    width: 100%;
+  }
+
+  .workflow-user-review-actions :deep(.overtype-toolbar) {
+    flex-wrap: wrap;
+  }
+
+  .workflow-user-review-actions__choices {
+    display: grid;
+    gap: var(--c-spacing-sm);
+    padding: 0;
+    border: 0;
+    margin: 0;
+  }
+
+  .workflow-user-review-actions__choice {
+    display: grid;
+    min-height: var(--c-size-touch-target);
+    align-items: start;
+    gap: var(--c-spacing-sm);
+    grid-template-columns: auto 1fr;
+    cursor: pointer;
+  }
+
+  .workflow-user-review-actions__choice input {
+    margin-block-start: 0.2em;
+  }
+
+  .workflow-user-review-actions__choice strong,
+  .workflow-user-review-actions__choice small {
+    display: block;
+  }
+
+  .workflow-user-review-actions__choice small {
+    color: var(--c-color-neutral-text);
+  }
+
+  .workflow-user-review-actions__footer {
+    display: flex;
+    justify-content: flex-end;
+    gap: var(--c-spacing-xs);
+  }
+
+  .workflow-user-review-actions__submit {
+    display: inline-flex;
+  }
+</style>
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
new file mode 100644
index 00000000000..4bf8a641a6d
--- /dev/null
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
@@ -0,0 +1,110 @@
+<script setup lang="ts">
+  import {t} from '@craftcms/ui';
+  import {computed} from 'vue';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+  type WorkflowRun = WorkflowReviewData['runs'][number];
+  type WorkflowStage = WorkflowRun['stages'][number];
+
+  const props = defineProps<{
+    run: WorkflowRun;
+    stage: WorkflowStage;
+    approvalsRequired: number;
+    approvals: number;
+    reviewers: Array<{name: string}>;
+  }>();
+
+  const remainingReviewers = computed(() => {
+    if (!props.run.current) {
+      return [];
+    }
+
+    const reviewerNames = new Set(
+      props.stage.events
+        .filter((event) => event.decision !== null)
+        .map((event) => event.actor.label)
+    );
+
+    return props.reviewers.filter(
+      (reviewer) => !reviewerNames.has(reviewer.name)
+    );
+  });
+</script>
+
+<template>
+  <craft-card class="workflow-user-review-summary">
+    <span slot="label">
+      {{
+        t('{count} of {required} approved', {
+          count: approvals,
+          required: approvalsRequired,
+        })
+      }}
+    </span>
+    <ul
+      v-if="remainingReviewers.length"
+      class="workflow-user-review-summary__reviewers"
+    >
+      <li
+        v-for="reviewer in remainingReviewers"
+        :key="reviewer.name"
+        class="workflow-user-review-summary__reviewer-row"
+      >
+        <span class="workflow-user-review-summary__reviewer">
+          <craft-avatar :label="reviewer.name" />
+          <span class="workflow-user-review-summary__name">
+            {{ reviewer.name }}
+          </span>
+        </span>
+        <craft-badge fill="orange" size="small">
+          {{ t('Pending') }}
+        </craft-badge>
+      </li>
+    </ul>
+  </craft-card>
+</template>
+
+<style scoped>
+  .workflow-user-review-summary {
+    margin-inline: var(--c-spacing-xs);
+  }
+
+  .workflow-user-review-summary__reviewers {
+    display: grid;
+    gap: var(--c-spacing-xs);
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .workflow-user-review-summary__reviewer-row,
+  .workflow-user-review-summary__reviewer {
+    display: flex;
+    align-items: center;
+  }
+
+  .workflow-user-review-summary__reviewer-row {
+    justify-content: space-between;
+    gap: var(--c-spacing-sm);
+  }
+
+  .workflow-user-review-summary__reviewer {
+    min-width: 0;
+    gap: var(--c-spacing-xs);
+  }
+
+  .workflow-user-review-summary__reviewer craft-avatar {
+    --size: var(--c-size-icon-lg);
+    flex: none;
+  }
+
+  .workflow-user-review-summary__name {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .workflow-user-review-summary craft-badge {
+    flex: none;
+  }
+</style>
diff --git a/resources/js/pages/content/Edit.vue b/resources/js/pages/content/Edit.vue
index f890c9d7887..97df5e9d153 100644
--- a/resources/js/pages/content/Edit.vue
+++ b/resources/js/pages/content/Edit.vue
@@ -19,7 +19,8 @@
     sectionHandle: string | null;
   }>();
 
-  const editor = useIsSlideout() ? ElementEditor : ElementEditScreen;
+  const isSlideout = useIsSlideout();
+  const editor = isSlideout ? ElementEditor : ElementEditScreen;
 
   // What `entries/save-entry` needs to resolve the entry it's saving. The
   // field layout and meta fields are collected by the pipeline itself.
diff --git a/src/Element/ElementEditorActions.php b/src/Element/ElementEditorActions.php
new file mode 100644
index 00000000000..91307057e76
--- /dev/null
+++ b/src/Element/ElementEditorActions.php
@@ -0,0 +1,258 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Element;
+
+use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowReviewData;
+use CraftCms\Cms\Workflow\Workflows;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Gate;
+
+use function CraftCms\Cms\t;
+
+class ElementEditorActions
+{
+    public function __construct(
+        private readonly Workflows $workflows,
+    ) {}
+
+    /**
+     * @return array{
+     *     primary: array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: null, tabId: string|null},
+     *     menu: list<array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: string|null, shortcut: bool, shift: bool}>,
+     *     buttons: list<array<string, mixed>>,
+     * }
+     */
+    public function for(
+        ElementInterface $element,
+        bool $canSave,
+        ?WorkflowReviewData $review = null,
+        ?string $primaryLabel = null,
+        bool $isNew = false,
+    ): array {
+        $actions = [
+            'primary' => $this->primaryAction($element, $primaryLabel),
+            'menu' => $this->menuActions($element, $canSave),
+            'buttons' => $this->buttonActions($element, $canSave),
+        ];
+
+        if (
+            ! $element instanceof WorkflowableInterface ||
+            ! $this->workflows->requiresApproval($element)
+        ) {
+            return $actions;
+        }
+
+        $workflowSaveAction = [
+            'actionUrl' => Url::actionUrl('elements/save-draft'),
+            'params' => [
+                ...$this->identityParams($element),
+                'dropProvisional' => 1,
+                'workflowSave' => 1,
+            ],
+        ];
+
+        $actions['primary'] = [
+            ...$actions['primary'],
+            ...$workflowSaveAction,
+        ];
+
+        if ($element->getIsUnpublishedDraft()) {
+            $actions['menu'] = [[
+                'label' => t('Save draft'),
+                ...$workflowSaveAction,
+                'redirect' => null,
+                'shortcut' => true,
+                'shift' => false,
+            ]];
+
+            if ($canSave && Gate::check('duplicateAsDraft', $element)) {
+                $actions['menu'][] = [
+                    ...$this->duplicateAsDraftAction($element),
+                    'shortcut' => false,
+                    'shift' => false,
+                ];
+            }
+
+            if (! $isNew) {
+                $actions['primary']['label'] = t('Save draft');
+
+                if ($review?->canSubmit) {
+                    $actions['primary'] = [
+                        ...$actions['primary'],
+                        'label' => t('Request review'),
+                        'tabId' => 'workflow',
+                    ];
+                }
+            }
+        } else {
+            $actions['menu'] = array_map(
+                fn (array $action): array => $action['actionUrl'] === null
+                    ? [
+                        ...$action,
+                        ...$workflowSaveAction,
+                        'params' => [...$workflowSaveAction['params'], ...$action['params']],
+                    ]
+                    : $action,
+                $actions['menu'],
+            );
+        }
+
+        if ($review !== null) {
+            $actions['buttons'] = array_map(
+                fn (array $action): array => $action['actionUrl'] === Url::actionUrl('elements/apply-draft')
+                    ? [
+                        ...$action,
+                        'params' => [
+                            ...$action['params'],
+                            'workflowRunId' => $review->runId,
+                            'workflowCurrentStage' => $review->currentStage,
+                        ],
+                        'includeFormData' => ! $review->canApply,
+                        'disabled' => ! $review->canApply,
+                        'disabledReason' => $review->applyDisabledReason,
+                    ]
+                    : $action,
+                $actions['buttons'],
+            );
+        }
+
+        return $actions;
+    }
+
+    /** @return array{label: string, actionUrl: null, params: array{}, redirect: null, tabId: null} */
+    private function primaryAction(ElementInterface $element, ?string $label): array
+    {
+        $label ??= match (true) {
+            $element->getIsUnpublishedDraft() => Gate::check('saveCanonical', $element)
+                ? mb_ucfirst(t('Create {type}', ['type' => $element::lowerDisplayName()]))
+                : mb_ucfirst(t('Save {type}', ['type' => t('draft')])),
+            $element->getIsDraft() && ! $element->isProvisionalDraft => mb_ucfirst(t('Save {type}', ['type' => t('draft')])),
+            default => t('Save'),
+        };
+
+        return [
+            'label' => $label,
+            'actionUrl' => null,
+            'params' => [],
+            'redirect' => null,
+            'tabId' => null,
+        ];
+    }
+
+    /** @return list<array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: string|null, shortcut: bool, shift: bool}> */
+    private function menuActions(ElementInterface $element, bool $canSave): array
+    {
+        if (! $canSave) {
+            return [];
+        }
+
+        return array_map(fn (array $action): array => [
+            'label' => (string) $action['label'],
+            'actionUrl' => isset($action['action']) ? Url::actionUrl($action['action']) : null,
+            'params' => isset($action['action'])
+                ? [...$this->identityParams($element), ...($action['params'] ?? [])]
+                : ($action['params'] ?? []),
+            'redirect' => isset($action['redirect']) ? Crypt::encrypt($action['redirect']) : null,
+            'shortcut' => (bool) ($action['shortcut'] ?? false),
+            'shift' => (bool) ($action['shift'] ?? false),
+        ], $element->getAltActions());
+    }
+
+    /** @return list<array<string, mixed>> */
+    private function buttonActions(ElementInterface $element, bool $canSave): array
+    {
+        $canonical = $element->getCanonical(true);
+        $isCurrent = $element->getIsCanonical() || $element->isProvisionalDraft;
+        $actions = [];
+
+        if ($isCurrent && ! $element->getIsUnpublishedDraft() && Gate::check('createDrafts', $canonical)) {
+            $actions[] = [
+                'label' => t('Create a draft'),
+                'actionUrl' => Url::actionUrl('elements/save-draft'),
+                'params' => [
+                    ...$this->identityParams($element),
+                    'dropProvisional' => 1,
+                ],
+                'redirect' => Crypt::encrypt('{cpEditUrl}'),
+                'variant' => 'outline',
+            ];
+        }
+
+        if (
+            $element->getIsDraft() &&
+            ! $element->isProvisionalDraft &&
+            $canSave &&
+            Gate::check('saveCanonical', $element)
+        ) {
+            $actions[] = [
+                'label' => t('Apply draft'),
+                'actionUrl' => Url::actionUrl('elements/apply-draft'),
+                'params' => [
+                    ...$this->identityParams($element),
+                    'draftId' => $element->draftId,
+                ],
+                'redirect' => Crypt::encrypt('{cpEditUrl}'),
+                'variant' => 'secondary',
+            ];
+        }
+
+        if (
+            $element->getIsRevision() &&
+            $element->hasRevisions() &&
+            Gate::check('saveCanonical', $element)
+        ) {
+            $actions[] = [
+                'label' => t('Revert content from this revision'),
+                'actionUrl' => Url::actionUrl('elements/revert'),
+                'params' => [
+                    ...$this->identityParams($element),
+                    'revisionId' => $element->revisionId,
+                ],
+                'redirect' => Crypt::encrypt('{cpEditUrl}'),
+                'variant' => 'outline',
+            ];
+        }
+
+        if (
+            ! $canSave &&
+            ! $element->getIsRevision() &&
+            Gate::check('duplicateAsDraft', $element)
+        ) {
+            $actions[] = [
+                ...$this->duplicateAsDraftAction($element),
+                'variant' => 'outline',
+            ];
+        }
+
+        return $actions;
+    }
+
+    /** @return array{label: string, actionUrl: string, params: array<string, mixed>, redirect: string} */
+    private function duplicateAsDraftAction(ElementInterface $element): array
+    {
+        return [
+            'label' => t('Save as a new {type}', ['type' => $element::lowerDisplayName()]),
+            'actionUrl' => Url::actionUrl('elements/duplicate'),
+            'params' => [
+                ...$this->identityParams($element),
+                'asUnpublishedDraft' => 1,
+            ],
+            'redirect' => Crypt::encrypt('{cpEditUrl}'),
+        ];
+    }
+
+    /** @return array{elementType: class-string<ElementInterface>, elementId: int|null, siteId: int|null} */
+    private function identityParams(ElementInterface $element): array
+    {
+        return [
+            'elementType' => $element::class,
+            'elementId' => $element->getCanonical(true)->id,
+            'siteId' => $element->siteId,
+        ];
+    }
+}
diff --git a/src/Http/Controllers/Workflows/UserReviewController.php b/src/Http/Controllers/Workflows/UserReviewController.php
index e5e7ad6af78..4fa6fca326d 100644
--- a/src/Http/Controllers/Workflows/UserReviewController.php
+++ b/src/Http/Controllers/Workflows/UserReviewController.php
@@ -5,6 +5,7 @@
 namespace CraftCms\Cms\Http\Controllers\Workflows;
 
 use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\ElementEditorActions;
 use CraftCms\Cms\Http\Requests\ElementRequest;
 use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
 use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
@@ -24,6 +25,7 @@ class UserReviewController
     public function __construct(
         private readonly ElementRequest $request,
         private readonly Workflows $workflows,
+        private readonly ElementEditorActions $editorActions,
     ) {}
 
     public function approve(WorkflowRun $workflowRun, string $stage): JsonResponse
@@ -69,8 +71,15 @@ private function decide(WorkflowRun $workflowRun, string $stage, UserReviewDecis
             activityNote: trim((string) $message) ?: null,
         );
 
+        $review = $this->workflows->reviewData($draft, $this->request->craftUser());
+
         return new JsonResponse([
-            'workflowReview' => $this->workflows->reviewData($draft, $this->request->craftUser()),
+            'workflowReview' => $review,
+            'editorActions' => $this->editorActions->for(
+                element: $draft,
+                canSave: $this->request->craftUser()->can('save', $draft),
+                review: $review,
+            ),
             'message' => t('Review updated.'),
         ]);
     }
diff --git a/src/Http/Controllers/Workflows/WorkflowTransitionsController.php b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
index b6d35f4269b..aebe0d429a1 100644
--- a/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
+++ b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
@@ -5,6 +5,7 @@
 namespace CraftCms\Cms\Http\Controllers\Workflows;
 
 use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\ElementEditorActions;
 use CraftCms\Cms\Http\Requests\ElementRequest;
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
 use CraftCms\Cms\Workflow\Workflows;
@@ -18,6 +19,7 @@ class WorkflowTransitionsController
     public function __construct(
         private readonly ElementRequest $request,
         private readonly Workflows $workflows,
+        private readonly ElementEditorActions $editorActions,
     ) {}
 
     public function submit(): JsonResponse
@@ -78,10 +80,17 @@ private function draft(): ElementInterface
 
     private function response(ElementInterface $draft, ?string $message = null): JsonResponse
     {
+        $review = $this->workflows->reviewData(
+            draft: $draft,
+            viewer: $this->request->craftUser(),
+        );
+
         return new JsonResponse([
-            'workflowReview' => $this->workflows->reviewData(
-                draft: $draft,
-                viewer: $this->request->craftUser(),
+            'workflowReview' => $review,
+            'editorActions' => $this->editorActions->for(
+                element: $draft,
+                canSave: $this->request->craftUser()->can('save', $draft),
+                review: $review,
             ),
             ...($message !== null ? ['message' => $message] : []),
         ]);
diff --git a/src/Http/ViewModels/ElementEditViewModel.php b/src/Http/ViewModels/ElementEditViewModel.php
index 4da1a2847d3..94df748a410 100644
--- a/src/Http/ViewModels/ElementEditViewModel.php
+++ b/src/Http/ViewModels/ElementEditViewModel.php
@@ -8,6 +8,7 @@
 use CraftCms\Cms\Cp\Html\ContentHtml;
 use CraftCms\Cms\Cp\Html\StatusHtml;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
+use CraftCms\Cms\Element\ElementEditorActions;
 use CraftCms\Cms\Element\ElementHelper;
 use CraftCms\Cms\Element\Enums\ElementActionContext;
 use CraftCms\Cms\Element\Queries\Contracts\ElementQueryInterface;
@@ -23,13 +24,17 @@
 use CraftCms\Cms\Support\Facades\DeltaRegistry;
 use CraftCms\Cms\Support\Facades\I18N;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Support\Facades\Workflows;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\Translation\Locale;
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Data\WorkflowDraftReviewData;
+use CraftCms\Cms\Workflow\Data\WorkflowReviewData;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Crypt;
-use Illuminate\Support\Facades\Gate;
 
+use function CraftCms\Cms\currentUser;
 use function CraftCms\Cms\t;
 
 /**
@@ -141,124 +146,55 @@ public function discardDraftUrl(): string
     }
 
     /**
-     * The alternate save actions offered beside the Save button — "Save and
-     * continue editing", "Save as a new …", and friends.
-     *
-     * Each entry submits the edit form as it stands, optionally to a different
-     * action and with extra params. `actionUrl` is null when the item posts to
-     * the screen's ordinary save target, which the client resolves at submit
-     * time (see {@see applyDraftUrl()}).
-     *
-     * @return list<array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: string|null, shortcut: bool, shift: bool}>
+     * @return array{
+     *     primary: array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: null, tabId: string|null},
+     *     menu: list<array{label: string, actionUrl: string|null, params: array<string, mixed>, redirect: string|null, shortcut: bool, shift: bool}>,
+     *     buttons: list<array<string, mixed>>,
+     * }
      */
-    public function formActions(): array
-    {
-        if (! $this->canSave) {
-            return [];
-        }
-
-        return array_map(fn (array $action): array => [
-            'label' => (string) $action['label'],
-            'actionUrl' => isset($action['action']) ? Url::actionUrl($action['action']) : null,
-            'params' => isset($action['action'])
-                ? [...$this->genericIdentityParams(), ...($action['params'] ?? [])]
-                : ($action['params'] ?? []),
-            // Redirects cross the wire encrypted; the save controllers decrypt
-            // them and render `{cpEditUrl}` against the saved element.
-            'redirect' => isset($action['redirect']) ? Crypt::encrypt($action['redirect']) : null,
-            'shortcut' => (bool) ($action['shortcut'] ?? false),
-            'shift' => (bool) ($action['shift'] ?? false),
-        ], $this->element->getAltActions());
+    public function editorActions(): array
+    {
+        return app(ElementEditorActions::class)->for(
+            element: $this->element,
+            canSave: $this->canSave,
+            review: $this->workflowReview(),
+            primaryLabel: $this->primaryActionLabel(),
+            isNew: $this->request->boolean('fresh'),
+        );
     }
 
-    /**
-     * Buttons shown beside Save.
-     *
-     * Applying a named draft and reverting a revision belong here too, but
-     * those screens still render through the legacy editor, so they arrive with
-     * the draft/revision work rather than as unreachable buttons.
-     *
-     * @return list<array{label: string, actionUrl: string, params: array<string, mixed>, redirect: string|null, variant: string}>
-     */
-    public function headerActions(): array
+    protected function primaryActionLabel(): ?string
     {
-        $element = $this->element;
-        $canonical = $element->getCanonical(true);
-        $isCurrent = $element->getIsCanonical() || $element->isProvisionalDraft;
-        $actions = [];
-
-        if ($isCurrent && ! $element->getIsUnpublishedDraft() && Gate::check('createDrafts', $canonical)) {
-            $actions[] = [
-                'label' => t('Create a draft'),
-                'actionUrl' => Url::actionUrl('elements/save-draft'),
-                'params' => [
-                    ...$this->genericIdentityParams(),
-                    // Without this the provisional draft is promoted in place
-                    // rather than a separate named draft being created.
-                    'dropProvisional' => 1,
-                ],
-                'redirect' => Crypt::encrypt('{cpEditUrl}'),
-                'variant' => 'outline',
-            ];
-        }
+        return null;
+    }
 
-        // Applying a named draft writes it onto the canonical element. The
-        // provisional case isn't here: for those the Save button *is* apply.
-        if (
-            $element->getIsDraft() &&
-            ! $isCurrent &&
-            $this->canSave &&
-            Gate::check('saveCanonical', $element)
-        ) {
-            $actions[] = [
-                'label' => t('Apply draft'),
-                'actionUrl' => Url::actionUrl('elements/apply-draft'),
-                'params' => [
-                    ...$this->genericIdentityParams(),
-                    'draftId' => $element->draftId,
-                ],
-                'redirect' => Crypt::encrypt('{cpEditUrl}'),
-                'variant' => 'secondary',
-            ];
-        }
+    /** @return array{convertedToDraft: bool, current: WorkflowReviewData|null, draftReviews: list<WorkflowDraftReviewData>} */
+    public function workflow(): array
+    {
+        return [
+            'convertedToDraft' => $this->element->draftId !== null
+                && (int) session()->get('workflowDraftCreated') === $this->element->draftId,
+            'current' => $this->workflowReview(),
+            'draftReviews' => [],
+        ];
+    }
 
-        if (
-            $element->getIsRevision() &&
-            $element->hasRevisions() &&
-            Gate::check('saveCanonical', $element)
-        ) {
-            $actions[] = [
-                'label' => t('Revert content from this revision'),
-                'actionUrl' => Url::actionUrl('elements/revert'),
-                'params' => [
-                    ...$this->genericIdentityParams(),
-                    'revisionId' => $element->revisionId,
-                ],
-                'redirect' => Crypt::encrypt('{cpEditUrl}'),
-                'variant' => 'outline',
-            ];
-        }
+    protected function workflowReview(): ?WorkflowReviewData
+    {
+        return once(function (): ?WorkflowReviewData {
+            $user = currentUser();
 
-        // Read-only users who may still branch the element get the duplicate
-        // path instead, since they can't save over the canonical one.
-        if (
-            ! $this->canSave &&
-            ! $element->getIsRevision() &&
-            Gate::check('duplicateAsDraft', $element)
-        ) {
-            $actions[] = [
-                'label' => t('Save as a new {type}', ['type' => $element::lowerDisplayName()]),
-                'actionUrl' => Url::actionUrl('elements/duplicate'),
-                'params' => [
-                    ...$this->genericIdentityParams(),
-                    'asUnpublishedDraft' => 1,
-                ],
-                'redirect' => Crypt::encrypt('{cpEditUrl}'),
-                'variant' => 'outline',
-            ];
-        }
+            if (
+                $user === null ||
+                ! $this->element instanceof WorkflowableInterface ||
+                ! $this->element->getIsDraft() ||
+                $this->element->isProvisionalDraft
+            ) {
+                return null;
+            }
 
-        return $actions;
+            return Workflows::reviewData($this->element, $user);
+        });
     }
 
     /** The element type's lowercase display name, for user-facing messages. */
@@ -563,22 +499,6 @@ private function revisionQuery(ElementInterface $element): ElementQueryInterface
             ->with(['revisionCreator']);
     }
 
-    /**
-     * Identity params the shared `elements/*` actions need to resolve the
-     * element. The type-specific save controllers key off their own params
-     * (an entry's `entryId`), so these only apply to the generic endpoints.
-     *
-     * @return array{elementType: class-string<ElementInterface>, elementId: int|null, siteId: int|null}
-     */
-    private function genericIdentityParams(): array
-    {
-        return [
-            'elementType' => $this->element::class,
-            'elementId' => $this->element->getCanonical(true)->id,
-            'siteId' => $this->element->siteId,
-        ];
-    }
-
     public function isProvisionalDraft(): bool
     {
         return (bool) $this->element->isProvisionalDraft;
@@ -632,27 +552,6 @@ public function canDiscardDraft(): bool
         return (bool) $this->element->isProvisionalDraft;
     }
 
-    /**
-     * The Save button's label. Saving a named draft saves the draft rather than
-     * the element, and an unpublished draft creates the element outright.
-     */
-    public function submitButtonLabel(): string
-    {
-        $element = $this->element;
-
-        if ($element->getIsUnpublishedDraft()) {
-            return Gate::check('saveCanonical', $element)
-                ? mb_ucfirst(t('Create {type}', ['type' => $element::lowerDisplayName()]))
-                : mb_ucfirst(t('Save {type}', ['type' => t('draft')]));
-        }
-
-        if ($element->getIsDraft() && ! $element->isProvisionalDraft) {
-            return mb_ucfirst(t('Save {type}', ['type' => t('draft')]));
-        }
-
-        return t('Save');
-    }
-
     public function elementId(): ?int
     {
         return $this->element->id;
diff --git a/src/Http/ViewModels/EntryEditViewModel.php b/src/Http/ViewModels/EntryEditViewModel.php
index 4f11bf6e6da..f6842419a9e 100644
--- a/src/Http/ViewModels/EntryEditViewModel.php
+++ b/src/Http/ViewModels/EntryEditViewModel.php
@@ -4,12 +4,18 @@
 
 namespace CraftCms\Cms\Http\ViewModels;
 
+use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Entry\Elements\Entry;
 use CraftCms\Cms\Http\Requests\ElementRequest;
+use CraftCms\Cms\Support\Facades\Workflows;
 use CraftCms\Cms\Support\Url;
+use CraftCms\Cms\Workflow\Data\WorkflowDraftReviewData;
+use CraftCms\Cms\Workflow\Data\WorkflowReviewData;
 use Illuminate\Support\Uri;
 use Override;
 
+use function CraftCms\Cms\currentUser;
+
 /**
  * The Inertia payload for the entry edit screen (`content/Edit`).
  */
@@ -62,6 +68,79 @@ public function entryTypeId(): ?int
         return $this->entry->typeId;
     }
 
+    /**
+     * @return array{
+     *     convertedToDraft: bool,
+     *     current: WorkflowReviewData|null,
+     *     draftReviews: list<WorkflowDraftReviewData>
+     * }
+     */
+    #[Override]
+    public function workflow(): array
+    {
+        return [
+            ...parent::workflow(),
+            'draftReviews' => $this->draftReviews(),
+        ];
+    }
+
+    /**
+     * Returns review summaries for visible named drafts of the canonical entry.
+     *
+     * @return list<WorkflowDraftReviewData>
+     */
+    private function draftReviews(): array
+    {
+        if (($this->entry->getIsDraft() && ! $this->entry->isProvisionalDraft) || $this->entry->getIsRevision()) {
+            return [];
+        }
+
+        $viewer = currentUser();
+        $canonical = $this->entry->getCanonical(true);
+
+        if ($viewer === null || ! $canonical->id) {
+            return [];
+        }
+
+        return $canonical::find()
+            ->draftOf($canonical)
+            ->siteId($canonical->siteId)
+            ->status(null)
+            ->orderByDesc('dateUpdated')
+            ->get()
+            ->map(function (ElementInterface $draft) use ($viewer): ?WorkflowDraftReviewData {
+                if (! $draft instanceof Entry || $draft->isProvisionalDraft || ! $viewer->can('view', $draft)) {
+                    return null;
+                }
+
+                $review = Workflows::reviewData($draft, $viewer);
+
+                if ($review === null) {
+                    return null;
+                }
+
+                $currentRun = collect($review->runs)->firstWhere('current', true);
+                if ($currentRun === null || $review->currentStage === null) {
+                    return null;
+                }
+
+                $stage = $currentRun->stages[$review->currentStage];
+                $submission = $currentRun->submission;
+
+                return new WorkflowDraftReviewData(
+                    name: (string) $draft->draftName,
+                    requester: $submission->actor['label'],
+                    stage: $stage->name,
+                    statusLabel: $review->statusLabel,
+                    statusIndicator: $review->statusIndicator,
+                    url: Uri::of($draft->getCpEditUrl())->withFragment('workflow')->value(),
+                );
+            })
+            ->filter()
+            ->values()
+            ->all();
+    }
+
     /**
      * The canonical id the save action expects, so an edit of a draft or a
      * revision posts against the entry it derives from rather than its own id.
diff --git a/src/Http/ViewModels/UserEditViewModel.php b/src/Http/ViewModels/UserEditViewModel.php
index b4e1e305381..dc6d02207e9 100644
--- a/src/Http/ViewModels/UserEditViewModel.php
+++ b/src/Http/ViewModels/UserEditViewModel.php
@@ -118,7 +118,7 @@ public function crumbs(): array
     }
 
     #[Override]
-    public function submitButtonLabel(): string
+    protected function primaryActionLabel(): string
     {
         if (! $this->user->getIsUnpublishedDraft()) {
             return t('Save');
diff --git a/src/Workflow/Data/WorkflowRunStageData.php b/src/Workflow/Data/WorkflowRunStageData.php
index b996eb7d26d..6565bd7d361 100644
--- a/src/Workflow/Data/WorkflowRunStageData.php
+++ b/src/Workflow/Data/WorkflowRunStageData.php
@@ -21,6 +21,7 @@ public function __construct(
         public bool $current,
         public bool $approved,
         public string $icon,
+        public string $iconColor,
         public ?string $message,
         public ?string $summaryComponent,
         /** @var array<string, mixed> */
@@ -34,24 +35,32 @@ public static function from(WorkflowStageData $stage, int $stageIndex, WorkflowR
         $component = $stage->component();
         $context = new WorkflowStageContext($draft, $run, $stage, $run->payload[$stage->uid] ?? []);
         $isCurrent = $stageIndex === $run->currentStage;
+        $summaryComponent = $component->summaryComponent();
         $isApproved = $stageIndex < $run->currentStage
             || ($isCurrent && in_array($run->status, [WorkflowStatus::Approved, WorkflowStatus::Published], true));
         $events = $runEvents
             ->filter(fn (WorkflowTimelineItemData $event): bool => $event->belongsToStage($stageIndex + 1))
             ->values();
+        $failed = $events->contains(fn (WorkflowTimelineItemData $event): bool => in_array($event->decision, [WorkflowStageStatus::Failed->value, 'rejected'], true));
 
         return new self(
             name: t($stage->name),
             current: $run->isPending() && $isCurrent,
             approved: $isApproved,
             icon: match (true) {
-                $events->contains(fn (WorkflowTimelineItemData $event): bool => in_array($event->decision, [WorkflowStageStatus::Failed->value, 'rejected'], true)) => 'xmark',
+                $failed => 'xmark',
                 $isApproved => 'check',
                 $run->isPending() && $isCurrent => 'clock',
                 default => 'minus',
             },
-            message: $isCurrent ? $run->currentStageResult : null,
-            summaryComponent: $component->summaryComponent(),
+            iconColor: match (true) {
+                $failed => 'danger',
+                $isApproved => 'success',
+                $run->isPending() && $isCurrent => 'warning',
+                default => 'neutral',
+            },
+            message: $isCurrent && $summaryComponent === null ? $run->currentStageResult : null,
+            summaryComponent: $summaryComponent,
             summaryProps: $component->summaryProps($context, $viewer),
             events: $events->all(),
         );
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
index d8cebdf2e22..efed417f798 100644
--- a/src/Workflow/UserReview/UserReviewStage.php
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -86,7 +86,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
 
         return new WorkflowStageResult(
             WorkflowStageStatus::Pending,
-            t('{count} of {required} approvals', ['count' => $approvals, 'required' => $this->approvalsRequired]),
+            t('{count} of {required} approved', ['count' => $approvals, 'required' => $this->approvalsRequired]),
             $context->payload,
         );
     }
diff --git a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
index 371ed78cbaf..a24aacf2e2e 100644
--- a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
@@ -376,9 +376,8 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
         expect($savedDraft->isProvisionalDraft)->toBeFalse()
             ->and($savedDraft->title)->toBe('Saved Draft Title')
             ->and($response->json('screen.isProvisionalDraft'))->toBeFalse()
-            ->and($response->json('screen.workflow.configured'))->toBeTrue()
             ->and($response->json('screen.workflow.current.canSubmit'))->toBeTrue()
-            ->and(collect($response->json('screen.headerActions'))->pluck('label'))->not->toContain('Create a draft');
+            ->and(collect($response->json('screen.editorActions.buttons'))->pluck('label'))->not->toContain('Create a draft');
     });
 
     it('redirects to the named draft after promoting a provisional draft for review', function () {
@@ -465,7 +464,7 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
             ->and($response->json('screen.canonicalId'))->toBe($entry->id)
             // Saving now means applying the draft, not saving the element under it.
             ->and($response->json('screen.applyDraftUrl'))->toContain('elements/apply-draft')
-            ->and($response->json('screen.submitButtonLabel'))->toBe(t('Save'));
+            ->and($response->json('screen.editorActions.primary.label'))->toBe(t('Save'));
 
         // The rest of the chrome the initial load carries, which the screen has
         // no other way to refresh mid-edit.
@@ -475,8 +474,7 @@ function elementDraftsControllerPayload(Entry $entry, array $overrides = []): ar
                 'metadataHtml',
                 'statusLabelHtml',
                 'crumbs',
-                'formActions',
-                'headerActions',
+                'editorActions',
                 'actionMenu',
                 'previewTargets',
                 'updatedTimestamps',
@@ -844,7 +842,6 @@ protected function canSave(ElementInterface $element, CraftUser $user): bool
             ->and($savedDraft->isProvisionalDraft)->toBeFalse()
             ->and($savedDraft->title)->toBe('Changed Title')
             ->and($response->json('screen.draftId'))->toBe($draft->draftId)
-            ->and($response->json('screen.workflow.configured'))->toBeTrue()
             ->and($response->json('screen.workflow.convertedToDraft'))->toBeTrue()
             ->and($response->json('screen.workflow.current.canSubmit'))->toBeTrue();
     });
diff --git a/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php b/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
index 16c30e9fc13..4597b9577cc 100644
--- a/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
+++ b/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use CraftCms\Cms\Edition;
 use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Revisions;
 use CraftCms\Cms\Entry\Elements\Entry;
@@ -18,9 +19,17 @@
 use CraftCms\Cms\Structure\Models\Structure;
 use CraftCms\Cms\Support\Facades\Elements;
 use CraftCms\Cms\Support\Facades\Sections;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\User\Models\UserGroup;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Collection;
 use Inertia\Testing\AssertableInertia;
+use Workbench\App\Workflow\AutomaticApprovalStage;
 
 use function CraftCms\Cms\cp_url;
 use function Pest\Laravel\actingAs;
@@ -162,7 +171,7 @@
     get($this->entry->getCpEditUrl())
         ->assertOk()
         ->assertInertia(fn (AssertableInertia $page) => $page
-            ->where('headerActions', function (Collection $actions) {
+            ->where('editorActions.buttons', function (Collection $actions) {
                 $create = $actions->firstWhere('label', 'Create a draft');
 
                 return $create !== null
@@ -178,7 +187,7 @@
     get($this->entry->getCpEditUrl())
         ->assertOk()
         ->assertInertia(fn (AssertableInertia $page) => $page
-            ->where('formActions', function (Collection $actions) {
+            ->where('editorActions.menu', function (Collection $actions) {
                 $labels = $actions->pluck('label');
 
                 return $labels->contains('Save and continue editing')
@@ -207,8 +216,8 @@
             ->where('draftId', $draft->draftId)
             ->where('isProvisionalDraft', false)
             ->where('readOnly', false)
-            ->where('submitButtonLabel', 'Save draft')
-            ->where('headerActions', fn (Collection $actions) => $actions
+            ->where('editorActions.primary.label', 'Save draft')
+            ->where('editorActions.buttons', fn (Collection $actions) => $actions
                 ->pluck('label')->contains('Apply draft'))
             ->etc()
         );
@@ -234,7 +243,7 @@
             ->where('canAutosave', false)
             ->where('notice', fn (?string $notice) => is_string($notice)
                 && str_contains($notice, 'viewing a revision'))
-            ->where('headerActions', fn (Collection $actions) => $actions
+            ->where('editorActions.buttons', fn (Collection $actions) => $actions
                 ->pluck('label')->contains('Revert content from this revision'))
             ->etc()
         );
@@ -332,12 +341,252 @@
         ->assertOk()
         ->assertInertia(fn (AssertableInertia $page) => $page
             ->component('content/Edit')
-            ->where('submitButtonLabel', 'Create entry')
+            ->where('editorActions.primary.label', 'Create entry')
             ->where('contextMenu', null)
             ->etc()
         );
 });
 
+it('creates a workflow entry as a draft before offering review', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Entry::class);
+    $draft->siteId = $this->entry->siteId;
+    $draft->sectionId = $this->section->id;
+    $draft->typeId = $this->entryType->id;
+    $draft->title = 'Unpublished Draft';
+    $draft->slug = 'unpublished-draft';
+    $draft->setAuthorIds([auth()->id()]);
+
+    app(Drafts::class)->saveElementAsDraft($draft, auth()->id(), markAsSaved: false);
+
+    get(Url::urlWithParams($draft->getCpEditUrl(), ['fresh' => 1]))
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->component('content/Edit')
+            ->where('editorActions.primary.label', 'Create entry')
+            ->where('editorActions.primary.tabId', null)
+            ->where('editorActions.primary.actionUrl', fn (string $url) => str_contains($url, 'elements/save-draft'))
+            ->where('editorActions.primary.params.dropProvisional', 1)
+            ->where('editorActions.primary.params.workflowSave', 1)
+            ->where('workflow.current.canSubmit', true)
+            ->where('editorActions.menu', function (Collection $actions) {
+                $save = $actions->firstWhere('label', 'Save draft');
+                $duplicate = $actions->firstWhere('label', 'Save as a new entry');
+
+                return $save !== null
+                    && str_contains($save['actionUrl'], 'elements/save-draft')
+                    && $save['params']['workflowSave'] === 1
+                    && $save['shortcut'] === true
+                    && $duplicate !== null
+                    && str_contains($duplicate['actionUrl'], 'elements/duplicate')
+                    && $duplicate['params']['asUnpublishedDraft'] === 1;
+            })
+            ->etc()
+        );
+});
+
+it('offers canonical creation for a disabled workflow entry', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Entry::class);
+    $draft->siteId = $this->entry->siteId;
+    $draft->sectionId = $this->section->id;
+    $draft->typeId = $this->entryType->id;
+    $draft->title = 'Disabled Entry';
+    $draft->slug = 'disabled-entry';
+    $draft->enabled = false;
+    $draft->setAuthorIds([auth()->id()]);
+
+    app(Drafts::class)->saveElementAsDraft($draft, auth()->id(), markAsSaved: false);
+
+    get(Url::urlWithParams($draft->getCpEditUrl(), ['fresh' => 1]))
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->component('content/Edit')
+            ->where('editorActions.primary.label', 'Create entry')
+            ->where('editorActions.primary.actionUrl', null)
+            ->where('editorActions.primary.tabId', null)
+            ->where('workflow.current.canSubmit', false)
+            ->etc()
+        );
+});
+
+it('offers review instead of canonical save actions for an unpublished workflow draft', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [[
+            'uid' => Str::uuid7()->toString(),
+            'name' => 'Automatic approval',
+            'type' => AutomaticApprovalStage::class,
+            'settings' => [],
+        ]],
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Entry::class);
+    $draft->siteId = $this->entry->siteId;
+    $draft->sectionId = $this->section->id;
+    $draft->typeId = $this->entryType->id;
+    $draft->title = 'Unpublished Draft';
+    $draft->slug = 'unpublished-draft';
+    $draft->setAuthorIds([auth()->id()]);
+
+    app(Drafts::class)->saveElementAsDraft($draft, auth()->id());
+
+    get($draft->getCpEditUrl())
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->component('content/Edit')
+            ->where('editorActions.primary.label', 'Request review')
+            ->where('editorActions.primary.tabId', 'workflow')
+            ->where('editorActions.primary.actionUrl', fn (string $url) => str_contains($url, 'elements/save-draft'))
+            ->where('editorActions.primary.params.workflowSave', 1)
+            ->where('workflow.current.canSubmit', true)
+            ->where('editorActions.menu', function (Collection $actions) {
+                $save = $actions->firstWhere('label', 'Save draft');
+                $duplicate = $actions->firstWhere('label', 'Save as a new entry');
+
+                return $save !== null
+                    && str_contains($save['actionUrl'], 'elements/save-draft')
+                    && $save['params']['workflowSave'] === 1
+                    && $save['shortcut'] === true
+                    && $duplicate !== null
+                    && str_contains($duplicate['actionUrl'], 'elements/duplicate')
+                    && $duplicate['params']['asUnpublishedDraft'] === 1;
+            })
+            ->where('editorActions.buttons', function (Collection $actions) {
+                $apply = $actions->firstWhere('label', 'Apply draft');
+
+                return $apply !== null
+                    && $apply['disabled'] === true
+                    && $apply['disabledReason'] === 'This draft must be approved before it can be applied.';
+            })
+            ->etc()
+        );
+
+    app(Workflows::class)->submitForReview($draft);
+
+    get($draft->getCpEditUrl())
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('editorActions.primary.label', 'Save draft')
+            ->where('editorActions.primary.tabId', null)
+            ->where('editorActions.primary.actionUrl', fn (string $url) => str_contains($url, 'elements/save-draft'))
+            ->where('editorActions.primary.params.workflowSave', 1)
+            ->where('workflow.current.canSubmit', false)
+            ->where('editorActions.buttons', function (Collection $actions) {
+                $apply = $actions->firstWhere('label', 'Apply draft');
+
+                return $apply !== null && $apply['disabled'] === false;
+            })
+            ->etc()
+        );
+});
+
+it('keeps draft actions visible and disables applying until workflow approval', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Drafts::class)->createDraft($this->entry, auth()->id(), name: 'Working Draft');
+
+    get($draft->getCpEditUrl())
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('editorActions.primary.label', 'Save draft')
+            ->where('workflow.convertedToDraft', false)
+            ->where('editorActions.menu', function (Collection $actions) {
+                $save = $actions->firstWhere('label', 'Save and continue editing');
+
+                return $save !== null
+                    && str_contains($save['actionUrl'], 'elements/save-draft')
+                    && $save['params']['workflowSave'] === 1;
+            })
+            ->where('editorActions.buttons', function (Collection $actions) {
+                $apply = $actions->firstWhere('label', 'Apply draft');
+
+                return $apply !== null
+                    && $apply['disabled'] === true
+                    && $apply['disabledReason'] === 'This draft must be approved before it can be applied.';
+            })
+            ->etc()
+        );
+});
+
+it('links reviewers from the canonical entry to drafts awaiting their review', function () {
+    Edition::set(Edition::Pro);
+    $author = User::findOne();
+    $reviewer = UserModel::factory()->admin()->createElement(['fullName' => 'Ada Reviewer']);
+    $reviewerGroup = UserGroup::factory()->create();
+    $reviewerGroup->users()->sync([$reviewer->id]);
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [[
+            'uid' => Str::uuid7()->toString(),
+            'name' => 'Editorial review',
+            'type' => UserReviewStage::class,
+            'settings' => [
+                'approvalsRequired' => 1,
+                'userGroups' => [$reviewerGroup->uid],
+            ],
+        ]],
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Drafts::class)->createDraft($this->entry, $author->id, name: 'Homepage refresh');
+    app(Drafts::class)->createDraft($this->entry, $author->id, name: 'Not submitted');
+    actingAs($author);
+    app(Workflows::class)->submitForReview($draft);
+    actingAs($reviewer);
+
+    get($this->entry->getCpEditUrl())
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->has('workflow.draftReviews', 1)
+            ->where('workflow.draftReviews.0.name', 'Homepage refresh')
+            ->where('workflow.draftReviews.0.requester', $author->name)
+            ->where('workflow.draftReviews.0.stage', 'Editorial review')
+            ->where('workflow.draftReviews.0.statusLabel', 'Awaiting approval')
+            ->where('workflow.draftReviews.0.url', fn (string $url): bool => str_contains($url, 'draftId='.$draft->draftId)
+                && str_ends_with($url, '#workflow'))
+            ->etc()
+        );
+});
+
+it('uses the standard draft publishing controls below Craft Pro', function () {
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+    ]);
+    $this->section->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+    $draft = app(Drafts::class)->createDraft($this->entry, auth()->id(), name: 'Working Draft');
+    Edition::set(Edition::Team);
+
+    get($draft->getCpEditUrl())
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('workflow.current', null)
+            ->where('editorActions.menu', fn (Collection $actions) => $actions->isNotEmpty())
+            ->where('editorActions.buttons', fn (Collection $actions) => $actions
+                ->pluck('label')->contains('Apply draft'))
+            ->etc()
+        );
+});
+
 it('exposes the action menu as behavior descriptors', function () {
     get($this->entry->getCpEditUrl())
         ->assertOk()
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index e017efa6b9c..72354895bde 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -2,7 +2,6 @@
 
 declare(strict_types=1);
 
-use CraftCms\Cms\Activity\ActivityTimelinePresenter;
 use CraftCms\Cms\Activity\Data\ActivityActor;
 use CraftCms\Cms\Activity\Data\ActivitySubject;
 use CraftCms\Cms\Activity\Models\ActivityEvent;
@@ -201,15 +200,10 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
             'uid' => $stageUid,
             'name' => 'Editorial',
             'type' => UserReviewStage::class,
-        ])->and(json_decode($workflow->getRawOriginal('stages'), true))->toBe([[
-            'uid' => $stageUid,
-            'name' => 'Editorial',
-            'type' => UserReviewStage::class,
-            'settings' => [
-                'approvalsRequired' => 1,
-                'userGroups' => [$group->uid],
-            ],
-        ]])->and($this->draft->workflow()?->is($workflow))->toBeTrue();
+        ])->and($stage->settings)->toBe([
+            'approvalsRequired' => 1,
+            'userGroups' => [$group->uid],
+        ])->and($this->draft->workflow()?->is($workflow))->toBeTrue();
 });
 
 it('validates settings with the registered stage type', function () {
@@ -227,9 +221,9 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         ->assertJsonValidationErrors('stages.0.settings.outcome');
 });
 
-it('cascades approved automated stages and stores each complete payload by stage uid', function () {
+it('cascades approved automated stages', function () {
     app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
-    $workflow = workflowFor($this->entry, [
+    workflowFor($this->entry, [
         automatedStage('lint', 'approved'),
         automatedStage('policy', 'approved'),
     ]);
@@ -237,11 +231,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     $run = submitAs($this->workflows, $this->draft, $this->author);
 
     expect($run->status)->toBe(WorkflowStatus::Approved)
-        ->and($run->currentStage)->toBe(1)
-        ->and($run->payload)->toBe([
-            $workflow->stages[0]->uid => ['evaluations' => 1],
-            $workflow->stages[1]->uid => ['evaluations' => 1],
-        ]);
+        ->and(workflowEvents($this->entry, WorkflowTransition::StageApproved))->toHaveCount(2);
 });
 
 it('keeps pending automated stages pending with their status message', function () {
@@ -252,7 +242,6 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
 
     expect($run->status)->toBe(WorkflowStatus::Pending)
         ->and($run->currentStageResult)->toBe('Automated check pending')
-        ->and($run->payload)->each->toBe(['evaluations' => 1])
         ->and($this->workflows->reviewData($this->draft, $this->author)->actionComponent)->toBeNull();
 });
 
@@ -273,15 +262,13 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
 
     expect($completed->status)->toBe(WorkflowStatus::Approved)
         ->and($completed->currentStageResult)->toBe('Automated check approved')
-        ->and($completed->payload)->each->toBe([
+        ->and($completed->payload[$workflow->stages->sole()->uid])->toBe([
             'evaluations' => 1,
             'summary' => 'No issues found.',
         ]);
 
     $event = workflowEvents($this->entry, WorkflowTransition::StageApproved)->sole();
     expect($event->actorType)->toBe(ActivityActor::TYPE_SYSTEM)
-        ->and($event->data['stage'])->toBe('External check')
-        ->and($event->data['note'])->toBe('Automated check approved')
         ->and(WorkflowActivityEvent::format($event))->toContain('External check');
 
     $stageData = collect($this->workflows->reviewData($this->draft, $this->author)->runs)
@@ -303,12 +290,12 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     $event = workflowEvents($this->entry, WorkflowTransition::StageFailed)->sole();
 
     expect($run->status)->toBe(WorkflowStatus::Failed)
-        ->and($event->actorType)->toBe(ActivityActor::TYPE_SYSTEM)
-        ->and($event->data['note'])->toBe('Automated check failed');
+        ->and($event->actorType)->toBe(ActivityActor::TYPE_SYSTEM);
 
     $stageData = collect($this->workflows->reviewData($this->draft, $this->author)->runs)
         ->firstWhere('current')->stages[0];
-    expect($stageData->events[0]->decision)->toBe('failed');
+    expect($stageData->events[0]->decision)->toBe('failed')
+        ->and($stageData->events[0]->noteHtml)->toContain('Automated check failed');
 });
 
 it('ignores stale automated stage completions', function () {
@@ -328,8 +315,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     );
 
     expect($completed->status)->toBe(WorkflowStatus::Pending)
-        ->and($completed->currentStageResult)->toBe('Automated check pending')
-        ->and($completed->payload)->each->toBe(['evaluations' => 1]);
+        ->and($completed->currentStageResult)->toBe('Automated check pending');
 
     $this->workflows->contentChanged($this->draft);
     $completed = $this->workflows->reportStageResult(
@@ -338,8 +324,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         result: $result,
     );
 
-    expect($completed->status)->toBe(WorkflowStatus::Invalidated)
-        ->and($completed->payload)->each->toBe(['evaluations' => 1]);
+    expect($completed->status)->toBe(WorkflowStatus::Invalidated);
 
     expect($this->workflows->reportStageResult(
         runId: PHP_INT_MAX,
@@ -392,12 +377,10 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         'Clarify the claim.',
     );
     $this->workflows->addComment($this->draft, $firstRun->id, $stage->uid, 'I will revise it.');
-    $secondRun = submitAs($this->workflows, $this->draft, $this->author, 'Revised.');
+    submitAs($this->workflows, $this->draft, $this->author, 'Revised.');
     $review = $this->workflows->reviewData($this->draft, $this->author);
 
     expect($firstRun->status)->toBe(WorkflowStatus::Failed)
-        ->and($secondRun->id)->not->toBe($firstRun->id)
-        ->and($secondRun->activityRootEventId)->not->toBe($firstRun->activityRootEventId)
         ->and($review->runs)->toHaveCount(2)
         ->and(collect($review->runs)->last()->stages[0]->icon)->toBe('xmark')
         ->and(collect($review->runs)->last()->stages[0]->events)->toHaveCount(2)
@@ -409,7 +392,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         ->and(collect($review->runs)->first()->submission->description)->toBe('requested review');
 });
 
-it('groups activity under a submission root and snapshots the workflow definition', function () {
+it('presents workflow activity as a grouped review and snapshots the workflow definition', function () {
     $group = reviewerGroup([$this->reviewers[0]]);
     $workflow = workflowFor($this->entry, [userReviewStage('Editorial review', $group)]);
     $stage = $workflow->stages->sole();
@@ -424,51 +407,12 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         'Approved.',
     );
 
-    $events = ActivityEvent::query()
-        ->subject(ActivitySubject::fromElement($this->entry))
-        ->eventTypes(WorkflowActivityEvent::class)
-        ->oldest('occurredAt')
-        ->orderBy('id')
-        ->get();
-    $root = $events->firstWhere('data.type', WorkflowActivityType::Submit->value);
-
-    expect($root)->not->toBeNull()
-        ->and($run->fresh()->activityRootEventId)->toBe($root->id)
-        ->and($root->rootEventId)->toBeNull()
-        ->and($events->whereNull('rootEventId'))->toHaveCount(1)
-        ->and($root->data)->not->toHaveKey('runId')
-        ->and($root->data['draft'])->toMatchArray([
-            'elementId' => $this->draft->id,
-            'draftId' => $this->draft->draftId,
-            'elementType' => Entry::class,
-            'siteId' => $this->draft->siteId,
-        ])
-        ->and($root->data['workflow'])->toMatchArray([
-            'id' => $workflow->id,
-            'uid' => $workflow->uid,
-            'name' => 'Editorial workflow',
-            'stages' => [[
-                'uid' => $stage->uid,
-                'name' => 'Editorial review',
-                'type' => UserReviewStage::class,
-                'settings' => [
-                    'approvalsRequired' => 1,
-                    'userGroups' => [$group->uid],
-                ],
-            ]],
-        ]);
-
-    $childEvents = $events->whereNotNull('rootEventId');
-    expect($childEvents)->not->toBeEmpty()
-        ->and($childEvents->pluck('rootEventId')->unique()->values()->all())->toBe([$root->id])
-        ->and($childEvents->every(fn (ActivityEvent $event): bool => ! array_key_exists('runId', $event->data)))->toBeTrue();
-
-    $presentedRoot = app(ActivityTimelinePresenter::class)
-        ->events(collect([$root]), $this->author)
-        ->sole();
+    $review = $this->workflows->reviewData($this->draft, $this->author);
+    $presentedRun = collect($review->runs)->firstWhere('current');
 
-    expect($presentedRoot['component'])->toBe('craft:workflow-activity-event')
-        ->and($presentedRoot['props']['noteHtml'])->toContain('Ready for review.');
+    expect($presentedRun->submission->noteHtml)->toContain('Ready for review.')
+        ->and($presentedRun->stages[0]->events)->toHaveCount(1)
+        ->and($presentedRun->stages[0]->events[0]->decision)->toBe('approved');
 
     $workflow->stages = $workflow->stages->map(fn (WorkflowStageData $workflowStage): array => [
         'uid' => $workflowStage->uid,
@@ -595,7 +539,6 @@ function (ElementInterface $draft) use (&$applied): ElementInterface {
         ->and($applied)->toBeFalse();
 
     $run = $this->workflows->overrideApproval($this->draft, $run->id);
-    expect($run->currentStageResult)->toBeNull();
     $this->workflows->applyDraft(
         $this->draft,
         $this->author,
@@ -657,7 +600,9 @@ function (ElementInterface $draft) use (&$applied): ElementInterface {
         ->assertJsonPath('workflowReview.status', 'approved')
         ->assertJsonPath('workflowReview.actionComponent', null)
         ->assertJsonPath('workflowReview.showDefaultActions', true)
-        ->assertJsonPath('workflowReview.actionProps', []);
+        ->assertJsonPath('workflowReview.actionProps', [])
+        ->assertJsonPath('editorActions.buttons.0.disabled', false)
+        ->assertJsonPath('editorActions.buttons.0.params.workflowRunId', $run->id);
 
     $event = workflowEvents($this->entry, WorkflowTransition::Approve)->sole();
     expect($event->actorId)->toBe($this->reviewers[0]->id)

From 82dc2a22a0a3dc6804ebec17807b9da1df31bd0e Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 13:25:19 +0200
Subject: [PATCH 06/32] Seed workflow examples in Workbench

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 .../app/Console/Commands/ServeCommand.php     |  6 +++
 .../Providers/WorkbenchServiceProvider.php    |  6 +++
 .../app/Workflow/AutomaticApprovalStage.php   | 27 +++++++++++
 workbench/database/seeders/DatabaseSeeder.php | 47 ++++++++++++++++++-
 4 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 workbench/app/Workflow/AutomaticApprovalStage.php

diff --git a/workbench/app/Console/Commands/ServeCommand.php b/workbench/app/Console/Commands/ServeCommand.php
index 9bd92f95045..9a72fe2fe4a 100644
--- a/workbench/app/Console/Commands/ServeCommand.php
+++ b/workbench/app/Console/Commands/ServeCommand.php
@@ -5,7 +5,9 @@
 namespace Workbench\App\Console\Commands;
 
 use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Edition;
 use CraftCms\Cms\Support\Env;
+use CraftCms\Cms\Support\Facades\ProjectConfig;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Schema;
@@ -58,6 +60,10 @@ public function handle(): int
             return self::FAILURE;
         }
 
+        ProjectConfig::reset();
+        ProjectConfig::set('system.edition', Edition::Pro->handle(), 'Set Workbench edition');
+        ProjectConfig::flush();
+
         $this->components->info("Workbench available at $url");
 
         return $this->call('serve', [
diff --git a/workbench/app/Providers/WorkbenchServiceProvider.php b/workbench/app/Providers/WorkbenchServiceProvider.php
index 8b8afd2e80a..b13a50c37c6 100644
--- a/workbench/app/Providers/WorkbenchServiceProvider.php
+++ b/workbench/app/Providers/WorkbenchServiceProvider.php
@@ -10,11 +10,13 @@
 use CraftCms\Cms\Plugin\Plugins;
 use CraftCms\Cms\Support\CmsAssets;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Workflow\WorkflowStageTypes;
 use Illuminate\Console\Events\CommandStarting;
 use Illuminate\Support\Facades\Event;
 use Illuminate\Support\ServiceProvider;
 use Workbench\App\Forms\FormKitchenSink;
 use Workbench\App\Widgets\HtmlExample;
+use Workbench\App\Workflow\AutomaticApprovalStage;
 
 use function Orchestra\Testbench\package_path;
 
@@ -22,6 +24,10 @@ class WorkbenchServiceProvider extends ServiceProvider
 {
     public function boot(): void
     {
+        $this->app->booted(
+            fn () => app(WorkflowStageTypes::class)->register(AutomaticApprovalStage::class),
+        );
+
         if (! $this->app->runningUnitTests()) {
             app(WidgetTypes::class)->register(HtmlExample::class);
         }
diff --git a/workbench/app/Workflow/AutomaticApprovalStage.php b/workbench/app/Workflow/AutomaticApprovalStage.php
new file mode 100644
index 00000000000..bf5450de043
--- /dev/null
+++ b/workbench/app/Workflow/AutomaticApprovalStage.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Workbench\App\Workflow;
+
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Stages\WorkflowStage;
+
+class AutomaticApprovalStage extends WorkflowStage
+{
+    public static function displayName(): string
+    {
+        return 'Automatic approval';
+    }
+
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+    {
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Approved,
+            'Automatically approved',
+            $context->payload,
+        );
+    }
+}
diff --git a/workbench/database/seeders/DatabaseSeeder.php b/workbench/database/seeders/DatabaseSeeder.php
index 60bfb0180e6..5a6e1cd84e6 100644
--- a/workbench/database/seeders/DatabaseSeeder.php
+++ b/workbench/database/seeders/DatabaseSeeder.php
@@ -45,10 +45,16 @@
 use CraftCms\Cms\Support\Facades\Plugins;
 use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Facades\Sites;
+use CraftCms\Cms\Support\Facades\UserGroups;
 use CraftCms\Cms\Support\Facades\Volumes;
 use CraftCms\Cms\Support\File;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\User\Data\UserGroup;
 use CraftCms\Cms\User\Models\User;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Console\Concerns\InteractsWithIO;
 use Illuminate\Console\OutputStyle;
 use Illuminate\Console\View\Components\Factory;
@@ -59,6 +65,7 @@
 use RuntimeException;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Output\ConsoleOutput;
+use Workbench\App\Workflow\AutomaticApprovalStage;
 
 class DatabaseSeeder extends Seeder
 {
@@ -230,6 +237,7 @@ public function run(): void
         $this->createSection($site, 'Posts', SectionType::Channel, 'blog/{slug}', [$pageType]);
 
         $this->createSampleEntries($site);
+        $this->seedWorkflow(Sections::getSectionByHandle('posts') ?? throw new RuntimeException('Posts section not found.'));
     }
 
     private function createSampleEntries(Site $site): void
@@ -316,7 +324,7 @@ private function createEntry(
     private function seedActivity(Entry $entry, Site $site): void
     {
         $user = User::query()->firstOrFail();
-        $editor = UserFactory::new()->createElement([
+        $editor = UserFactory::new()->admin()->createElement([
             'fullName' => 'Ada Lovelace',
             'username' => 'ada',
             'email' => 'ada@example.com',
@@ -433,6 +441,43 @@ private function seedActivity(Entry $entry, Site $site): void
         }
     }
 
+    private function seedWorkflow(Section $section): void
+    {
+        UserGroups::saveGroup($reviewerGroup = new UserGroup([
+            'name' => 'Reviewers',
+            'handle' => 'reviewers',
+        ]));
+        User::query()
+            ->orderBy('id')
+            ->get()
+            ->each(fn (User $user) => $user->userGroups()->syncWithoutDetaching([$reviewerGroup->id]));
+
+        $workflow = new Workflow([
+            'name' => 'Editorial workflow',
+            'stages' => [
+                new WorkflowStageData(
+                    uid: Str::uuid7()->toString(),
+                    name: 'Automatic approval',
+                    type: AutomaticApprovalStage::class,
+                    settings: [],
+                ),
+                new WorkflowStageData(
+                    uid: Str::uuid7()->toString(),
+                    name: 'Editorial review',
+                    type: UserReviewStage::class,
+                    settings: [
+                        'approvalsRequired' => 1,
+                        'userGroups' => [$reviewerGroup->uid],
+                    ],
+                ),
+            ],
+        ]);
+        app(Workflows::class)->saveWorkflow($workflow);
+
+        $section->workflowId = $workflow->id;
+        Sections::saveSection($section);
+    }
+
     /** @param list<EntryType> $entryTypes */
     public function createSection(Site $site, string $title, SectionType $sectionType = SectionType::Channel, ?string $uriFormat = null, array $entryTypes = []): ?Section
     {

From ae654d8a999c7ee3b68d028a02756eda3bc2a6f3 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Thu, 17 Sep 2026 17:32:40 +0200
Subject: [PATCH 07/32] Document approval workflows

Amp-Thread-ID: https://ampcode.com/threads/T-01a0a94a-11cb-77ad-ba1e-c88828744b3c
---
 docs/workflows.md | 356 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 356 insertions(+)
 create mode 100644 docs/workflows.md

diff --git a/docs/workflows.md b/docs/workflows.md
new file mode 100644
index 00000000000..058552fe9e9
--- /dev/null
+++ b/docs/workflows.md
@@ -0,0 +1,356 @@
+# Approval workflows
+
+Approval workflows control when changes to an entry may be published. A workflow is an ordered list of stages assigned to a section. When an author submits a draft for review, Craft evaluates each stage in sequence and only allows the approved draft to be applied after every stage has approved it.
+
+Workflows require Craft Pro.
+
+## How workflows work
+
+Configure workflows under **Settings → Workflows**, then assign one to a section. Entries in sections without an assigned workflow retain the normal save and publish behavior.
+
+When an enabled entry has a workflow:
+
+1. Saving changes creates or updates a named draft instead of publishing directly to the canonical entry.
+2. The author submits the draft for review from its **Workflow** tab.
+3. Craft evaluates the first stage.
+4. An approved stage advances the run to the next stage. A pending stage waits for an external decision, and a failed stage ends the run with changes requested.
+5. After every stage approves, an authorized user can apply the draft to the canonical entry.
+
+Disabled entries can be created and saved canonically without review. Enabling one routes the save into a draft and starts the workflow process.
+
+```mermaid
+stateDiagram-v2
+    [*] --> NotSubmitted: Save draft
+    NotSubmitted --> Pending: Request review
+    Pending --> Pending: Stage awaits a result
+    Pending --> Failed: Stage fails
+    Pending --> Approved: All stages approve
+    Pending --> Invalidated: Draft or workflow changes
+    Approved --> Invalidated: Draft or workflow changes
+    Approved --> Published: Apply draft
+    Failed --> Pending: Request another review
+    Invalidated --> Pending: Request another review
+```
+
+Stages are evaluated in their configured order. Craft evaluates a stage when the run reaches it and whenever the stage reports new state. A stage returns one of three statuses:
+
+| Status     | Result                                                                       |
+| ---------- | ---------------------------------------------------------------------------- |
+| `Pending`  | Stop and wait at the current stage.                                    |
+| `Approved` | Continue to the next stage, or approve the run if this is the last one. |
+| `Failed`   | Stop the run with changes requested.                                    |
+
+The built-in **User review** stage waits for approval from members of its configured user groups. It can require one or more approvals. The draft author cannot review their own work, and each reviewer can decide only once per run.
+
+### Runs use a configuration snapshot
+
+Submitting a draft creates a workflow run and stores a snapshot of the configured stages. The snapshot is retained for the run's execution and history, and is never updated in place.
+
+Editing an assigned workflow invalidates any pending or approved runs whose executable configuration changed. The draft must be submitted again to start a new run with the updated configuration. Names are descriptive and do not affect execution, so renaming a workflow or stage does not invalidate a run.
+
+### Invalidation
+
+An approval applies to the exact content that reviewers saw. Craft invalidates pending and approved runs when:
+
+- the draft's publishable content changes;
+- nested content in the draft changes or is deleted;
+- the section's workflow assignment changes;
+- a stage's type, order, or settings change; or
+- the workflow is deleted.
+
+The draft remains available after invalidation and can be submitted again. Published runs and their activity history are retained.
+
+Drafts are locked in the editor while a review is pending or approved, preventing accidental changes from invalidating the review. An author can choose **Start editing** to unlock the draft; saving any publishable changes then invalidates the run and requires a new review.
+
+Applying an approved draft validates the current element state before publishing. If validation fails without changing the draft, the approval remains valid. Correcting publishable content changes the reviewed draft, so it invalidates the run and requires another review.
+
+### Permissions and write boundaries
+
+Workflow actions also enforce the existing element `view`, `save`, and `saveCanonical` authorization rules. Approval override is currently restricted to administrators.
+
+The control panel and other user-facing HTTP saves route workflow-controlled canonical changes into drafts. Craft does not globally intercept low-level element writes from plugins, console commands, or other trusted application code. Code that writes elements directly is responsible for choosing whether to create a draft or intentionally update the canonical element.
+
+## Creating a workflow stage type
+
+A plugin can add a stage type by implementing `WorkflowStageInterface`. Extending `WorkflowStage` is recommended because it supplies configurable-component behavior and default review UI behavior.
+
+This stage approves as soon as a workflow reaches it:
+
+```php
+<?php
+
+declare(strict_types=1);
+
+namespace Acme\Editorial\Workflow;
+
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Stages\WorkflowStage;
+
+class AutomaticApprovalStage extends WorkflowStage
+{
+    public static function displayName(): string
+    {
+        return 'Automatic approval';
+    }
+
+    public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+    {
+        return new WorkflowStageResult(
+            status: WorkflowStageStatus::Approved,
+            message: 'Automatically approved',
+            payload: $context->payload,
+        );
+    }
+}
+```
+
+Register it from the plugin's service provider:
+
+```php
+use Acme\Editorial\Workflow\AutomaticApprovalStage;
+use CraftCms\Cms\Workflow\WorkflowStageTypes;
+
+public function boot(WorkflowStageTypes $workflowStageTypes): void
+{
+    $workflowStageTypes->register(AutomaticApprovalStage::class);
+}
+```
+
+Registered types appear in the stage type selector when an administrator configures a workflow. If a configured type becomes unavailable, Craft preserves its settings as a missing stage rather than discarding project config. The stage remains pending until its plugin is restored or the workflow is reconfigured.
+
+### Stage context and results
+
+`WorkflowStageContext` gives a stage the state needed to make its decision:
+
+| Property  | Description                                                    |
+| --------- | -------------------------------------------------------------- |
+| `draft`   | The named draft under review.                                  |
+| `run`     | The current `WorkflowRun` model.                                |
+| `stage`   | The snapshotted `WorkflowStageData` for this stage.             |
+| `payload` | Stage-owned data persisted from its previous result in the run. |
+
+`evaluate()` returns a `WorkflowStageResult` containing a `WorkflowStageStatus`, a human-readable message, and the next payload. Payloads must contain JSON-encodable values. Craft stores each payload under the stage UID, isolating one stage's state from the others.
+
+Use the payload for durable state needed by later evaluations or by the stage's review UI. Do not put secrets in it; workflow state and activity are application data.
+
+### Configurable stages
+
+Stage classes use the same configurable-component conventions as other Craft components. Define public settings properties, validation rules, and an optional settings form:
+
+```php
+use CraftCms\Cms\Form\Controls\Text;
+use CraftCms\Cms\Form\Form;
+use CraftCms\Cms\Form\FormContext;
+use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Workflow\Stages\WorkflowStage;
+
+class WebhookApprovalStage extends WorkflowStage
+{
+    public string $endpoint = '';
+
+    public function getRules(): array
+    {
+        return [
+            'endpoint' => ['required', 'url:https'],
+        ];
+    }
+
+    public function settingsForm(FormContext $context = new FormContext): Form
+    {
+        return Form::make([
+            Field::make('Endpoint', Text::make('endpoint'))->required(),
+        ]);
+    }
+
+    // ...
+}
+```
+
+Craft serializes public component settings into project config and validates them when the workflow is saved. Return `null` from `settingsForm()` when the type has no settings UI.
+
+## Waiting for an external result
+
+An integration stage can return `Pending` while it waits for a webhook, queue job, or another external system:
+
+```php
+public function evaluate(WorkflowStageContext $context): WorkflowStageResult
+{
+    $requestId = $context->payload['requestId'] ?? null;
+
+    if ($requestId === null) {
+        $requestId = $this->client->requestReview($context->draft);
+    }
+
+    return new WorkflowStageResult(
+        status: WorkflowStageStatus::Pending,
+        message: 'Waiting for external approval',
+        payload: ['requestId' => $requestId],
+    );
+}
+```
+
+When the external decision arrives, report it through the `Workflows` facade rather than updating a run directly:
+
+```php
+use CraftCms\Cms\Support\Facades\Workflows;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+
+$run = Workflows::reportStageResult(
+    runId: $runId,
+    stageUid: $stageUid,
+    result: function (WorkflowStageContext $context) use ($externalRequestId): WorkflowStageResult {
+        if (($context->payload['requestId'] ?? null) !== $externalRequestId) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                'Ignored a stale response',
+                $context->payload,
+            );
+        }
+
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Approved,
+            'Approved by the external service',
+            $context->payload,
+        );
+    },
+);
+```
+
+The callback receives a fresh context while Craft holds the workflow lock. This lets the integration compare external identifiers with current payload state without a read-then-write race. `reportStageResult()` only changes a run when the supplied stage is still its current pending stage; stale responses do not advance a newer run or stage.
+
+Authenticate and authorize webhook or control panel endpoints before calling the facade. `reportStageResult()` protects workflow consistency, but it does not establish whether an incoming caller is trusted.
+
+## Adding stage-specific review UI
+
+A stage can optionally provide Vue components for its pending actions and timeline summary:
+
+```php
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+
+public function actionComponent(): ?string
+{
+    return 'acme:external-approval-actions';
+}
+
+public function actionProps(WorkflowStageContext $context, CraftUser $viewer): array
+{
+    return [
+        'requestId' => $context->payload['requestId'] ?? null,
+        'canDecide' => $viewer->can('approveExternalReviews'),
+    ];
+}
+
+public function summaryComponent(): ?string
+{
+    return 'acme:external-approval-summary';
+}
+
+public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array
+{
+    return [
+        'requestId' => $context->payload['requestId'] ?? null,
+    ];
+}
+```
+
+Register those components from the plugin's control panel JavaScript entry point:
+
+```typescript
+import Cp from '@/bootstrap/cp';
+import ExternalApprovalActions from './ExternalApprovalActions.vue';
+import ExternalApprovalSummary from './ExternalApprovalSummary.vue';
+
+Cp.$components.register(
+  'acme:external-approval-actions',
+  ExternalApprovalActions
+);
+Cp.$components.register(
+  'acme:external-approval-summary',
+  ExternalApprovalSummary
+);
+```
+
+Use a plugin-prefixed component name to avoid collisions. `actionProps()` and `summaryProps()` must return JSON-safe values because they are sent to the control panel.
+
+Craft passes the action component its configured action props together with `review`, `elementType`, `elementId`, `draftId`, and `siteId`. After a successful action, emit `reviewUpdated` with the updated workflow review data and editor actions returned by the endpoint. Craft passes a summary component its configured summary props together with the containing `run` and `stage`.
+
+The action component is rendered above Craft's default comment and override controls for the current pending stage. The summary component is rendered in that stage's timeline for current and previous runs. To replace rather than supplement the default controls, set the inherited property in the stage class:
+
+```php
+protected bool $showDefaultReviewActions = false;
+```
+
+Plugin action endpoints remain responsible for authorization and input validation. They should translate a valid decision into a `WorkflowStageResult` through `Workflows::reportStageResult()`.
+
+## Listening for workflow activity
+
+Craft dispatches lifecycle events for plugins that need to enforce policy or react to completed activity.
+
+| Event                   | Timing                                                    |
+| ----------------------- | --------------------------------------------------------- |
+| `WorkflowTransitioning` | Synchronously before a transition; may cancel it.         |
+| `WorkflowTransitioned`  | After the transaction commits successfully.               |
+| `WorkflowCommented`     | After a workflow comment's transaction commits.           |
+
+Set `$event->cancel = true` in a `WorkflowTransitioning` listener to prevent the transition. Keep pre-transition listeners synchronous and side-effect free, because the surrounding transaction can still roll back. Use `WorkflowTransitioned` for notifications and other effects that should happen only after a successful commit.
+
+```php
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Events\WorkflowTransitioning;
+use Illuminate\Support\Facades\Event;
+
+Event::listen(function (WorkflowTransitioning $event): void {
+    if ($event->transition !== WorkflowTransition::Publish) {
+        return;
+    }
+
+    if (! $this->releaseWindow->isOpen()) {
+        $event->cancel = true;
+    }
+});
+```
+
+Transitions are represented by `WorkflowTransition`: `Submit`, `Override`, `Approve`, `Reject`, `StageApproved`, `StageFailed`, `Invalidate`, and `Publish`. Comments are deliberately separate because adding a comment does not change workflow state.
+
+## Supporting another element type
+
+Entries provide Craft's built-in workflow assignment UI. A plugin-owned element type can opt into the workflow runtime by implementing `WorkflowableInterface`:
+
+```php
+use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
+use CraftCms\Cms\Workflow\Models\Workflow;
+
+class Release extends Element implements WorkflowableInterface
+{
+    public static function hasDrafts(): true
+    {
+        return true;
+    }
+
+    public function workflow(): ?Workflow
+    {
+        return $this->workflowId === null
+            ? null
+            : Workflow::find($this->workflowId);
+    }
+}
+```
+
+The element type must support drafts, and `workflow()` must return its assigned workflow or `null`. The plugin owns storage and configuration UI for that assignment. Implementing the contract lets Craft resolve review data, workflow-aware editor actions, and approved draft application; it does not add an assignment field to the element type's settings automatically.
+
+## Testing a custom stage
+
+Test the behavior at the stage and workflow boundaries:
+
+- Given representative contexts and payloads, assert that `evaluate()` returns the correct status, message, and payload.
+- Test both sides of each approval boundary, including stale or mismatched external response IDs.
+- For an asynchronous stage, verify that a result only affects the matching current stage and pending run.
+- Test endpoint authentication and authorization separately from stage evaluation.
+- If the stage has custom UI, test user-visible choices and submitted results rather than Vue implementation details.
+
+Avoid asserting database implementation details when the public result is what matters. A useful workflow test proves whether a draft remains pending, fails, advances, becomes approved, or can be applied.

From f740327a758344a4b5080753e64b010b0641e7b1 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Fri, 18 Sep 2026 19:27:05 +0200
Subject: [PATCH 08/32] Add carried user review approvals

Amp-Thread-ID: https://ampcode.com/threads/T-01a0b453-2312-7449-85a8-354bc59d1f1a
---
 .../timeline-item/timeline-item.styles.ts     |   4 +-
 .../timeline-item/timeline-item.test.ts       |   6 +
 .../elements/composables/useElementEditor.ts  |   4 +-
 .../components/WorkflowDraftReviews.vue       |   5 +-
 .../components/WorkflowReviewPanel.test.ts    |  59 ++-
 .../components/WorkflowStagesInput.test.ts    |   6 +-
 .../components/WorkflowStagesInput.vue        |   6 +
 .../user-review/WorkflowUserReviewSummary.vue | 219 +++++++++---
 .../Elements/ElementDraftsController.php      |  62 +++-
 src/Workflow/Data/WorkflowStageContext.php    |  17 +-
 src/Workflow/Data/WorkflowStageHistory.php    |  14 +
 .../SendUserReviewNotifications.php           |  14 +-
 .../UserReview/UserReviewApprovalMode.php     |  11 +
 .../UserReview/UserReviewDecisionData.php     |  27 ++
 .../UserReview/UserReviewDecisions.php        |  41 +++
 src/Workflow/UserReview/UserReviewStage.php   | 134 ++++---
 src/Workflow/UserReview/UserReviewState.php   |  65 ++++
 src/Workflow/UserReview/UserReviewSummary.php |  39 ++
 src/Workflow/WorkflowContentChanges.php       |   9 +
 src/Workflow/Workflows.php                    |   5 +-
 .../Feature/Workflow/UserReviewStageTest.php  | 337 ++++++++++++++++++
 tests/Feature/Workflow/WorkflowsTest.php      |  11 +-
 22 files changed, 954 insertions(+), 141 deletions(-)
 create mode 100644 src/Workflow/Data/WorkflowStageHistory.php
 create mode 100644 src/Workflow/UserReview/UserReviewApprovalMode.php
 create mode 100644 src/Workflow/UserReview/UserReviewDecisionData.php
 create mode 100644 src/Workflow/UserReview/UserReviewDecisions.php
 create mode 100644 src/Workflow/UserReview/UserReviewState.php
 create mode 100644 src/Workflow/UserReview/UserReviewSummary.php
 create mode 100644 tests/Feature/Workflow/UserReviewStageTest.php

diff --git a/packages/craftcms-ui/src/components/timeline-item/timeline-item.styles.ts b/packages/craftcms-ui/src/components/timeline-item/timeline-item.styles.ts
index dcebd374399..f59f4498c82 100644
--- a/packages/craftcms-ui/src/components/timeline-item/timeline-item.styles.ts
+++ b/packages/craftcms-ui/src/components/timeline-item/timeline-item.styles.ts
@@ -57,8 +57,8 @@ export default css`
   }
 
   .timeline-item__header {
-    display: flex;
-    flex-wrap: wrap;
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) auto;
     align-items: center;
     column-gap: var(--c-spacing-xs);
   }
diff --git a/packages/craftcms-ui/src/components/timeline-item/timeline-item.test.ts b/packages/craftcms-ui/src/components/timeline-item/timeline-item.test.ts
index 9f06b7f464d..a61886242a7 100644
--- a/packages/craftcms-ui/src/components/timeline-item/timeline-item.test.ts
+++ b/packages/craftcms-ui/src/components/timeline-item/timeline-item.test.ts
@@ -69,6 +69,12 @@ describe('craft-timeline-item', () => {
     ).toBeNull();
   });
 
+  it('keeps a heading and its metadata in separate grid columns', () => {
+    expect(styles.cssText).toContain(
+      'grid-template-columns: minmax(0, 1fr) auto'
+    );
+  });
+
   it('tracks optional content added after connection', async () => {
     const element = await createTimelineItem('<p>Content</p>');
     const heading = document.createElement('h2');
diff --git a/resources/js/modules/elements/composables/useElementEditor.ts b/resources/js/modules/elements/composables/useElementEditor.ts
index d476120424f..37c435a0992 100644
--- a/resources/js/modules/elements/composables/useElementEditor.ts
+++ b/resources/js/modules/elements/composables/useElementEditor.ts
@@ -186,11 +186,11 @@ export function useElementEditor({saveData}: Options = {}) {
   const workflowReviewLocked = computed(
     () =>
       !editingReviewedDraft.value &&
-      ['pending', 'approved'].includes(props.workflow.current?.status ?? '')
+      ['pending', 'approved'].includes(props.workflow?.current?.status ?? '')
   );
 
   watch(
-    () => props.workflow.current?.status,
+    () => props.workflow?.current?.status,
     (status, previousStatus) => {
       if (
         status !== previousStatus &&
diff --git a/resources/js/modules/workflows/components/WorkflowDraftReviews.vue b/resources/js/modules/workflows/components/WorkflowDraftReviews.vue
index b04904223f1..307f24d3c95 100644
--- a/resources/js/modules/workflows/components/WorkflowDraftReviews.vue
+++ b/resources/js/modules/workflows/components/WorkflowDraftReviews.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import {t} from '@craftcms/ui';
+  import CpLink from '@/common/components/CpLink.vue';
 
   defineProps<{
     drafts: CraftCms.Cms.Workflow.Data.WorkflowDraftReviewData[];
@@ -29,9 +30,9 @@
           }}
         </p>
       </div>
-      <craft-button :href="draft.url" variant="outline" size="small">
+      <CpLink as="craft-button" :href="draft.url" size="small">
         {{ t('View draft') }}
-      </craft-button>
+      </CpLink>
     </li>
   </ul>
 </template>
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
index 679971ae0d8..6cda84ac11d 100644
--- a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
@@ -80,9 +80,10 @@ function workflowRun(overrides: Partial<WorkflowRun> = {}): WorkflowRun {
         message: null,
         summaryComponent: 'craft:user-review-workflow-stage-summary',
         summaryProps: {
+          approvalMode: 'total',
           approvalsRequired: 1,
           approvals: 0,
-          reviewers: [{name: 'Ada'}],
+          remainingReviewers: [{name: 'Ada'}],
         },
         events: [],
       },
@@ -366,6 +367,47 @@ describe('WorkflowReviewPanel', () => {
     ]);
   });
 
+  it('presents approval progress for each reviewer group', () => {
+    mount(
+      review({
+        runs: [
+          workflowRun({
+            stages: [
+              {
+                ...workflowRun().stages[0]!,
+                summaryProps: {
+                  approvalMode: 'per-group',
+                  approvalsRequired: 2,
+                  groups: [
+                    {
+                      name: 'Editorial',
+                      approvals: 2,
+                      carriedReviewers: [{name: 'Ada'}],
+                      remainingReviewers: [],
+                    },
+                    {
+                      name: 'Legal',
+                      approvals: 1,
+                      carriedReviewers: [{name: 'Ada'}],
+                      remainingReviewers: [{name: 'Lin'}],
+                    },
+                  ],
+                },
+              },
+            ],
+          }),
+        ],
+      })
+    );
+
+    expect(container!.textContent).toContain('Editorial');
+    expect(container!.textContent).toContain('2 of 2 approved');
+    expect(container!.textContent).toContain('Legal');
+    expect(container!.textContent).toContain('1 of 2 approved');
+    expect(container!.textContent).toContain('Lin');
+    expect(container!.textContent).toContain('Approved previously');
+  });
+
   it('omits review choices when commenting is the only available action', () => {
     mount(
       review({
@@ -390,9 +432,10 @@ describe('WorkflowReviewPanel', () => {
             {
               ...workflowRun().stages[0]!,
               summaryProps: {
+                approvalMode: 'total',
                 approvalsRequired: 2,
                 approvals: 1,
-                reviewers: [{name: 'Ada'}, {name: 'Grace'}],
+                remainingReviewers: [{name: 'Grace'}],
               },
             },
           ],
@@ -557,9 +600,10 @@ describe('WorkflowReviewPanel', () => {
                 message: 'Changes requested',
                 summaryComponent: 'craft:user-review-workflow-stage-summary',
                 summaryProps: {
+                  approvalMode: 'total',
                   approvalsRequired: 2,
                   approvals: 1,
-                  reviewers: [{name: 'Ada'}, {name: 'Grace'}, {name: 'Lin'}],
+                  remainingReviewers: [{name: 'Grace'}, {name: 'Lin'}],
                 },
                 events: [
                   timelineItem({
@@ -633,9 +677,11 @@ describe('WorkflowReviewPanel', () => {
                 message: null,
                 summaryComponent: 'craft:user-review-workflow-stage-summary',
                 summaryProps: {
+                  approvalMode: 'total',
                   approvalsRequired: 1,
                   approvals: 1,
-                  reviewers: [{name: 'Ada'}],
+                  approvedReviewers: [{name: 'Ada'}],
+                  remainingReviewers: [],
                 },
                 events: [
                   timelineItem({
@@ -654,9 +700,10 @@ describe('WorkflowReviewPanel', () => {
                 message: null,
                 summaryComponent: 'craft:user-review-workflow-stage-summary',
                 summaryProps: {
+                  approvalMode: 'total',
                   approvalsRequired: 2,
                   approvals: 0,
-                  reviewers: [{name: 'Grace'}, {name: 'Lin'}],
+                  remainingReviewers: [{name: 'Grace'}, {name: 'Lin'}],
                 },
                 events: [],
               },
@@ -690,6 +737,8 @@ describe('WorkflowReviewPanel', () => {
     )!;
 
     expect(editorial.opened).toBe(false);
+    expect(editorial.textContent).toContain('Ada');
+    expect(editorial.textContent).toContain('Approved');
     expect(legal.opened).toBe(true);
     expect(legal.textContent).toContain('Grace');
     expect(legal.textContent).toContain('Lin');
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
index e80c6ef4bf5..534ff6a64b5 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -13,7 +13,7 @@ const stageTypes = [
   {
     type,
     label: 'User review',
-    settings: {approvalsRequired: 1, userGroups: []},
+    settings: {approvalsRequired: 1, approvalMode: 'total', userGroups: []},
     settingsForm: null,
   },
   {
@@ -29,7 +29,7 @@ function stage(uid: string, name: string): WorkflowStage {
     uid,
     name,
     type,
-    settings: {approvalsRequired: 1, userGroups: []},
+    settings: {approvalsRequired: 1, approvalMode: 'total', userGroups: []},
     settingsForm: null,
   };
 }
@@ -125,7 +125,7 @@ describe('WorkflowStagesInput', () => {
         uid: 'new-stage',
         name: 'Review',
         type,
-        settings: {approvalsRequired: 1, userGroups: []},
+        settings: {approvalsRequired: 1, approvalMode: 'total', userGroups: []},
         settingsForm: null,
       },
     ]);
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
index 01bcf94f49f..ed795ab237e 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.vue
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -202,6 +202,7 @@
 
       <TypeConfigurator
         :key="stage.type"
+        class="workflow-stage__configurator"
         :types="typePickerOptions"
         :selected-type-label="stageTypeLabel(stage)"
         :type-label="t('Type')"
@@ -238,4 +239,9 @@
   .workflow-stage__title :deep(craft-input) {
     min-inline-size: 8rem;
   }
+
+  .workflow-stage__configurator
+    :deep(.type-configurator__fields > craft-field) {
+    flex: 0 0 auto;
+  }
 </style>
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
index 4bf8a641a6d..16958399162 100644
--- a/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
@@ -1,64 +1,180 @@
 <script setup lang="ts">
   import {t} from '@craftcms/ui';
-  import {computed} from 'vue';
 
   type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
   type WorkflowRun = WorkflowReviewData['runs'][number];
   type WorkflowStage = WorkflowRun['stages'][number];
+  type Reviewer = {name: string};
+  type Group = {
+    name: string;
+    approvals: number;
+    approvedReviewers?: Reviewer[];
+    carriedReviewers: Reviewer[];
+    remainingReviewers: Reviewer[];
+  };
 
-  const props = defineProps<{
+  defineProps<{
     run: WorkflowRun;
     stage: WorkflowStage;
+    approvalMode: 'total' | 'per-group';
     approvalsRequired: number;
-    approvals: number;
-    reviewers: Array<{name: string}>;
+    approvals?: number;
+    approvedReviewers?: Reviewer[];
+    carriedReviewers?: Reviewer[];
+    remainingReviewers?: Reviewer[];
+    groups?: Group[];
   }>();
-
-  const remainingReviewers = computed(() => {
-    if (!props.run.current) {
-      return [];
-    }
-
-    const reviewerNames = new Set(
-      props.stage.events
-        .filter((event) => event.decision !== null)
-        .map((event) => event.actor.label)
-    );
-
-    return props.reviewers.filter(
-      (reviewer) => !reviewerNames.has(reviewer.name)
-    );
-  });
 </script>
 
 <template>
   <craft-card class="workflow-user-review-summary">
-    <span slot="label">
-      {{
-        t('{count} of {required} approved', {
-          count: approvals,
-          required: approvalsRequired,
-        })
-      }}
-    </span>
-    <ul
-      v-if="remainingReviewers.length"
-      class="workflow-user-review-summary__reviewers"
-    >
-      <li
-        v-for="reviewer in remainingReviewers"
-        :key="reviewer.name"
-        class="workflow-user-review-summary__reviewer-row"
+    <template v-if="approvalMode === 'total'">
+      <span slot="label">
+        {{
+          t('{count} of {required} approved', {
+            count: approvals ?? 0,
+            required: approvalsRequired,
+          })
+        }}
+      </span>
+      <ul
+        v-if="approvedReviewers?.length"
+        class="workflow-user-review-summary__reviewers"
       >
-        <span class="workflow-user-review-summary__reviewer">
-          <craft-avatar :label="reviewer.name" />
-          <span class="workflow-user-review-summary__name">
-            {{ reviewer.name }}
+        <li
+          v-for="reviewer in approvedReviewers"
+          :key="reviewer.name"
+          class="workflow-user-review-summary__reviewer-row"
+        >
+          <span class="workflow-user-review-summary__reviewer">
+            <craft-avatar :label="reviewer.name" />
+            <span class="workflow-user-review-summary__name">
+              {{ reviewer.name }}
+            </span>
           </span>
+          <craft-badge fill="green" size="small">
+            {{ t('Approved') }}
+          </craft-badge>
+        </li>
+      </ul>
+      <ul
+        v-if="carriedReviewers?.length"
+        class="workflow-user-review-summary__reviewers"
+      >
+        <li
+          v-for="reviewer in carriedReviewers"
+          :key="reviewer.name"
+          class="workflow-user-review-summary__reviewer-row"
+        >
+          <span class="workflow-user-review-summary__reviewer">
+            <craft-avatar :label="reviewer.name" />
+            <span class="workflow-user-review-summary__name">
+              {{ reviewer.name }}
+            </span>
+          </span>
+          <craft-badge fill="green" size="small">
+            {{ t('Approved previously') }}
+          </craft-badge>
+        </li>
+      </ul>
+      <ul
+        v-if="remainingReviewers?.length"
+        class="workflow-user-review-summary__reviewers"
+      >
+        <li
+          v-for="reviewer in remainingReviewers"
+          :key="reviewer.name"
+          class="workflow-user-review-summary__reviewer-row"
+        >
+          <span class="workflow-user-review-summary__reviewer">
+            <craft-avatar :label="reviewer.name" />
+            <span class="workflow-user-review-summary__name">
+              {{ reviewer.name }}
+            </span>
+          </span>
+          <craft-badge fill="orange" size="small">
+            {{ t('Pending') }}
+          </craft-badge>
+        </li>
+      </ul>
+    </template>
+    <ul v-else class="workflow-user-review-summary__groups">
+      <li
+        v-for="group in groups ?? []"
+        :key="group.name"
+        class="workflow-user-review-summary__group"
+      >
+        <span class="workflow-user-review-summary__group-label">{{
+          group.name
+        }}</span>
+        <span>
+          {{
+            t('{count} of {required} approved', {
+              count: group.approvals,
+              required: approvalsRequired,
+            })
+          }}
         </span>
-        <craft-badge fill="orange" size="small">
-          {{ t('Pending') }}
-        </craft-badge>
+        <ul
+          v-if="group.approvedReviewers?.length"
+          class="workflow-user-review-summary__reviewers"
+        >
+          <li
+            v-for="reviewer in group.approvedReviewers"
+            :key="reviewer.name"
+            class="workflow-user-review-summary__reviewer-row"
+          >
+            <span class="workflow-user-review-summary__reviewer">
+              <craft-avatar :label="reviewer.name" />
+              <span class="workflow-user-review-summary__name">
+                {{ reviewer.name }}
+              </span>
+            </span>
+            <craft-badge fill="green" size="small">
+              {{ t('Approved') }}
+            </craft-badge>
+          </li>
+        </ul>
+        <ul
+          v-if="group.carriedReviewers.length"
+          class="workflow-user-review-summary__reviewers"
+        >
+          <li
+            v-for="reviewer in group.carriedReviewers"
+            :key="reviewer.name"
+            class="workflow-user-review-summary__reviewer-row"
+          >
+            <span class="workflow-user-review-summary__reviewer">
+              <craft-avatar :label="reviewer.name" />
+              <span class="workflow-user-review-summary__name">
+                {{ reviewer.name }}
+              </span>
+            </span>
+            <craft-badge fill="green" size="small">
+              {{ t('Approved previously') }}
+            </craft-badge>
+          </li>
+        </ul>
+        <ul
+          v-if="group.remainingReviewers.length"
+          class="workflow-user-review-summary__reviewers"
+        >
+          <li
+            v-for="reviewer in group.remainingReviewers"
+            :key="reviewer.name"
+            class="workflow-user-review-summary__reviewer-row"
+          >
+            <span class="workflow-user-review-summary__reviewer">
+              <craft-avatar :label="reviewer.name" />
+              <span class="workflow-user-review-summary__name">
+                {{ reviewer.name }}
+              </span>
+            </span>
+            <craft-badge fill="orange" size="small">
+              {{ t('Pending') }}
+            </craft-badge>
+          </li>
+        </ul>
       </li>
     </ul>
   </craft-card>
@@ -77,6 +193,23 @@
     list-style: none;
   }
 
+  .workflow-user-review-summary__groups {
+    display: grid;
+    gap: var(--c-spacing-md);
+    margin: 0;
+    padding: 0;
+    list-style: none;
+  }
+
+  .workflow-user-review-summary__group {
+    display: grid;
+    gap: var(--c-spacing-xs);
+  }
+
+  .workflow-user-review-summary__group-label {
+    font-weight: var(--c-font-weight-semibold);
+  }
+
   .workflow-user-review-summary__reviewer-row,
   .workflow-user-review-summary__reviewer {
     display: flex;
diff --git a/src/Http/Controllers/Elements/ElementDraftsController.php b/src/Http/Controllers/Elements/ElementDraftsController.php
index 524b1cee94e..f64120cca72 100644
--- a/src/Http/Controllers/Elements/ElementDraftsController.php
+++ b/src/Http/Controllers/Elements/ElementDraftsController.php
@@ -353,12 +353,12 @@ public function apply(): Response
                 is_numeric($runId) ? (int) $runId : null,
                 is_numeric($currentStage) ? (int) $currentStage : null,
                 function (WorkflowRun $run) use ($element, $oldFieldLayoutId): Response {
-                    $applyApproved = $run->status === WorkflowStatus::Approved;
-                    if (! $applyApproved) {
+                    $validateOnly = $run->status === WorkflowStatus::Approved;
+                    if (! $validateOnly) {
                         $this->applyParamsToElement($element);
                     }
 
-                    return $this->applyElementDraft($element, $oldFieldLayoutId);
+                    return $this->applyElementDraft($element, $oldFieldLayoutId, $validateOnly);
                 },
             );
         }
@@ -370,7 +370,7 @@ function (WorkflowRun $run) use ($element, $oldFieldLayoutId): Response {
         return $this->applyElementDraft($element, $oldFieldLayoutId);
     }
 
-    private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayoutId): Response
+    private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayoutId, bool $validateOnly = false): Response
     {
         Gate::authorize('save', $element);
 
@@ -383,29 +383,52 @@ private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayo
             );
         }
 
+        $elementToSave = $validateOnly ? clone $element : $element;
+
         // Validate and save the draft
-        if ($element->enabled && $element->getEnabledForSite()) {
-            $element->ruleset->useScenario(ElementRules::SCENARIO_LIVE);
+        if ($elementToSave->enabled && $elementToSave->getEnabledForSite()) {
+            $elementToSave->ruleset->useScenario(ElementRules::SCENARIO_LIVE);
         }
 
         // if we're about to apply an unpublished draft, set propagateRequired to true
         if ($isUnpublishedDraft) {
-            $element->propagateRequired = true;
+            $elementToSave->propagateRequired = true;
         }
 
-        $element->applyingDraft = true;
+        $elementToSave->applyingDraft = true;
 
         // If the field layout ID changed, save all content
-        $saveContent = $element->getFieldLayout()?->id !== $oldFieldLayoutId;
+        $saveContent = $elementToSave->getFieldLayout()?->id !== $oldFieldLayoutId;
 
         $namespace = $this->request->header('X-Craft-Namespace');
         $crossSiteValidate = $namespace === null && Sites::isMultiSite();
 
-        if (! $this->elements->saveElement(
-            element: $element,
-            crossSiteValidate: $crossSiteValidate,
-            saveContent: $saveContent,
-        )) {
+        if ($validateOnly) {
+            DB::beginTransaction();
+        }
+
+        $saved = false;
+        try {
+            $saved = $this->elements->saveElement(
+                element: $elementToSave,
+                crossSiteValidate: $crossSiteValidate,
+                saveContent: $saveContent,
+            );
+        } finally {
+            if ($validateOnly) {
+                $saved ? DB::commit() : DB::rollBack();
+            }
+        }
+
+        if (! $saved) {
+            if ($validateOnly) {
+                $element->clearErrors();
+                $element->errors()->merge($elementToSave->errors()->getMessages());
+                $element->addInvalidNestedElementIds($elementToSave->getInvalidNestedElementIds());
+
+                return new ElementResponse()->applyDraftFailure($element);
+            }
+
             // save the draft anyway, so we don’t lose the latest changes
             // (see https://github.com/craftcms/cms/issues/18657)
             /** @var MessageBag $errors */
@@ -420,10 +443,11 @@ private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayo
             return new ElementResponse()->applyDraftFailure($element);
         }
 
-        $element->applyingDraft = false;
+        $elementToSave->applyingDraft = false;
+        $elementToApply = $validateOnly ? $elementToSave : $element;
 
         if (! $isUnpublishedDraft) {
-            $mutex = Cache::lock("element:$element->canonicalId", 15);
+            $mutex = Cache::lock("element:$elementToApply->canonicalId", 15);
             if (! $mutex->get()) {
                 abort(500, 'Could not acquire a lock to save the element.');
             }
@@ -436,13 +460,13 @@ private function applyElementDraft(ElementInterface $element, ?int $oldFieldLayo
             $attributes['workflowCurrentStage'] = $this->request->integer('workflowCurrentStage');
         }
 
-        if ($element instanceof NestedElementInterface) {
+        if ($elementToApply instanceof NestedElementInterface) {
             $attributes['updateSearchIndexForOwner'] = true;
         }
 
         try {
-            $element->propagateRequired = false;
-            $canonical = $this->drafts->applyDraft($element, $attributes);
+            $elementToApply->propagateRequired = false;
+            $canonical = $this->drafts->applyDraft($elementToApply, $attributes);
         } catch (InvalidElementException $exception) {
             return new ElementResponse()->applyDraftFailure($exception->element);
         } finally {
diff --git a/src/Workflow/Data/WorkflowStageContext.php b/src/Workflow/Data/WorkflowStageContext.php
index 6983a15f392..899ba12bbfb 100644
--- a/src/Workflow/Data/WorkflowStageContext.php
+++ b/src/Workflow/Data/WorkflowStageContext.php
@@ -6,14 +6,29 @@
 
 use CraftCms\Cms\Element\Contracts\ElementInterface;
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use Illuminate\Support\Collection;
 
 readonly class WorkflowStageContext
 {
+    /** @var Collection<int, WorkflowStageHistory> */
+    public Collection $previousStages;
+
     /** @param array<string, mixed> $payload */
     public function __construct(
         public ElementInterface $draft,
         public WorkflowRun $run,
         public WorkflowStageData $stage,
         public array $payload,
-    ) {}
+    ) {
+        $stageIndex = $run->stages()->search(fn (WorkflowStageData $stage): bool => $stage->uid === $this->stage->uid);
+
+        $this->previousStages = $stageIndex === false
+            ? collect()
+            : $run->stages()
+                ->take($stageIndex)
+                ->map(fn (WorkflowStageData $stage): WorkflowStageHistory => new WorkflowStageHistory(
+                    $stage,
+                    $run->payload[$stage->uid] ?? [],
+                ));
+    }
 }
diff --git a/src/Workflow/Data/WorkflowStageHistory.php b/src/Workflow/Data/WorkflowStageHistory.php
new file mode 100644
index 00000000000..1820ffb4ee6
--- /dev/null
+++ b/src/Workflow/Data/WorkflowStageHistory.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\Data;
+
+readonly class WorkflowStageHistory
+{
+    /** @param array<string, mixed> $payload */
+    public function __construct(
+        public WorkflowStageData $stage,
+        public array $payload,
+    ) {}
+}
diff --git a/src/Workflow/UserReview/SendUserReviewNotifications.php b/src/Workflow/UserReview/SendUserReviewNotifications.php
index 55134a3e818..9536cf2907d 100644
--- a/src/Workflow/UserReview/SendUserReviewNotifications.php
+++ b/src/Workflow/UserReview/SendUserReviewNotifications.php
@@ -78,14 +78,14 @@ private function sendReviewRequested(WorkflowTransitioned $event, ?WorkflowStage
         $context = $this->stageContext($event, $stage);
         $component = $stage?->component();
 
-        if (! $event->run->isPending() || ! $component instanceof UserReviewStage || $context === null || $this->decisions($context) !== []) {
+        if (! $event->run->isPending() || ! $component instanceof UserReviewStage || $context === null) {
             return;
         }
 
         $this->send(
             $event,
             $stage,
-            $component->reviewers($context),
+            $component->outstandingReviewers($context),
             'workflow_review_requested',
             t('Review requested'),
             t('“{entry}” is awaiting your approval in {stage}.', [
@@ -133,9 +133,7 @@ private function outstandingReviewers(WorkflowCommented $event): Collection
             return collect();
         }
 
-        $reviewerIds = collect($this->decisions($context))->pluck('reviewerId');
-
-        return $component->reviewers($context)->whereNotIn('id', $reviewerIds);
+        return $component->outstandingReviewers($context);
     }
 
     private function stageContext(WorkflowTransitioned|WorkflowCommented $event, ?WorkflowStageData $stage): ?WorkflowStageContext
@@ -148,12 +146,6 @@ private function stageContext(WorkflowTransitioned|WorkflowCommented $event, ?Wo
         );
     }
 
-    /** @return list<array<string, mixed>> */
-    private function decisions(WorkflowStageContext $context): array
-    {
-        return is_array($context->payload['decisions'] ?? null) ? $context->payload['decisions'] : [];
-    }
-
     /** @param Collection<int, mixed> $recipients */
     private function send(WorkflowTransitioned|WorkflowCommented $event, ?WorkflowStageData $stage, Collection $recipients, string $messageKey, string $title, string $message): void
     {
diff --git a/src/Workflow/UserReview/UserReviewApprovalMode.php b/src/Workflow/UserReview/UserReviewApprovalMode.php
new file mode 100644
index 00000000000..933966fa8e4
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewApprovalMode.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+enum UserReviewApprovalMode: string
+{
+    case Total = 'total';
+    case PerGroup = 'per-group';
+}
diff --git a/src/Workflow/UserReview/UserReviewDecisionData.php b/src/Workflow/UserReview/UserReviewDecisionData.php
new file mode 100644
index 00000000000..83a7b320589
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewDecisionData.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+readonly class UserReviewDecisionData
+{
+    public function __construct(
+        public int $reviewerId,
+        public UserReviewDecision $decision,
+        public ?string $message,
+        public string $decidedAt,
+    ) {}
+
+    /** @param array{reviewerId: int, decision: string, message: string|null, decidedAt: string} $data */
+    public static function fromArray(array $data): self
+    {
+        return new self($data['reviewerId'], UserReviewDecision::from($data['decision']), $data['message'], $data['decidedAt']);
+    }
+
+    /** @return array{reviewerId: int, decision: string, message: string|null, decidedAt: string} */
+    public function toArray(): array
+    {
+        return ['reviewerId' => $this->reviewerId, 'decision' => $this->decision->value, 'message' => $this->message, 'decidedAt' => $this->decidedAt];
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewDecisions.php b/src/Workflow/UserReview/UserReviewDecisions.php
new file mode 100644
index 00000000000..d3c15af4e8f
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewDecisions.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use Illuminate\Support\Collection;
+
+readonly class UserReviewDecisions
+{
+    /** @param list<UserReviewDecisionData> $all */
+    private function __construct(public array $all) {}
+
+    /** @param array<string, mixed> $payload */
+    public static function fromPayload(array $payload): self
+    {
+        return new self(array_map(UserReviewDecisionData::fromArray(...), $payload['decisions'] ?? []));
+    }
+
+    public function hasRejection(): bool
+    {
+        return collect($this->all)->contains(fn (UserReviewDecisionData $decision): bool => $decision->decision === UserReviewDecision::Rejected);
+    }
+
+    public function hasDecisionFrom(int $reviewerId): bool
+    {
+        return collect($this->all)->contains(fn (UserReviewDecisionData $decision): bool => $decision->reviewerId === $reviewerId);
+    }
+
+    /** @return Collection<int, int> */
+    public function approvalIds(): Collection
+    {
+        return collect($this->all)->filter(fn (UserReviewDecisionData $decision): bool => $decision->decision === UserReviewDecision::Approved)->pluck('reviewerId');
+    }
+
+    /** @return list<array{reviewerId: int, decision: string, message: string|null, decidedAt: string}> */
+    public function append(int $reviewerId, UserReviewDecision $decision, ?string $message): array
+    {
+        return [...collect($this->all)->map(fn (UserReviewDecisionData $decision): array => $decision->toArray())->all(), new UserReviewDecisionData($reviewerId, $decision, $message, now()->toIso8601String())->toArray()];
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
index efed417f798..49afec953e6 100644
--- a/src/Workflow/UserReview/UserReviewStage.php
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -5,21 +5,21 @@
 namespace CraftCms\Cms\Workflow\UserReview;
 
 use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Form\Controls\Choice;
 use CraftCms\Cms\Form\Controls\Number;
 use CraftCms\Cms\Form\Controls\UserGroupSelect;
 use CraftCms\Cms\Form\Form;
 use CraftCms\Cms\Form\FormContext;
 use CraftCms\Cms\Form\Nodes\Field;
-use CraftCms\Cms\Support\Facades\UserGroups;
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\UserGroup;
 use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
 use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
 use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
 use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
 use CraftCms\Cms\Workflow\Stages\WorkflowStage;
 use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rule;
 
 use function CraftCms\Cms\t;
@@ -31,6 +31,8 @@ class UserReviewStage extends WorkflowStage
 
     public int $approvalsRequired = 1;
 
+    public UserReviewApprovalMode $approvalMode = UserReviewApprovalMode::Total;
+
     /** @var list<string> */
     public array $userGroups = [];
 
@@ -45,6 +47,7 @@ public function getRules(): array
             'userGroups' => ['required', 'array', 'min:1'],
             'userGroups.*' => ['required', 'string', 'distinct', Rule::exists(Table::USERGROUPS, 'uid')],
             'approvalsRequired' => ['required', 'integer', 'min:1'],
+            'approvalMode' => ['required', Rule::enum(UserReviewApprovalMode::class)],
         ];
     }
 
@@ -55,24 +58,34 @@ public function settingsForm(FormContext $context = new FormContext): Form
                 ->required(),
             Field::make(t('Approvals required'), Number::make('approvalsRequired')->min(1))
                 ->required(),
+            Field::make(t('Approval mode'), Choice::make('approvalMode')->options([
+                ['label' => t('Total'), 'value' => UserReviewApprovalMode::Total->value],
+                ['label' => t('Per group'), 'value' => UserReviewApprovalMode::PerGroup->value],
+            ]))->required(),
         ]);
     }
 
     public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     {
-        $decisions = $this->decisions($context->payload);
-        $failed = collect($decisions)->contains(fn (array $decision): bool => $decision['decision'] === UserReviewDecision::Rejected->value);
-
-        if ($failed) {
+        if (UserReviewDecisions::fromPayload($context->payload)->hasRejection()) {
             return new WorkflowStageResult(WorkflowStageStatus::Failed, t('Changes requested'), $context->payload);
         }
 
-        $reviewerIds = $this->reviewers($context)->pluck('id')->all();
-        $approvals = collect($decisions)->filter(fn (array $decision): bool => $decision['decision'] === UserReviewDecision::Approved->value &&
-            in_array($decision['reviewerId'], $reviewerIds, true)
-        )->count();
+        if ($this->hasMissingReviewerGroups()) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                t('A configured reviewer group no longer exists.'),
+                $context->payload,
+            );
+        }
+
+        $state = $this->state($context);
+
+        if ($this->approvalMode === UserReviewApprovalMode::PerGroup) {
+            return $this->evaluatePerGroup($context, $state);
+        }
 
-        if (count($reviewerIds) < $this->approvalsRequired) {
+        if ($state->reviewers->count() < $this->approvalsRequired) {
             return new WorkflowStageResult(
                 WorkflowStageStatus::Pending,
                 t('Not enough eligible reviewers are available.'),
@@ -80,6 +93,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
             );
         }
 
+        $approvals = $state->effectiveApprovalIds->count();
         if ($approvals >= $this->approvalsRequired) {
             return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $context->payload);
         }
@@ -110,18 +124,9 @@ public function summaryComponent(): string
 
     public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array
     {
-        $reviewers = $this->reviewers($context);
-        $reviewerIds = $reviewers->pluck('id');
-        $approvals = collect($this->decisions($context->payload))
-            ->where('decision', UserReviewDecision::Approved->value)
-            ->whereIn('reviewerId', $reviewerIds)
-            ->count();
+        $groups = $this->reviewerGroups();
 
-        return [
-            'approvalsRequired' => $this->approvalsRequired,
-            'approvals' => $approvals,
-            'reviewers' => $reviewers->map(fn (User $reviewer): array => ['name' => $reviewer->name])->all(),
-        ];
+        return UserReviewSummary::props($this, UserReviewState::for($context, $groups), $groups);
     }
 
     public function decide(UserReviewDecision $decision, ?string $message, WorkflowStageContext $context, CraftUser $reviewer): WorkflowStageResult
@@ -136,15 +141,7 @@ public function decide(UserReviewDecision $decision, ?string $message, WorkflowS
         }
 
         $payload = $context->payload;
-        $payload['decisions'] = [
-            ...$this->decisions($payload),
-            [
-                'reviewerId' => $reviewer->getCraftUserId(),
-                'decision' => $decision->value,
-                'message' => $message !== '' ? $message : null,
-                'decidedAt' => now()->toIso8601String(),
-            ],
-        ];
+        $payload['decisions'] = UserReviewDecisions::fromPayload($payload)->append($reviewer->getCraftUserId(), $decision, $message !== '' ? $message : null);
 
         return $this->evaluate(new WorkflowStageContext(
             draft: $context->draft,
@@ -156,38 +153,73 @@ public function decide(UserReviewDecision $decision, ?string $message, WorkflowS
 
     private function canReview(WorkflowStageContext $context, CraftUser $reviewer): bool
     {
+        if ($this->hasMissingReviewerGroups()) {
+            return false;
+        }
+
         $reviewerId = $reviewer->getCraftUserId();
+        $state = $this->state($context);
 
         return $reviewerId !== null
             && $reviewerId !== $context->run->authorId
-            && $this->reviewers($context)->contains('id', $reviewerId)
-            && collect($this->decisions($context->payload))->doesntContain('reviewerId', $reviewerId);
+            && $state->reviewers->contains('id', $reviewerId)
+            && $state->effectiveApprovalIds->doesntContain($reviewerId)
+            && ! UserReviewDecisions::fromPayload($context->payload)->hasDecisionFrom($reviewerId);
     }
 
     /** @return Collection<int, User> */
-    public function reviewers(WorkflowStageContext $context): Collection
+    public function outstandingReviewers(WorkflowStageContext $context): Collection
     {
-        $groupIds = array_filter(array_map(
-            fn (string $uid): ?int => UserGroups::getGroupByUid($uid)?->id,
-            $this->userGroups,
-        ));
+        if ($this->hasMissingReviewerGroups()) {
+            return collect();
+        }
+
+        $state = $this->state($context);
+        $decidedReviewerIds = collect(UserReviewDecisions::fromPayload($context->payload)->all)->pluck('reviewerId');
 
-        return User::find()
-            ->groupId($groupIds)
-            ->status(User::STATUS_ACTIVE)
-            ->id(['not', $context->run->authorId])
-            ->can('accessCp')
-            ->collect()
-            ->filter(fn (User $user): bool => Gate::forUser($user)->allows('view', $context->draft))
+        return $state->reviewers->whereNotIn('id', $state->effectiveApprovalIds->merge($decidedReviewerIds));
+    }
+
+    private function evaluatePerGroup(WorkflowStageContext $context, UserReviewState $state): WorkflowStageResult
+    {
+        $groups = $this->reviewerGroups()->map(function (UserGroup $group) use ($state): array {
+            $reviewerIds = $state->reviewersForGroup($group)->pluck('id');
+
+            return [
+                'reviewers' => $reviewerIds->count(),
+                'approvals' => $state->effectiveApprovalIds->intersect($reviewerIds)->count(),
+            ];
+        });
+
+        if ($groups->contains(fn (array $group): bool => $group['reviewers'] < $this->approvalsRequired)) {
+            return new WorkflowStageResult(WorkflowStageStatus::Pending, t('Not enough eligible reviewers are available.'), $context->payload);
+        }
+
+        if ($groups->every(fn (array $group): bool => $group['approvals'] >= $this->approvalsRequired)) {
+            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $context->payload);
+        }
+
+        return new WorkflowStageResult(WorkflowStageStatus::Pending, t('Approvals are required from every reviewer group.'), $context->payload);
+    }
+
+    /** @return Collection<int, UserGroup> */
+    private function reviewerGroups(): Collection
+    {
+        $groups = UserGroup::query()->whereIn('uid', $this->userGroups)->get()->keyBy('uid');
+
+        return collect($this->userGroups)
+            ->map(fn (string $uid): ?UserGroup => $groups->get($uid))
+            ->filter()
             ->values();
     }
 
-    /**
-     * @param  array<string, mixed>  $payload
-     * @return list<array{reviewerId: int, decision: string, message: string|null, decidedAt: string}>
-     */
-    private function decisions(array $payload): array
+    private function hasMissingReviewerGroups(): bool
+    {
+        return $this->reviewerGroups()->count() !== count($this->userGroups);
+    }
+
+    private function state(WorkflowStageContext $context): UserReviewState
     {
-        return is_array($payload['decisions'] ?? null) ? $payload['decisions'] : [];
+        return UserReviewState::for($context, $this->reviewerGroups());
     }
 }
diff --git a/src/Workflow/UserReview/UserReviewState.php b/src/Workflow/UserReview/UserReviewState.php
new file mode 100644
index 00000000000..2ef024c41cc
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewState.php
@@ -0,0 +1,65 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\UserGroup;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
+
+readonly class UserReviewState
+{
+    /**
+     * @param  Collection<int, User>  $reviewers
+     * @param  Collection<int, array<int, User>>  $reviewersByGroup
+     * @param  Collection<int, int>  $localApprovalIds
+     * @param  Collection<int, int>  $carriedApprovalIds
+     * @param  Collection<int, int>  $effectiveApprovalIds
+     */
+    private function __construct(
+        public Collection $reviewers,
+        public Collection $reviewersByGroup,
+        public Collection $localApprovalIds,
+        public Collection $carriedApprovalIds,
+        public Collection $effectiveApprovalIds,
+    ) {}
+
+    /** @param Collection<int, UserGroup> $groups */
+    public static function for(WorkflowStageContext $context, Collection $groups): self
+    {
+        $reviewers = User::find()
+            ->groupId($groups->pluck('id')->all())
+            ->status(User::STATUS_ACTIVE)
+            ->id(['not', $context->run->authorId])
+            ->can('accessCp')
+            ->collect()
+            ->filter(fn (User $user): bool => Gate::forUser($user)->allows('view', $context->draft))
+            ->values();
+        $reviewerIds = $reviewers->pluck('id');
+        $localApprovalIds = UserReviewDecisions::fromPayload($context->payload)->approvalIds();
+        $carriedApprovalIds = $context->previousStages
+            ->filter(fn ($previous): bool => $previous->stage->component() instanceof UserReviewStage)
+            ->flatMap(fn ($previous): Collection => UserReviewDecisions::fromPayload($previous->payload)->approvalIds())
+            ->unique()
+            ->values();
+
+        return new self(
+            $reviewers,
+            $groups->mapWithKeys(fn (UserGroup $group): array => [$group->id => $reviewers->filter(
+                fn (User $reviewer): bool => $group->users()->whereKey($reviewer->id)->exists(),
+            )->values()->all()]),
+            $localApprovalIds,
+            $carriedApprovalIds->intersect($reviewerIds)->values(),
+            $localApprovalIds->merge($carriedApprovalIds)->intersect($reviewerIds)->unique()->values(),
+        );
+    }
+
+    /** @return Collection<int, User> */
+    public function reviewersForGroup(UserGroup $group): Collection
+    {
+        return collect($this->reviewersByGroup->get($group->id, []));
+    }
+}
diff --git a/src/Workflow/UserReview/UserReviewSummary.php b/src/Workflow/UserReview/UserReviewSummary.php
new file mode 100644
index 00000000000..4f201b381d0
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewSummary.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\UserGroup;
+use Illuminate\Support\Collection;
+
+readonly class UserReviewSummary
+{
+    /**
+     * @param  Collection<int, UserGroup>  $groups
+     * @return array<string, mixed>
+     */
+    public static function props(UserReviewStage $stage, UserReviewState $state, Collection $groups): array
+    {
+        $props = ['approvalMode' => $stage->approvalMode->value, 'approvalsRequired' => $stage->approvalsRequired];
+        if ($stage->approvalMode === UserReviewApprovalMode::Total) {
+            return [...$props, 'approvals' => $state->effectiveApprovalIds->count(), 'approvedReviewers' => self::names($state->reviewers->whereIn('id', $state->localApprovalIds)), 'carriedReviewers' => self::names($state->reviewers->whereIn('id', $state->carriedApprovalIds)), 'remainingReviewers' => self::names($state->reviewers->whereNotIn('id', $state->effectiveApprovalIds))];
+        }
+
+        return [...$props, 'groups' => $groups->map(function (UserGroup $group) use ($state): array {
+            $reviewers = $state->reviewersForGroup($group);
+
+            return ['name' => $group->name, 'approvals' => $state->effectiveApprovalIds->intersect($reviewers->pluck('id'))->count(), 'approvedReviewers' => self::names($reviewers->whereIn('id', $state->localApprovalIds)), 'carriedReviewers' => self::names($reviewers->whereIn('id', $state->carriedApprovalIds)), 'remainingReviewers' => self::names($reviewers->whereNotIn('id', $state->effectiveApprovalIds))];
+        })->values()->all()];
+    }
+
+    /**
+     * @param  Collection<int, User>  $reviewers
+     * @return list<array{name: string}>
+     */
+    private static function names(Collection $reviewers): array
+    {
+        return $reviewers->map(fn (User $reviewer): array => ['name' => $reviewer->name])->values()->all();
+    }
+}
diff --git a/src/Workflow/WorkflowContentChanges.php b/src/Workflow/WorkflowContentChanges.php
index aea22d0490f..70cd4703712 100644
--- a/src/Workflow/WorkflowContentChanges.php
+++ b/src/Workflow/WorkflowContentChanges.php
@@ -10,6 +10,8 @@
 use CraftCms\Cms\Element\Events\ElementLifecycleDeleting;
 use CraftCms\Cms\Element\Events\ElementPersisted;
 use CraftCms\Cms\Element\Events\ElementSaving;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
 use Illuminate\Container\Attributes\Singleton;
 use WeakMap;
 
@@ -61,6 +63,13 @@ public function handleElementPersisted(ElementPersisted $event): void
             return;
         }
 
+        if (($event->element->applyingDraft || $event->element->propagatingFrom?->applyingDraft) && WorkflowRun::query()
+            ->whereIn('draftId', $write['draftIds'])
+            ->where('status', WorkflowStatus::Approved)
+            ->exists()) {
+            return;
+        }
+
         $this->workflows->contentChangedByDraftIds($write['draftIds']);
     }
 
diff --git a/src/Workflow/Workflows.php b/src/Workflow/Workflows.php
index 9b3db2a7eab..764b54f1bf9 100644
--- a/src/Workflow/Workflows.php
+++ b/src/Workflow/Workflows.php
@@ -35,6 +35,7 @@
 use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
 use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
 use Illuminate\Container\Attributes\Singleton;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Support\Collection;
@@ -479,7 +480,9 @@ private function advance(ElementInterface $draft, WorkflowRun $run): void
             $stage = $this->currentStage($run);
             $context = $this->stageContext($draft, $run, $stage);
             $result = $stage->component()->evaluate($context);
-            $this->recordAutomatedTransition($draft, $run, $stage, $result);
+            if (! $stage->component() instanceof UserReviewStage) {
+                $this->recordAutomatedTransition($draft, $run, $stage, $result);
+            }
 
             if (! $this->advanceFromResult($run, $stage, $result)) {
                 return;
diff --git a/tests/Feature/Workflow/UserReviewStageTest.php b/tests/Feature/Workflow/UserReviewStageTest.php
new file mode 100644
index 00000000000..b652317b694
--- /dev/null
+++ b/tests/Feature/Workflow/UserReviewStageTest.php
@@ -0,0 +1,337 @@
+<?php
+
+declare(strict_types=1);
+
+use CraftCms\Cms\Activity\Data\ActivitySubject;
+use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Edition;
+use CraftCms\Cms\Element\Drafts;
+use CraftCms\Cms\Entry\Elements\Entry;
+use CraftCms\Cms\Entry\Models\Entry as EntryModel;
+use CraftCms\Cms\Section\Models\Section;
+use CraftCms\Cms\Support\Facades\Elements;
+use CraftCms\Cms\Support\Facades\Sections;
+use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\User as UserModel;
+use CraftCms\Cms\User\Models\UserGroup;
+use CraftCms\Cms\Workflow\Activity\WorkflowActivityEvent;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageData;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use CraftCms\Cms\Workflow\Models\Workflow;
+use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\UserReview\UserReviewApprovalMode;
+use CraftCms\Cms\Workflow\UserReview\UserReviewDecision;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
+use CraftCms\Cms\Workflow\Workflows;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Auth;
+
+use function CraftCms\Cms\cp_url;
+use function Pest\Laravel\actingAs;
+use function Pest\Laravel\postJson;
+
+beforeEach(function () {
+    Edition::set(Edition::Pro);
+
+    $this->author = UserModel::factory()->admin()->createElement(['fullName' => 'Draft Author']);
+    $this->reviewers = collect([
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer One']),
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer Two']),
+        UserModel::factory()->admin()->createElement(['fullName' => 'Reviewer Three']),
+    ]);
+    $this->entry = EntryModel::factory()->createElement(['title' => 'Canonical title']);
+    $this->draft = app(Drafts::class)->createDraft($this->entry, $this->author->id, name: 'Campaign draft');
+    $this->draft->title = 'Reviewed title';
+    actingAs($this->author);
+    expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
+
+    $this->workflows = app(Workflows::class);
+});
+
+it('carries eligible approvals into a later user review stage and completes it without a duplicate event', function () {
+    $group = userReviewGroup([$this->reviewers[0]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $group),
+        makeUserReviewStage('Legal review', $group),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    $run = decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+
+    expect($run->status)->toBe(WorkflowStatus::Approved)
+        ->and(userReviewEvents($this->entry, WorkflowTransition::Approve))->toHaveCount(1)
+        ->and(userReviewEvents($this->entry, WorkflowTransition::StageApproved))->toHaveCount(0)
+        ->and(collect($this->workflows->reviewData($this->draft, $this->author)->runs)->firstWhere('current')->stages[0]->summaryProps['approvedReviewers'])->toBe([
+            ['name' => $this->reviewers[0]->name],
+        ])
+        ->and(collect($this->workflows->reviewData($this->draft, $this->author)->runs)->firstWhere('current')->stages[1]->summaryProps['carriedReviewers'])->toBe([
+            ['name' => $this->reviewers[0]->name],
+        ])
+        ->and($this->reviewers[0]->notifications()->count())->toBe(1);
+});
+
+it('applies a draft approved through a carried approval', function () {
+    $group = userReviewGroup([$this->reviewers[0]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $group),
+        makeUserReviewStage('Legal review', $group),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+
+    postJson(cp_url('actions/elements/apply-draft'), [
+        'elementType' => Entry::class,
+        'elementId' => $this->entry->id,
+        'siteId' => $this->draft->siteId,
+        'draftId' => $this->draft->draftId,
+        'workflowRunId' => $run->id,
+        'workflowCurrentStage' => 1,
+    ])->assertOk();
+
+    expect($run->fresh()->status)->toBe(WorkflowStatus::Published);
+});
+
+it('excludes carried reviewers from later review actions and notifications', function () {
+    $firstGroup = userReviewGroup([$this->reviewers[0]]);
+    $secondGroup = userReviewGroup([$this->reviewers[0], $this->reviewers[1]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $firstGroup),
+        makeUserReviewStage('Legal review', $secondGroup, approvals: 2),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    $run = decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[0])->actionProps['canReview'])->toBeFalse()
+        ->and($this->reviewers[0]->notifications()->count())->toBe(1)
+        ->and($this->reviewers[1]->notifications()->count())->toBe(1)
+        ->and(fn () => decideUserReview(
+            $this->workflows,
+            $this->reviewers[0],
+            $run,
+            $workflow->stages->last(),
+            UserReviewDecision::Approved,
+        ))->toThrow(WorkflowException::class, 'not available');
+});
+
+it('carries approvals only when the reviewer remains eligible for the destination stage', function () {
+    $firstGroup = userReviewGroup([$this->reviewers[0]]);
+    $secondGroup = userReviewGroup([$this->reviewers[1]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $firstGroup),
+        makeUserReviewStage('Legal review', $secondGroup),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    $run = decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+
+    $review = $this->workflows->reviewData($this->draft, $this->reviewers[1]);
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and($review->actionProps['canReview'])->toBeTrue()
+        ->and(collect($review->runs)->firstWhere('current')->stages[1]->summaryProps['approvals'])->toBe(0);
+});
+
+it('does not carry approvals from an earlier workflow run', function () {
+    $group = userReviewGroup([$this->reviewers[0], $this->reviewers[1]]);
+    $workflow = userReviewWorkflow($this->entry, [makeUserReviewStage('Editorial review', $group, approvals: 2)]);
+    $firstRun = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $firstRun,
+        $workflow->stages->sole(),
+        UserReviewDecision::Approved,
+    );
+    $this->workflows->contentChanged($this->draft);
+    $secondRun = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    $review = $this->workflows->reviewData($this->draft, $this->reviewers[0]);
+    expect($secondRun->status)->toBe(WorkflowStatus::Pending)
+        ->and($review->actionProps['canReview'])->toBeTrue()
+        ->and(collect($review->runs)->firstWhere('current')->stages[0]->summaryProps['approvals'])->toBe(0);
+});
+
+it('deduplicates carried approvals in total mode', function () {
+    $firstGroup = userReviewGroup([$this->reviewers[0]]);
+    $secondGroup = userReviewGroup([$this->reviewers[0], $this->reviewers[1]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $firstGroup),
+        makeUserReviewStageForGroups('Legal review', [$firstGroup, $secondGroup], approvals: 2),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    $run = decideUserReview(
+        $this->workflows,
+        $this->reviewers[0],
+        $run,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+
+    $review = $this->workflows->reviewData($this->draft, $this->reviewers[1]);
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and(collect($review->runs)->firstWhere('current')->stages[1]->summaryProps['approvals'])->toBe(1);
+});
+
+it('requires approvals from every selected group in per-group mode', function () {
+    $editorial = userReviewGroup([$this->reviewers[0], $this->reviewers[1]]);
+    $legal = userReviewGroup([$this->reviewers[0], $this->reviewers[2]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStageForGroups('Final review', [$editorial, $legal], approvals: 2, approvalMode: UserReviewApprovalMode::PerGroup),
+    ]);
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+    $stage = $workflow->stages->sole();
+
+    $run = decideUserReview($this->workflows, $this->reviewers[0], $run, $stage, UserReviewDecision::Approved);
+    $run = decideUserReview($this->workflows, $this->reviewers[1], $run, $stage, UserReviewDecision::Approved);
+
+    $review = $this->workflows->reviewData($this->draft, $this->reviewers[2]);
+    $summaryProps = collect($review->runs)->firstWhere('current')->stages[0]->summaryProps;
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and($summaryProps['approvalMode'])->toBe('per-group')
+        ->and($summaryProps['groups'][0]['approvals'])->toBe(2)
+        ->and($summaryProps['groups'][1]['approvals'])->toBe(1);
+
+    $run = decideUserReview($this->workflows, $this->reviewers[2], $run, $stage, UserReviewDecision::Approved);
+    expect($run->status)->toBe(WorkflowStatus::Approved);
+});
+
+it('keeps a user review stage pending when a configured group no longer exists', function () {
+    $group = userReviewGroup([$this->reviewers[0]]);
+    userReviewWorkflow($this->entry, [
+        makeUserReviewStageForGroups('Final review', [$group], approvalMode: UserReviewApprovalMode::PerGroup),
+    ]);
+    $group->delete();
+
+    $run = submitUserReview($this->workflows, $this->draft, $this->author);
+
+    expect($run->status)->toBe(WorkflowStatus::Pending)
+        ->and($run->currentStageResult)->toBe('A configured reviewer group no longer exists.')
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[0])->actionProps['canReview'])->toBeFalse()
+        ->and($this->reviewers[0]->notifications()->count())->toBe(0);
+});
+
+/** @param list<array{name: string, type: string, settings: array<string, mixed>}> $stages */
+function userReviewWorkflow(Entry $entry, array $stages): Workflow
+{
+    $workflow = Workflow::query()->create([
+        'name' => 'Editorial workflow',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => array_map(fn (array $stage): array => [...$stage, 'uid' => Str::uuid7()->toString()], $stages),
+    ]);
+    Section::query()->whereKey($entry->sectionId)->update(['workflowId' => $workflow->id]);
+    Sections::refreshSections();
+
+    return $workflow->refresh();
+}
+
+/** @return array{name: string, type: string, settings: array<string, mixed>} */
+function makeUserReviewStage(string $name, UserGroup $group, int $approvals = 1): array
+{
+    return makeUserReviewStageForGroups($name, [$group], $approvals);
+}
+
+/** @param list<UserGroup> $groups */
+function makeUserReviewStageForGroups(string $name, array $groups, int $approvals = 1, UserReviewApprovalMode $approvalMode = UserReviewApprovalMode::Total): array
+{
+    return [
+        'name' => $name,
+        'type' => UserReviewStage::class,
+        'settings' => [
+            'approvalsRequired' => $approvals,
+            'approvalMode' => $approvalMode->value,
+            'userGroups' => collect($groups)->pluck('uid')->all(),
+        ],
+    ];
+}
+
+function submitUserReview(Workflows $workflows, Entry $draft, User $author): WorkflowRun
+{
+    return actAsUserReview($author, fn () => $workflows->submitForReview($draft));
+}
+
+function decideUserReview(Workflows $workflows, User $reviewer, WorkflowRun $run, WorkflowStageData $stage, UserReviewDecision $decision): WorkflowRun
+{
+    return actAsUserReview($reviewer, fn (): WorkflowRun => $workflows->reportStageResult(
+        runId: $run->id,
+        stageUid: $stage->uid,
+        result: function (WorkflowStageContext $context) use ($reviewer, $decision): WorkflowStageResult {
+            $component = $context->stage->component();
+            expect($component)->toBeInstanceOf(UserReviewStage::class);
+
+            return $component->decide($decision, null, $context, $reviewer);
+        },
+        actor: $reviewer,
+        activityTransition: $decision === UserReviewDecision::Approved ? WorkflowTransition::Approve : WorkflowTransition::Reject,
+    ));
+}
+
+/**
+ * @template TResult
+ *
+ * @param  Closure(): TResult  $callback
+ * @return TResult
+ */
+function actAsUserReview(User $actor, Closure $callback): mixed
+{
+    $previousUser = Auth::user();
+    Auth::guard()->setUser($actor);
+
+    try {
+        return $callback();
+    } finally {
+        $previousUser === null ? Auth::logout() : Auth::guard()->setUser($previousUser);
+    }
+}
+
+/** @param list<User> $reviewers */
+function userReviewGroup(array $reviewers): UserGroup
+{
+    $group = UserGroup::factory()->create();
+    $group->users()->sync(collect($reviewers)->pluck('id'));
+
+    return $group;
+}
+
+/** @return Collection<int, ActivityEvent> */
+function userReviewEvents(Entry $entry, WorkflowTransition $transition): Collection
+{
+    return ActivityEvent::query()
+        ->subject(ActivitySubject::fromElement($entry))
+        ->eventTypes(WorkflowActivityEvent::class)
+        ->get()
+        ->filter(fn (ActivityEvent $event): bool => $event->data['type'] === $transition->value)
+        ->values();
+}
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index 72354895bde..ef5e063d6f7 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -37,6 +37,7 @@
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
 use CraftCms\Cms\Workflow\Stages\MissingWorkflowStage;
 use CraftCms\Cms\Workflow\Stages\WorkflowStage as BaseWorkflowStage;
+use CraftCms\Cms\Workflow\UserReview\UserReviewApprovalMode;
 use CraftCms\Cms\Workflow\UserReview\UserReviewDecision;
 use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
 use CraftCms\Cms\Workflow\Workflows;
@@ -135,6 +136,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     expect($userReview['label'])->toBe('User review')
         ->and($userReview['settings'])->toBe([
             'approvalsRequired' => 1,
+            'approvalMode' => 'total',
             'userGroups' => [],
         ])
         ->and($userReview['settingsForm'])->not->toBeNull()
@@ -695,13 +697,20 @@ function assignWorkflow(Entry $entry, Workflow $workflow): void
 
 /** @return array{name: string, type: string, settings: array<string, mixed>} */
 function userReviewStage(string $name, UserGroup $group, int $approvals = 1): array
+{
+    return userReviewStageForGroups($name, [$group], $approvals);
+}
+
+/** @param list<UserGroup> $groups */
+function userReviewStageForGroups(string $name, array $groups, int $approvals = 1, UserReviewApprovalMode $approvalMode = UserReviewApprovalMode::Total): array
 {
     return [
         'name' => $name,
         'type' => UserReviewStage::class,
         'settings' => [
             'approvalsRequired' => $approvals,
-            'userGroups' => [$group->uid],
+            'approvalMode' => $approvalMode->value,
+            'userGroups' => collect($groups)->pluck('uid')->all(),
         ],
     ];
 }

From 39c2227d8f376880ea85c6532f7b67ac2c459f19 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Fri, 18 Sep 2026 23:06:35 +0200
Subject: [PATCH 09/32] Avoid duplicate validation error messages

Amp-Thread-ID: https://ampcode.com/threads/T-01a0b453-2312-7449-85a8-354bc59d1f1a
---
 src/Http/RespondsWithFlash.php               | 10 +++++++---
 tests/Feature/Http/RespondsWithFlashTest.php | 13 +++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/Http/RespondsWithFlash.php b/src/Http/RespondsWithFlash.php
index 4812ad08c32..b840c4a63cd 100644
--- a/src/Http/RespondsWithFlash.php
+++ b/src/Http/RespondsWithFlash.php
@@ -30,8 +30,6 @@ public function asFailure(?string $message = null, array $data = []): Response
             return $this->asJsonFailure($message, $data);
         }
 
-        $message = Flash::error($message);
-
         request()->flash();
 
         // Attributes with no messages must not reach the session error bag:
@@ -39,9 +37,15 @@ public function asFailure(?string $message = null, array $data = []): Response
         // on an empty one.
         $errors = array_filter($data['errors'] ?? []);
 
+        if ($errors !== []) {
+            return back()->with($data)->withErrors($errors);
+        }
+
+        $message = Flash::error($message);
+
         return back()
             ->with('error', $message)
-            ->with($data)->withErrors($errors);
+            ->with($data);
     }
 
     /** @param array<string, mixed> $data */
diff --git a/tests/Feature/Http/RespondsWithFlashTest.php b/tests/Feature/Http/RespondsWithFlashTest.php
index 8b239805cb4..5d686051788 100644
--- a/tests/Feature/Http/RespondsWithFlashTest.php
+++ b/tests/Feature/Http/RespondsWithFlashTest.php
@@ -34,6 +34,11 @@ public function failureWithoutData()
         return $this->asFailure('Failure message');
     }
 
+    public function failureWithErrors()
+    {
+        return $this->asFailure('Failure message', ['errors' => ['name' => ['Name is required']]]);
+    }
+
     public function successWithRedirect()
     {
         return $this->asSuccess('Success message', [], '/custom-redirect');
@@ -76,6 +81,7 @@ public function setAttributes(array $values): void
     Route::middleware('web')->post('/test-flash/success', [TestFlashController::class, 'success']);
     Route::middleware('web')->post('/test-flash/failure', [TestFlashController::class, 'failure']);
     Route::middleware('web')->post('/test-flash/failure-without-data', [TestFlashController::class, 'failureWithoutData']);
+    Route::middleware('web')->post('/test-flash/failure-with-errors', [TestFlashController::class, 'failureWithErrors']);
     Route::middleware('web')->post('/test-flash/success-redirect', [TestFlashController::class, 'successWithRedirect']);
     Route::middleware('web')->post('/test-flash/model-success', [TestFlashController::class, 'modelSuccess']);
     Route::middleware('web')->post('/test-flash/model-failure', [TestFlashController::class, 'modelFailure']);
@@ -105,6 +111,13 @@ public function setAttributes(array $values): void
         ->assertRedirect();
 });
 
+it('asFailure leaves validation messages to the error bag', function () {
+    post('/test-flash/failure-with-errors')
+        ->assertRedirect()
+        ->assertSessionHasErrors(['name' => 'Name is required'])
+        ->assertSessionMissing('error');
+});
+
 it('asSuccess with custom redirect uses the redirect URL', function () {
     post('/test-flash/success-redirect')
         ->assertRedirect('/custom-redirect');

From f411e142e4a335672ba1c08af5808098ed4b4be4 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 16:33:32 +0200
Subject: [PATCH 10/32] Keep workflow transitions in activity timeline

Amp-Thread-ID: https://ampcode.com/threads/T-01a0b453-2312-7449-85a8-354bc59d1f1a
---
 .../Activity/WorkflowActivityEvent.php        |  2 +
 src/Workflow/Workflows.php                    | 11 ++++--
 .../ActivityTimelineControllerTest.php        | 37 +++++++++++++++++++
 tests/Feature/Workflow/WorkflowsTest.php      |  5 ++-
 4 files changed, 50 insertions(+), 5 deletions(-)

diff --git a/src/Workflow/Activity/WorkflowActivityEvent.php b/src/Workflow/Activity/WorkflowActivityEvent.php
index 726e24e7583..dc3e21d48c3 100644
--- a/src/Workflow/Activity/WorkflowActivityEvent.php
+++ b/src/Workflow/Activity/WorkflowActivityEvent.php
@@ -30,6 +30,7 @@ public function __construct(
         private readonly ?string $stage = null,
         private readonly ?int $stageNumber = null,
         private readonly ?string $note = null,
+        private readonly ?int $runId = null,
         /** @var array{id: int, uid: string, name: string, stages: list<array{uid: string, name: string, type: string, settings: array<string, mixed>}>}|null */
         private readonly ?array $workflow = null,
         /** @var array{elementId: int, draftId: int, elementType: string, siteId: int}|null */
@@ -46,6 +47,7 @@ public function data(): array
             'stage' => $this->stage,
             'stageNumber' => $this->stageNumber,
             'note' => $this->note,
+            ...($this->runId === null ? [] : ['runId' => $this->runId]),
             ...($this->workflow === null ? [] : ['workflow' => $this->workflow]),
             ...($this->draft === null ? [] : ['draft' => $this->draft]),
         ];
diff --git a/src/Workflow/Workflows.php b/src/Workflow/Workflows.php
index 764b54f1bf9..b132933a229 100644
--- a/src/Workflow/Workflows.php
+++ b/src/Workflow/Workflows.php
@@ -719,8 +719,9 @@ private function recordActivity(
             stage: $stage?->name,
             stageNumber: $stageIndex === false ? null : $stageIndex + 1,
             note: $note,
+            runId: $run->id,
             actor: $actor,
-        ), $run->activityRootEventId);
+        ));
     }
 
     /**
@@ -736,14 +737,16 @@ private function timelineItems(ElementInterface $draft, CraftUser $viewer, Colle
         $runIdsByRootEvent = $runs->mapWithKeys(fn (WorkflowRun $run): array => [$run->activityRootEventId => $run->id]);
         $rootEventIds = $runIdsByRootEvent->keys();
         $events = ActivityEvent::query()->subject(ActivitySubject::fromElement($draft))->eventTypes(WorkflowActivityEvent::class)
-            ->where(fn (Builder $query) => $query->whereIn('id', $rootEventIds)->orWhereIn('rootEventId', $rootEventIds))
+            ->where(fn (Builder $query) => $query
+                ->whereIn('id', $rootEventIds)
+                ->orWhereIn('payload->data->runId', $runs->pluck('id')))
             ->oldest('occurredAt')->orderBy('id')->get();
         $presented = $this->activityTimelinePresenter->events($events, $viewer->asElement())->keyBy('id');
 
         return $events->map(function (ActivityEvent $event) use ($presented, $runIdsByRootEvent): WorkflowTimelineItemData {
             $presentation = $presented->get($event->id);
             $type = WorkflowActivityType::from($event->data['type']);
-            $rootEventId = $event->rootEventId ?? $event->id;
+            $runId = $event->data['runId'] ?? $runIdsByRootEvent->get($event->id);
             $impersonator = $presentation['impersonator'];
 
             return new WorkflowTimelineItemData(
@@ -775,7 +778,7 @@ private function timelineItems(ElementInterface $draft, CraftUser $viewer, Colle
                 noteHtml: $presentation['props']['noteHtml'] ?? null,
                 occurredAt: $presentation['occurredAt'],
                 formattedOccurredAt: (array) $presentation['formattedOccurredAt'],
-                runId: (int) $runIdsByRootEvent->get($rootEventId),
+                runId: (int) $runId,
                 stageNumber: isset($event->data['stageNumber']) ? (int) $event->data['stageNumber'] : null,
             );
         })->all();
diff --git a/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php b/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
index c3a5a616059..7a99928522a 100644
--- a/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/ActivityTimelineControllerTest.php
@@ -28,6 +28,8 @@
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
 use CraftCms\Cms\User\Notifications\ActivityMentionNotification;
+use CraftCms\Cms\Workflow\Activity\WorkflowActivityEvent;
+use CraftCms\Cms\Workflow\Enums\WorkflowActivityType;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\DB;
@@ -150,6 +152,41 @@
             ->etc());
 });
 
+it('includes workflow events that belong to a workflow submission', function () {
+    $activities = app(Activities::class);
+    $submission = $activities->record(new WorkflowActivityEvent(
+        subject: $this->entry,
+        type: WorkflowActivityType::Submit,
+        workflow: ['id' => 1, 'uid' => fake()->uuid(), 'name' => 'Editorial review', 'stages' => []],
+        draft: ['elementId' => $this->entry->id, 'draftId' => 1, 'elementType' => Entry::class, 'siteId' => $this->entry->siteId],
+    ));
+    $approval = $activities->record(new WorkflowActivityEvent(
+        subject: $this->entry,
+        type: WorkflowActivityType::Approve,
+        stage: 'Editorial review',
+        stageNumber: 1,
+    ));
+    $comment = $activities->record(new WorkflowActivityEvent(
+        subject: $this->entry,
+        type: WorkflowActivityType::Comment,
+        stage: 'Editorial review',
+        stageNumber: 1,
+        note: 'Looks good.',
+    ));
+
+    postJson(action(ActivityTimelineController::class), [
+        'elementType' => Entry::class,
+        'elementId' => $this->entry->id,
+        'siteId' => $this->entry->siteId,
+    ])
+        ->assertOk()
+        ->assertJsonPath('events.0.id', (string) $submission->id)
+        ->assertJsonPath('events.1.id', (string) $approval->id)
+        ->assertJsonPath('events.1.component', 'craft:workflow-activity-event')
+        ->assertJsonPath('events.2.id', (string) $comment->id)
+        ->assertJsonPath('events.2.props.noteHtml', "<p>Looks good.</p>\n");
+});
+
 it('returns impersonator details', function () {
     $impersonator = UserModel::factory()->admin()->createElement(['fullName' => 'Grace Hopper']);
     $actor = UserModel::factory()->createElement(['fullName' => 'Ada Lovelace']);
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index ef5e063d6f7..fc3aa7ad068 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -411,10 +411,13 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
 
     $review = $this->workflows->reviewData($this->draft, $this->author);
     $presentedRun = collect($review->runs)->firstWhere('current');
+    $approval = workflowEvents($this->entry, WorkflowTransition::Approve)->sole();
 
     expect($presentedRun->submission->noteHtml)->toContain('Ready for review.')
         ->and($presentedRun->stages[0]->events)->toHaveCount(1)
-        ->and($presentedRun->stages[0]->events[0]->decision)->toBe('approved');
+        ->and($presentedRun->stages[0]->events[0]->decision)->toBe('approved')
+        ->and($approval->rootEventId)->toBeNull()
+        ->and($approval->data['runId'])->toBe($run->id);
 
     $workflow->stages = $workflow->stages->map(fn (WorkflowStageData $workflowStage): array => [
         'uid' => $workflowStage->uid,

From 83696063fbb9d2c2a10a006dfd085d025d77002a Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 16:33:39 +0200
Subject: [PATCH 11/32] Simplify workflow review UI

Amp-Thread-ID: https://ampcode.com/threads/T-01a0b453-2312-7449-85a8-354bc59d1f1a
---
 .../js/common/components/FormActions.vue      |   7 -
 .../components/WorkflowDefaultActions.vue     |  90 +++---------
 .../composables/useWorkflowTransition.ts      |  83 +++++++++++
 .../user-review/WorkflowUserReviewActions.vue |  87 +++--------
 .../user-review/WorkflowUserReviewSummary.vue | 137 ++++++------------
 resources/js/pages/content/Edit.vue           |   3 +-
 6 files changed, 172 insertions(+), 235 deletions(-)
 create mode 100644 resources/js/modules/workflows/composables/useWorkflowTransition.ts

diff --git a/resources/js/common/components/FormActions.vue b/resources/js/common/components/FormActions.vue
index ada7d154607..e33bcd9ac6e 100644
--- a/resources/js/common/components/FormActions.vue
+++ b/resources/js/common/components/FormActions.vue
@@ -136,10 +136,3 @@
     <ActionMenu v-if="additionalActions?.length" :actions="additionalActions" />
   </div>
 </template>
-
-<style scoped lang="scss">
-  craft-button[aria-disabled='true'] {
-    cursor: default;
-    opacity: 0.25;
-  }
-</style>
diff --git a/resources/js/modules/workflows/components/WorkflowDefaultActions.vue b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
index 2c4c0c2ee0f..d1cbf12cf18 100644
--- a/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
+++ b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
@@ -1,29 +1,16 @@
 <script setup lang="ts">
   import {ButtonVariant, t} from '@craftcms/ui';
-  import {HttpResponseError} from '@inertiajs/core';
-  import {useHttp} from '@inertiajs/vue3';
   import {computed, shallowRef, useId} from 'vue';
   import controller from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/WorkflowTransitionsController';
-  import {useFlashMessages} from '@/common/composables/useFlashMessages';
   import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
   import {commentToolbarButtons} from '@/modules/markdown-field/commentToolbarButtons';
+  import {
+    useWorkflowTransition,
+    type WorkflowIdentity,
+  } from '../composables/useWorkflowTransition';
   import '../../markdown-field/markdown-field';
 
   type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
-  type WorkflowIdentity = {
-    elementType: string;
-    elementId: number | null;
-    draftId: number | null;
-    siteId: number | null;
-  };
-  type WorkflowTransitionRequest = WorkflowIdentity & {
-    note?: string;
-  };
-  type WorkflowResponse = {
-    workflowReview: WorkflowReviewData;
-    editorActions: ElementEditorActions;
-    message?: string;
-  };
 
   const props = defineProps<{
     review: WorkflowReviewData;
@@ -41,16 +28,9 @@
   }>();
 
   const note = shallowRef('');
-  const error = shallowRef<string | null>(null);
-  const {flash} = useFlashMessages();
-  const transitionRequest = useHttp<
-    WorkflowTransitionRequest,
-    WorkflowResponse
-  >(identity());
   const id = useId();
   const noteId = `workflow-review-note-${id}`;
   const commentId = `workflow-review-comment-${id}`;
-  const busy = computed(() => transitionRequest.processing);
   const noteIsEmpty = computed(() => !note.value.trim());
   const canShowActions = computed(
     () =>
@@ -68,31 +48,16 @@
     };
   }
 
-  async function transition(url: string): Promise<void> {
-    error.value = null;
-    transitionRequest.transform(() => ({
-      ...identity(),
-      note: note.value,
-    }));
-
-    try {
-      const data = await transitionRequest.post(url);
-      emit('reviewUpdated', data.workflowReview, data.editorActions);
+  const {error, processing, transition} = useWorkflowTransition(
+    identity,
+    (review, actions) => {
+      emit('reviewUpdated', review, actions);
       note.value = '';
-      if (data.message) {
-        flash('success', data.message);
-      }
-    } catch (exception) {
-      error.value =
-        responseMessage(exception) ??
-        (exception instanceof Error
-          ? exception.message
-          : t('The workflow could not be updated.'));
     }
-  }
+  );
 
   async function submitForReview(): Promise<void> {
-    await transition(controller.submit.url());
+    await transition(controller.submit.url(), {note: note.value});
   }
 
   function onNoteKeydown(event: KeyboardEvent): void {
@@ -100,7 +65,7 @@
       event.key !== 'Enter' ||
       (!event.metaKey && !event.ctrlKey) ||
       !props.review.canSubmit ||
-      busy.value
+      processing.value
     ) {
       return;
     }
@@ -110,7 +75,7 @@
   }
 
   async function addComment(): Promise<void> {
-    if (noteIsEmpty.value || busy.value) {
+    if (noteIsEmpty.value || processing.value) {
       return;
     }
 
@@ -122,12 +87,15 @@
     }
 
     await transition(
-      controller.comment.url({workflowRun: runId, stage: stageUid})
+      controller.comment.url({workflowRun: runId, stage: stageUid}),
+      {
+        note: note.value,
+      }
     );
   }
 
   async function overrideApproval(): Promise<void> {
-    if (busy.value) {
+    if (processing.value) {
       return;
     }
 
@@ -153,22 +121,6 @@
   function staleReview(): void {
     error.value = t('This review is no longer current. Refresh and try again.');
   }
-
-  function responseMessage(exception: unknown): string | null {
-    if (!(exception instanceof HttpResponseError)) {
-      return null;
-    }
-
-    try {
-      const response = JSON.parse(exception.response.data) as {
-        message?: unknown;
-      };
-
-      return typeof response.message === 'string' ? response.message : null;
-    } catch {
-      return null;
-    }
-  }
 </script>
 
 <template>
@@ -186,7 +138,7 @@
       show-toolbar
       .toolbarButtons="commentToolbarButtons"
       .value="note"
-      :disabled="busy"
+      :disabled="processing"
       @input="note = ($event.target as HTMLTextAreaElement).value"
       @keydown="onNoteKeydown"
     />
@@ -196,7 +148,7 @@
         v-if="review.canSubmit"
         type="button"
         :variant="ButtonVariant.Primary"
-        :disabled="busy"
+        :disabled="processing"
         @click="submitForReview"
       >
         {{ review.submitLabel }}
@@ -208,7 +160,7 @@
             :id="commentId"
             type="button"
             :variant="ButtonVariant.Solid"
-            :disabled="busy || noteIsEmpty"
+            :disabled="processing || noteIsEmpty"
             focusable-when-disabled
             @click="addComment"
           >
@@ -224,7 +176,7 @@
         <craft-button
           type="button"
           :variant="ButtonVariant.DangerPlain"
-          :disabled="busy"
+          :disabled="processing"
           @click="overrideApproval"
         >
           {{ t('Override approval') }}
diff --git a/resources/js/modules/workflows/composables/useWorkflowTransition.ts b/resources/js/modules/workflows/composables/useWorkflowTransition.ts
new file mode 100644
index 00000000000..634296e1868
--- /dev/null
+++ b/resources/js/modules/workflows/composables/useWorkflowTransition.ts
@@ -0,0 +1,83 @@
+import {t} from '@craftcms/ui';
+import {HttpResponseError} from '@inertiajs/core';
+import {useHttp} from '@inertiajs/vue3';
+import {computed, shallowRef, type Ref} from 'vue';
+import {useFlashMessages} from '@/common/composables/useFlashMessages';
+import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
+
+type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+export type WorkflowIdentity = {
+  elementType: string;
+  elementId: number | null;
+  draftId: number | null;
+  siteId: number | null;
+};
+
+type WorkflowTransitionResponse = {
+  workflowReview: WorkflowReviewData;
+  editorActions: ElementEditorActions;
+  message?: string;
+};
+
+type WorkflowTransitionRequest = WorkflowIdentity & {
+  message?: string;
+  note?: string;
+};
+
+export function useWorkflowTransition(
+  identity: () => WorkflowIdentity,
+  updated: (review: WorkflowReviewData, actions: ElementEditorActions) => void
+): {
+  error: Ref<string | null>;
+  processing: Ref<boolean>;
+  transition: (
+    url: string,
+    values?: Pick<WorkflowTransitionRequest, 'message' | 'note'>
+  ) => Promise<void>;
+} {
+  const error = shallowRef<string | null>(null);
+  const {flash} = useFlashMessages();
+  const request = useHttp<
+    WorkflowTransitionRequest,
+    WorkflowTransitionResponse
+  >(identity());
+
+  async function transition(
+    url: string,
+    values: Pick<WorkflowTransitionRequest, 'message' | 'note'> = {}
+  ): Promise<void> {
+    error.value = null;
+    request.transform(() => ({...identity(), ...values}));
+
+    try {
+      const data = await request.post(url);
+      updated(data.workflowReview, data.editorActions);
+      if (data.message) {
+        flash('success', data.message);
+      }
+    } catch (exception) {
+      error.value =
+        responseMessage(exception) ??
+        (exception instanceof Error
+          ? exception.message
+          : t('The workflow could not be updated.'));
+    }
+  }
+
+  return {error, processing: computed(() => request.processing), transition};
+}
+
+function responseMessage(exception: unknown): string | null {
+  if (!(exception instanceof HttpResponseError)) {
+    return null;
+  }
+
+  try {
+    const response = JSON.parse(exception.response.data) as {message?: unknown};
+
+    return typeof response.message === 'string' ? response.message : null;
+  } catch {
+    return null;
+  }
+}
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
index 0946a9b8f52..4ebfb51a8cc 100644
--- a/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
@@ -1,33 +1,19 @@
 <script setup lang="ts">
   import {ButtonVariant, t} from '@craftcms/ui';
-  import {HttpResponseError} from '@inertiajs/core';
-  import {useHttp} from '@inertiajs/vue3';
   import {computed, shallowRef, useId} from 'vue';
   import transitionsController from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/WorkflowTransitionsController';
   import userReviewController from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/UserReviewController';
-  import {useFlashMessages} from '@/common/composables/useFlashMessages';
   import type {ElementEditorActions} from '@/modules/elements/composables/useElementEditor';
   import {commentToolbarButtons} from '@/modules/markdown-field/commentToolbarButtons';
   import {isModifierKeyPressed} from '@/modules/markdown-field/behaviors/utilities';
   import '@/modules/markdown-field/markdown-field';
+  import {
+    useWorkflowTransition,
+    type WorkflowIdentity,
+  } from '../composables/useWorkflowTransition';
 
   type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
-  type WorkflowIdentity = {
-    elementType: string;
-    elementId: number | null;
-    draftId: number | null;
-    siteId: number | null;
-  };
   type ReviewDecision = 'comment' | 'approve' | 'requestChanges';
-  type WorkflowActionRequest = WorkflowIdentity & {
-    message?: string;
-    note?: string;
-  };
-  type WorkflowResponse = {
-    workflowReview: WorkflowReviewData;
-    editorActions: ElementEditorActions;
-    message?: string;
-  };
 
   const props = defineProps<{
     review: WorkflowReviewData;
@@ -49,11 +35,6 @@
   const decision = shallowRef<ReviewDecision>(
     props.review.canComment ? 'comment' : 'approve'
   );
-  const error = shallowRef<string | null>(null);
-  const {flash} = useFlashMessages();
-  const actionRequest = useHttp<WorkflowActionRequest, WorkflowResponse>({
-    ...identity(),
-  });
   const id = useId();
   const messageIsEmpty = computed(() => !message.value.trim());
   const currentRun = computed(() =>
@@ -94,9 +75,17 @@
     };
   }
 
+  const {error, processing, transition} = useWorkflowTransition(
+    identity,
+    (review, actions) => {
+      emit('reviewUpdated', review, actions);
+      message.value = '';
+    }
+  );
+
   async function submitReview(): Promise<void> {
     error.value = null;
-    if (disabledReason.value || actionRequest.processing) {
+    if (disabledReason.value || processing.value) {
       return;
     }
 
@@ -138,7 +127,7 @@
 
   async function overrideApproval(): Promise<void> {
     error.value = null;
-    if (actionRequest.processing) {
+    if (processing.value) {
       return;
     }
 
@@ -162,44 +151,6 @@
       {note: message.value}
     );
   }
-
-  async function transition(
-    url: string,
-    values: Partial<Pick<WorkflowActionRequest, 'message' | 'note'>>
-  ): Promise<void> {
-    actionRequest.transform(() => ({...identity(), ...values}));
-
-    try {
-      const data = await actionRequest.post(url);
-      emit('reviewUpdated', data.workflowReview, data.editorActions);
-      message.value = '';
-      if (data.message) {
-        flash('success', data.message);
-      }
-    } catch (exception) {
-      error.value =
-        responseMessage(exception) ??
-        (exception instanceof Error
-          ? exception.message
-          : t('The workflow could not be updated.'));
-    }
-  }
-
-  function responseMessage(exception: unknown): string | null {
-    if (!(exception instanceof HttpResponseError)) {
-      return null;
-    }
-
-    try {
-      const response = JSON.parse(exception.response.data) as {
-        message?: unknown;
-      };
-
-      return typeof response.message === 'string' ? response.message : null;
-    } catch {
-      return null;
-    }
-  }
 </script>
 
 <template>
@@ -230,7 +181,7 @@
       show-toolbar
       .toolbarButtons="commentToolbarButtons"
       .value="message"
-      :disabled="actionRequest.processing"
+      :disabled="processing"
       @input="message = ($event.target as HTMLTextAreaElement).value"
       @keydown="onMessageKeydown"
     />
@@ -254,7 +205,7 @@
         </span>
       </label>
 
-      <label v-if="canReview" class="workflow-user-review-actions__choice">
+      <label class="workflow-user-review-actions__choice">
         <input
           v-model="decision"
           type="radio"
@@ -267,7 +218,7 @@
         </span>
       </label>
 
-      <label v-if="canReview" class="workflow-user-review-actions__choice">
+      <label class="workflow-user-review-actions__choice">
         <input
           v-model="decision"
           type="radio"
@@ -286,7 +237,7 @@
         v-if="review.canOverride"
         type="button"
         :variant="ButtonVariant.DangerPlain"
-        .disabled="actionRequest.processing"
+        .disabled="processing"
         @click="overrideApproval"
       >
         {{ t('Override approval') }}
@@ -298,7 +249,7 @@
         <craft-button
           type="button"
           :variant="ButtonVariant.Primary"
-          .disabled="actionRequest.processing || Boolean(disabledReason)"
+          .disabled="processing || Boolean(disabledReason)"
           focusable-when-disabled
           @click="submitReview"
         >
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
index 16958399162..1529b2abe4c 100644
--- a/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewSummary.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import {t} from '@craftcms/ui';
+  import {computed} from 'vue';
 
   type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
   type WorkflowRun = WorkflowReviewData['runs'][number];
@@ -13,7 +14,13 @@
     remainingReviewers: Reviewer[];
   };
 
-  defineProps<{
+  type ReviewerSection = {
+    reviewers: Reviewer[];
+    label: string;
+    fill: 'green' | 'orange';
+  };
+
+  const props = defineProps<{
     run: WorkflowRun;
     stage: WorkflowStage;
     approvalMode: 'total' | 'per-group';
@@ -24,6 +31,30 @@
     remainingReviewers?: Reviewer[];
     groups?: Group[];
   }>();
+
+  function reviewerSections(
+    approved: Reviewer[] | undefined,
+    carried: Reviewer[] | undefined,
+    remaining: Reviewer[] | undefined
+  ): ReviewerSection[] {
+    return [
+      {reviewers: approved ?? [], label: t('Approved'), fill: 'green'},
+      {
+        reviewers: carried ?? [],
+        label: t('Approved previously'),
+        fill: 'green',
+      },
+      {reviewers: remaining ?? [], label: t('Pending'), fill: 'orange'},
+    ];
+  }
+
+  const totalReviewerSections = computed(() =>
+    reviewerSections(
+      props.approvedReviewers,
+      props.carriedReviewers,
+      props.remainingReviewers
+    )
+  );
 </script>
 
 <template>
@@ -38,11 +69,13 @@
         }}
       </span>
       <ul
-        v-if="approvedReviewers?.length"
+        v-for="section in totalReviewerSections"
+        v-show="section.reviewers.length"
+        :key="section.label"
         class="workflow-user-review-summary__reviewers"
       >
         <li
-          v-for="reviewer in approvedReviewers"
+          v-for="reviewer in section.reviewers"
           :key="reviewer.name"
           class="workflow-user-review-summary__reviewer-row"
         >
@@ -52,48 +85,8 @@
               {{ reviewer.name }}
             </span>
           </span>
-          <craft-badge fill="green" size="small">
-            {{ t('Approved') }}
-          </craft-badge>
-        </li>
-      </ul>
-      <ul
-        v-if="carriedReviewers?.length"
-        class="workflow-user-review-summary__reviewers"
-      >
-        <li
-          v-for="reviewer in carriedReviewers"
-          :key="reviewer.name"
-          class="workflow-user-review-summary__reviewer-row"
-        >
-          <span class="workflow-user-review-summary__reviewer">
-            <craft-avatar :label="reviewer.name" />
-            <span class="workflow-user-review-summary__name">
-              {{ reviewer.name }}
-            </span>
-          </span>
-          <craft-badge fill="green" size="small">
-            {{ t('Approved previously') }}
-          </craft-badge>
-        </li>
-      </ul>
-      <ul
-        v-if="remainingReviewers?.length"
-        class="workflow-user-review-summary__reviewers"
-      >
-        <li
-          v-for="reviewer in remainingReviewers"
-          :key="reviewer.name"
-          class="workflow-user-review-summary__reviewer-row"
-        >
-          <span class="workflow-user-review-summary__reviewer">
-            <craft-avatar :label="reviewer.name" />
-            <span class="workflow-user-review-summary__name">
-              {{ reviewer.name }}
-            </span>
-          </span>
-          <craft-badge fill="orange" size="small">
-            {{ t('Pending') }}
+          <craft-badge :fill="section.fill" size="small">
+            {{ section.label }}
           </craft-badge>
         </li>
       </ul>
@@ -116,51 +109,17 @@
           }}
         </span>
         <ul
-          v-if="group.approvedReviewers?.length"
-          class="workflow-user-review-summary__reviewers"
-        >
-          <li
-            v-for="reviewer in group.approvedReviewers"
-            :key="reviewer.name"
-            class="workflow-user-review-summary__reviewer-row"
-          >
-            <span class="workflow-user-review-summary__reviewer">
-              <craft-avatar :label="reviewer.name" />
-              <span class="workflow-user-review-summary__name">
-                {{ reviewer.name }}
-              </span>
-            </span>
-            <craft-badge fill="green" size="small">
-              {{ t('Approved') }}
-            </craft-badge>
-          </li>
-        </ul>
-        <ul
-          v-if="group.carriedReviewers.length"
-          class="workflow-user-review-summary__reviewers"
-        >
-          <li
-            v-for="reviewer in group.carriedReviewers"
-            :key="reviewer.name"
-            class="workflow-user-review-summary__reviewer-row"
-          >
-            <span class="workflow-user-review-summary__reviewer">
-              <craft-avatar :label="reviewer.name" />
-              <span class="workflow-user-review-summary__name">
-                {{ reviewer.name }}
-              </span>
-            </span>
-            <craft-badge fill="green" size="small">
-              {{ t('Approved previously') }}
-            </craft-badge>
-          </li>
-        </ul>
-        <ul
-          v-if="group.remainingReviewers.length"
+          v-for="section in reviewerSections(
+            group.approvedReviewers,
+            group.carriedReviewers,
+            group.remainingReviewers
+          )"
+          v-show="section.reviewers.length"
+          :key="section.label"
           class="workflow-user-review-summary__reviewers"
         >
           <li
-            v-for="reviewer in group.remainingReviewers"
+            v-for="reviewer in section.reviewers"
             :key="reviewer.name"
             class="workflow-user-review-summary__reviewer-row"
           >
@@ -170,8 +129,8 @@
                 {{ reviewer.name }}
               </span>
             </span>
-            <craft-badge fill="orange" size="small">
-              {{ t('Pending') }}
+            <craft-badge :fill="section.fill" size="small">
+              {{ section.label }}
             </craft-badge>
           </li>
         </ul>
diff --git a/resources/js/pages/content/Edit.vue b/resources/js/pages/content/Edit.vue
index 97df5e9d153..f890c9d7887 100644
--- a/resources/js/pages/content/Edit.vue
+++ b/resources/js/pages/content/Edit.vue
@@ -19,8 +19,7 @@
     sectionHandle: string | null;
   }>();
 
-  const isSlideout = useIsSlideout();
-  const editor = isSlideout ? ElementEditor : ElementEditScreen;
+  const editor = useIsSlideout() ? ElementEditor : ElementEditScreen;
 
   // What `entries/save-entry` needs to resolve the entry it's saving. The
   // field layout and meta fields are collected by the pipeline itself.

From ad0ad0ba335375be127e37c8fee1ce84ce2e0fb6 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 17:36:08 +0200
Subject: [PATCH 12/32] Handle missing workflow payloads

Amp-Thread-ID: https://ampcode.com/threads/T-01a0b453-2312-7449-85a8-354bc59d1f1a
---
 .../composables/useElementEditor.test.ts      | 10 ++++++++
 .../elements/composables/useElementEditor.ts  | 23 +++++++++++++++----
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/resources/js/modules/elements/composables/useElementEditor.test.ts b/resources/js/modules/elements/composables/useElementEditor.test.ts
index 7f5dacc148d..729a8ca6f5c 100644
--- a/resources/js/modules/elements/composables/useElementEditor.test.ts
+++ b/resources/js/modules/elements/composables/useElementEditor.test.ts
@@ -209,6 +209,16 @@ describe('useElementEditor', () => {
     expect(editor.activityTimelineVersion.value).toBe(1);
   });
 
+  it('supplies an empty workflow payload when a visit omits workflow data', () => {
+    const {editor} = mount(payload({workflow: undefined as never}));
+
+    expect(editor.props.workflow).toEqual({
+      convertedToDraft: false,
+      current: null,
+      draftReviews: [],
+    });
+  });
+
   it.each(['pending', 'approved'] as const)(
     'locks a %s workflow review until editing is explicitly started',
     async (status) => {
diff --git a/resources/js/modules/elements/composables/useElementEditor.ts b/resources/js/modules/elements/composables/useElementEditor.ts
index 37c435a0992..5ae768921d5 100644
--- a/resources/js/modules/elements/composables/useElementEditor.ts
+++ b/resources/js/modules/elements/composables/useElementEditor.ts
@@ -126,12 +126,22 @@ export interface ElementEditPayload {
   };
 }
 
+type IncomingElementEditPayload = Omit<ElementEditPayload, 'workflow'> & {
+  workflow?: ElementEditPayload['workflow'];
+};
+
 export type ElementEditPayloadUpdater = (
   patch:
     | Partial<ElementEditPayload>
     | ((payload: ElementEditPayload) => Partial<ElementEditPayload>)
 ) => void;
 
+const emptyWorkflow = {
+  convertedToDraft: false,
+  current: null,
+  draftReviews: [],
+};
+
 /*
  * `origin/6.x` added an `isElementEditPayload()` guard here that threw when the
  * merged payload was missing any key. It is dropped rather than merged: this
@@ -176,10 +186,15 @@ export function useElementEditor({saveData}: Options = {}) {
   // an element with no drafts — does that without remounting this component, so
   // the title, notices, and timestamps below have to track the live payload.
   const props = toReactive(
-    computed(() => ({
-      ...(pageProps() as unknown as ElementEditPayload),
-      ...savedScreen.value,
-    }))
+    computed(() => {
+      const page = pageProps() as unknown as IncomingElementEditPayload;
+
+      return {
+        ...page,
+        ...savedScreen.value,
+        workflow: savedScreen.value?.workflow ?? page.workflow ?? emptyWorkflow,
+      };
+    })
   );
 
   const editingReviewedDraft = shallowRef(false);

From 1c2e8e67c4367aff6a00433241ddecd08c6e2686 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 21:00:08 +0200
Subject: [PATCH 13/32] Align workflow review headings

Amp-Thread-ID: https://ampcode.com/threads/T-01a0baf0-66a0-7450-a82d-e45af7ad22a5
---
 resources/js/modules/workflows/components/Run.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/resources/js/modules/workflows/components/Run.vue b/resources/js/modules/workflows/components/Run.vue
index e3900ae2348..6e9898064bb 100644
--- a/resources/js/modules/workflows/components/Run.vue
+++ b/resources/js/modules/workflows/components/Run.vue
@@ -29,7 +29,7 @@
       align="start"
       class="workflow-review-run__heading"
     >
-      <strong>{{ t('Review {number}', {number}) }}</strong>
+      <strong slot="prefix">{{ t('Review {number}', {number}) }}</strong>
       <span slot="suffix" class="workflow-review-run__status">
         <craft-status
           :status="run.statusIndicator"
@@ -95,6 +95,7 @@
 
   .workflow-review-run__status {
     display: flex;
+    margin-inline-start: auto;
     align-items: center;
     gap: var(--c-spacing-xs);
     color: var(--c-text-quiet);

From edc6c096b1ae8ad7b3ecbb9bdf3fdfd844a7ad36 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 22:18:53 +0200
Subject: [PATCH 14/32] Fix workflow stage timeline ending

Amp-Thread-ID: https://ampcode.com/threads/T-01a0bb4d-3362-73bc-8a84-3bd15be4bcb1
---
 resources/js/modules/workflows/components/Stage.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/resources/js/modules/workflows/components/Stage.vue b/resources/js/modules/workflows/components/Stage.vue
index c1352218b26..758f2dc4bd5 100644
--- a/resources/js/modules/workflows/components/Stage.vue
+++ b/resources/js/modules/workflows/components/Stage.vue
@@ -66,10 +66,7 @@
         <li v-for="(event, eventIndex) in stage.events" :key="event.id">
           <TimelineItem
             :event="event"
-            :last="
-              eventIndex === stage.events.length - 1 &&
-              stage.summaryComponent === null
-            "
+            :last="eventIndex === stage.events.length - 1"
           />
         </li>
       </ol>

From 21f8ad81833dc4b2cc8a89012d30b3ae10ee1255 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 22:18:55 +0200
Subject: [PATCH 15/32] Correct approval workflow documentation

Amp-Thread-ID: https://ampcode.com/threads/T-01a0bb4d-3362-73bc-8a84-3bd15be4bcb1
---
 docs/workflows.md | 63 +++++++++++++++++++++++++----------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 058552fe9e9..4d76ae40afe 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -2,7 +2,7 @@
 
 Approval workflows control when changes to an entry may be published. A workflow is an ordered list of stages assigned to a section. When an author submits a draft for review, Craft evaluates each stage in sequence and only allows the approved draft to be applied after every stage has approved it.
 
-Workflows require Craft Pro.
+Workflows require Craft Pro or Enterprise.
 
 ## How workflows work
 
@@ -16,7 +16,7 @@ When an enabled entry has a workflow:
 4. An approved stage advances the run to the next stage. A pending stage waits for an external decision, and a failed stage ends the run with changes requested.
 5. After every stage approves, an authorized user can apply the draft to the canonical entry.
 
-Disabled entries can be created and saved canonically without review. Enabling one routes the save into a draft and starts the workflow process.
+Disabled entries can be created and saved canonically without review. Enabling one routes the save into a draft, which can then be submitted for review.
 
 ```mermaid
 stateDiagram-v2
@@ -40,7 +40,7 @@ Stages are evaluated in their configured order. Craft evaluates a stage when the
 | `Approved` | Continue to the next stage, or approve the run if this is the last one. |
 | `Failed`   | Stop the run with changes requested.                                    |
 
-The built-in **User review** stage waits for approval from members of its configured user groups. It can require one or more approvals. The draft author cannot review their own work, and each reviewer can decide only once per run.
+The built-in **User review** stage waits for approval from members of its configured user groups. It can require one or more approvals. The draft author cannot review their own work, and each reviewer can decide only once per stage in a run.
 
 ### Runs use a configuration snapshot
 
@@ -66,7 +66,7 @@ Applying an approved draft validates the current element state before publishing
 
 ### Permissions and write boundaries
 
-Workflow actions also enforce the existing element `view`, `save`, and `saveCanonical` authorization rules. Approval override is currently restricted to administrators.
+Submitting a draft requires `save` authorization, commenting requires `view` authorization, and applying an approved draft requires both `save` and `saveCanonical` authorization. Approval override is currently restricted to administrators.
 
 The control panel and other user-facing HTTP saves route workflow-controlled canonical changes into drafts. Craft does not globally intercept low-level element writes from plugins, console commands, or other trusted application code. Code that writes elements directly is responsible for choosing whether to create a draft or intentionally update the canonical element.
 
@@ -124,12 +124,13 @@ Registered types appear in the stage type selector when an administrator configu
 
 `WorkflowStageContext` gives a stage the state needed to make its decision:
 
-| Property  | Description                                                    |
-| --------- | -------------------------------------------------------------- |
-| `draft`   | The named draft under review.                                  |
-| `run`     | The current `WorkflowRun` model.                                |
-| `stage`   | The snapshotted `WorkflowStageData` for this stage.             |
-| `payload` | Stage-owned data persisted from its previous result in the run. |
+| Property         | Description                                                           |
+| ---------------- | --------------------------------------------------------------------- |
+| `draft`          | The named draft under review.                                         |
+| `run`            | The current `WorkflowRun` model.                                      |
+| `stage`          | The snapshotted `WorkflowStageData` for this stage.                    |
+| `payload`        | Stage-owned data persisted from its previous result in the run.        |
+| `previousStages` | The preceding snapshotted stages and the payload stored for each one. |
 
 `evaluate()` returns a `WorkflowStageResult` containing a `WorkflowStageStatus`, a human-readable message, and the next payload. Payloads must contain JSON-encodable values. Craft stores each payload under the stage UID, isolating one stage's state from the others.
 
@@ -220,7 +221,7 @@ $run = Workflows::reportStageResult(
 );
 ```
 
-The callback receives a fresh context while Craft holds the workflow lock. This lets the integration compare external identifiers with current payload state without a read-then-write race. `reportStageResult()` only changes a run when the supplied stage is still its current pending stage; stale responses do not advance a newer run or stage.
+The callback receives the current run, stage, and payload while Craft holds the workflow lock. This lets the integration compare external identifiers with current payload state without a read-then-write race. `reportStageResult()` only changes a run when the supplied stage is still its current pending stage; stale responses do not advance a newer run or stage.
 
 Authenticate and authorize webhook or control panel endpoints before calling the facade. `reportStageResult()` protects workflow consistency, but it does not establish whether an incoming caller is trusted.
 
@@ -261,21 +262,22 @@ public function summaryProps(WorkflowStageContext $context, CraftUser $viewer):
 Register those components from the plugin's control panel JavaScript entry point:
 
 ```typescript
-import Cp from '@/bootstrap/cp';
 import ExternalApprovalActions from './ExternalApprovalActions.vue';
 import ExternalApprovalSummary from './ExternalApprovalSummary.vue';
 
-Cp.$components.register(
-  'acme:external-approval-actions',
-  ExternalApprovalActions
-);
-Cp.$components.register(
-  'acme:external-approval-summary',
-  ExternalApprovalSummary
-);
+Cp.booting((cp) => {
+  cp.$components.register(
+    'acme:external-approval-actions',
+    ExternalApprovalActions
+  );
+  cp.$components.register(
+    'acme:external-approval-summary',
+    ExternalApprovalSummary
+  );
+});
 ```
 
-Use a plugin-prefixed component name to avoid collisions. `actionProps()` and `summaryProps()` must return JSON-safe values because they are sent to the control panel.
+Register the components before the Inertia application mounts. Use a plugin-prefixed component name to avoid collisions. `actionProps()` and `summaryProps()` must return JSON-safe values because they are sent to the control panel.
 
 Craft passes the action component its configured action props together with `review`, `elementType`, `elementId`, `draftId`, and `siteId`. After a successful action, emit `reviewUpdated` with the updated workflow review data and editor actions returned by the endpoint. Craft passes a summary component its configured summary props together with the containing `run` and `stage`.
 
@@ -289,13 +291,13 @@ Plugin action endpoints remain responsible for authorization and input validatio
 
 ## Listening for workflow activity
 
-Craft dispatches lifecycle events for plugins that need to enforce policy or react to completed activity.
+Craft dispatches lifecycle events for plugins that need to enforce policy or react to completed activity. Event coverage depends on the transition:
 
-| Event                   | Timing                                                    |
-| ----------------------- | --------------------------------------------------------- |
-| `WorkflowTransitioning` | Synchronously before a transition; may cancel it.         |
-| `WorkflowTransitioned`  | After the transaction commits successfully.               |
-| `WorkflowCommented`     | After a workflow comment's transaction commits.           |
+| Event                   | Timing                                                                                                                                                    |
+| ----------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `WorkflowTransitioning` | Synchronously before `Submit`, `Override`, `Approve`, or `Reject`; may cancel the transition.                                                             |
+| `WorkflowTransitioned`  | After commit for those transitions, invalidation, and an `Approved` or `Failed` result reported for an asynchronous stage through `reportStageResult()`. |
+| `WorkflowCommented`     | After a workflow comment's transaction commits.                                                                                                          |
 
 Set `$event->cancel = true` in a `WorkflowTransitioning` listener to prevent the transition. Keep pre-transition listeners synchronous and side-effect free, because the surrounding transaction can still roll back. Use `WorkflowTransitioned` for notifications and other effects that should happen only after a successful commit.
 
@@ -305,23 +307,24 @@ use CraftCms\Cms\Workflow\Events\WorkflowTransitioning;
 use Illuminate\Support\Facades\Event;
 
 Event::listen(function (WorkflowTransitioning $event): void {
-    if ($event->transition !== WorkflowTransition::Publish) {
+    if ($event->transition !== WorkflowTransition::Submit) {
         return;
     }
 
-    if (! $this->releaseWindow->isOpen()) {
+    if (! $this->reviewWindow->isOpen()) {
         $event->cancel = true;
     }
 });
 ```
 
-Transitions are represented by `WorkflowTransition`: `Submit`, `Override`, `Approve`, `Reject`, `StageApproved`, `StageFailed`, `Invalidate`, and `Publish`. Comments are deliberately separate because adding a comment does not change workflow state.
+Transitions and workflow activity use `WorkflowTransition`: `Submit`, `Override`, `Approve`, `Reject`, `StageApproved`, `StageFailed`, `Invalidate`, and `Publish`. Applying an approved draft records `Publish` activity but does not dispatch a workflow lifecycle event. Automatic stage results evaluated synchronously while submitting or advancing a run also record activity without dispatching a separate lifecycle event. Comments are separate because adding a comment does not change workflow state.
 
 ## Supporting another element type
 
 Entries provide Craft's built-in workflow assignment UI. A plugin-owned element type can opt into the workflow runtime by implementing `WorkflowableInterface`:
 
 ```php
+use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Workflow\Contracts\WorkflowableInterface;
 use CraftCms\Cms\Workflow\Models\Workflow;
 

From 4481d6e2a37513394da18045f2fd27db26531944 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 22:23:58 +0200
Subject: [PATCH 16/32] Fix workflow comment test after rebase

Amp-Thread-ID: https://ampcode.com/threads/T-01a0bb4b-7225-75be-a59b-49f9cdd46419
---
 tests/Feature/Workflow/WorkflowsTest.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index fc3aa7ad068..2b37d82c293 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -30,8 +30,6 @@
 use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
 use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
 use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
-use CraftCms\Cms\Workflow\Events\WorkflowCommented;
-use CraftCms\Cms\Workflow\Events\WorkflowTransitioned;
 use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
 use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
@@ -45,7 +43,6 @@
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Event;
 use Inertia\Testing\AssertableInertia;
 use Workbench\App\Workflow\AutomaticApprovalStage;
 
@@ -443,11 +440,8 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     expect($review->canComment)->toBeTrue()
         ->and($review->actionProps['canReview'])->toBeFalse();
 
-    Event::fake([WorkflowCommented::class, WorkflowTransitioned::class]);
     actAs($viewer, fn () => $this->workflows->addComment($this->draft, $run->id, $stage->uid, 'A useful note.'));
     expect(workflowEvents($this->entry, WorkflowActivityType::Comment))->toHaveCount(1);
-    Event::assertDispatched(WorkflowCommented::class);
-    Event::assertNotDispatched(WorkflowTransitioned::class);
 });
 
 it('invalidates pending and approved runs when publishable content changes', function () {

From 43b31b233575d9bfbed46fdbd2853483556b2a3e Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 22:39:04 +0200
Subject: [PATCH 17/32] Fix workflow CI regressions

Amp-Thread-ID: https://ampcode.com/threads/T-01a0bb4b-7225-75be-a59b-49f9cdd46419
---
 resources/js/pages/settings/workflows/Edit.vue  | 17 +++++++++++++++--
 .../Settings/UserFieldsControllerTest.php       |  6 ++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/resources/js/pages/settings/workflows/Edit.vue b/resources/js/pages/settings/workflows/Edit.vue
index 0d9fe641021..8aea4d43f23 100644
--- a/resources/js/pages/settings/workflows/Edit.vue
+++ b/resources/js/pages/settings/workflows/Edit.vue
@@ -6,10 +6,23 @@
   import WorkflowStagesInput from '@/modules/workflows/components/WorkflowStagesInput.vue';
   import FormPage from '@/pages/Form.vue';
 
-  type Props = CraftCms.Cms.Http.ViewModels.WorkflowEditViewModel;
   type WorkflowStage = CraftCms.Cms.Workflow.Data.WorkflowStageData;
+  type StageType =
+    CraftCms.Cms.Http.ViewModels.WorkflowEditViewModel['stageTypes'][number];
 
-  const props = defineProps<Props>();
+  const props = defineProps<{
+    form: CraftCms.Cms.Form.FormPayload;
+    stageTypes: StageType[];
+    submit: {
+      method: 'patch' | 'post';
+      url: string;
+    };
+    deleteAction: {
+      confirm: string;
+      label: string;
+      url: string;
+    } | null;
+  }>();
   const formPayload = props.form as unknown as FormPayload;
   const actions: ActionItem[] = props.deleteAction
     ? [
diff --git a/tests/Feature/Http/Controllers/Settings/UserFieldsControllerTest.php b/tests/Feature/Http/Controllers/Settings/UserFieldsControllerTest.php
index cdb1ca42627..832f25f34a1 100644
--- a/tests/Feature/Http/Controllers/Settings/UserFieldsControllerTest.php
+++ b/tests/Feature/Http/Controllers/Settings/UserFieldsControllerTest.php
@@ -75,6 +75,8 @@
 });
 
 it('rejects reserved field handles', function () {
+    $fieldUid = Str::uuid()->toString();
+
     post(action([UserFieldsController::class, 'store']), [
         'fieldLayout' => json_encode([
             'uid' => Str::uuid()->toString(),
@@ -93,11 +95,11 @@
         ]),
         'generatedFields' => [
             [
-                'uid' => Str::uuid()->toString(),
+                'uid' => $fieldUid,
                 'name' => 'Username',
                 'handle' => 'username',
                 'template' => '',
             ],
         ],
-    ])->assertSessionHas('error');
+    ])->assertSessionHasErrors("generatedFields.$fieldUid.handle");
 });

From 4d7925ce5ee00cdb9d888c3b1c4cbd38746864d8 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sat, 19 Sep 2026 22:47:48 +0200
Subject: [PATCH 18/32] Make workflow assertions database agnostic

Amp-Thread-ID: https://ampcode.com/threads/T-01a0bb4b-7225-75be-a59b-49f9cdd46419
---
 tests/Feature/Workflow/WorkflowsTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index 2b37d82c293..ff15a2081bb 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -199,7 +199,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
             'uid' => $stageUid,
             'name' => 'Editorial',
             'type' => UserReviewStage::class,
-        ])->and($stage->settings)->toBe([
+        ])->and($stage->settings)->toMatchArray([
             'approvalsRequired' => 1,
             'userGroups' => [$group->uid],
         ])->and($this->draft->workflow()?->is($workflow))->toBeTrue();
@@ -261,7 +261,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
 
     expect($completed->status)->toBe(WorkflowStatus::Approved)
         ->and($completed->currentStageResult)->toBe('Automated check approved')
-        ->and($completed->payload[$workflow->stages->sole()->uid])->toBe([
+        ->and($completed->payload[$workflow->stages->sole()->uid])->toMatchArray([
             'evaluations' => 1,
             'summary' => 'No issues found.',
         ]);

From 886f8ccffa240338f740ded6b73f5cee657bbaaf Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sun, 20 Sep 2026 19:56:02 +0200
Subject: [PATCH 19/32] Update nav order

---
 src/Cp/Settings.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/Cp/Settings.php b/src/Cp/Settings.php
index 724f80cf4a6..d457859ccdc 100644
--- a/src/Cp/Settings.php
+++ b/src/Cp/Settings.php
@@ -121,21 +121,18 @@ public function all(): array
             'iconName' => 'light/files',
             'label' => t('Entry Types'),
         ];
-        $settings[$label]['assets'] = [
-            'iconName' => 'light/image',
-            'label' => t('Assets'),
-        ];
 
-        // CONFLICT-REVIEW: 6.x moved "Assets" out of the "Media" section into "Content"
-        // between "Entry Types" and "Fields"; this branch added "Workflows" in that same
-        // spot. Both are kept, with "Assets" left directly after "Entry Types" to preserve
-        // 6.x's ordering and "Workflows" ahead of "Fields". Confirm the intended nav order.
         if (Edition::isAtLeast(Edition::Pro)) {
             $settings[$label]['workflows'] = [
                 'iconName' => 'light/clipboard-list-check',
                 'label' => t('Workflows'),
             ];
         }
+        
+        $settings[$label]['assets'] = [
+            'iconName' => 'light/image',
+            'label' => t('Assets'),
+        ];
 
         $settings[$label]['fields'] = [
             'iconName' => 'light/pen-to-square',

From 6aae3321ebedd30bcd82a2447d9b4e464fd29da7 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Sun, 20 Sep 2026 22:04:54 +0200
Subject: [PATCH 20/32] whitespace

---
 src/Cp/Settings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cp/Settings.php b/src/Cp/Settings.php
index d457859ccdc..0af5e5f9e9e 100644
--- a/src/Cp/Settings.php
+++ b/src/Cp/Settings.php
@@ -128,7 +128,7 @@ public function all(): array
                 'label' => t('Workflows'),
             ];
         }
-        
+
         $settings[$label]['assets'] = [
             'iconName' => 'light/image',
             'label' => t('Assets'),

From 6e0de289e5fcc180b798457cf1238d55363d59ba Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Mon, 21 Sep 2026 15:52:27 -0700
Subject: [PATCH 21/32] Bump the schema version

---
 src/Cms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Cms.php b/src/Cms.php
index fa78bab28e5..7038ccb6f73 100644
--- a/src/Cms.php
+++ b/src/Cms.php
@@ -29,7 +29,7 @@
 
     public const string VERSION = '6.0.0-alpha.18';
 
-    public const string SCHEMA_VERSION = '6.0.0.15';
+    public const string SCHEMA_VERSION = '6.0.0.16';
 
     public const string MIN_VERSION_REQUIRED = '5.9.0';
 

From afc18d6b49d19d5871a1f9a154abcef1a3762c03 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 08:46:40 +0200
Subject: [PATCH 22/32] Fix asset index CI test after merge

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../Http/Controllers/Assets/IndexControllerTest.php        | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/Http/Controllers/Assets/IndexControllerTest.php b/tests/Feature/Http/Controllers/Assets/IndexControllerTest.php
index c44e83b0d1f..932271aeaa7 100644
--- a/tests/Feature/Http/Controllers/Assets/IndexControllerTest.php
+++ b/tests/Feature/Http/Controllers/Assets/IndexControllerTest.php
@@ -401,14 +401,17 @@
         ->assertJsonFragment(['id' => $nestedAsset->id]);
 });
 
-it('offers descendant search for the implicitly selected default volume', function () {
+it('offers descendant search for a volume root', function () {
     $volumeModel = Volume::factory()->create([
         'fs' => 'test-disk',
         'handle' => 'testvolume',
     ]);
     Folders::ensureFolderByFullPathAndVolume('child', Volumes::getVolumeById($volumeModel->id));
 
-    get(route('craft.cp.assets.index', ['search' => 'needle']), ['X-Inertia' => 'true'])
+    get(route('craft.cp.assets.index', [
+        'defaultSource' => $volumeModel->handle,
+        'search' => 'needle',
+    ]), ['X-Inertia' => 'true'])
         ->assertOk()
         ->assertJsonPath('props.source.key', "volume:{$volumeModel->uid}")
         ->assertJsonPath('props.canSearchSubfolders', true);

From b95716a2bb9717d48812be3b99e68a2e5996400a Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 09:58:40 +0200
Subject: [PATCH 23/32] Improve workflow settings index

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../js/pages/settings/workflows/Index.vue     | 89 ++++++++++++++++---
 .../Settings/WorkflowsController.php          | 36 ++++++--
 tests/Feature/Workflow/WorkflowsTest.php      | 64 +++++++++++++
 3 files changed, 170 insertions(+), 19 deletions(-)

diff --git a/resources/js/pages/settings/workflows/Index.vue b/resources/js/pages/settings/workflows/Index.vue
index b0776627ab7..11011328432 100644
--- a/resources/js/pages/settings/workflows/Index.vue
+++ b/resources/js/pages/settings/workflows/Index.vue
@@ -1,14 +1,26 @@
 <script setup lang="ts">
   import {t} from '@craftcms/ui';
-  import {Link, router} from '@inertiajs/vue3';
+  import {router} from '@inertiajs/vue3';
   import {getCoreRowModel, useVueTable} from '@tanstack/vue-table';
-  import {computed, h} from 'vue';
+  import {computed, h, ref} from 'vue';
+  import CpContainer from '@/common/components/CpContainer.vue';
+  import CpLink from '@/common/components/CpLink.vue';
   import LayoutSlot from '@/common/components/LayoutSlot.vue';
+  import {useAppLayout} from '@/common/composables/useAppLayout';
+  import type {PaginationData, SortItem} from '@/common/types';
   import Empty from '@/common/components/Empty.vue';
   import AdminTable from '@/modules/admin-table/components/AdminTable.vue';
   import DeleteButton from '@/modules/admin-table/components/DeleteButton.vue';
+  import SearchForm from '@/modules/admin-table/components/SearchForm.vue';
+  import {useServerPagination} from '@/modules/admin-table/composables/useServerPagination';
+  import {useServerSort} from '@/modules/admin-table/composables/useServerSort';
   import {createCraftColumnHelper} from '@/modules/admin-table/helpers/createCraftColumnHelper';
-  import {create, destroy, edit} from '@actions/Settings/WorkflowsController';
+  import {
+    create,
+    destroy,
+    edit,
+    index,
+  } from '@actions/Settings/WorkflowsController';
 
   interface Workflow {
     id: number;
@@ -17,16 +29,26 @@
   }
 
   const props = defineProps<{
-    workflows: Workflow[];
+    title: string;
+    data: Workflow[];
+    pagination: PaginationData;
+    sort: SortItem[];
+    searchTerm?: string;
     readOnly: boolean;
   }>();
+  const searchTerm = ref(props.searchTerm ?? '');
+
+  useAppLayout({title: props.title, form: null});
   const columnHelper = createCraftColumnHelper<Workflow>();
   const columns = computed(() => [
     columnHelper.link('name', {
       header: t('Name'),
       props: ({row}) => ({href: edit({workflow: row.original.id}).url}),
     }),
-    columnHelper.accessor('stages', {header: t('Stages')}),
+    columnHelper.accessor('stages', {
+      header: t('Stages'),
+      enableSorting: false,
+    }),
     columnHelper.actions(({row}) => [
       h(DeleteButton, {
         confirm: t('Are you sure you want to delete “{name}”?', {
@@ -36,38 +58,79 @@
       }),
     ]),
   ]);
+
+  const {paginationState, paginationConfig} = useServerPagination({
+    initialState: props.pagination,
+    onChange: ({query}) => {
+      router.visit(index({}, {query}), {
+        only: ['data', 'pagination'],
+        preserveScroll: true,
+      });
+    },
+  });
+  const {sortingState, sortingConfig} = useServerSort({
+    initialState: props.sort,
+    onChange: ({query}) => {
+      router.visit(index({}, {query}), {
+        only: ['data', 'sort'],
+        preserveScroll: true,
+      });
+    },
+  });
   const table = useVueTable<Workflow>({
     get data() {
-      return props.workflows;
+      return props.data;
     },
     get columns() {
       return columns.value;
     },
     state: {
+      get pagination() {
+        return paginationState.value;
+      },
+      get sorting() {
+        return sortingState.value;
+      },
       get columnVisibility() {
         return {actions: !props.readOnly};
       },
     },
-    enableSorting: false,
     getCoreRowModel: getCoreRowModel<Workflow>(),
+    ...paginationConfig,
+    ...sortingConfig,
   });
 </script>
 
 <template>
-  <LayoutSlot v-if="!readOnly" name="actions">
-    <Link as="craft-button" :href="create().url" variant="primary" icon="plus">
+  <LayoutSlot v-if="!readOnly" name="content-actions">
+    <CpLink
+      :href="create().url"
+      variant="accent"
+      appearance="button"
+      icon="plus"
+    >
       {{ t('New workflow') }}
-    </Link>
+    </CpLink>
   </LayoutSlot>
 
-  <craft-pane padding="0" appearance="raised">
-    <AdminTable :table="table" :reorderable="false">
+  <CpContainer>
+    <AdminTable
+      :table="table"
+      :reorderable="false"
+      :from="pagination.from"
+      :to="pagination.to"
+      :total="pagination.total"
+      :enable-adjust-page-size="true"
+    >
       <template #empty-row>
         <Empty
           icon="light/clipboard-list-check"
           :label="t('No approval workflows exist yet.')"
         />
       </template>
+      <template #table-header>
+        <SearchForm :action="index()" v-model="searchTerm" />
+      </template>
     </AdminTable>
-  </craft-pane>
+  </CpContainer>
 </template>
diff --git a/src/Http/Controllers/Settings/WorkflowsController.php b/src/Http/Controllers/Settings/WorkflowsController.php
index 8ea19b894a3..26d7ca479ab 100644
--- a/src/Http/Controllers/Settings/WorkflowsController.php
+++ b/src/Http/Controllers/Settings/WorkflowsController.php
@@ -4,11 +4,14 @@
 
 namespace CraftCms\Cms\Http\Controllers\Settings;
 
+use CraftCms\Cms\Cms;
 use CraftCms\Cms\Config\GeneralConfig;
+use CraftCms\Cms\Http\Requests\TableRequest;
 use CraftCms\Cms\Http\Requests\WorkflowRequest;
 use CraftCms\Cms\Http\RespondsWithFlash;
 use CraftCms\Cms\Http\Responses\CpScreenResponse;
 use CraftCms\Cms\Http\ViewModels\WorkflowEditViewModel;
+use CraftCms\Cms\Support\Arr;
 use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\Cms\Workflow\Workflows;
@@ -29,8 +32,26 @@ public function __construct(
         $this->readOnly = ! $generalConfig->allowAdminChanges;
     }
 
-    public function index(): CpScreenResponse
+    public function index(TableRequest $request): CpScreenResponse
     {
+        $searchTerm = trim($request->search() ?? '');
+        $pageParam = Cms::config()->getPageTriggerParam();
+        $paginator = Workflow::query()
+            ->when($searchTerm !== '', fn ($query) => $query->where('name', 'like', "%{$searchTerm}%"))
+            ->orderBy('name', $request->sortDir() === SORT_DESC ? 'desc' : 'asc')
+            ->paginate($request->limit(), ['*'], $pageParam, $request->page())
+            ->appends($request->except($pageParam));
+        $pagination = Arr::only($paginator->toArray(), [
+            'total',
+            'per_page',
+            'current_page',
+            'last_page',
+            'next_page_url',
+            'prev_page_url',
+            'from',
+            'to',
+        ]);
+
         return new CpScreenResponse()
             ->title(t('Workflows'))
             ->crumbs([
@@ -38,14 +59,15 @@ public function index(): CpScreenResponse
                 ['label' => t('Workflows')],
             ])
             ->inertiaPage('settings/workflows/Index', [
-                'workflows' => Workflow::query()
-                    ->orderBy('name')
-                    ->get()
+                'searchTerm' => $request->search(),
+                'sort' => $request->sort(),
+                'data' => fn () => $paginator->getCollection()
                     ->map(fn (Workflow $workflow): array => [
                         'id' => $workflow->id,
                         'name' => $workflow->name,
                         'stages' => $workflow->stages->count(),
                     ]),
+                'pagination' => fn () => $pagination,
                 'readOnly' => $this->readOnly,
             ]);
     }
@@ -90,7 +112,8 @@ private function save(WorkflowRequest $request, Workflow $workflow): Response
 
         return $this->asSuccess(
             t('Workflow saved.'),
-            redirect: action([self::class, 'edit'], $workflow->id),
+            redirect: $this->getPostedRedirectUrl($workflow)
+                ?? action([self::class, 'edit'], $workflow->id),
         );
     }
 
@@ -105,6 +128,7 @@ private function form(Workflow $workflow): CpScreenResponse
             ->inertiaPage('settings/workflows/Edit', app(WorkflowEditViewModel::class, [
                 'workflow' => $workflow,
                 'readOnly' => $this->readOnly,
-            ]));
+            ]))
+            ->redirectUrl('settings/workflows');
     }
 }
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index ff15a2081bb..075ddb51714 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -5,6 +5,7 @@
 use CraftCms\Cms\Activity\Data\ActivityActor;
 use CraftCms\Cms\Activity\Data\ActivitySubject;
 use CraftCms\Cms\Activity\Models\ActivityEvent;
+use CraftCms\Cms\Cms;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Edition;
 use CraftCms\Cms\Element\Contracts\ElementInterface;
@@ -19,6 +20,7 @@
 use CraftCms\Cms\Support\Facades\Elements;
 use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Str;
+use CraftCms\Cms\Support\Url;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\User\Models\User as UserModel;
 use CraftCms\Cms\User\Models\UserGroup;
@@ -42,6 +44,7 @@
 use CraftCms\Cms\Workflow\WorkflowStageTypes;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Inertia\Testing\AssertableInertia;
 use Workbench\App\Workflow\AutomaticApprovalStage;
@@ -49,6 +52,7 @@
 use function Pest\Laravel\actingAs;
 use function Pest\Laravel\delete;
 use function Pest\Laravel\get;
+use function Pest\Laravel\patch;
 use function Pest\Laravel\postJson;
 
 class TestAutomatedWorkflowStage extends BaseWorkflowStage
@@ -669,6 +673,66 @@ function (ElementInterface $draft) use (&$applied): ElementInterface {
             ->etc());
 });
 
+it('returns to the workflow index unless saving and continuing', function () {
+    $workflow = workflowFor($this->entry, [automatedStage('Review', 'pending')]);
+    $editUrl = action([WorkflowsController::class, 'edit'], $workflow);
+    $payload = [
+        'name' => 'Updated workflow',
+        'stages' => $workflow->stages->map->getConfig()->all(),
+    ];
+
+    patch(action([WorkflowsController::class, 'update'], $workflow), [
+        ...$payload,
+        'redirect' => Crypt::encrypt('settings/workflows'),
+    ])->assertRedirect(Url::cpUrl('settings/workflows'));
+
+    $workflow->refresh();
+    patch(action([WorkflowsController::class, 'update'], $workflow), $payload)
+        ->assertRedirect($editUrl);
+});
+
+it('filters sorts and paginates the workflow settings index', function () {
+    Workflow::query()->create([
+        'name' => 'Alpha review',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [
+            [
+                ...automatedStage('Review', 'pending'),
+                'uid' => Str::uuid7()->toString(),
+            ],
+        ],
+    ]);
+    Workflow::query()->create([
+        'name' => 'Beta review',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [],
+    ]);
+    Workflow::query()->create([
+        'name' => 'Ignored release',
+        'uid' => Str::uuid7()->toString(),
+        'stages' => [],
+    ]);
+
+    get(action([WorkflowsController::class, 'index'], [
+        'search' => 'review',
+        'sort' => [['field' => 'name', 'direction' => 'desc']],
+        'per_page' => 1,
+        Cms::config()->getPageTriggerParam() => 2,
+    ]))
+        ->assertOk()
+        ->assertInertia(fn (AssertableInertia $page) => $page
+            ->where('searchTerm', 'review')
+            ->where('sort.0.field', 'name')
+            ->where('sort.0.direction', 'desc')
+            ->where('pagination.total', 2)
+            ->where('pagination.per_page', 1)
+            ->where('pagination.current_page', 2)
+            ->has('data', 1)
+            ->where('data.0.name', 'Alpha review')
+            ->where('data.0.stages', 1)
+            ->etc());
+});
+
 /** @param list<array{name: string, type: string, settings: array<string, mixed>}> $stages */
 function workflowFor(Entry $entry, array $stages): Workflow
 {

From 200f3a342c93a0f335672182b41f48a8e7bcedd2 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 14:19:12 +0200
Subject: [PATCH 24/32] Improve workflow review lifecycle

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 docs/workflows.md                             |  59 ++---
 .../js/bootstrap/element-details-tabs.ts      |   2 +
 .../components/ElementDetailsTabs.test.ts     |  20 +-
 .../components/ElementDetailsTabs.vue         |  27 +-
 .../js/modules/workflows/components/Run.vue   | 121 +++++----
 .../components/WorkflowDefaultActions.vue     |  40 +--
 .../components/WorkflowDetailsActions.test.ts | 169 +++++++++++++
 .../components/WorkflowDetailsActions.vue     | 142 +++++++++++
 .../components/WorkflowDetailsTab.test.ts     |   3 +-
 .../components/WorkflowEditLockCallout.vue    |   2 +-
 .../components/WorkflowReviewPanel.test.ts    |  66 +++--
 resources/js/modules/workflows/register.ts    |   2 +
 .../user-review/WorkflowUserReviewActions.vue |  32 +--
 routes/cp.php                                 |   2 +
 .../Workflows/UserReviewController.php        |  45 +++-
 .../WorkflowTransitionsController.php         |   9 +
 src/Support/Facades/Workflows.php             |   1 +
 .../Activity/WorkflowActivityEvent.php        |   4 +-
 src/Workflow/Data/WorkflowReviewData.php      |  10 +-
 src/Workflow/Data/WorkflowRunStageData.php    |   4 +-
 src/Workflow/Enums/WorkflowActivityType.php   |   2 +
 src/Workflow/Enums/WorkflowTransition.php     |   2 +
 .../SendUserReviewNotifications.php           |   2 +-
 src/Workflow/UserReview/UserReviewStage.php   | 136 ++--------
 src/Workflow/UserReview/UserReviewState.php   |  12 +-
 .../UserReview/UserReviewStateMachine.php     | 238 ++++++++++++++++++
 src/Workflow/Workflows.php                    | 143 +++++++++--
 .../Feature/Workflow/UserReviewStageTest.php  |  24 +-
 tests/Feature/Workflow/WorkflowsTest.php      | 118 +++++++--
 29 files changed, 1055 insertions(+), 382 deletions(-)
 create mode 100644 resources/js/modules/workflows/components/WorkflowDetailsActions.test.ts
 create mode 100644 resources/js/modules/workflows/components/WorkflowDetailsActions.vue
 create mode 100644 src/Workflow/UserReview/UserReviewStateMachine.php

diff --git a/docs/workflows.md b/docs/workflows.md
index 4d76ae40afe..720b9503233 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -13,7 +13,7 @@ When an enabled entry has a workflow:
 1. Saving changes creates or updates a named draft instead of publishing directly to the canonical entry.
 2. The author submits the draft for review from its **Workflow** tab.
 3. Craft evaluates the first stage.
-4. An approved stage advances the run to the next stage. A pending stage waits for an external decision, and a failed stage ends the run with changes requested.
+4. An approved stage advances the run to the next stage. A pending stage waits for a decision. A reviewer who requests changes fails a user-review stage until someone requests another review.
 5. After every stage approves, an authorized user can apply the draft to the canonical entry.
 
 Disabled entries can be created and saved canonically without review. Enabling one routes the save into a draft, which can then be submitted for review.
@@ -23,24 +23,25 @@ stateDiagram-v2
     [*] --> NotSubmitted: Save draft
     NotSubmitted --> Pending: Request review
     Pending --> Pending: Stage awaits a result
-    Pending --> Failed: Stage fails
+    Pending --> Failed: Changes requested
     Pending --> Approved: All stages approve
-    Pending --> Invalidated: Draft or workflow changes
-    Approved --> Invalidated: Draft or workflow changes
-    Approved --> Published: Apply draft
+    Pending --> Invalidated: Workflow changes or manual restart
     Failed --> Pending: Request another review
+    Approved --> Pending: Draft changes reopen final stage
+    Approved --> Invalidated: Workflow changes or manual restart
+    Approved --> Published: Apply draft
     Invalidated --> Pending: Request another review
 ```
 
 Stages are evaluated in their configured order. Craft evaluates a stage when the run reaches it and whenever the stage reports new state. A stage returns one of three statuses:
 
-| Status     | Result                                                                       |
-| ---------- | ---------------------------------------------------------------------------- |
-| `Pending`  | Stop and wait at the current stage.                                    |
+| Status     | Result                                                                  |
+| ---------- | ----------------------------------------------------------------------- |
+| `Pending`  | Stop and wait at the current stage.                                     |
 | `Approved` | Continue to the next stage, or approve the run if this is the last one. |
 | `Failed`   | Stop the run with changes requested.                                    |
 
-The built-in **User review** stage waits for approval from members of its configured user groups. It can require one or more approvals. The draft author cannot review their own work, and each reviewer can decide only once per stage in a run.
+The built-in **User review** stage waits for approval from members of its configured user groups. It can require one or more approvals. The draft author cannot review their own work, and each reviewer can decide only once per stage until another review is requested. Requesting another review clears the current stage’s decisions but preserves approvals from earlier stages.
 
 ### Runs use a configuration snapshot
 
@@ -48,21 +49,23 @@ Submitting a draft creates a workflow run and stores a snapshot of the configure
 
 Editing an assigned workflow invalidates any pending or approved runs whose executable configuration changed. The draft must be submitted again to start a new run with the updated configuration. Names are descriptive and do not affect execution, so renaming a workflow or stage does not invalidate a run.
 
-### Invalidation
+### Draft changes and resets
+
+Changing publishable content does not restart a pending workflow. It clears approvals from the current user-review stage while preserving completed stages. External stage results can still arrive after the draft changes.
+
+If an approved draft changes, Craft reopens its final stage and clears that stage’s decisions. Earlier stages remain approved. The final stage is evaluated again, so an automated stage may approve immediately while a user-review stage waits for fresh approvals.
 
-An approval applies to the exact content that reviewers saw. Craft invalidates pending and approved runs when:
+An authorized editor can use **Restart workflow** to invalidate the current run and start a new run from the first stage. Workflow runs are also invalidated when:
 
-- the draft's publishable content changes;
-- nested content in the draft changes or is deleted;
 - the section's workflow assignment changes;
 - a stage's type, order, or settings change; or
 - the workflow is deleted.
 
-The draft remains available after invalidation and can be submitted again. Published runs and their activity history are retained.
+The draft remains available after invalidation. Published and invalidated runs and their activity history are retained.
 
-Drafts are locked in the editor while a review is pending or approved, preventing accidental changes from invalidating the review. An author can choose **Start editing** to unlock the draft; saving any publishable changes then invalidates the run and requires a new review.
+Drafts are initially locked in the editor while a review is pending or approved. An author can choose **Start editing** to unlock the draft without resetting completed stages.
 
-Applying an approved draft validates the current element state before publishing. If validation fails without changing the draft, the approval remains valid. Correcting publishable content changes the reviewed draft, so it invalidates the run and requires another review.
+Applying an approved draft validates the current element state before publishing. If validation fails without changing the draft, the approval remains valid. Correcting publishable content reopens the final stage.
 
 ### Permissions and write boundaries
 
@@ -128,8 +131,8 @@ Registered types appear in the stage type selector when an administrator configu
 | ---------------- | --------------------------------------------------------------------- |
 | `draft`          | The named draft under review.                                         |
 | `run`            | The current `WorkflowRun` model.                                      |
-| `stage`          | The snapshotted `WorkflowStageData` for this stage.                    |
-| `payload`        | Stage-owned data persisted from its previous result in the run.        |
+| `stage`          | The snapshotted `WorkflowStageData` for this stage.                   |
+| `payload`        | Stage-owned data persisted from its previous result in the run.       |
 | `previousStages` | The preceding snapshotted stages and the payload stored for each one. |
 
 `evaluate()` returns a `WorkflowStageResult` containing a `WorkflowStageStatus`, a human-readable message, and the next payload. Payloads must contain JSON-encodable values. Craft stores each payload under the stage UID, isolating one stage's state from the others.
@@ -262,17 +265,17 @@ public function summaryProps(WorkflowStageContext $context, CraftUser $viewer):
 Register those components from the plugin's control panel JavaScript entry point:
 
 ```typescript
-import ExternalApprovalActions from './ExternalApprovalActions.vue';
-import ExternalApprovalSummary from './ExternalApprovalSummary.vue';
+import ExternalApprovalActions from "./ExternalApprovalActions.vue";
+import ExternalApprovalSummary from "./ExternalApprovalSummary.vue";
 
 Cp.booting((cp) => {
   cp.$components.register(
-    'acme:external-approval-actions',
-    ExternalApprovalActions
+    "acme:external-approval-actions",
+    ExternalApprovalActions,
   );
   cp.$components.register(
-    'acme:external-approval-summary',
-    ExternalApprovalSummary
+    "acme:external-approval-summary",
+    ExternalApprovalSummary,
   );
 });
 ```
@@ -293,9 +296,9 @@ Plugin action endpoints remain responsible for authorization and input validatio
 
 Craft dispatches lifecycle events for plugins that need to enforce policy or react to completed activity. Event coverage depends on the transition:
 
-| Event                   | Timing                                                                                                                                                    |
-| ----------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `WorkflowTransitioning` | Synchronously before `Submit`, `Override`, `Approve`, or `Reject`; may cancel the transition.                                                             |
+| Event                   | Timing                                                                                                                                                   |
+| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `WorkflowTransitioning` | Synchronously before `Submit`, `Override`, `Approve`, `Reject`, `RequestReview`, or `Restart`; may cancel the transition.                                |
 | `WorkflowTransitioned`  | After commit for those transitions, invalidation, and an `Approved` or `Failed` result reported for an asynchronous stage through `reportStageResult()`. |
 | `WorkflowCommented`     | After a workflow comment's transaction commits.                                                                                                          |
 
@@ -317,7 +320,7 @@ Event::listen(function (WorkflowTransitioning $event): void {
 });
 ```
 
-Transitions and workflow activity use `WorkflowTransition`: `Submit`, `Override`, `Approve`, `Reject`, `StageApproved`, `StageFailed`, `Invalidate`, and `Publish`. Applying an approved draft records `Publish` activity but does not dispatch a workflow lifecycle event. Automatic stage results evaluated synchronously while submitting or advancing a run also record activity without dispatching a separate lifecycle event. Comments are separate because adding a comment does not change workflow state.
+Transitions and workflow activity use `WorkflowTransition`: `Submit`, `Override`, `Approve`, `Reject`, `RequestReview`, `Restart`, `StageApproved`, `StageFailed`, `Invalidate`, and `Publish`. Applying an approved draft records `Publish` activity but does not dispatch a workflow lifecycle event. Automatic stage results evaluated synchronously while submitting or advancing a run also record activity without dispatching a separate lifecycle event. Comments are separate because adding a comment does not change workflow state.
 
 ## Supporting another element type
 
diff --git a/resources/js/bootstrap/element-details-tabs.ts b/resources/js/bootstrap/element-details-tabs.ts
index c5c8dd395fb..5fd3f82c084 100644
--- a/resources/js/bootstrap/element-details-tabs.ts
+++ b/resources/js/bootstrap/element-details-tabs.ts
@@ -23,6 +23,8 @@ export interface ElementDetailsTabDescriptor {
   label: string;
   icon: string;
   component: Component;
+  /** Optional controls rendered at the end of the panel header. */
+  headerActionsComponent?: Component;
   order?: number;
   visible?: (payload: ElementEditPayload) => boolean;
   status?: (payload: ElementEditPayload) => ElementDetailsTabStatus | null;
diff --git a/resources/js/modules/elements/components/ElementDetailsTabs.test.ts b/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
index 7264f8873f3..195e460c503 100644
--- a/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
+++ b/resources/js/modules/elements/components/ElementDetailsTabs.test.ts
@@ -137,6 +137,18 @@ describe('ElementDetailsTabs', () => {
           `${props.payload?.elementId}:${props.active}`
         ),
     });
+    const PluginTabActions = defineComponent({
+      props: {
+        payload: Object,
+        active: Boolean,
+      },
+      setup: (props) => () =>
+        h(
+          'button',
+          {class: 'plugin-actions'},
+          `${props.payload?.elementId}:${props.active}`
+        ),
+    });
     const HiddenTab = defineComponent({render: () => null});
     const overlaid = ref(false);
     const conditionalVisible = ref(true);
@@ -165,7 +177,9 @@ describe('ElementDetailsTabs', () => {
                 activityTimelineVersion: 0,
                 updatePayload: vi.fn(),
               },
-              {info: () => h('div', {class: 'info-content'}, 'Info content')}
+              {
+                info: () => h('div', {class: 'info-content'}, 'Info content'),
+              }
             );
         },
       })
@@ -186,6 +200,7 @@ describe('ElementDetailsTabs', () => {
       label: 'Plugin details',
       icon: 'puzzle-piece',
       component: PluginTab,
+      headerActionsComponent: PluginTabActions,
       order: 5,
       props: ({payload, active}) => ({payload, active}),
     });
@@ -246,6 +261,9 @@ describe('ElementDetailsTabs', () => {
     expect(container.querySelector('.plugin-content')?.textContent).toBe(
       '1:true'
     );
+    expect(container.querySelector('.plugin-actions')?.textContent).toBe(
+      '1:true'
+    );
 
     select(2);
     conditionalVisible.value = false;
diff --git a/resources/js/modules/elements/components/ElementDetailsTabs.vue b/resources/js/modules/elements/components/ElementDetailsTabs.vue
index 9a465c57a33..69f93f8abcd 100644
--- a/resources/js/modules/elements/components/ElementDetailsTabs.vue
+++ b/resources/js/modules/elements/components/ElementDetailsTabs.vue
@@ -220,6 +220,9 @@
       >
         <div class="flex items-center gap-1">
           <h3 class="text-md/4">{{ tab.label }}</h3>
+        </div>
+
+        <div class="flex items-center gap-1">
           <span v-if="tab.statusData" class="flex items-center gap-1">
             <craft-status
               :status="tab.statusData.indicator"
@@ -229,17 +232,21 @@
               {{ tab.statusData.label }}
             </span>
           </span>
+          <component
+            :is="tab.headerActionsComponent"
+            v-if="tab.headerActionsComponent"
+            v-bind="componentProps(tab)"
+          />
+          <craft-button
+            type="button"
+            icon="x"
+            :aria-label="t('Close {tab}', {tab: tab.label})"
+            variant="plain"
+            size="small"
+            @click="tabs?.close()"
+            flush="inline-end"
+          ></craft-button>
         </div>
-
-        <craft-button
-          type="button"
-          icon="x"
-          :aria-label="t('Close {tab}', {tab: tab.label})"
-          variant="plain"
-          size="small"
-          @click="tabs?.close()"
-          flush="inline-end"
-        ></craft-button>
       </div>
       <slot v-if="tab.slot" :name="tab.slot" />
       <div v-else class="p-lg">
diff --git a/resources/js/modules/workflows/components/Run.vue b/resources/js/modules/workflows/components/Run.vue
index 6e9898064bb..dc962c5fdb3 100644
--- a/resources/js/modules/workflows/components/Run.vue
+++ b/resources/js/modules/workflows/components/Run.vue
@@ -15,57 +15,63 @@
 </script>
 
 <template>
-  <component
-    :is="collapsible ? 'craft-disclosure' : 'section'"
-    class="workflow-review-run"
-    :class="{'workflow-review-run--collapsible': collapsible}"
-    :opened.prop="collapsible ? run.current : undefined"
-  >
-    <craft-button
-      v-if="collapsible"
-      slot="invoker"
-      type="button"
-      variant="plain"
-      align="start"
-      class="workflow-review-run__heading"
+  <craft-pane appearance="outline" padding="sm">
+    <component
+      :is="collapsible ? 'craft-disclosure' : 'section'"
+      class="workflow-review-run"
+      :opened.prop="collapsible ? run.current : undefined"
     >
-      <strong slot="prefix">{{ t('Review {number}', {number}) }}</strong>
-      <span slot="suffix" class="workflow-review-run__status">
-        <craft-status
-          :status="run.statusIndicator"
-          :label="run.statusLabel"
-        ></craft-status>
-        {{ run.statusLabel }}
-        <craft-icon class="workflow-review-run__chevron" name="chevron-down" />
-      </span>
-    </craft-button>
-
-    <div
-      :slot="collapsible ? 'content' : undefined"
-      class="workflow-review-run__content"
-    >
-      <ol class="workflow-review-events workflow-review-submission">
-        <li>
-          <TimelineItem :event="run.submission" last />
-        </li>
-      </ol>
-
-      <ol class="workflow-review-stages">
-        <li
-          v-for="(stage, stageIndex) in run.stages"
-          :key="stageIndex"
-          :aria-current="stage.current ? 'step' : undefined"
-        >
-          <Stage
-            :run="run"
-            :stage="stage"
-            :number="stageIndex + 1"
-            :collapsible="run.stages.length > 1"
-          />
-        </li>
-      </ol>
-    </div>
-  </component>
+      <craft-button
+        v-if="collapsible"
+        slot="invoker"
+        type="button"
+        variant="plain"
+        align="start"
+        class="workflow-review-run__heading"
+      >
+        <span class="workflow-review-run__heading-content">
+          <strong>{{ t('Review {number}', {number}) }}</strong>
+          <span class="workflow-review-run__status">
+            <craft-status
+              :status="run.statusIndicator"
+              :label="run.statusLabel"
+            ></craft-status>
+            {{ run.statusLabel }}
+            <craft-icon
+              class="workflow-review-run__chevron"
+              name="chevron-down"
+            />
+          </span>
+        </span>
+      </craft-button>
+
+      <div
+        :slot="collapsible ? 'content' : undefined"
+        class="workflow-review-run__content"
+      >
+        <ol class="workflow-review-events workflow-review-submission">
+          <li>
+            <TimelineItem :event="run.submission" last />
+          </li>
+        </ol>
+
+        <ol class="workflow-review-stages">
+          <li
+            v-for="(stage, stageIndex) in run.stages"
+            :key="stageIndex"
+            :aria-current="stage.current ? 'step' : undefined"
+          >
+            <Stage
+              :run="run"
+              :stage="stage"
+              :number="stageIndex + 1"
+              :collapsible="run.stages.length > 1"
+            />
+          </li>
+        </ol>
+      </div>
+    </component>
+  </craft-pane>
 </template>
 
 <style scoped>
@@ -73,10 +79,6 @@
     display: block;
   }
 
-  .workflow-review-run--collapsible {
-    border-block-end: 1px solid var(--c-color-neutral-border-quiet);
-  }
-
   .workflow-review-run__heading {
     width: 100%;
     --c-button-height: var(--c-size-touch-target);
@@ -93,12 +95,18 @@
     text-align: start;
   }
 
+  .workflow-review-run__heading-content {
+    display: flex;
+    width: 100%;
+    align-items: center;
+  }
+
   .workflow-review-run__status {
     display: flex;
     margin-inline-start: auto;
     align-items: center;
     gap: var(--c-spacing-xs);
-    color: var(--c-text-quiet);
+    color: var(--c-text);
     font-size: var(--c-text-sm);
   }
 
@@ -125,7 +133,10 @@
   }
 
   .workflow-review-run__content {
+    margin-block-start: var(--c-spacing-xs);
     padding-block-end: var(--c-spacing-sm);
+    padding-inline-start: 0;
+    border-inline-start: 0;
   }
 
   .workflow-review-submission {
diff --git a/resources/js/modules/workflows/components/WorkflowDefaultActions.vue b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
index d1cbf12cf18..dc96899e9e4 100644
--- a/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
+++ b/resources/js/modules/workflows/components/WorkflowDefaultActions.vue
@@ -33,10 +33,7 @@
   const commentId = `workflow-review-comment-${id}`;
   const noteIsEmpty = computed(() => !note.value.trim());
   const canShowActions = computed(
-    () =>
-      props.review.canSubmit ||
-      props.review.canComment ||
-      props.review.canOverride
+    () => props.review.canSubmit || props.review.canComment
   );
 
   function identity(): WorkflowIdentity {
@@ -94,30 +91,6 @@
     );
   }
 
-  async function overrideApproval(): Promise<void> {
-    if (processing.value) {
-      return;
-    }
-
-    if (
-      !window.confirm(
-        t(
-          'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
-        )
-      )
-    ) {
-      return;
-    }
-
-    const runId = props.review.runId;
-    if (runId === null) {
-      staleReview();
-      return;
-    }
-
-    await transition(controller.override.url({workflowRun: runId}));
-  }
-
   function staleReview(): void {
     error.value = t('This review is no longer current. Refresh and try again.');
   }
@@ -171,17 +144,6 @@
           {{ t('Enter a comment before submitting.') }}
         </craft-tooltip>
       </template>
-
-      <span v-if="review.canOverride" class="workflow-default-actions__button">
-        <craft-button
-          type="button"
-          :variant="ButtonVariant.DangerPlain"
-          :disabled="processing"
-          @click="overrideApproval"
-        >
-          {{ t('Override approval') }}
-        </craft-button>
-      </span>
     </div>
 
     <craft-callout
diff --git a/resources/js/modules/workflows/components/WorkflowDetailsActions.test.ts b/resources/js/modules/workflows/components/WorkflowDetailsActions.test.ts
new file mode 100644
index 00000000000..8188b6156b1
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDetailsActions.test.ts
@@ -0,0 +1,169 @@
+import {http} from '@inertiajs/vue3';
+import {createApp, h, nextTick, shallowRef} from 'vue';
+import {afterEach, beforeEach, describe, expect, it, vi} from 'vite-plus/test';
+import {useFlashMessages} from '@/common/composables/useFlashMessages';
+import type {
+  ElementEditPayload,
+  ElementEditPayloadUpdater,
+} from '@/modules/elements/composables/useElementEditor';
+import WorkflowDetailsActions from './WorkflowDetailsActions.vue';
+
+type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+const requestSpy = vi.spyOn(http.getClient(), 'request');
+
+function review(
+  overrides: Partial<WorkflowReviewData> = {}
+): WorkflowReviewData {
+  return {
+    status: 'pending',
+    statusLabel: 'Awaiting approval',
+    statusIndicator: 'pending',
+    submitLabel: 'Request new review',
+    applyDisabledReason:
+      'This draft must be approved before it can be applied.',
+    runId: 41,
+    currentStage: 1,
+    stageUid: 'publishers-stage',
+    actionComponent: null,
+    showDefaultActions: true,
+    actionProps: {},
+    runs: [],
+    canSubmit: false,
+    canComment: true,
+    canOverride: true,
+    canRestart: true,
+    canApply: false,
+    ...overrides,
+  };
+}
+
+function response(data: unknown, status = 200) {
+  return {
+    status,
+    headers: {},
+    data: JSON.stringify(data),
+  };
+}
+
+describe('WorkflowDetailsActions', () => {
+  let app: ReturnType<typeof createApp> | undefined;
+  let container: HTMLElement | undefined;
+
+  beforeEach(() => {
+    requestSpy.mockReset();
+    useFlashMessages().clearAll();
+    vi.stubGlobal(
+      'confirm',
+      vi.fn(() => true)
+    );
+    vi.stubGlobal(
+      'fetch',
+      vi.fn(async () => new Response('<svg></svg>'))
+    );
+  });
+
+  afterEach(() => {
+    app?.unmount();
+    container?.remove();
+    vi.unstubAllGlobals();
+  });
+
+  function mount(workflowReview: WorkflowReviewData): void {
+    const payload = shallowRef({
+      elementType: 'CraftCms\\Cms\\Entry\\Elements\\Entry',
+      canonicalId: 12,
+      draftId: 7,
+      siteId: 1,
+      workflow: {
+        current: workflowReview,
+        draftReviews: [],
+      },
+      editorActions: {
+        primary: {
+          label: 'Save',
+          actionUrl: null,
+          params: {},
+          redirect: null,
+          tabId: null,
+        },
+        menu: [],
+        buttons: [],
+      },
+    } as unknown as ElementEditPayload);
+    const updatePayload: ElementEditPayloadUpdater = (update) => {
+      const patch =
+        typeof update === 'function' ? update(payload.value) : update;
+      payload.value = {...payload.value, ...patch};
+    };
+
+    container = document.createElement('div');
+    document.body.append(container);
+    app = createApp({
+      render: () =>
+        h(WorkflowDetailsActions, {
+          payload: payload.value,
+          updatePayload,
+        }),
+    });
+    app.config.compilerOptions.isCustomElement = (tag) => tag.includes('-');
+    app.mount(container);
+  }
+
+  function action(label: string): HTMLElement {
+    return [
+      ...container!.querySelectorAll<HTMLElement>('craft-action-item'),
+    ].find((item) => item.textContent?.trim() === label)!;
+  }
+
+  it('offers override and restart from the header menu', async () => {
+    const workflowReview = review();
+    requestSpy
+      .mockResolvedValueOnce(
+        response({
+          message: 'Workflow approved.',
+          workflowReview,
+          editorActions: {},
+        })
+      )
+      .mockResolvedValueOnce(
+        response({
+          message: 'Workflow restarted.',
+          workflowReview,
+          editorActions: {},
+        })
+      );
+    mount(workflowReview);
+    await nextTick();
+
+    expect(action('Override approval')).toBeTruthy();
+    expect(action('Restart workflow')).toBeTruthy();
+
+    vi.mocked(window.confirm).mockReturnValueOnce(false);
+    action('Override approval').click();
+    await nextTick();
+    expect(requestSpy).not.toHaveBeenCalled();
+
+    action('Override approval').click();
+    await vi.waitFor(() => expect(requestSpy).toHaveBeenCalledTimes(1));
+    action('Restart workflow').click();
+    await vi.waitFor(() => expect(requestSpy).toHaveBeenCalledTimes(2));
+
+    expect(window.confirm).toHaveBeenCalledWith(
+      'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
+    );
+    expect(window.confirm).toHaveBeenCalledWith(
+      'This will discard all approvals and restart the workflow from its first stage. Are you sure?'
+    );
+    expect(requestSpy.mock.calls.map(([request]) => request.url)).toEqual([
+      '/admin/workflows/41/override',
+      '/admin/workflows/41/restart',
+    ]);
+  });
+
+  it('hides the menu when there are no available workflow actions', () => {
+    mount(review({canOverride: false, canRestart: false}));
+
+    expect(container!.querySelector('craft-action-menu')).toBeNull();
+  });
+});
diff --git a/resources/js/modules/workflows/components/WorkflowDetailsActions.vue b/resources/js/modules/workflows/components/WorkflowDetailsActions.vue
new file mode 100644
index 00000000000..221e54d0814
--- /dev/null
+++ b/resources/js/modules/workflows/components/WorkflowDetailsActions.vue
@@ -0,0 +1,142 @@
+<script setup lang="ts">
+  import {t, type ActionMenuItem} from '@craftcms/ui';
+  import {computed, watch} from 'vue';
+  import controller from '@/actions/CraftCms/Cms/Http/Controllers/Workflows/WorkflowTransitionsController';
+  import {useFlashMessages} from '@/common/composables/useFlashMessages';
+  import type {
+    ElementEditPayload,
+    ElementEditPayloadUpdater,
+  } from '@/modules/elements/composables/useElementEditor';
+  import {
+    useWorkflowTransition,
+    type WorkflowIdentity,
+  } from '../composables/useWorkflowTransition';
+
+  type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
+
+  const props = defineProps<{
+    payload: ElementEditPayload;
+    updatePayload: ElementEditPayloadUpdater;
+  }>();
+
+  const review = computed(() => props.payload.workflow.current);
+
+  function identity(): WorkflowIdentity {
+    return {
+      elementType: props.payload.elementType,
+      elementId: props.payload.canonicalId,
+      draftId: props.payload.draftId,
+      siteId: props.payload.siteId,
+    };
+  }
+
+  function updateReview(
+    workflowReview: WorkflowReviewData,
+    editorActions: ElementEditPayload['editorActions']
+  ): void {
+    props.updatePayload((payload) => ({
+      workflow: {
+        ...payload.workflow,
+        current: workflowReview,
+      },
+      editorActions,
+    }));
+  }
+
+  const {error, processing, transition} = useWorkflowTransition(
+    identity,
+    updateReview
+  );
+  const {flash} = useFlashMessages();
+
+  watch(error, (message) => {
+    if (message) {
+      flash('error', message);
+    }
+  });
+
+  const actions = computed<ActionMenuItem[]>(() => {
+    if (!review.value) {
+      return [];
+    }
+
+    return [
+      ...(review.value.canOverride
+        ? [
+            {
+              label: t('Override approval'),
+              variant: 'danger',
+              disabled: processing.value,
+              onClick: overrideApproval,
+            },
+          ]
+        : []),
+      ...(review.value.canRestart
+        ? [
+            {
+              label: t('Restart workflow'),
+              variant: 'danger',
+              disabled: processing.value,
+              onClick: restartWorkflow,
+            },
+          ]
+        : []),
+    ];
+  });
+
+  async function overrideApproval(): Promise<void> {
+    if (processing.value || !review.value) {
+      return;
+    }
+
+    if (
+      !window.confirm(
+        t(
+          'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
+        )
+      )
+    ) {
+      return;
+    }
+
+    if (review.value.runId === null) {
+      error.value = t(
+        'This review is no longer current. Refresh and try again.'
+      );
+      return;
+    }
+
+    await transition(
+      controller.override.url({workflowRun: review.value.runId})
+    );
+  }
+
+  async function restartWorkflow(): Promise<void> {
+    if (processing.value || !review.value) {
+      return;
+    }
+
+    if (
+      !window.confirm(
+        t(
+          'This will discard all approvals and restart the workflow from its first stage. Are you sure?'
+        )
+      )
+    ) {
+      return;
+    }
+
+    if (review.value.runId === null) {
+      error.value = t(
+        'This review is no longer current. Refresh and try again.'
+      );
+      return;
+    }
+
+    await transition(controller.restart.url({workflowRun: review.value.runId}));
+  }
+</script>
+
+<template>
+  <craft-action-menu v-if="actions.length" .actions="actions" />
+</template>
diff --git a/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts b/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
index 9de5bea5f57..897e8f2bf06 100644
--- a/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowDetailsTab.test.ts
@@ -28,11 +28,12 @@ function review(
     stageUid: 'publishers-stage',
     actionComponent: 'craft:user-review-workflow-stage-actions',
     showDefaultActions: false,
-    actionProps: {canReview: true},
+    actionProps: {canReview: true, canRequestReviewAgain: false},
     runs: [],
     canSubmit: false,
     canComment: false,
     canOverride: false,
+    canRestart: true,
     canApply: false,
     ...overrides,
   };
diff --git a/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
index 8365f80ec09..f2cdcf9b153 100644
--- a/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
+++ b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
@@ -10,7 +10,7 @@
   <craft-callout variant="warning" icon="lock" appearance="fill">
     {{
       t(
-        'This draft is in review. Editing it will invalidate the current review and require a new review.'
+        'You can edit this draft without resetting completed stages. If it has already been approved, editing it will reopen the final stage.'
       )
     }}
 
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
index 6cda84ac11d..8682425b48f 100644
--- a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
@@ -123,11 +123,12 @@ function review(
     stageUid: 'publishers-stage',
     actionComponent: 'craft:user-review-workflow-stage-actions',
     showDefaultActions: false,
-    actionProps: {canReview: true},
+    actionProps: {canReview: true, canRequestReviewAgain: false},
     runs: [workflowRun()],
     canSubmit: false,
     canComment: true,
     canOverride: false,
+    canRestart: true,
     canApply: false,
     ...overrides,
   };
@@ -241,9 +242,6 @@ describe('WorkflowReviewPanel', () => {
           message: 'Changes requested.',
           workflowReview: overridableReview,
         })
-      )
-      .mockResolvedValueOnce(
-        response({message: 'Workflow approved.', workflowReview: review()})
       );
     mount(overridableReview);
 
@@ -315,29 +313,6 @@ describe('WorkflowReviewPanel', () => {
       )
     );
 
-    const override = actionButton(
-      'Override approval'
-    ) as HTMLElementTagNameMap['craft-button'];
-    await override.updateComplete;
-    expect(override.disabled).toBe(false);
-
-    await enterReviewMessage('Reviewed outside the normal approval path.');
-    vi.mocked(window.confirm).mockReturnValueOnce(false);
-    override.click();
-    await nextTick();
-
-    expect(requests()).toHaveLength(3);
-    expect(window.confirm).toHaveBeenCalledWith(
-      'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
-    );
-
-    override.click();
-    await vi.waitFor(() => {
-      expect(useFlashMessages().messages.value.success).toBe(
-        'Workflow approved.'
-      );
-    });
-
     expect(requests()).toEqual([
       expect.objectContaining({
         method: 'post',
@@ -357,13 +332,6 @@ describe('WorkflowReviewPanel', () => {
           message: 'The legal claim needs support.',
         }),
       }),
-      expect.objectContaining({
-        method: 'post',
-        url: '/admin/workflows/41/override',
-        data: expect.objectContaining({
-          note: 'Reviewed outside the normal approval path.',
-        }),
-      }),
     ]);
   });
 
@@ -411,7 +379,7 @@ describe('WorkflowReviewPanel', () => {
   it('omits review choices when commenting is the only available action', () => {
     mount(
       review({
-        actionProps: {canReview: false},
+        actionProps: {canReview: false, canRequestReviewAgain: false},
         canComment: true,
         canOverride: false,
       })
@@ -422,9 +390,29 @@ describe('WorkflowReviewPanel', () => {
     expect(actionButton('Comment')).toBeTruthy();
   });
 
+  it('requests another review after changes were requested', async () => {
+    const changesRequested = review({
+      actionProps: {canReview: false, canRequestReviewAgain: true},
+    });
+    requestSpy.mockResolvedValueOnce(
+      response({message: 'Review requested.', workflowReview: review()})
+    );
+    mount(changesRequested);
+
+    actionButton('Request review again').click();
+    await vi.waitFor(() => expect(requests()).toHaveLength(1));
+
+    expect(requests()[0]).toEqual(
+      expect.objectContaining({
+        method: 'post',
+        url: '/admin/workflows/41/stages/publishers-stage/user-review/request-review',
+      })
+    );
+  });
+
   it('comments after a partial approval removes the reviewers remaining actions', async () => {
     const partialApproval = review({
-      actionProps: {canReview: false},
+      actionProps: {canReview: false, canRequestReviewAgain: false},
       canComment: true,
       runs: [
         workflowRun({
@@ -450,7 +438,10 @@ describe('WorkflowReviewPanel', () => {
         })
       )
       .mockResolvedValueOnce(
-        response({message: 'Comment added.', workflowReview: partialApproval})
+        response({
+          message: 'Comment added.',
+          workflowReview: partialApproval,
+        })
       );
     mount(review());
 
@@ -544,6 +535,7 @@ describe('WorkflowReviewPanel', () => {
         actionProps: {canReview: false},
         runs: [],
         canSubmit: true,
+        canRestart: false,
       })
     );
 
diff --git a/resources/js/modules/workflows/register.ts b/resources/js/modules/workflows/register.ts
index 4cce797be92..98155e54715 100644
--- a/resources/js/modules/workflows/register.ts
+++ b/resources/js/modules/workflows/register.ts
@@ -2,6 +2,7 @@ import type {CpComponentRegistry} from '@/bootstrap/components';
 import type {ElementDetailsTabRegistry} from '@/bootstrap/element-details-tabs';
 import {t} from '@craftcms/ui';
 import WorkflowDefaultActions from './components/WorkflowDefaultActions.vue';
+import WorkflowDetailsActions from './components/WorkflowDetailsActions.vue';
 import WorkflowDetailsTab from './components/WorkflowDetailsTab.vue';
 import WorkflowUserReviewActions from './user-review/WorkflowUserReviewActions.vue';
 import WorkflowUserReviewSummary from './user-review/WorkflowUserReviewSummary.vue';
@@ -30,6 +31,7 @@ export function registerWorkflowComponents(
     },
     icon: 'clipboard-list-check',
     component: WorkflowDetailsTab,
+    headerActionsComponent: WorkflowDetailsActions,
     order: 5,
     visible: (payload) =>
       Boolean(payload.workflow.current || payload.workflow.draftReviews.length),
diff --git a/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
index 4ebfb51a8cc..4ac7aa3e170 100644
--- a/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
+++ b/resources/js/modules/workflows/user-review/WorkflowUserReviewActions.vue
@@ -18,6 +18,7 @@
   const props = defineProps<{
     review: WorkflowReviewData;
     canReview: boolean;
+    canRequestReviewAgain: boolean;
     elementType: string;
     elementId: number | null;
     draftId: number | null;
@@ -58,7 +59,8 @@
     return t('Enter a comment before submitting.');
   });
   const canShowActions = computed(
-    () => props.canReview || props.review.canComment || props.review.canOverride
+    () =>
+      props.canReview || props.canRequestReviewAgain || props.review.canComment
   );
   const submitLabel = computed(() =>
     !props.canReview && props.review.canComment
@@ -125,30 +127,22 @@
     error.value = t('This review is no longer current. Refresh and try again.');
   }
 
-  async function overrideApproval(): Promise<void> {
+  async function requestReviewAgain(): Promise<void> {
     error.value = null;
     if (processing.value) {
       return;
     }
 
-    if (
-      !window.confirm(
-        t(
-          'This will bypass the remaining workflow requirements and approve the draft. Are you sure?'
-        )
-      )
-    ) {
-      return;
-    }
-
-    if (props.review.runId === null) {
+    if (props.review.runId === null || props.review.stageUid === null) {
       staleReview();
       return;
     }
 
     await transition(
-      transitionsController.override.url({workflowRun: props.review.runId}),
-      {note: message.value}
+      userReviewController.requestReview.url({
+        workflowRun: props.review.runId,
+        stage: props.review.stageUid,
+      })
     );
   }
 </script>
@@ -234,13 +228,13 @@
 
     <div class="workflow-user-review-actions__footer">
       <craft-button
-        v-if="review.canOverride"
+        v-if="canRequestReviewAgain"
         type="button"
-        :variant="ButtonVariant.DangerPlain"
+        :variant="ButtonVariant.Solid"
         .disabled="processing"
-        @click="overrideApproval"
+        @click="requestReviewAgain"
       >
-        {{ t('Override approval') }}
+        {{ t('Request review again') }}
       </craft-button>
       <span
         :id="`workflow-user-review-submit-${id}`"
diff --git a/routes/cp.php b/routes/cp.php
index 625eedf5c80..1c0996040a8 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -127,10 +127,12 @@
     Route::prefix('workflows')->group(function () {
         Route::post('submit', [WorkflowTransitionsController::class, 'submit']);
         Route::post('{workflowRun}/override', [WorkflowTransitionsController::class, 'override']);
+        Route::post('{workflowRun}/restart', [WorkflowTransitionsController::class, 'restart']);
         Route::prefix('{workflowRun}/stages/{stage}')->group(function () {
             Route::post('comment', [WorkflowTransitionsController::class, 'comment']);
             Route::post('user-review/approve', [UserReviewController::class, 'approve']);
             Route::post('user-review/request-changes', [UserReviewController::class, 'requestChanges']);
+            Route::post('user-review/request-review', [UserReviewController::class, 'requestReview']);
         });
     });
 
diff --git a/src/Http/Controllers/Workflows/UserReviewController.php b/src/Http/Controllers/Workflows/UserReviewController.php
index 4fa6fca326d..0be891d4858 100644
--- a/src/Http/Controllers/Workflows/UserReviewController.php
+++ b/src/Http/Controllers/Workflows/UserReviewController.php
@@ -38,6 +38,28 @@ public function requestChanges(WorkflowRun $workflowRun, string $stage): JsonRes
         return $this->decide($workflowRun, $stage, UserReviewDecision::Rejected);
     }
 
+    public function requestReview(WorkflowRun $workflowRun, string $stage): JsonResponse
+    {
+        $draft = $this->draft();
+
+        $this->workflows->reportStageResult(
+            runId: $workflowRun->id,
+            stageUid: $stage,
+            result: function (WorkflowStageContext $context) {
+                $component = $context->stage->component();
+                if (! $component instanceof UserReviewStage) {
+                    throw new WorkflowException('The current workflow stage does not accept user reviews.');
+                }
+
+                return $component->requestReviewAgain($context, $this->request->craftUser());
+            },
+            actor: $this->request->craftUser(),
+            activityTransition: WorkflowTransition::RequestReview,
+        );
+
+        return $this->response($draft, t('Review requested.'));
+    }
+
     private function decide(WorkflowRun $workflowRun, string $stage, UserReviewDecision $decision): JsonResponse
     {
         $draft = $this->draft();
@@ -71,6 +93,19 @@ private function decide(WorkflowRun $workflowRun, string $stage, UserReviewDecis
             activityNote: trim((string) $message) ?: null,
         );
 
+        return $this->response($draft, t('Review updated.'));
+    }
+
+    private function draft(): ElementInterface
+    {
+        $element = $this->request->element();
+        abort_unless($element instanceof ElementInterface && $element->getIsDraft(), Response::HTTP_BAD_REQUEST, 'A draft element is required.');
+
+        return $element;
+    }
+
+    private function response(ElementInterface $draft, string $message): JsonResponse
+    {
         $review = $this->workflows->reviewData($draft, $this->request->craftUser());
 
         return new JsonResponse([
@@ -80,15 +115,7 @@ private function decide(WorkflowRun $workflowRun, string $stage, UserReviewDecis
                 canSave: $this->request->craftUser()->can('save', $draft),
                 review: $review,
             ),
-            'message' => t('Review updated.'),
+            'message' => $message,
         ]);
     }
-
-    private function draft(): ElementInterface
-    {
-        $element = $this->request->element();
-        abort_unless($element instanceof ElementInterface && $element->getIsDraft(), Response::HTTP_BAD_REQUEST, 'A draft element is required.');
-
-        return $element;
-    }
 }
diff --git a/src/Http/Controllers/Workflows/WorkflowTransitionsController.php b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
index aebe0d429a1..d4891fb13ae 100644
--- a/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
+++ b/src/Http/Controllers/Workflows/WorkflowTransitionsController.php
@@ -70,6 +70,15 @@ public function override(WorkflowRun $workflowRun): JsonResponse
         return $this->response($draft, t('Workflow approval overridden.'));
     }
 
+    public function restart(WorkflowRun $workflowRun): JsonResponse
+    {
+        $draft = $this->draft();
+
+        $this->workflows->restartWorkflow($draft, $workflowRun->id);
+
+        return $this->response($draft, t('Workflow restarted.'));
+    }
+
     private function draft(): ElementInterface
     {
         $element = $this->request->element();
diff --git a/src/Support/Facades/Workflows.php b/src/Support/Facades/Workflows.php
index 8a23fce43a5..b4009240cdb 100644
--- a/src/Support/Facades/Workflows.php
+++ b/src/Support/Facades/Workflows.php
@@ -11,6 +11,7 @@
  * @method static \CraftCms\Cms\Workflow\Models\Workflow|null forElement(\CraftCms\Cms\Element\Contracts\ElementInterface $element)
  * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun|null latestRun(\CraftCms\Cms\Element\Contracts\ElementInterface $draft)
  * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun submitForReview(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, string|null $note = null)
+ * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun restartWorkflow(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int $runId)
  * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun|null reportStageResult(int $runId, string $stageUid, \CraftCms\Cms\Workflow\Data\WorkflowStageResult|\Closure $result, \CraftCms\Cms\User\Contracts\CraftUser|null $actor = null, \CraftCms\Cms\Workflow\Enums\WorkflowTransition|null $activityTransition = null, string|null $activityNote = null)
  * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun addComment(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int $runId, int|string $stage, string $note)
  * @method static \CraftCms\Cms\Workflow\Models\WorkflowRun overrideApproval(\CraftCms\Cms\Element\Contracts\ElementInterface $draft, int $runId, string|null $reason = null)
diff --git a/src/Workflow/Activity/WorkflowActivityEvent.php b/src/Workflow/Activity/WorkflowActivityEvent.php
index dc3e21d48c3..0c63ffd4dbf 100644
--- a/src/Workflow/Activity/WorkflowActivityEvent.php
+++ b/src/Workflow/Activity/WorkflowActivityEvent.php
@@ -65,9 +65,11 @@ public static function format(ActivityEvent $event): string|Htmlable
             WorkflowActivityType::Override => t('Overrode the workflow approval.'),
             WorkflowActivityType::Approve => t('Approved the “{stage}” review stage.', ['stage' => $translatedStage]),
             WorkflowActivityType::Reject => t('Requested changes during the “{stage}” review stage.', ['stage' => $translatedStage]),
+            WorkflowActivityType::RequestReview => t('Requested another review of the “{stage}” stage.', ['stage' => $translatedStage]),
+            WorkflowActivityType::Restart => t('Restarted the workflow review.'),
             WorkflowActivityType::StageApproved => t('The “{stage}” stage was approved.', ['stage' => $translatedStage]),
             WorkflowActivityType::StageFailed => t('The “{stage}” stage failed.', ['stage' => $translatedStage]),
-            WorkflowActivityType::Invalidate => t('Invalidated the review by changing the draft.'),
+            WorkflowActivityType::Invalidate => t('Invalidated the workflow review.'),
             WorkflowActivityType::Publish => t('Published the approved draft.'),
         };
     }
diff --git a/src/Workflow/Data/WorkflowReviewData.php b/src/Workflow/Data/WorkflowReviewData.php
index afa134bfef7..5190a92e1c4 100644
--- a/src/Workflow/Data/WorkflowReviewData.php
+++ b/src/Workflow/Data/WorkflowReviewData.php
@@ -8,6 +8,7 @@
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
 use CraftCms\Cms\Workflow\Models\WorkflowRun;
+use CraftCms\Cms\Workflow\UserReview\UserReviewStage;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Gate;
@@ -37,6 +38,7 @@ public function __construct(
         public bool $canSubmit,
         public bool $canComment,
         public bool $canOverride,
+        public bool $canRestart,
         public bool $canApply,
     ) {}
 
@@ -59,7 +61,10 @@ public static function from(
             $stage,
             $run->payload[$stage->uid] ?? [],
         ) : null;
-        $component = $run?->isPending() && $context !== null ? $stage->component() : null;
+        $stageComponent = $context !== null ? $stage->component() : null;
+        $canActOnStage = $run?->isPending()
+            || ($run?->status === WorkflowStatus::Failed && $stageComponent instanceof UserReviewStage);
+        $component = $canActOnStage ? $stageComponent : null;
         $canSubmit = $draft->enabled && $draft->getEnabledForSite()
             && $draft->getIsDraft() && ! $draft->isProvisionalDraft && (bool) $draft->draftId
             && $draft->markDraftAsSaved
@@ -70,6 +75,8 @@ public static function from(
             && Gate::forUser($viewer)->allows('view', $draft);
         $canOverride = $viewer->isAdmin()
             && in_array($run?->status, [WorkflowStatus::Pending, WorkflowStatus::Failed], true);
+        $canRestart = in_array($run?->status, [WorkflowStatus::Pending, WorkflowStatus::Approved], true)
+            && Gate::forUser($viewer)->allows('save', $draft);
         $canApply = $run?->status === WorkflowStatus::Approved
             && Gate::forUser($viewer)->allows('save', $draft)
             && Gate::forUser($viewer)->allows('saveCanonical', $draft);
@@ -90,6 +97,7 @@ public static function from(
             canSubmit: $canSubmit,
             canComment: $canComment,
             canOverride: $canOverride,
+            canRestart: $canRestart,
             canApply: $canApply,
         );
     }
diff --git a/src/Workflow/Data/WorkflowRunStageData.php b/src/Workflow/Data/WorkflowRunStageData.php
index 6565bd7d361..abf27c735dc 100644
--- a/src/Workflow/Data/WorkflowRunStageData.php
+++ b/src/Workflow/Data/WorkflowRunStageData.php
@@ -41,7 +41,9 @@ public static function from(WorkflowStageData $stage, int $stageIndex, WorkflowR
         $events = $runEvents
             ->filter(fn (WorkflowTimelineItemData $event): bool => $event->belongsToStage($stageIndex + 1))
             ->values();
-        $failed = $events->contains(fn (WorkflowTimelineItemData $event): bool => in_array($event->decision, [WorkflowStageStatus::Failed->value, 'rejected'], true));
+        $lastReset = $events->search(fn (WorkflowTimelineItemData $event): bool => $event->decision === 'reset');
+        $currentEvents = $lastReset === false ? $events : $events->slice($lastReset + 1);
+        $failed = $currentEvents->contains(fn (WorkflowTimelineItemData $event): bool => in_array($event->decision, [WorkflowStageStatus::Failed->value, 'rejected'], true));
 
         return new self(
             name: t($stage->name),
diff --git a/src/Workflow/Enums/WorkflowActivityType.php b/src/Workflow/Enums/WorkflowActivityType.php
index 2b78594d5f3..272d16df7bc 100644
--- a/src/Workflow/Enums/WorkflowActivityType.php
+++ b/src/Workflow/Enums/WorkflowActivityType.php
@@ -11,6 +11,8 @@ enum WorkflowActivityType: string
     case Override = 'override';
     case Approve = 'approve';
     case Reject = 'reject';
+    case RequestReview = 'request-review';
+    case Restart = 'reset';
     case StageApproved = 'stage-approved';
     case StageFailed = 'stage-failed';
     case Invalidate = 'invalidate';
diff --git a/src/Workflow/Enums/WorkflowTransition.php b/src/Workflow/Enums/WorkflowTransition.php
index b993bdb3079..ab0342e247c 100644
--- a/src/Workflow/Enums/WorkflowTransition.php
+++ b/src/Workflow/Enums/WorkflowTransition.php
@@ -10,6 +10,8 @@ enum WorkflowTransition: string
     case Override = 'override';
     case Approve = 'approve';
     case Reject = 'reject';
+    case RequestReview = 'request-review';
+    case Restart = 'reset';
     case StageApproved = 'stage-approved';
     case StageFailed = 'stage-failed';
     case Invalidate = 'invalidate';
diff --git a/src/Workflow/UserReview/SendUserReviewNotifications.php b/src/Workflow/UserReview/SendUserReviewNotifications.php
index 9536cf2907d..cf1b676e2e2 100644
--- a/src/Workflow/UserReview/SendUserReviewNotifications.php
+++ b/src/Workflow/UserReview/SendUserReviewNotifications.php
@@ -30,7 +30,7 @@ public function handleTransition(WorkflowTransitioned $event): void
             WorkflowTransition::Approve => $run->status === WorkflowStatus::Approved
                 ? $this->sendApproved($event, $stage)
                 : $this->sendReviewRequested($event, $stage),
-            WorkflowTransition::Submit, WorkflowTransition::StageApproved => $this->sendReviewRequested($event, $stage),
+            WorkflowTransition::Submit, WorkflowTransition::StageApproved, WorkflowTransition::RequestReview => $this->sendReviewRequested($event, $stage),
             WorkflowTransition::Reject => $this->sendChangesRequested($event, $stage),
             WorkflowTransition::Invalidate => $this->sendInvalidated($event, $stage),
             default => null,
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
index 49afec953e6..f52ee5d07e7 100644
--- a/src/Workflow/UserReview/UserReviewStage.php
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -13,11 +13,8 @@
 use CraftCms\Cms\Form\Nodes\Field;
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\User\Elements\User;
-use CraftCms\Cms\User\Models\UserGroup;
 use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
 use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
-use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
-use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
 use CraftCms\Cms\Workflow\Stages\WorkflowStage;
 use Illuminate\Support\Collection;
 use Illuminate\Validation\Rule;
@@ -67,42 +64,7 @@ public function settingsForm(FormContext $context = new FormContext): Form
 
     public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     {
-        if (UserReviewDecisions::fromPayload($context->payload)->hasRejection()) {
-            return new WorkflowStageResult(WorkflowStageStatus::Failed, t('Changes requested'), $context->payload);
-        }
-
-        if ($this->hasMissingReviewerGroups()) {
-            return new WorkflowStageResult(
-                WorkflowStageStatus::Pending,
-                t('A configured reviewer group no longer exists.'),
-                $context->payload,
-            );
-        }
-
-        $state = $this->state($context);
-
-        if ($this->approvalMode === UserReviewApprovalMode::PerGroup) {
-            return $this->evaluatePerGroup($context, $state);
-        }
-
-        if ($state->reviewers->count() < $this->approvalsRequired) {
-            return new WorkflowStageResult(
-                WorkflowStageStatus::Pending,
-                t('Not enough eligible reviewers are available.'),
-                $context->payload,
-            );
-        }
-
-        $approvals = $state->effectiveApprovalIds->count();
-        if ($approvals >= $this->approvalsRequired) {
-            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $context->payload);
-        }
-
-        return new WorkflowStageResult(
-            WorkflowStageStatus::Pending,
-            t('{count} of {required} approved', ['count' => $approvals, 'required' => $this->approvalsRequired]),
-            $context->payload,
-        );
+        return $this->stateMachine($context)->result();
     }
 
     public function actionComponent(): string
@@ -112,9 +74,7 @@ public function actionComponent(): string
 
     public function actionProps(WorkflowStageContext $context, CraftUser $viewer): array
     {
-        return [
-            'canReview' => $this->canReview($context, $viewer),
-        ];
+        return $this->stateMachine($context)->actionsFor($viewer);
     }
 
     public function summaryComponent(): string
@@ -124,102 +84,34 @@ public function summaryComponent(): string
 
     public function summaryProps(WorkflowStageContext $context, CraftUser $viewer): array
     {
-        $groups = $this->reviewerGroups();
+        $stateMachine = $this->stateMachine($context);
 
-        return UserReviewSummary::props($this, UserReviewState::for($context, $groups), $groups);
+        return UserReviewSummary::props($this, $stateMachine->state(), $stateMachine->groups());
     }
 
     public function decide(UserReviewDecision $decision, ?string $message, WorkflowStageContext $context, CraftUser $reviewer): WorkflowStageResult
     {
-        if (! $this->canReview($context, $reviewer)) {
-            throw new WorkflowException('This stage action is not available to you.');
-        }
-
-        $message = trim((string) $message);
-        if ($decision === UserReviewDecision::Rejected && $message === '') {
-            throw new WorkflowException('A message is required when requesting changes.');
-        }
-
-        $payload = $context->payload;
-        $payload['decisions'] = UserReviewDecisions::fromPayload($payload)->append($reviewer->getCraftUserId(), $decision, $message !== '' ? $message : null);
-
-        return $this->evaluate(new WorkflowStageContext(
-            draft: $context->draft,
-            run: $context->run,
-            stage: $context->stage,
-            payload: $payload,
-        ));
+        return $this->stateMachine($context)->decide($decision, $message, $reviewer);
     }
 
-    private function canReview(WorkflowStageContext $context, CraftUser $reviewer): bool
+    public function requestReviewAgain(WorkflowStageContext $context, CraftUser $requester): WorkflowStageResult
     {
-        if ($this->hasMissingReviewerGroups()) {
-            return false;
-        }
-
-        $reviewerId = $reviewer->getCraftUserId();
-        $state = $this->state($context);
-
-        return $reviewerId !== null
-            && $reviewerId !== $context->run->authorId
-            && $state->reviewers->contains('id', $reviewerId)
-            && $state->effectiveApprovalIds->doesntContain($reviewerId)
-            && ! UserReviewDecisions::fromPayload($context->payload)->hasDecisionFrom($reviewerId);
+        return $this->stateMachine($context)->requestReviewAgain($requester);
     }
 
-    /** @return Collection<int, User> */
-    public function outstandingReviewers(WorkflowStageContext $context): Collection
+    public function contentChanged(WorkflowStageContext $context): ?WorkflowStageResult
     {
-        if ($this->hasMissingReviewerGroups()) {
-            return collect();
-        }
-
-        $state = $this->state($context);
-        $decidedReviewerIds = collect(UserReviewDecisions::fromPayload($context->payload)->all)->pluck('reviewerId');
-
-        return $state->reviewers->whereNotIn('id', $state->effectiveApprovalIds->merge($decidedReviewerIds));
+        return $this->stateMachine($context)->contentChanged();
     }
 
-    private function evaluatePerGroup(WorkflowStageContext $context, UserReviewState $state): WorkflowStageResult
-    {
-        $groups = $this->reviewerGroups()->map(function (UserGroup $group) use ($state): array {
-            $reviewerIds = $state->reviewersForGroup($group)->pluck('id');
-
-            return [
-                'reviewers' => $reviewerIds->count(),
-                'approvals' => $state->effectiveApprovalIds->intersect($reviewerIds)->count(),
-            ];
-        });
-
-        if ($groups->contains(fn (array $group): bool => $group['reviewers'] < $this->approvalsRequired)) {
-            return new WorkflowStageResult(WorkflowStageStatus::Pending, t('Not enough eligible reviewers are available.'), $context->payload);
-        }
-
-        if ($groups->every(fn (array $group): bool => $group['approvals'] >= $this->approvalsRequired)) {
-            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $context->payload);
-        }
-
-        return new WorkflowStageResult(WorkflowStageStatus::Pending, t('Approvals are required from every reviewer group.'), $context->payload);
-    }
-
-    /** @return Collection<int, UserGroup> */
-    private function reviewerGroups(): Collection
-    {
-        $groups = UserGroup::query()->whereIn('uid', $this->userGroups)->get()->keyBy('uid');
-
-        return collect($this->userGroups)
-            ->map(fn (string $uid): ?UserGroup => $groups->get($uid))
-            ->filter()
-            ->values();
-    }
-
-    private function hasMissingReviewerGroups(): bool
+    /** @return Collection<int, User> */
+    public function outstandingReviewers(WorkflowStageContext $context): Collection
     {
-        return $this->reviewerGroups()->count() !== count($this->userGroups);
+        return $this->stateMachine($context)->outstandingReviewers();
     }
 
-    private function state(WorkflowStageContext $context): UserReviewState
+    private function stateMachine(WorkflowStageContext $context): UserReviewStateMachine
     {
-        return UserReviewState::for($context, $this->reviewerGroups());
+        return UserReviewStateMachine::for($this, $context);
     }
 }
diff --git a/src/Workflow/UserReview/UserReviewState.php b/src/Workflow/UserReview/UserReviewState.php
index 2ef024c41cc..930ba1139e0 100644
--- a/src/Workflow/UserReview/UserReviewState.php
+++ b/src/Workflow/UserReview/UserReviewState.php
@@ -40,11 +40,13 @@ public static function for(WorkflowStageContext $context, Collection $groups): s
             ->values();
         $reviewerIds = $reviewers->pluck('id');
         $localApprovalIds = UserReviewDecisions::fromPayload($context->payload)->approvalIds();
-        $carriedApprovalIds = $context->previousStages
-            ->filter(fn ($previous): bool => $previous->stage->component() instanceof UserReviewStage)
-            ->flatMap(fn ($previous): Collection => UserReviewDecisions::fromPayload($previous->payload)->approvalIds())
-            ->unique()
-            ->values();
+        $carriedApprovalIds = ($context->payload['previousApprovalsReset'] ?? false)
+            ? collect()
+            : $context->previousStages
+                ->filter(fn ($previous): bool => $previous->stage->component() instanceof UserReviewStage)
+                ->flatMap(fn ($previous): Collection => UserReviewDecisions::fromPayload($previous->payload)->approvalIds())
+                ->unique()
+                ->values();
 
         return new self(
             $reviewers,
diff --git a/src/Workflow/UserReview/UserReviewStateMachine.php b/src/Workflow/UserReview/UserReviewStateMachine.php
new file mode 100644
index 00000000000..f46dbb40797
--- /dev/null
+++ b/src/Workflow/UserReview/UserReviewStateMachine.php
@@ -0,0 +1,238 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CraftCms\Cms\Workflow\UserReview;
+
+use CraftCms\Cms\User\Contracts\CraftUser;
+use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\User\Models\UserGroup;
+use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
+use CraftCms\Cms\Workflow\Data\WorkflowStageResult;
+use CraftCms\Cms\Workflow\Enums\WorkflowStageStatus;
+use CraftCms\Cms\Workflow\Exceptions\WorkflowException;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Gate;
+
+use function CraftCms\Cms\t;
+
+readonly class UserReviewStateMachine
+{
+    /**
+     * @param  Collection<int, UserGroup>  $groups
+     */
+    private function __construct(
+        private UserReviewStage $stage,
+        private WorkflowStageContext $context,
+        private Collection $groups,
+        private UserReviewState $state,
+        private UserReviewDecisions $decisions,
+        private bool $hasMissingReviewerGroups,
+    ) {}
+
+    public static function for(UserReviewStage $stage, WorkflowStageContext $context): self
+    {
+        $groupsByUid = UserGroup::query()->whereIn('uid', $stage->userGroups)->get()->keyBy('uid');
+        $groups = collect($stage->userGroups)
+            ->map(fn (string $uid): ?UserGroup => $groupsByUid->get($uid))
+            ->filter()
+            ->values();
+
+        return new self(
+            $stage,
+            $context,
+            $groups,
+            UserReviewState::for($context, $groups),
+            UserReviewDecisions::fromPayload($context->payload),
+            $groups->count() !== count($stage->userGroups),
+        );
+    }
+
+    public function result(): WorkflowStageResult
+    {
+        if ($this->decisions->hasRejection()) {
+            return new WorkflowStageResult(WorkflowStageStatus::Failed, t('Changes requested'), $this->context->payload);
+        }
+
+        if ($this->hasMissingReviewerGroups) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                t('A configured reviewer group no longer exists.'),
+                $this->context->payload,
+            );
+        }
+
+        if ($this->stage->approvalMode === UserReviewApprovalMode::PerGroup) {
+            return $this->perGroupResult();
+        }
+
+        if ($this->state->reviewers->count() < $this->stage->approvalsRequired) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                t('Not enough eligible reviewers are available.'),
+                $this->context->payload,
+            );
+        }
+
+        $approvals = $this->state->effectiveApprovalIds->count();
+        if ($approvals >= $this->stage->approvalsRequired) {
+            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $this->context->payload);
+        }
+
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Pending,
+            t('{count} of {required} approved', ['count' => $approvals, 'required' => $this->stage->approvalsRequired]),
+            $this->context->payload,
+        );
+    }
+
+    /** @return array{canReview: bool, canRequestReviewAgain: bool} */
+    public function actionsFor(CraftUser $viewer): array
+    {
+        return [
+            'canReview' => $this->canReview($viewer),
+            'canRequestReviewAgain' => $this->canRequestReviewAgain($viewer),
+        ];
+    }
+
+    public function decide(UserReviewDecision $decision, ?string $message, CraftUser $reviewer): WorkflowStageResult
+    {
+        $reviewerId = $reviewer->getCraftUserId();
+        if ($reviewerId === null || ! $this->canReview($reviewer)) {
+            throw new WorkflowException('This stage action is not available to you.');
+        }
+
+        $message = trim((string) $message);
+        if ($decision === UserReviewDecision::Rejected && $message === '') {
+            throw new WorkflowException('A message is required when requesting changes.');
+        }
+
+        $payload = $this->context->payload;
+        $payload['decisions'] = $this->decisions->append(
+            $reviewerId,
+            $decision,
+            $message !== '' ? $message : null,
+        );
+
+        return self::for($this->stage, $this->withPayload($payload))->result();
+    }
+
+    public function requestReviewAgain(CraftUser $requester): WorkflowStageResult
+    {
+        if (! $this->canRequestReviewAgain($requester)) {
+            throw new WorkflowException('This stage cannot be requested again.');
+        }
+
+        return $this->awaitingApproval();
+    }
+
+    public function contentChanged(): ?WorkflowStageResult
+    {
+        if ($this->context->run->isPending() && $this->state->effectiveApprovalIds->isEmpty()) {
+            return null;
+        }
+
+        return $this->awaitingApproval();
+    }
+
+    /** @return Collection<int, User> */
+    public function outstandingReviewers(): Collection
+    {
+        if ($this->hasMissingReviewerGroups) {
+            return collect();
+        }
+
+        $decidedReviewerIds = collect($this->decisions->all)->pluck('reviewerId');
+
+        return $this->state->reviewers->whereNotIn(
+            'id',
+            $this->state->effectiveApprovalIds->merge($decidedReviewerIds),
+        );
+    }
+
+    public function state(): UserReviewState
+    {
+        return $this->state;
+    }
+
+    /** @return Collection<int, UserGroup> */
+    public function groups(): Collection
+    {
+        return $this->groups;
+    }
+
+    private function canReview(CraftUser $reviewer): bool
+    {
+        if ($this->hasMissingReviewerGroups || $this->decisions->hasRejection()) {
+            return false;
+        }
+
+        $reviewerId = $reviewer->getCraftUserId();
+
+        return $reviewerId !== null
+            && $reviewerId !== $this->context->run->authorId
+            && $this->state->reviewers->contains('id', $reviewerId)
+            && $this->state->effectiveApprovalIds->doesntContain($reviewerId)
+            && ! $this->decisions->hasDecisionFrom($reviewerId);
+    }
+
+    private function canRequestReviewAgain(CraftUser $requester): bool
+    {
+        return $this->decisions->hasRejection()
+            && $requester->getCraftUserId() === $this->context->run->authorId
+            && Gate::forUser($requester)->allows('save', $this->context->draft);
+    }
+
+    private function perGroupResult(): WorkflowStageResult
+    {
+        $groups = $this->groups->map(function (UserGroup $group): array {
+            $reviewerIds = $this->state->reviewersForGroup($group)->pluck('id');
+
+            return [
+                'reviewers' => $reviewerIds->count(),
+                'approvals' => $this->state->effectiveApprovalIds->intersect($reviewerIds)->count(),
+            ];
+        });
+
+        if ($groups->contains(fn (array $group): bool => $group['reviewers'] < $this->stage->approvalsRequired)) {
+            return new WorkflowStageResult(
+                WorkflowStageStatus::Pending,
+                t('Not enough eligible reviewers are available.'),
+                $this->context->payload,
+            );
+        }
+
+        if ($groups->every(fn (array $group): bool => $group['approvals'] >= $this->stage->approvalsRequired)) {
+            return new WorkflowStageResult(WorkflowStageStatus::Approved, t('Approved'), $this->context->payload);
+        }
+
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Pending,
+            t('Approvals are required from every reviewer group.'),
+            $this->context->payload,
+        );
+    }
+
+    private function awaitingApproval(): WorkflowStageResult
+    {
+        return new WorkflowStageResult(
+            WorkflowStageStatus::Pending,
+            t('Awaiting approval'),
+            [
+                'decisions' => [],
+                'previousApprovalsReset' => true,
+            ],
+        );
+    }
+
+    /** @param array<string, mixed> $payload */
+    private function withPayload(array $payload): WorkflowStageContext
+    {
+        return new WorkflowStageContext(
+            draft: $this->context->draft,
+            run: $this->context->run,
+            stage: $this->context->stage,
+            payload: $payload,
+        );
+    }
+}
diff --git a/src/Workflow/Workflows.php b/src/Workflow/Workflows.php
index b132933a229..6746b3500cc 100644
--- a/src/Workflow/Workflows.php
+++ b/src/Workflow/Workflows.php
@@ -182,25 +182,57 @@ public function submitForReview(ElementInterface $draft, ?string $note = null):
                 throw new WorkflowException('A workflow must contain at least one stage.');
             }
 
-            $this->beforeTransition(WorkflowTransition::Submit, $submittedDraft, $author, note: $note);
-            $rootEvent = $this->recordSubmission($submittedDraft, $author, $workflow, $note);
-            $run = WorkflowRun::query()->create([
-                'workflowId' => $workflow->id,
-                'draftId' => $draft->draftId,
-                'authorId' => $author->getCraftUserId(),
-                'activityRootEventId' => $rootEvent->id,
-                'currentStage' => 0,
+            return $this->createRun($submittedDraft, $author, $workflow, $note);
+        });
+
+        $this->afterTransition(WorkflowTransition::Submit, $submittedDraft, $author, $run, $note);
+
+        return $run;
+    }
+
+    public function restartWorkflow(ElementInterface $draft, int $runId): WorkflowRun
+    {
+        $this->ensureAvailable();
+        $actor = $this->actor();
+        $submittedDraft = $draft;
+        $restartedRun = null;
+
+        $run = DB::transaction(function () use ($draft, $runId, $actor, &$submittedDraft, &$restartedRun): WorkflowRun {
+            $this->lockDraft($draft);
+            $submittedDraft = $draft::find()
+                ->draftId($draft->draftId)
+                ->provisionalDrafts(null)
+                ->siteId($draft->siteId)
+                ->status(null)
+                ->one()
+                ?? throw new WorkflowException('This draft could not be found.');
+            $this->ensureReviewableDraft($submittedDraft);
+
+            if (! Gate::forUser($actor)->allows('save', $submittedDraft)) {
+                throw new WorkflowException('You are not allowed to edit this draft.');
+            }
+
+            $workflow = $this->forElement($submittedDraft)
+                ?? throw new WorkflowException('This element does not have an approval workflow.');
+            $restartedRun = $this->latestRun($submittedDraft);
+
+            if ($restartedRun?->id !== $runId || ! in_array($restartedRun->status, [WorkflowStatus::Pending, WorkflowStatus::Approved], true)) {
+                throw new WorkflowException('This review can no longer be restarted.');
+            }
+
+            $stage = $this->currentStage($restartedRun);
+            $this->beforeTransition(WorkflowTransition::Restart, $submittedDraft, $actor, $restartedRun);
+            $restartedRun->update([
+                'status' => WorkflowStatus::Invalidated,
                 'currentStageResult' => null,
-                'status' => WorkflowStatus::Pending,
-                'payload' => [],
             ]);
+            $this->recordTransition($submittedDraft, $actor, $restartedRun, WorkflowTransition::Restart, $stage);
 
-            $this->advance($submittedDraft, $run);
-
-            return $run->refresh()->load('activityRootEvent');
+            return $this->createRun($submittedDraft, $actor, $workflow);
         });
 
-        $this->afterTransition(WorkflowTransition::Submit, $submittedDraft, $author, $run, $note);
+        $this->afterTransition(WorkflowTransition::Restart, $submittedDraft, $actor, $restartedRun);
+        $this->afterTransition(WorkflowTransition::Submit, $submittedDraft, $actor, $run);
 
         return $run;
     }
@@ -239,7 +271,9 @@ public function reportStageResult(
                 return null;
             }
 
-            if (! $run->isPending()) {
+            $canRequestReviewAgain = $activityTransition === WorkflowTransition::RequestReview
+                && $run->status === WorkflowStatus::Failed;
+            if (! $run->isPending() && ! $canRequestReviewAgain) {
                 return $run;
             }
 
@@ -400,10 +434,7 @@ public function contentChanged(ElementInterface $draft): void
     /** @param list<int> $draftIds */
     public function contentChangedByDraftIds(array $draftIds): void
     {
-        $this->invalidateActiveRuns(
-            WorkflowRun::query()->whereIn('draftId', $draftIds),
-            'The draft changed.',
-        );
+        $this->resetApprovalsForContentChanges(WorkflowRun::query()->whereIn('draftId', $draftIds));
     }
 
     public function invalidateRuns(Workflow $workflow, string $reason): void
@@ -495,6 +526,10 @@ private function advanceFromResult(WorkflowRun $run, WorkflowStageData $stage, W
         $this->storeStageResult($run, $stage, $result);
 
         if ($result->status === WorkflowStageStatus::Pending) {
+            if (! $run->isPending()) {
+                $run->update(['status' => WorkflowStatus::Pending]);
+            }
+
             return false;
         }
 
@@ -572,6 +607,52 @@ private function invalidateActiveRuns($query, string $reason): void
             });
     }
 
+    /** @param Builder<WorkflowRun> $query */
+    private function resetApprovalsForContentChanges($query): void
+    {
+        $query->whereIn('status', [WorkflowStatus::Pending, WorkflowStatus::Approved])
+            ->with('activityRootEvent')
+            ->get()
+            ->each(function (WorkflowRun $run): void {
+                $draft = $this->draftForRun($run);
+                if ($draft === null) {
+                    return;
+                }
+
+                $stage = $this->currentStage($run);
+                $component = $stage->component();
+                $context = $this->stageContext($draft, $run, $stage);
+                if ($component instanceof UserReviewStage) {
+                    $contentChangeResult = $component->contentChanged($context);
+                    if ($contentChangeResult === null) {
+                        return;
+                    }
+
+                    $stagePayload = $contentChangeResult->payload;
+                } else {
+                    if ($run->isPending()) {
+                        return;
+                    }
+
+                    $stagePayload = [];
+                }
+
+                $payload = $run->payload ?? [];
+                $payload[$stage->uid] = $stagePayload;
+                $run->update([
+                    'status' => WorkflowStatus::Pending,
+                    'currentStageResult' => null,
+                    'payload' => $payload,
+                ]);
+
+                $actor = currentUser();
+                $this->recordTransition($draft, $actor, $run, WorkflowTransition::RequestReview, $stage);
+                $this->advance($draft, $run);
+                $run->refresh();
+                $this->afterTransition(WorkflowTransition::RequestReview, $draft, $actor, $run);
+            });
+    }
+
     private function draftForRun(WorkflowRun $run): ?ElementInterface
     {
         $type = $run->activityRootEvent->data['draft']['elementType'] ?? null;
@@ -656,6 +737,26 @@ private function afterTransition(WorkflowTransition $transition, ElementInterfac
         DB::afterCommit(fn () => event(new WorkflowTransitioned($transition, $draft, $actor, $run, $note)));
     }
 
+    private function createRun(ElementInterface $draft, CraftUser $author, Workflow $workflow, ?string $note = null): WorkflowRun
+    {
+        $this->beforeTransition(WorkflowTransition::Submit, $draft, $author, note: $note);
+        $rootEvent = $this->recordSubmission($draft, $author, $workflow, $note);
+        $run = WorkflowRun::query()->create([
+            'workflowId' => $workflow->id,
+            'draftId' => $draft->draftId,
+            'authorId' => $author->getCraftUserId(),
+            'activityRootEventId' => $rootEvent->id,
+            'currentStage' => 0,
+            'currentStageResult' => null,
+            'status' => WorkflowStatus::Pending,
+            'payload' => [],
+        ]);
+
+        $this->advance($draft, $run);
+
+        return $run->refresh()->load('activityRootEvent');
+    }
+
     private function recordSubmission(ElementInterface $draft, CraftUser $actor, Workflow $workflow, ?string $note): ActivityEvent
     {
         return Activities::record(new WorkflowActivityEvent(
@@ -757,6 +858,7 @@ private function timelineItems(ElementInterface $draft, CraftUser $viewer, Colle
                     WorkflowActivityType::Comment => 'comment',
                     WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => 'check',
                     WorkflowActivityType::Reject, WorkflowActivityType::StageFailed => 'xmark',
+                    WorkflowActivityType::RequestReview, WorkflowActivityType::Restart => 'rotate',
                     default => 'rotate',
                 },
                 description: match ($type) {
@@ -764,6 +866,8 @@ private function timelineItems(ElementInterface $draft, CraftUser $viewer, Colle
                     WorkflowActivityType::Comment => t('commented.'),
                     WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => t('approved'),
                     WorkflowActivityType::Reject => t('requested changes'),
+                    WorkflowActivityType::RequestReview => t('requested another review'),
+                    WorkflowActivityType::Restart => t('restarted the workflow'),
                     WorkflowActivityType::StageFailed => t('failed the stage'),
                     default => t('updated the workflow stage'),
                 },
@@ -772,6 +876,7 @@ private function timelineItems(ElementInterface $draft, CraftUser $viewer, Colle
                 decision: match ($type) {
                     WorkflowActivityType::Approve, WorkflowActivityType::StageApproved => WorkflowStageStatus::Approved->value,
                     WorkflowActivityType::Reject => 'rejected',
+                    WorkflowActivityType::RequestReview, WorkflowActivityType::Restart => 'reset',
                     WorkflowActivityType::StageFailed => WorkflowStageStatus::Failed->value,
                     default => null,
                 },
diff --git a/tests/Feature/Workflow/UserReviewStageTest.php b/tests/Feature/Workflow/UserReviewStageTest.php
index b652317b694..29dc809e48b 100644
--- a/tests/Feature/Workflow/UserReviewStageTest.php
+++ b/tests/Feature/Workflow/UserReviewStageTest.php
@@ -162,23 +162,33 @@
         ->and(collect($review->runs)->firstWhere('current')->stages[1]->summaryProps['approvals'])->toBe(0);
 });
 
-it('does not carry approvals from an earlier workflow run', function () {
-    $group = userReviewGroup([$this->reviewers[0], $this->reviewers[1]]);
-    $workflow = userReviewWorkflow($this->entry, [makeUserReviewStage('Editorial review', $group, approvals: 2)]);
+it('does not carry approvals into a manually restarted workflow run', function () {
+    $editorial = userReviewGroup([$this->reviewers[0]]);
+    $legal = userReviewGroup([$this->reviewers[1]]);
+    $workflow = userReviewWorkflow($this->entry, [
+        makeUserReviewStage('Editorial review', $editorial),
+        makeUserReviewStage('Legal review', $legal),
+    ]);
     $firstRun = submitUserReview($this->workflows, $this->draft, $this->author);
 
     decideUserReview(
         $this->workflows,
         $this->reviewers[0],
         $firstRun,
-        $workflow->stages->sole(),
+        $workflow->stages->first(),
         UserReviewDecision::Approved,
     );
-    $this->workflows->contentChanged($this->draft);
-    $secondRun = submitUserReview($this->workflows, $this->draft, $this->author);
+    expect($firstRun->fresh()->currentStage)->toBe(1);
+
+    $secondRun = actAsUserReview(
+        $this->author,
+        fn (): WorkflowRun => $this->workflows->restartWorkflow($this->draft, $firstRun->id),
+    );
 
     $review = $this->workflows->reviewData($this->draft, $this->reviewers[0]);
-    expect($secondRun->status)->toBe(WorkflowStatus::Pending)
+    expect($firstRun->fresh()->status)->toBe(WorkflowStatus::Invalidated)
+        ->and($secondRun->status)->toBe(WorkflowStatus::Pending)
+        ->and($secondRun->currentStage)->toBe(0)
         ->and($review->actionProps['canReview'])->toBeTrue()
         ->and(collect($review->runs)->firstWhere('current')->stages[0]->summaryProps['approvals'])->toBe(0);
 });
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index 075ddb51714..402d08ebc17 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -301,7 +301,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         ->and($stageData->events[0]->noteHtml)->toContain('Automated check failed');
 });
 
-it('ignores stale automated stage completions', function () {
+it('allows a pending automated stage to complete after content changes', function () {
     app(WorkflowStageTypes::class)->register(TestAutomatedWorkflowStage::class);
     $workflow = workflowFor($this->entry, [automatedStage('External check', 'pending')]);
     $run = submitAs($this->workflows, $this->draft, $this->author);
@@ -327,7 +327,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         result: $result,
     );
 
-    expect($completed->status)->toBe(WorkflowStatus::Invalidated);
+    expect($completed->status)->toBe(WorkflowStatus::Approved);
 
     expect($this->workflows->reportStageResult(
         runId: PHP_INT_MAX,
@@ -365,7 +365,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     expect($run->status)->toBe(WorkflowStatus::Approved);
 });
 
-it('fails on a change request and preserves history when resubmitted', function () {
+it('fails on a change request and restores the current stage when review is requested again', function () {
     $group = reviewerGroup([$this->reviewers[0]]);
     $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
     $stage = $workflow->stages->sole();
@@ -380,19 +380,44 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         'Clarify the claim.',
     );
     $this->workflows->addComment($this->draft, $firstRun->id, $stage->uid, 'I will revise it.');
-    submitAs($this->workflows, $this->draft, $this->author, 'Revised.');
-    $review = $this->workflows->reviewData($this->draft, $this->author);
 
+    $failedReview = $this->workflows->reviewData($this->draft, $this->author);
     expect($firstRun->status)->toBe(WorkflowStatus::Failed)
-        ->and($review->runs)->toHaveCount(2)
-        ->and(collect($review->runs)->last()->stages[0]->icon)->toBe('xmark')
-        ->and(collect($review->runs)->last()->stages[0]->events)->toHaveCount(2)
-        ->and(collect($review->runs)->last()->stages[0]->events[0]->icon)->toBe('xmark')
-        ->and(collect($review->runs)->last()->stages[0]->events[0]->description)->toBe('requested changes')
-        ->and(collect($review->runs)->last()->stages[0]->events[1]->icon)->toBe('comment')
-        ->and(collect($review->runs)->last()->stages[0]->events[1]->description)->toBe('commented.')
-        ->and(collect($review->runs)->first()->submission->icon)->toBe('clipboard-list-check')
-        ->and(collect($review->runs)->first()->submission->description)->toBe('requested review');
+        ->and(collect($failedReview->runs)->first()->stages[0]->icon)->toBe('xmark')
+        ->and($failedReview->actionProps['canRequestReviewAgain'])->toBeTrue()
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[0])->actionProps['canRequestReviewAgain'])->toBeFalse();
+
+    actingAs($this->reviewers[0]);
+    postJson(action([UserReviewController::class, 'requestReview'], [
+        'workflowRun' => $firstRun,
+        'stage' => $stage->uid,
+    ]), elementIdentity($this->entry, $this->draft))
+        ->assertUnprocessable()
+        ->assertJsonPath('message', 'This stage cannot be requested again.');
+
+    actingAs($this->author);
+    postJson(action([UserReviewController::class, 'requestReview'], [
+        'workflowRun' => $firstRun,
+        'stage' => $stage->uid,
+    ]), elementIdentity($this->entry, $this->draft))
+        ->assertOk()
+        ->assertJsonPath('workflowReview.status', 'pending');
+    $review = $this->workflows->reviewData($this->draft, $this->author);
+
+    $resetRun = $firstRun->fresh();
+    expect($resetRun->status)->toBe(WorkflowStatus::Pending)
+        ->and($resetRun->payload[$stage->uid])->toBe([
+            'decisions' => [],
+            'previousApprovalsReset' => true,
+        ])
+        ->and($review->runs)->toHaveCount(1)
+        ->and(collect($review->runs)->first()->stages[0]->icon)->toBe('clock')
+        ->and(collect($review->runs)->first()->stages[0]->events)->toHaveCount(3)
+        ->and(collect($review->runs)->first()->stages[0]->events[0]->description)->toBe('requested changes')
+        ->and(collect($review->runs)->first()->stages[0]->events[1]->description)->toBe('commented.')
+        ->and(collect($review->runs)->first()->stages[0]->events[2]->description)->toBe('requested another review')
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[0])->actionProps['canReview'])->toBeTrue()
+        ->and($this->reviewers[0]->notifications()->count())->toBe(2);
 });
 
 it('presents workflow activity as a grouped review and snapshots the workflow definition', function () {
@@ -448,28 +473,68 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     expect(workflowEvents($this->entry, WorkflowActivityType::Comment))->toHaveCount(1);
 });
 
-it('invalidates pending and approved runs when publishable content changes', function () {
-    $group = reviewerGroup([$this->reviewers[0]]);
-    $workflow = workflowFor($this->entry, [userReviewStage('Review', $group)]);
-    $stage = $workflow->stages->sole();
+it('resets current-stage approvals after pending and approved content changes', function () {
+    $firstGroup = reviewerGroup([$this->reviewers[0]]);
+    $finalGroup = reviewerGroup([$this->reviewers[1], $this->reviewers[2]]);
+    $workflow = workflowFor($this->entry, [
+        userReviewStage('Editorial review', $firstGroup),
+        userReviewStage('Final review', $finalGroup, approvals: 2),
+    ]);
     $pending = submitAs($this->workflows, $this->draft, $this->author);
 
+    $pending = reviewStageAs(
+        $this->workflows,
+        $this->reviewers[0],
+        $pending,
+        $workflow->stages->first(),
+        UserReviewDecision::Approved,
+    );
+    $pending = reviewStageAs(
+        $this->workflows,
+        $this->reviewers[1],
+        $pending,
+        $workflow->stages->last(),
+        UserReviewDecision::Approved,
+    );
     $this->draft->title = 'Changed during review';
     expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
-    expect($pending->fresh()->status)->toBe(WorkflowStatus::Invalidated);
 
-    $approved = submitAs($this->workflows, $this->draft, $this->author);
-    reviewStageAs(
+    $resetPending = $pending->fresh();
+    expect($resetPending->status)->toBe(WorkflowStatus::Pending)
+        ->and($resetPending->currentStage)->toBe(1)
+        ->and($resetPending->payload[$workflow->stages->first()->uid]['decisions'])->toHaveCount(1)
+        ->and($resetPending->payload[$workflow->stages->last()->uid])->toBe([
+            'decisions' => [],
+            'previousApprovalsReset' => true,
+        ])
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[1])->actionProps['canReview'])->toBeTrue();
+
+    $approved = reviewStageAs(
         $this->workflows,
-        $this->reviewers[0],
+        $this->reviewers[1],
+        $resetPending,
+        $workflow->stages->last(),
+        UserReviewDecision::Approved,
+    );
+    $approved = reviewStageAs(
+        $this->workflows,
+        $this->reviewers[2],
         $approved,
-        $stage,
+        $workflow->stages->last(),
         UserReviewDecision::Approved,
     );
     $this->draft->title = 'Changed after approval';
     expect(Elements::saveElement($this->draft, updateSearchIndex: false))->toBeTrue();
 
-    expect($approved->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+    $reopened = $approved->fresh();
+    expect($reopened->status)->toBe(WorkflowStatus::Pending)
+        ->and($reopened->currentStage)->toBe(1)
+        ->and($reopened->payload[$workflow->stages->first()->uid]['decisions'])->toHaveCount(1)
+        ->and($reopened->payload[$workflow->stages->last()->uid])->toBe([
+            'decisions' => [],
+            'previousApprovalsReset' => true,
+        ])
+        ->and($this->workflows->reviewData($this->draft, $this->reviewers[1])->actionProps['canReview'])->toBeTrue();
 });
 
 it('invalidates an approved run when its workflow assignment changes', function () {
@@ -593,7 +658,10 @@ function (ElementInterface $draft) use (&$applied): ElementInterface {
     $review = $this->workflows->reviewData($this->draft, $this->reviewers[0]);
     expect($review->actionComponent)->toBe('craft:user-review-workflow-stage-actions')
         ->and($review->showDefaultActions)->toBeFalse()
-        ->and($review->actionProps)->toBe(['canReview' => true]);
+        ->and($review->actionProps)->toBe([
+            'canReview' => true,
+            'canRequestReviewAgain' => false,
+        ]);
 
     postJson(action([UserReviewController::class, 'approve'], [
         'workflowRun' => $run,

From fb66538b2371d74857e4a55b57380ef6a4e4795f Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 15:45:46 +0200
Subject: [PATCH 25/32] Improve workflow stage editor

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../field-group/field-group.browser.test.ts   |  85 ++++++
 .../src/components/field-group/field-group.ts |  24 +-
 resources/js/modules/forms/GroupNode.vue      |   5 +-
 .../components/WorkflowStagesInput.test.ts    |  69 +----
 .../components/WorkflowStagesInput.vue        | 255 ++++++++----------
 src/Form/Nodes/Group.php                      |  10 +-
 src/Workflow/UserReview/UserReviewStage.php   |  27 +-
 tests/Feature/Workflow/WorkflowsTest.php      |   2 +-
 8 files changed, 270 insertions(+), 207 deletions(-)
 create mode 100644 packages/craftcms-ui/src/components/field-group/field-group.browser.test.ts

diff --git a/packages/craftcms-ui/src/components/field-group/field-group.browser.test.ts b/packages/craftcms-ui/src/components/field-group/field-group.browser.test.ts
new file mode 100644
index 00000000000..c309b9eae4b
--- /dev/null
+++ b/packages/craftcms-ui/src/components/field-group/field-group.browser.test.ts
@@ -0,0 +1,85 @@
+import {beforeEach, expect, it} from 'vite-plus/test';
+import './field-group.js';
+import '../select/select.js';
+
+beforeEach(() => {
+  document.body.innerHTML = '';
+});
+
+it('uses intrinsic widths when space allows and stacks them when it does not', async () => {
+  const fieldGroup = document.createElement('craft-field-group');
+  fieldGroup.classList.add('auto-widths');
+  fieldGroup.style.width = '720px';
+  fieldGroup.style.setProperty('--c-spacing-lg', '24px');
+  fieldGroup.style.setProperty('--c-spacing-sm', '8px');
+  fieldGroup.innerHTML = `
+    <div>Minimum</div>
+    <div class="width-25">Mode</div>
+  `;
+  document.body.append(fieldGroup);
+  await fieldGroup.updateComplete;
+
+  const minimum = fieldGroup.querySelector<HTMLElement>('div:not([class])')!;
+  const mode = fieldGroup.querySelector<HTMLElement>('.width-25')!;
+  expect(minimum.getBoundingClientRect().width).toBeLessThan(
+    mode.getBoundingClientRect().width
+  );
+  expect(minimum.getBoundingClientRect().top).toBe(
+    mode.getBoundingClientRect().top
+  );
+  expect(
+    mode.getBoundingClientRect().left - minimum.getBoundingClientRect().right
+  ).toBeGreaterThanOrEqual(8);
+
+  fieldGroup.style.width = '390px';
+  await new Promise((resolve) => requestAnimationFrame(() => resolve(null)));
+
+  expect(mode.getBoundingClientRect().top).toBeGreaterThan(
+    minimum.getBoundingClientRect().top
+  );
+});
+
+it('sizes an intrinsic select for its longest option', async () => {
+  const fieldGroup = document.createElement('craft-field-group');
+  fieldGroup.classList.add('auto-widths');
+  fieldGroup.style.width = '900px';
+  fieldGroup.style.setProperty('--c-spacing-sm', '8px');
+  fieldGroup.innerHTML = `
+    <div>Minimum</div>
+    <div>
+      <craft-select>
+        <select slot="input">
+          <option selected>Total</option>
+          <option>Per group</option>
+        </select>
+      </craft-select>
+    </div>
+  `;
+  document.body.append(fieldGroup);
+  await fieldGroup.updateComplete;
+
+  const [minimum, mode] = fieldGroup.children as unknown as [
+    HTMLElement,
+    HTMLElement,
+  ];
+  const select = mode.querySelector('craft-select')!;
+  const selectedOptionWidth = document.createElement('craft-select');
+  selectedOptionWidth.style.width = 'max-content';
+  selectedOptionWidth.innerHTML = `
+    <select slot="input">
+      <option selected>Total</option>
+    </select>
+  `;
+  document.body.append(selectedOptionWidth);
+  await Promise.all([
+    select.updateComplete,
+    selectedOptionWidth.updateComplete,
+  ]);
+
+  expect(select.getBoundingClientRect().width).toBeGreaterThan(
+    selectedOptionWidth.getBoundingClientRect().width
+  );
+  expect(mode.getBoundingClientRect().top).toBe(
+    minimum.getBoundingClientRect().top
+  );
+});
diff --git a/packages/craftcms-ui/src/components/field-group/field-group.ts b/packages/craftcms-ui/src/components/field-group/field-group.ts
index eb6e07ba8b2..b208fca4a6f 100644
--- a/packages/craftcms-ui/src/components/field-group/field-group.ts
+++ b/packages/craftcms-ui/src/components/field-group/field-group.ts
@@ -7,7 +7,7 @@ export default class CraftFieldGroup extends LitElement {
         craft-field-group {
           display: grid;
           grid-template-columns: repeat(12, minmax(0, 1fr));
-          gap: var(--gap, var(--c-spacing-lg)) 0;
+          gap: var(--gap, var(--c-spacing-lg)) var(--c-spacing-sm);
           container-type: inline-size;
         }
 
@@ -16,7 +16,20 @@ export default class CraftFieldGroup extends LitElement {
           min-width: 0;
         }
 
+        craft-field-group.auto-widths > :not([class*='width-']) {
+          width: fit-content;
+        }
+
+        craft-field-group.auto-widths > :not([class*='width-']) craft-select {
+          width: max-content;
+          max-width: 100%;
+        }
+
         @container (min-width: 30rem) {
+          craft-field-group.auto-widths > :not([class*='width-']) {
+            grid-column: span 2;
+          }
+
           craft-field-group > .width-25 {
             grid-column: span 3;
           }
@@ -39,6 +52,15 @@ export default class CraftFieldGroup extends LitElement {
         }
 
         @container (min-width: 50rem) {
+          craft-field-group.auto-widths > :not([class*='width-']) {
+            grid-column: span 1;
+          }
+
+          craft-field-group.auto-widths
+            > :not([class*='width-']):has(craft-select) {
+            grid-column: span 2;
+          }
+
           craft-field-group > .width-25 {
             grid-column: span 3;
           }
diff --git a/resources/js/modules/forms/GroupNode.vue b/resources/js/modules/forms/GroupNode.vue
index daa65751e61..3714eaaef61 100644
--- a/resources/js/modules/forms/GroupNode.vue
+++ b/resources/js/modules/forms/GroupNode.vue
@@ -74,7 +74,10 @@
     />
     <craft-field-group
       slot="input"
-      :class="{'group-fields-loading': showLoading}"
+      :class="{
+        'auto-widths': true,
+        'group-fields-loading': showLoading,
+      }"
     >
       <FormNodeList
         :nodes="node.children ?? []"
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
index 534ff6a64b5..4bc13c197fd 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -75,15 +75,9 @@ describe('WorkflowStagesInput', () => {
     return updates;
   }
 
-  function button(label: string): HTMLElement {
-    return container!.querySelector(`[aria-label="${label}"]`)!;
-  }
-
-  async function selectType(label: string, menuIndex: number): Promise<void> {
+  async function selectType(label: string): Promise<void> {
     const menu =
-      container!.querySelectorAll<CraftActionMenu>('craft-action-menu')[
-        menuIndex
-      ]!;
+      container!.querySelectorAll<CraftActionMenu>('craft-action-menu')[1]!;
     await vi.waitFor(() =>
       expect(menu.querySelector('craft-action-item')).not.toBeNull()
     );
@@ -116,8 +110,13 @@ describe('WorkflowStagesInput', () => {
     const updates = mount([stage('editorial', 'Editorial')]);
     await nextTick();
 
-    expect((button('Remove stage') as HTMLButtonElement).disabled).toBe(true);
-    await selectType('User review', 1);
+    const removeAction = [
+      ...container!.querySelectorAll('craft-action-item'),
+    ].find((item) => item.textContent === 'Remove stage') as
+      | (HTMLElement & {disabled: boolean})
+      | undefined;
+    expect(removeAction?.disabled).toBe(true);
+    await selectType('Add User review');
 
     expect(updates.at(-1)).toEqual([
       stage('editorial', 'Editorial'),
@@ -130,52 +129,10 @@ describe('WorkflowStagesInput', () => {
       },
     ]);
 
-    button('Remove stage').click();
+    const firstRemoveAction = [
+      ...container!.querySelectorAll('craft-action-item'),
+    ].find((item) => item.textContent === 'Remove stage') as HTMLElement;
+    firstRemoveAction.click();
     expect(updates.at(-1)?.map(({uid}) => uid)).toEqual(['new-stage']);
   });
-
-  it('confirms and resets settings when changing stage type', async () => {
-    const confirm = vi.fn(() => true);
-    Object.defineProperty(window, 'confirm', {
-      value: confirm,
-      configurable: true,
-    });
-    const updates = mount([stage('editorial', 'Editorial')]);
-    await nextTick();
-
-    await selectType('Automated review', 0);
-
-    expect(confirm).toHaveBeenCalled();
-    expect(updates.at(-1)?.[0]).toEqual({
-      uid: 'editorial',
-      name: 'Editorial',
-      type: 'plugin\\AutomatedStage',
-      settings: {rule: 'passing'},
-      settingsForm: null,
-    });
-  });
-
-  it('labels the stage type picker', async () => {
-    const settingsForm = {
-      scope: [],
-      refreshable: false,
-      nodes: [],
-      values: {},
-      errors: [],
-      globalErrors: [],
-    };
-
-    mount([{...stage('editorial', 'Editorial'), settingsForm}]);
-    await nextTick();
-
-    const typeField = container!.querySelector<
-      HTMLElement & {label: string; updateComplete: Promise<boolean>}
-    >('craft-field');
-    expect(typeField).not.toBeNull();
-    await typeField!.updateComplete;
-    expect(typeField!.label).toBe('Type');
-    expect(typeField!.getAttribute('role')).toBe('group');
-    expect(typeField!.getAttribute('aria-labelledby')).not.toBeNull();
-    expect(typeField!.textContent).toContain('User review');
-  });
 });
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
index ed795ab237e..41f62130f3a 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.vue
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -2,11 +2,11 @@
   import {computed} from 'vue';
   import {t} from '@craftcms/ui';
   import CraftInput from '@craftcms/ui/components/input/input';
-  import TypePicker, {
-    type TypePickerOption,
-  } from '@/common/components/TypePicker.vue';
-  import {useReorderableItems} from '@/common/composables/useReorderableItems';
-  import TypeConfigurator from '@/modules/forms/TypeConfigurator.vue';
+  import ActionMenu from '@/common/components/ActionMenu.vue';
+  import SelectableCardList from '@/common/components/SelectableCardList.vue';
+  import {useSelectable} from '@/common/composables/useSelectable';
+  import type {ActionItems} from '@/common/types';
+  import FormRenderer from '@/modules/forms/FormRenderer.vue';
   import type {
     FormChange,
     FormPayload,
@@ -28,10 +28,11 @@
   const emit = defineEmits<{
     'update:modelValue': [value: WorkflowStage[]];
   }>();
-  const typePickerOptions = computed<TypePickerOption[]>(() =>
-    props.stageTypes.map((type) => ({
-      value: type.type,
-      label: type.label,
+  const addStageActions = computed<ActionItems>(() =>
+    props.stageTypes.map((stageType) => ({
+      label: t('Add {type}', {type: stageType.label}),
+      icon: 'plus',
+      onClick: () => addStage(stageType.type),
     }))
   );
 
@@ -52,27 +53,6 @@
     updateStage(index, {settings: values});
   }
 
-  function changeType(index: number, type: string): void {
-    const current = props.modelValue[index];
-    const replacement = props.stageTypes.find(
-      (candidate) => candidate.type === type
-    );
-    if (!current || !replacement || current.type === type) return;
-
-    if (
-      Object.keys(current.settings).length > 0 &&
-      !window.confirm(t('Changing the stage type will reset its settings.'))
-    ) {
-      return;
-    }
-
-    updateStage(index, {
-      type: replacement.type,
-      settings: {...replacement.settings},
-      settingsForm: replacement.settingsForm,
-    });
-  }
-
   function addStage(type: string): void {
     const stageType = props.stageTypes.find(
       (candidate) => candidate.type === type
@@ -109,12 +89,11 @@
     emit('update:modelValue', stages);
   }
 
-  const {setItemRef, setHandleRef, getDragState, getDropState, getRowPosition} =
-    useReorderableItems({
-      getItemIds: () => props.modelValue.map((stage) => stage.uid),
-      enabled: () => props.editable && props.modelValue.length > 1,
-      onReorder: moveStage,
-    });
+  const selection = useSelectable<string>({
+    ids: () => props.modelValue.map((stage) => stage.uid),
+    enabled: false,
+    readOnly: true,
+  });
 
   function stageTypeLabel(stage: WorkflowStage): string {
     return (
@@ -130,118 +109,120 @@
 
     updateStage(index, {name: String(event.target.modelValue ?? '')});
   }
+
+  function stageActions(index: number): ActionItems {
+    return [
+      {
+        label: t('Remove stage'),
+        icon: 'trash',
+        variant: 'danger',
+        disabled: props.modelValue.length === 1,
+        onClick: () => removeStage(index),
+      },
+    ];
+  }
+
+  function stageForm(stage: WorkflowStage): FormPayload | null {
+    return stage.settingsForm
+      ? {
+          ...(stage.settingsForm as FormPayload),
+          values: stage.settings,
+        }
+      : null;
+  }
 </script>
 
 <template>
-  <div class="flex flex-col gap-2">
-    <craft-pane
-      v-for="(stage, index) in modelValue"
-      :key="stage.uid"
-      :ref="(el: Parameters<typeof setItemRef>[0]) => setItemRef(el, stage.uid)"
-      padding="lg"
-      appearance="outline"
-      class="workflow-stage"
-      :class="{
-        'opacity-50': getDragState(stage.uid).type === 'is-dragging',
-        'bg-gray-100': getDropState(stage.uid).type === 'is-over',
-      }"
-      role="group"
-      :aria-label="t('Stage {num}: {name}', {num: index + 1, name: stage.name})"
+  <div>
+    <SelectableCardList
+      :ids="modelValue.map((stage) => stage.uid)"
+      :selection="selection"
+      :sortable="editable && modelValue.length > 1"
+      :read-only="!editable"
+      single-column
+      tag="div"
+      item-tag="div"
+      list-class="grid gap-1"
+      :card-attrs="
+        (_uid, index) => ({
+          collapsed: !modelValue[index]?.settingsForm,
+        })
+      "
+      :item-attrs="
+        (uid, index) => ({
+          role: 'listitem',
+          'aria-label': t('Stage {num}: {name}', {
+            num: index + 1,
+            name: modelValue[index]?.name ?? uid,
+          }),
+        })
+      "
+      role="list"
+      @reorder="moveStage"
     >
-      <div
-        slot="title"
-        class="workflow-stage__title flex items-center gap-2 font-normal"
-      >
-        <span class="whitespace-nowrap">
-          {{ t('Stage {num}', {num: index + 1}) }}
+      <template #label="{index}">
+        <div class="workflow-stage__title font-normal">
+          <craft-input
+            :label="t('Stage {num} name', {num: index + 1})"
+            label-sr-only
+            small
+            required
+            :disabled="!editable"
+            .modelValue="modelValue[index]?.name ?? ''"
+            @model-value-changed="changeName(index, $event)"
+          >
+            <input slot="input" />
+          </craft-input>
+        </div>
+      </template>
+
+      <template #actions="{index}">
+        <span>
+          {{ stageTypeLabel(modelValue[index]!) }}
         </span>
-        <craft-input
-          :label="t('Stage {num} name', {num: index + 1})"
-          label-sr-only
-          small
-          required
-          :disabled="!editable"
-          .modelValue="stage.name"
-          @model-value-changed="changeName(index, $event)"
-        >
-          <input slot="input" />
-        </craft-input>
-      </div>
-
-      <div
-        v-if="editable"
-        slot="header-actions"
-        class="flex items-center gap-1"
-      >
-        <craft-reorder-button
-          :ref="
-            (el: Parameters<typeof setHandleRef>[0]) =>
-              setHandleRef(el, stage.uid)
-          "
-          :position="getRowPosition(index)"
-          :disabled="modelValue.length === 1"
-          :label="t('Reorder stage {num}', {num: index + 1})"
-          @reorder="
-            (event: CustomEvent<{direction: 'up' | 'down'}>) =>
-              moveStage(
-                index,
-                index + (event.detail.direction === 'up' ? -1 : 1)
-              )
-          "
-        />
-        <craft-button
-          type="button"
-          size="small"
-          variant="danger-plain"
-          icon="xmark"
-          :disabled="modelValue.length === 1"
-          :aria-label="t('Remove stage')"
-          @click="removeStage(index)"
+        <ActionMenu
+          v-if="editable"
+          :actions="stageActions(index)"
+          :label="t('Stage {num} actions', {num: index + 1})"
         />
-      </div>
-
-      <TypeConfigurator
-        :key="stage.type"
-        class="workflow-stage__configurator"
-        :types="typePickerOptions"
-        :selected-type-label="stageTypeLabel(stage)"
-        :type-label="t('Type')"
-        :form="
-          stage.settingsForm
-            ? {
-                ...(stage.settingsForm as FormPayload),
-                values: stage.settings,
-              }
-            : null
-        "
-        :disabled="!editable"
-        @select="changeType(index, $event)"
-        @change="(change, values) => changeSettings(index, change, values)"
-      />
-    </craft-pane>
-
-    <TypePicker
-      v-if="editable"
-      :types="typePickerOptions"
-      :label="t('Add stage')"
-      :disabled="!stageTypes.length"
-      adding
-      @select="addStage"
-    />
+      </template>
+
+      <template #default="{index}">
+        <div v-if="stageForm(modelValue[index]!)">
+          <FormRenderer
+            :key="modelValue[index]!.type"
+            :payload="stageForm(modelValue[index]!)!"
+            :disabled="!editable"
+            @change="(change, values) => changeSettings(index, change, values)"
+          />
+        </div>
+      </template>
+    </SelectableCardList>
+
+    <div v-if="editable" class="mt-3">
+      <ActionMenu
+        :actions="addStageActions"
+        :searchable="stageTypes.length > 5"
+        :label="t('Add stage')"
+      >
+        <template #invoker="{attributes}">
+          <craft-button
+            v-bind="attributes"
+            type="button"
+            variant="dashed"
+            icon="plus"
+            :disabled="!stageTypes.length"
+          >
+            {{ t('Add stage') }}
+          </craft-button>
+        </template>
+      </ActionMenu>
+    </div>
   </div>
 </template>
 
 <style scoped>
-  .workflow-stage {
-    container-type: inline-size;
-  }
-
   .workflow-stage__title :deep(craft-input) {
     min-inline-size: 8rem;
   }
-
-  .workflow-stage__configurator
-    :deep(.type-configurator__fields > craft-field) {
-    flex: 0 0 auto;
-  }
 </style>
diff --git a/src/Form/Nodes/Group.php b/src/Form/Nodes/Group.php
index 0c6d9db55a2..b89a459f99a 100644
--- a/src/Form/Nodes/Group.php
+++ b/src/Form/Nodes/Group.php
@@ -212,9 +212,13 @@ private static function fieldHtml(
             ->instructions($props['instructions'] ?? null)
             ->tip($props['tip'] ?? null)
             ->warning($props['warning'] ?? null)
-            ->input(FieldGroup::make()->children([
-                new HtmlString($renderer->renderNodes($node->children ?? [], $payload)),
-            ]))
+            ->input(
+                FieldGroup::make()
+                    ->children([
+                        new HtmlString($renderer->renderNodes($node->children ?? [], $payload)),
+                    ])
+                    ->attributes(['class' => 'auto-widths']),
+            )
             ->attributes([
                 'class' => isset($props['width']) ? "width-{$props['width']}" : null,
                 'data-form-node' => $node->uid,
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
index f52ee5d07e7..e885f28fccc 100644
--- a/src/Workflow/UserReview/UserReviewStage.php
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -11,6 +11,7 @@
 use CraftCms\Cms\Form\Form;
 use CraftCms\Cms\Form\FormContext;
 use CraftCms\Cms\Form\Nodes\Field;
+use CraftCms\Cms\Form\Nodes\Group;
 use CraftCms\Cms\User\Contracts\CraftUser;
 use CraftCms\Cms\User\Elements\User;
 use CraftCms\Cms\Workflow\Data\WorkflowStageContext;
@@ -51,14 +52,24 @@ public function getRules(): array
     public function settingsForm(FormContext $context = new FormContext): Form
     {
         return Form::make([
-            Field::make(t('Reviewer groups'), UserGroupSelect::make('userGroups'))
-                ->required(),
-            Field::make(t('Approvals required'), Number::make('approvalsRequired')->min(1))
-                ->required(),
-            Field::make(t('Approval mode'), Choice::make('approvalMode')->options([
-                ['label' => t('Total'), 'value' => UserReviewApprovalMode::Total->value],
-                ['label' => t('Per group'), 'value' => UserReviewApprovalMode::PerGroup->value],
-            ]))->required(),
+            Group::make('user-review-settings', [
+                Field::make(t('Reviewer groups'), UserGroupSelect::make('userGroups'))
+                    ->required(),
+                Group::make('user-review-approval-requirement', [
+                    Field::make(t('Minimum'), Number::make('approvalsRequired')->min(1)->size(3))
+                        ->labelSrOnly()
+                        ->required(),
+                    Field::make(t('Mode'), Choice::make('approvalMode')->options([
+                        ['label' => t('Total'), 'value' => UserReviewApprovalMode::Total->value],
+                        ['label' => t('Per group'), 'value' => UserReviewApprovalMode::PerGroup->value],
+                    ]))
+                        ->labelSrOnly()
+                        ->required(),
+                ])
+                    ->label(t('Approvals required'))
+                    ->instructions(t('The minimum number of approvals required in total or per reviewer group.'))
+                    ->asField(),
+            ]),
         ]);
     }
 
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index 402d08ebc17..676981fca25 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -141,7 +141,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
             'userGroups' => [],
         ])
         ->and($userReview['settingsForm'])->not->toBeNull()
-        ->and($userReview['settingsForm']->nodes[0]->control->component)->toBe('craft:user-group-select')
+        ->and($userReview['settingsForm']->nodes[0]->children[0]->control->component)->toBe('craft:user-group-select')
         ->and($automaticApproval)->toMatchArray([
             'label' => 'Automatic approval',
             'settings' => [],

From ef0151dba68f96faaee0dcb80bcc00d614d71978 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 15:57:41 +0200
Subject: [PATCH 26/32] Simplify workflow stage actions

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../js/modules/workflows/components/WorkflowStagesInput.test.ts | 2 +-
 .../js/modules/workflows/components/WorkflowStagesInput.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
index 4bc13c197fd..472b18a71b8 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -116,7 +116,7 @@ describe('WorkflowStagesInput', () => {
       | (HTMLElement & {disabled: boolean})
       | undefined;
     expect(removeAction?.disabled).toBe(true);
-    await selectType('Add User review');
+    await selectType('User review');
 
     expect(updates.at(-1)).toEqual([
       stage('editorial', 'Editorial'),
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
index 41f62130f3a..6ec02576ad3 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.vue
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -30,7 +30,7 @@
   }>();
   const addStageActions = computed<ActionItems>(() =>
     props.stageTypes.map((stageType) => ({
-      label: t('Add {type}', {type: stageType.label}),
+      label: stageType.label,
       icon: 'plus',
       onClick: () => addStage(stageType.type),
     }))

From 4fcf99fd7d8152804f7d38707f645971518740dc Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 16:10:27 +0200
Subject: [PATCH 27/32] Update nested workflow change expectation

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../Controllers/NestedElementsControllerTest.php  | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/tests/Feature/Http/Controllers/NestedElementsControllerTest.php b/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
index dff494a18f6..07a4c84407a 100644
--- a/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
+++ b/tests/Feature/Http/Controllers/NestedElementsControllerTest.php
@@ -2,6 +2,8 @@
 
 declare(strict_types=1);
 
+use CraftCms\Cms\Activity\Data\ActivitySubject;
+use CraftCms\Cms\Activity\Models\ActivityEvent;
 use CraftCms\Cms\Address\Models\Address as AddressModel;
 use CraftCms\Cms\Auth\SessionAuth;
 use CraftCms\Cms\Database\Table;
@@ -19,7 +21,9 @@
 use CraftCms\Cms\Support\Facades\Sections;
 use CraftCms\Cms\Support\Str;
 use CraftCms\Cms\User\Elements\User;
+use CraftCms\Cms\Workflow\Activity\WorkflowActivityEvent;
 use CraftCms\Cms\Workflow\Enums\WorkflowStatus;
+use CraftCms\Cms\Workflow\Enums\WorkflowTransition;
 use CraftCms\Cms\Workflow\Models\Workflow;
 use CraftCms\Cms\Workflow\Workflows;
 use Illuminate\Support\Facades\DB;
@@ -362,7 +366,7 @@ function nestedElementsControllerOwnerSortOrders(int $ownerId): array
         ->not->toBeNull();
 });
 
-it('invalidates a review when a primary nested element is deleted', function () {
+it('re-evaluates a review when a primary nested element is deleted', function () {
     ['owner' => $owner, 'field' => $field, 'entryType' => $entryType] = nestedElementsControllerCreateMatrixOwnerFixture();
     $workflow = Workflow::query()->create([
         'name' => 'Editorial workflow',
@@ -388,5 +392,12 @@ function nestedElementsControllerOwnerSortOrders(int $ownerId): array
         'elementId' => $nestedEntry->id,
     ])->assertOk();
 
-    expect($run->fresh()->status)->toBe(WorkflowStatus::Invalidated);
+    $stageApprovals = ActivityEvent::query()
+        ->subject(ActivitySubject::fromElement($owner))
+        ->eventTypes(WorkflowActivityEvent::class)
+        ->get()
+        ->filter(fn (ActivityEvent $event): bool => $event->data['type'] === WorkflowTransition::StageApproved->value);
+
+    expect($run->fresh()->status)->toBe(WorkflowStatus::Approved)
+        ->and($stageApprovals)->toHaveCount(2);
 });

From 61e9e7b759498160cde0ab418cd8a1c9c32d9361 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 16:20:57 +0200
Subject: [PATCH 28/32] Improve workflow stage cards

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 resources/js/modules/forms/FieldNode.vue      |  1 +
 resources/js/modules/forms/types.ts           |  1 +
 .../components/WorkflowStagesInput.test.ts    | 24 +++++++-
 .../components/WorkflowStagesInput.vue        | 57 ++++++++-----------
 .../js/pages/settings/workflows/Edit.vue      |  3 +-
 5 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/resources/js/modules/forms/FieldNode.vue b/resources/js/modules/forms/FieldNode.vue
index 763dc82e14c..4b2be8cafe7 100644
--- a/resources/js/modules/forms/FieldNode.vue
+++ b/resources/js/modules/forms/FieldNode.vue
@@ -168,6 +168,7 @@
       control: control.value,
       value: value.value,
       values: props.values,
+      errors: props.errors,
       label: props.node.props.label ?? undefined,
       editable: editable.value,
       invalid: controlErrors.value.length > 0,
diff --git a/resources/js/modules/forms/types.ts b/resources/js/modules/forms/types.ts
index 4dda207abed..12bfb4cbe5e 100644
--- a/resources/js/modules/forms/types.ts
+++ b/resources/js/modules/forms/types.ts
@@ -108,6 +108,7 @@ export type FormControlOverrideProps = {
   control: FormControlPayload;
   value: FormValue;
   values: FormPayload['values'];
+  errors: FormPayload['errors'];
   label?: string;
   editable: boolean;
   invalid: boolean;
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
index 472b18a71b8..a78e66896a2 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -52,7 +52,10 @@ describe('WorkflowStagesInput', () => {
     vi.unstubAllGlobals();
   });
 
-  function mount(stages: WorkflowStage[]) {
+  function mount(
+    stages: WorkflowStage[],
+    errors: CraftCms.Cms.Form.FormPayload['errors'] = []
+  ) {
     const updates: WorkflowStage[][] = [];
     const modelValue = shallowRef(stages);
     container = document.createElement('div');
@@ -63,6 +66,7 @@ describe('WorkflowStagesInput', () => {
           modelValue: modelValue.value,
           stageTypes,
           editable: true,
+          errors,
           'onUpdate:modelValue': (value: WorkflowStage[]) => {
             modelValue.value = value;
             updates.push(value);
@@ -135,4 +139,22 @@ describe('WorkflowStagesInput', () => {
     firstRemoveAction.click();
     expect(updates.at(-1)?.map(({uid}) => uid)).toEqual(['new-stage']);
   });
+
+  it('shows a stage name validation error on its field', async () => {
+    mount(
+      [stage('editorial', '')],
+      [
+        {
+          path: ['stages', '0', 'name'],
+          messages: ['The name field is required.'],
+        },
+      ]
+    );
+    await nextTick();
+
+    const nameInput = container!.querySelector('craft-input');
+
+    expect(nameInput?.getAttribute('has-feedback-for')).toBe('error');
+    expect(nameInput?.textContent).toContain('The name field is required.');
+  });
 });
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
index 6ec02576ad3..239e7f8702a 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.vue
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
   import {computed} from 'vue';
   import {t} from '@craftcms/ui';
-  import CraftInput from '@craftcms/ui/components/input/input';
+  import CraftInput from '@craftcms/ui/vue/CraftInput.vue';
   import ActionMenu from '@/common/components/ActionMenu.vue';
   import SelectableCardList from '@/common/components/SelectableCardList.vue';
   import {useSelectable} from '@/common/composables/useSelectable';
@@ -24,6 +24,7 @@
     modelValue: WorkflowStage[];
     stageTypes: StageType[];
     editable: boolean;
+    errors?: FormPayload['errors'];
   }>();
   const emit = defineEmits<{
     'update:modelValue': [value: WorkflowStage[]];
@@ -102,12 +103,14 @@
     );
   }
 
-  function changeName(index: number, event: Event): void {
-    if (!(event.target instanceof CraftInput)) {
-      throw new TypeError('Expected a craft input event target.');
-    }
+  function changeName(index: number, value: string | number | undefined): void {
+    updateStage(index, {name: String(value ?? '')});
+  }
 
-    updateStage(index, {name: String(event.target.modelValue ?? '')});
+  function stageNameError(index: number): string | undefined {
+    return props.errors
+      ?.find((error) => error.path.join('.') === `stages.${index}.name`)
+      ?.messages.join(' ');
   }
 
   function stageActions(index: number): ActionItems {
@@ -143,11 +146,6 @@
       tag="div"
       item-tag="div"
       list-class="grid gap-1"
-      :card-attrs="
-        (_uid, index) => ({
-          collapsed: !modelValue[index]?.settingsForm,
-        })
-      "
       :item-attrs="
         (uid, index) => ({
           role: 'listitem',
@@ -161,25 +159,10 @@
       @reorder="moveStage"
     >
       <template #label="{index}">
-        <div class="workflow-stage__title font-normal">
-          <craft-input
-            :label="t('Stage {num} name', {num: index + 1})"
-            label-sr-only
-            small
-            required
-            :disabled="!editable"
-            .modelValue="modelValue[index]?.name ?? ''"
-            @model-value-changed="changeName(index, $event)"
-          >
-            <input slot="input" />
-          </craft-input>
-        </div>
+        {{ stageTypeLabel(modelValue[index]!) }}
       </template>
 
       <template #actions="{index}">
-        <span>
-          {{ stageTypeLabel(modelValue[index]!) }}
-        </span>
         <ActionMenu
           v-if="editable"
           :actions="stageActions(index)"
@@ -188,8 +171,20 @@
       </template>
 
       <template #default="{index}">
-        <div v-if="stageForm(modelValue[index]!)">
+        <div class="grid gap-4">
+          <CraftInput
+            :label="t('Name')"
+            required
+            :disabled="!editable"
+            :model-value="modelValue[index]?.name ?? ''"
+            :error="stageNameError(index)"
+            @update:model-value="changeName(index, $event)"
+          >
+            <input slot="input" />
+          </CraftInput>
+
           <FormRenderer
+            v-if="stageForm(modelValue[index]!)"
             :key="modelValue[index]!.type"
             :payload="stageForm(modelValue[index]!)!"
             :disabled="!editable"
@@ -220,9 +215,3 @@
     </div>
   </div>
 </template>
-
-<style scoped>
-  .workflow-stage__title :deep(craft-input) {
-    min-inline-size: 8rem;
-  }
-</style>
diff --git a/resources/js/pages/settings/workflows/Edit.vue b/resources/js/pages/settings/workflows/Edit.vue
index 8aea4d43f23..0304de84967 100644
--- a/resources/js/pages/settings/workflows/Edit.vue
+++ b/resources/js/pages/settings/workflows/Edit.vue
@@ -47,11 +47,12 @@
 
 <template>
   <FormPage :form="formPayload" :submit="submit">
-    <template #stages="{value, setValue, editable}">
+    <template #stages="{value, setValue, editable, errors}">
       <WorkflowStagesInput
         :model-value="stages(value)"
         :stage-types="stageTypes"
         :editable="editable"
+        :errors="errors"
         @update:model-value="setValue($event, 'discrete')"
       />
     </template>

From 4809151fecdd74035d4f3bc735744c0f9cbcca34 Mon Sep 17 00:00:00 2001
From: Rias <hey@rias.be>
Date: Tue, 22 Sep 2026 16:44:43 +0200
Subject: [PATCH 29/32] Avoid empty workflow stage disclosures

Amp-Thread-ID: https://ampcode.com/threads/T-01a0c79c-cec6-75df-8e8f-c2d90d5dc527
---
 .../js/modules/workflows/components/Stage.vue | 18 +++++++---
 .../components/WorkflowReviewPanel.test.ts    | 34 +++++++++++++++++++
 2 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/resources/js/modules/workflows/components/Stage.vue b/resources/js/modules/workflows/components/Stage.vue
index 758f2dc4bd5..c445fcc20b5 100644
--- a/resources/js/modules/workflows/components/Stage.vue
+++ b/resources/js/modules/workflows/components/Stage.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
   import '@craftcms/ui/components/disclosure/disclosure';
+  import {computed} from 'vue';
   import TimelineItem from './TimelineItem.vue';
 
   type WorkflowReviewData = CraftCms.Cms.Workflow.Data.WorkflowReviewData;
@@ -12,16 +13,24 @@
     number: number;
     collapsible: boolean;
   }>();
+
+  const hasContent = computed(
+    () =>
+      Boolean(props.stage.message) ||
+      props.stage.events.length > 0 ||
+      Boolean(props.stage.summaryComponent)
+  );
+  const isCollapsible = computed(() => props.collapsible && hasContent.value);
 </script>
 
 <template>
   <component
-    :is="collapsible ? 'craft-disclosure' : 'section'"
+    :is="isCollapsible ? 'craft-disclosure' : 'section'"
     class="workflow-review-stage"
-    :opened.prop="collapsible ? stage.current : undefined"
+    :opened.prop="isCollapsible ? stage.current : undefined"
   >
     <craft-button
-      v-if="collapsible"
+      v-if="isCollapsible"
       slot="invoker"
       type="button"
       variant="plain"
@@ -55,7 +64,8 @@
     </div>
 
     <div
-      :slot="collapsible ? 'content' : undefined"
+      v-if="hasContent"
+      :slot="isCollapsible ? 'content' : undefined"
       class="workflow-review-stage__content"
     >
       <p v-if="stage.message" class="workflow-review-stage__message">
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
index 8682425b48f..0f228a01504 100644
--- a/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.test.ts
@@ -739,4 +739,38 @@ describe('WorkflowReviewPanel', () => {
       'Waiting for the external policy service.'
     );
   });
+
+  it('renders stages without details as static status rows', async () => {
+    mount(
+      review({
+        runs: [
+          workflowRun({
+            stages: [
+              workflowRun().stages[0]!,
+              {
+                name: 'External review',
+                current: false,
+                approved: true,
+                icon: 'check',
+                iconColor: 'success',
+                message: null,
+                summaryComponent: null,
+                summaryProps: {},
+                events: [],
+              },
+            ],
+          }),
+        ],
+      })
+    );
+    await nextTick();
+
+    const externalReview = [
+      ...container!.querySelectorAll('.workflow-review-stage'),
+    ].find((stage) => stage.textContent?.includes('External review'))!;
+
+    expect(externalReview.tagName).toBe('SECTION');
+    expect(externalReview.querySelector('craft-button')).toBeNull();
+    expect(externalReview.querySelector('[name="chevron-down"]')).toBeNull();
+  });
 });

From 3e61a34a04ff4b8286767149fb1a925da3c20ce9 Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Wed, 23 Sep 2026 08:25:30 -0700
Subject: [PATCH 30/32] Couple more Craft Pro checks

---
 routes/cp.php                                        | 2 +-
 src/Http/Controllers/Settings/SectionsController.php | 5 ++++-
 src/Workflow/Workflows.php                           | 4 ++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/routes/cp.php b/routes/cp.php
index 1c0996040a8..c0ed9d85934 100644
--- a/routes/cp.php
+++ b/routes/cp.php
@@ -124,7 +124,7 @@
 
     Route::post('notifications/mark-read', [NotificationsController::class, 'markRead']);
 
-    Route::prefix('workflows')->group(function () {
+    Route::prefix('workflows')->middleware(RequireEdition::class.':'.Edition::Pro->value)->group(function () {
         Route::post('submit', [WorkflowTransitionsController::class, 'submit']);
         Route::post('{workflowRun}/override', [WorkflowTransitionsController::class, 'override']);
         Route::post('{workflowRun}/restart', [WorkflowTransitionsController::class, 'restart']);
diff --git a/src/Http/Controllers/Settings/SectionsController.php b/src/Http/Controllers/Settings/SectionsController.php
index 9071fdb661b..e562ab1fcc5 100644
--- a/src/Http/Controllers/Settings/SectionsController.php
+++ b/src/Http/Controllers/Settings/SectionsController.php
@@ -7,6 +7,7 @@
 use CraftCms\Cms\Config\GeneralConfig;
 use CraftCms\Cms\Cp\Data\ActionItem;
 use CraftCms\Cms\Database\Table;
+use CraftCms\Cms\Edition;
 use CraftCms\Cms\Element\Element;
 use CraftCms\Cms\Element\Enums\PropagationMethod;
 use CraftCms\Cms\Entry\EntryTypes;
@@ -143,7 +144,9 @@ public function store(
         $section->name = $request->input('name');
         $section->handle = $request->input('handle');
         $section->type = $request->enum('type', SectionType::class, SectionType::Channel);
-        $section->workflowId = $request->integer('workflowId') ?: null;
+        if (Edition::isAtLeast(Edition::Pro)) {
+            $section->workflowId = $request->integer('workflowId') ?: null;
+        }
         $section->enableVersioning = $request->boolean('enableVersioning', true);
         $minAuthors = $request->input('minAuthors');
         $maxAuthors = $request->input('maxAuthors');
diff --git a/src/Workflow/Workflows.php b/src/Workflow/Workflows.php
index 6746b3500cc..8ff4f34d696 100644
--- a/src/Workflow/Workflows.php
+++ b/src/Workflow/Workflows.php
@@ -315,6 +315,8 @@ public function reportStageResult(
 
     public function addComment(ElementInterface $draft, int $runId, int|string $stage, string $note): WorkflowRun
     {
+        $this->ensureAvailable();
+
         if (trim($note) === '') {
             throw new WorkflowException('A comment is required.');
         }
@@ -344,6 +346,8 @@ public function addComment(ElementInterface $draft, int $runId, int|string $stag
 
     public function overrideApproval(ElementInterface $draft, int $runId, ?string $reason = null): WorkflowRun
     {
+        $this->ensureAvailable();
+
         $reason = $reason !== null && trim($reason) !== '' ? $reason : null;
 
         $actor = $this->actor();

From 8d16da7d8d450533cc65a015313c302c64315ccd Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Wed, 23 Sep 2026 10:16:16 -0700
Subject: [PATCH 31/32] Style tweaks

---
 docs/workflows.md                                         | 2 +-
 packages/craftcms-ui/src/components/card/card.styles.ts   | 4 ++--
 resources/js/common/components/Callout.vue                | 1 -
 .../js/modules/activity/components/ActivityTimeline.vue   | 2 +-
 .../activity/components/ActivityTimelineChangeList.vue    | 1 +
 .../modules/activity/components/ActivityTimelineEvent.vue | 2 ++
 resources/js/modules/forms/MatrixControl.vue              | 2 +-
 resources/js/modules/forms/TypeConfigurator.stories.ts    | 6 +++---
 .../workflows/components/WorkflowEditLockCallout.vue      | 8 +++++++-
 .../modules/workflows/components/WorkflowReviewPanel.vue  | 1 -
 .../workflows/components/WorkflowStagesInput.test.ts      | 4 ++--
 .../modules/workflows/components/WorkflowStagesInput.vue  | 5 +++--
 src/Http/Controllers/Settings/WorkflowsController.php     | 2 +-
 src/Workflow/UserReview/UserReviewStage.php               | 2 +-
 .../Controllers/Elements/ElementDraftsControllerTest.php  | 4 ++--
 .../Http/Controllers/Entries/EditEntryControllerTest.php  | 2 +-
 tests/Feature/Workflow/WorkflowsTest.php                  | 4 ++--
 workbench/app/Workflow/AutomaticApprovalStage.php         | 2 +-
 workbench/database/seeders/DatabaseSeeder.php             | 2 +-
 19 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/docs/workflows.md b/docs/workflows.md
index 720b9503233..9b1e83c557c 100644
--- a/docs/workflows.md
+++ b/docs/workflows.md
@@ -95,7 +95,7 @@ class AutomaticApprovalStage extends WorkflowStage
 {
     public static function displayName(): string
     {
-        return 'Automatic approval';
+        return 'Automatic Approval';
     }
 
     public function evaluate(WorkflowStageContext $context): WorkflowStageResult
diff --git a/packages/craftcms-ui/src/components/card/card.styles.ts b/packages/craftcms-ui/src/components/card/card.styles.ts
index b614aa25e67..a587a198dec 100644
--- a/packages/craftcms-ui/src/components/card/card.styles.ts
+++ b/packages/craftcms-ui/src/components/card/card.styles.ts
@@ -81,8 +81,8 @@ export default css`
 
   .card-body {
     gap: var(--c-spacing-md);
-    padding-inline: var(--c-card-padding-inline, var(--c-spacing-md));
-    padding-block: var(--c-card-padding-block, var(--c-spacing-md));
+    padding-inline: var(--c-card-padding-inline, var(--cp-container-padding));
+    padding-block: var(--c-card-padding-block, var(--cp-container-padding));
   }
 
   .card-body--thumb-start {
diff --git a/resources/js/common/components/Callout.vue b/resources/js/common/components/Callout.vue
index defa9bf14a1..923add0bfcf 100644
--- a/resources/js/common/components/Callout.vue
+++ b/resources/js/common/components/Callout.vue
@@ -32,7 +32,6 @@
     padding: var(--c-callout-padding, var(--c-spacing-md));
     border: 1px solid var(--c-callout-border-color);
     color: var(--c-callout-text);
-    border-radius: var(--c-callout-radius);
   }
 
   .callout--danger {
diff --git a/resources/js/modules/activity/components/ActivityTimeline.vue b/resources/js/modules/activity/components/ActivityTimeline.vue
index 9bc1eb92069..ba92a306b7e 100644
--- a/resources/js/modules/activity/components/ActivityTimeline.vue
+++ b/resources/js/modules/activity/components/ActivityTimeline.vue
@@ -134,7 +134,7 @@
   }
 
   .activity-timeline__composer {
-    padding: var(--c-spacing-md);
+    padding-block-start: var(--c-spacing-md);
   }
 
   .activity-timeline__full-link {
diff --git a/resources/js/modules/activity/components/ActivityTimelineChangeList.vue b/resources/js/modules/activity/components/ActivityTimelineChangeList.vue
index b67fe3a68ae..c53ebd62dcf 100644
--- a/resources/js/modules/activity/components/ActivityTimelineChangeList.vue
+++ b/resources/js/modules/activity/components/ActivityTimelineChangeList.vue
@@ -37,6 +37,7 @@
     container-type: inline-size;
     margin: 0;
     padding: 0;
+    border-inline-start: none;
     list-style: none;
   }
 
diff --git a/resources/js/modules/activity/components/ActivityTimelineEvent.vue b/resources/js/modules/activity/components/ActivityTimelineEvent.vue
index c957f9472b5..98c0cec4cbc 100644
--- a/resources/js/modules/activity/components/ActivityTimelineEvent.vue
+++ b/resources/js/modules/activity/components/ActivityTimelineEvent.vue
@@ -85,6 +85,8 @@
     display: flex;
     flex-direction: column;
     gap: var(--c-spacing-sm);
+    --c-card-padding-inline: var(--c-spacing-md);
+    --c-card-padding-block: var(--c-spacing-md);
   }
 
   .activity-timeline__source {
diff --git a/resources/js/modules/forms/MatrixControl.vue b/resources/js/modules/forms/MatrixControl.vue
index aa8cd67d057..1750bef5379 100644
--- a/resources/js/modules/forms/MatrixControl.vue
+++ b/resources/js/modules/forms/MatrixControl.vue
@@ -1428,7 +1428,7 @@
         single-column
         tag="div"
         item-tag="div"
-        list-class="grid gap-1"
+        list-class="grid gap-md"
         :item-attrs="blockAttrs"
         :card-attrs="blockCardAttrs"
         @reorder="move"
diff --git a/resources/js/modules/forms/TypeConfigurator.stories.ts b/resources/js/modules/forms/TypeConfigurator.stories.ts
index 22328f0a7a4..9907ee1741d 100644
--- a/resources/js/modules/forms/TypeConfigurator.stories.ts
+++ b/resources/js/modules/forms/TypeConfigurator.stories.ts
@@ -14,8 +14,8 @@ setup((app) => {
 });
 
 const types = [
-  {value: 'user-review', label: 'User review'},
-  {value: 'automatic-approval', label: 'Automatic approval'},
+  {value: 'user-review', label: 'User Review'},
+  {value: 'automatic-approval', label: 'Automatic Approval'},
 ];
 
 const userReviewForm: FormPayload = {
@@ -69,7 +69,7 @@ const meta = {
   component: TypeConfigurator,
   args: {
     types,
-    selectedTypeLabel: 'User review',
+    selectedTypeLabel: 'User Review',
     form: userReviewForm,
   },
   parameters: {
diff --git a/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
index f2cdcf9b153..c9a765cfc76 100644
--- a/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
+++ b/resources/js/modules/workflows/components/WorkflowEditLockCallout.vue
@@ -7,7 +7,7 @@
 </script>
 
 <template>
-  <craft-callout variant="warning" icon="lock" appearance="fill">
+  <craft-callout variant="warning" icon="lock" appearance="fill" rounded="none">
     {{
       t(
         'You can edit this draft without resetting completed stages. If it has already been approved, editing it will reopen the final stage.'
@@ -26,3 +26,9 @@
     </craft-button>
   </craft-callout>
 </template>
+
+<style scoped lang="scss">
+  craft-callout {
+    --c-callout-padding-inline: var(--cp-container-padding);
+  }
+</style>
diff --git a/resources/js/modules/workflows/components/WorkflowReviewPanel.vue b/resources/js/modules/workflows/components/WorkflowReviewPanel.vue
index 6bef581a4a8..0461762a8ac 100644
--- a/resources/js/modules/workflows/components/WorkflowReviewPanel.vue
+++ b/resources/js/modules/workflows/components/WorkflowReviewPanel.vue
@@ -77,7 +77,6 @@
   .workflow-review {
     display: grid;
     gap: var(--c-spacing-md);
-    padding: var(--c-spacing-md);
   }
 
   .workflow-review__body {
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
index a78e66896a2..3dfc551d260 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.test.ts
@@ -12,7 +12,7 @@ const type = 'CraftCms\\Cms\\Workflow\\UserReview\\UserReviewStage';
 const stageTypes = [
   {
     type,
-    label: 'User review',
+    label: 'User Review',
     settings: {approvalsRequired: 1, approvalMode: 'total', userGroups: []},
     settingsForm: null,
   },
@@ -120,7 +120,7 @@ describe('WorkflowStagesInput', () => {
       | (HTMLElement & {disabled: boolean})
       | undefined;
     expect(removeAction?.disabled).toBe(true);
-    await selectType('User review');
+    await selectType('User Review');
 
     expect(updates.at(-1)).toEqual([
       stage('editorial', 'Editorial'),
diff --git a/resources/js/modules/workflows/components/WorkflowStagesInput.vue b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
index 239e7f8702a..ea002aac49b 100644
--- a/resources/js/modules/workflows/components/WorkflowStagesInput.vue
+++ b/resources/js/modules/workflows/components/WorkflowStagesInput.vue
@@ -64,7 +64,7 @@
       ...props.modelValue,
       {
         uid: crypto.randomUUID(),
-        name: t('Review'),
+        name: '',
         type: stageType.type,
         settings: {...stageType.settings},
         settingsForm: stageType.settingsForm,
@@ -145,7 +145,7 @@
       single-column
       tag="div"
       item-tag="div"
-      list-class="grid gap-1"
+      list-class="grid gap-md"
       :item-attrs="
         (uid, index) => ({
           role: 'listitem',
@@ -167,6 +167,7 @@
           v-if="editable"
           :actions="stageActions(index)"
           :label="t('Stage {num} actions', {num: index + 1})"
+          :flush="false"
         />
       </template>
 
diff --git a/src/Http/Controllers/Settings/WorkflowsController.php b/src/Http/Controllers/Settings/WorkflowsController.php
index 26d7ca479ab..68920225e3f 100644
--- a/src/Http/Controllers/Settings/WorkflowsController.php
+++ b/src/Http/Controllers/Settings/WorkflowsController.php
@@ -119,7 +119,7 @@ private function save(WorkflowRequest $request, Workflow $workflow): Response
 
     private function form(Workflow $workflow): CpScreenResponse
     {
-        $title = $workflow->exists ? $workflow->name : t('New workflow');
+        $title = $workflow->exists ? $workflow->name : t('Create a new workflow');
 
         return new CpScreenResponse()
             ->title($title)
diff --git a/src/Workflow/UserReview/UserReviewStage.php b/src/Workflow/UserReview/UserReviewStage.php
index e885f28fccc..efb769aaf79 100644
--- a/src/Workflow/UserReview/UserReviewStage.php
+++ b/src/Workflow/UserReview/UserReviewStage.php
@@ -36,7 +36,7 @@ class UserReviewStage extends WorkflowStage
 
     public static function displayName(): string
     {
-        return t('User review');
+        return t('User Review');
     }
 
     public function getRules(): array
diff --git a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
index a24aacf2e2e..5742bd9b29a 100644
--- a/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
+++ b/tests/Feature/Http/Controllers/Elements/ElementDraftsControllerTest.php
@@ -743,7 +743,7 @@ protected function canSave(ElementInterface $element, CraftUser $user): bool
             'uid' => Str::uuid7()->toString(),
             'stages' => [[
                 'uid' => Str::uuid7()->toString(),
-                'name' => 'Automatic approval',
+                'name' => 'Automatic Approval',
                 'type' => AutomaticApprovalStage::class,
                 'settings' => [],
             ]],
@@ -775,7 +775,7 @@ protected function canSave(ElementInterface $element, CraftUser $user): bool
             'uid' => Str::uuid7()->toString(),
             'stages' => [[
                 'uid' => Str::uuid7()->toString(),
-                'name' => 'Automatic approval',
+                'name' => 'Automatic Approval',
                 'type' => AutomaticApprovalStage::class,
                 'settings' => [],
             ]],
diff --git a/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php b/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
index 4597b9577cc..e4d416465b5 100644
--- a/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
+++ b/tests/Feature/Http/Controllers/Entries/EditEntryControllerTest.php
@@ -426,7 +426,7 @@
         'uid' => Str::uuid7()->toString(),
         'stages' => [[
             'uid' => Str::uuid7()->toString(),
-            'name' => 'Automatic approval',
+            'name' => 'Automatic Approval',
             'type' => AutomaticApprovalStage::class,
             'settings' => [],
         ]],
diff --git a/tests/Feature/Workflow/WorkflowsTest.php b/tests/Feature/Workflow/WorkflowsTest.php
index 676981fca25..a29ade68181 100644
--- a/tests/Feature/Workflow/WorkflowsTest.php
+++ b/tests/Feature/Workflow/WorkflowsTest.php
@@ -134,7 +134,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
     $userReview = collect($payload['stageTypes'])->firstWhere('type', UserReviewStage::class);
     $automaticApproval = collect($payload['stageTypes'])->firstWhere('type', AutomaticApprovalStage::class);
 
-    expect($userReview['label'])->toBe('User review')
+    expect($userReview['label'])->toBe('User Review')
         ->and($userReview['settings'])->toBe([
             'approvalsRequired' => 1,
             'approvalMode' => 'total',
@@ -143,7 +143,7 @@ public function evaluate(WorkflowStageContext $context): WorkflowStageResult
         ->and($userReview['settingsForm'])->not->toBeNull()
         ->and($userReview['settingsForm']->nodes[0]->children[0]->control->component)->toBe('craft:user-group-select')
         ->and($automaticApproval)->toMatchArray([
-            'label' => 'Automatic approval',
+            'label' => 'Automatic Approval',
             'settings' => [],
             'settingsForm' => null,
         ]);
diff --git a/workbench/app/Workflow/AutomaticApprovalStage.php b/workbench/app/Workflow/AutomaticApprovalStage.php
index bf5450de043..9ec3b45740e 100644
--- a/workbench/app/Workflow/AutomaticApprovalStage.php
+++ b/workbench/app/Workflow/AutomaticApprovalStage.php
@@ -13,7 +13,7 @@ class AutomaticApprovalStage extends WorkflowStage
 {
     public static function displayName(): string
     {
-        return 'Automatic approval';
+        return 'Automatic Approval';
     }
 
     public function evaluate(WorkflowStageContext $context): WorkflowStageResult
diff --git a/workbench/database/seeders/DatabaseSeeder.php b/workbench/database/seeders/DatabaseSeeder.php
index 5a6e1cd84e6..59686ee21f0 100644
--- a/workbench/database/seeders/DatabaseSeeder.php
+++ b/workbench/database/seeders/DatabaseSeeder.php
@@ -457,7 +457,7 @@ private function seedWorkflow(Section $section): void
             'stages' => [
                 new WorkflowStageData(
                     uid: Str::uuid7()->toString(),
-                    name: 'Automatic approval',
+                    name: 'Automatic Approval',
                     type: AutomaticApprovalStage::class,
                     settings: [],
                 ),

From 9435e7a2ee37d1981d0098c35cbd8e8658c2c33a Mon Sep 17 00:00:00 2001
From: brandonkelly <brandon@pixelandtonic.com>
Date: Wed, 23 Sep 2026 11:43:05 -0700
Subject: [PATCH 32/32] Release notes

[ci skip]
---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0805813e06..3b2da9ee59b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,17 @@
 ### Entries & Sections
 - Added the “Show the Post Date field” and “Show the Expiry Date field” entry type settings. ([#17675](https://github.com/craftcms/cms/pull/17675))
 
+### Workflows
+- Added approval workflows, which control when drafts may be applied to entries. Workflows are configured from Settings → Workflows and assigned to sections. (Craft Pro and Enterprise only.) ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Changes to enabled entries in sections with a workflow are now saved as drafts, which must be submitted for review and approved by each workflow stage before they can be applied. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added the “User Review” workflow stage type, which supports per-group approval requirements, carried-over approvals, change requests, and email notifications for reviewers. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added a “Workflow” element details tab, for submitting drafts for review, reviewing them, and viewing workflow activity history. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added `CraftCms\Cms\Workflow\Contracts\WorkflowStageInterface` and `CraftCms\Cms\Workflow\Stages\WorkflowStage`, for creating custom workflow stage types. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added `CraftCms\Cms\Workflow\WorkflowStageTypes`, for registering custom workflow stage types. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added `CraftCms\Cms\Workflow\Contracts\WorkflowableInterface`, which element types can implement to support workflows. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added `CraftCms\Cms\Workflow\Workflows` and `CraftCms\Cms\Support\Facades\Workflows`. ([#19667](https://github.com/craftcms/cms/pull/19667))
+- Added the `CraftCms\Cms\Workflow\Events\WorkflowTransitioning`, `WorkflowTransitioned`, and `WorkflowCommented` events. ([#19667](https://github.com/craftcms/cms/pull/19667))
+
 ### Elements
 - Added the `autoEagerLoadElements` general config setting (`true` by default), which determines whether element queries should be automatically lazy eager-loaded. ([#19637](https://github.com/craftcms/cms/pull/19637))
 - Added Markdown comments to element activity timelines, with support for editing, removing, structured user mentions, and email notifications.