Add Phase 5 revision lifecycle guards for collaborative editing

Prevents load/create/delete revision operations from running while a
collaborative edit session is active or an unsaved draft exists.

Backend:
- Add _revision_is_locked() helper (checks DB draft + in-memory room)
- GET /revisions annotates each revision with has_draft field
- POST /revisions returns 409 if parent revision is locked
- POST /revisions/current returns 409 if current revision has active room
- DELETE /revisions returns 409 if target revision is locked
- Broadcast GET_SCRIPT_REVISIONS after every code path that creates or
  destroys a ScriptDraft (STOP_SCRIPT_EDIT, on_close, SAVE/DISCARD draft)
- Add TestRevisionLifecycleGuards (8 tests); fix test_ws_controller for
  new GET_SCRIPT_REVISIONS message in checkpoint sequence

Frontend:
- Surface backend 409 error messages in revision action toast errors
- Replace canChangeRevisions with targeted canLoadRevision /
  canDeleteRevision computed props and revisionHasDraft() method
- Add v-b-tooltip.hover on span wrappers for disabled buttons; use ''
  not null so tooltips clear correctly when condition lifts
- Add .btn-group-item CSS using :not(:last-child)/:not(:first-child)
  so solo Load button retains all rounded corners

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Tim020

client/src/store/modules/script.js

@@ -73,8 +73,9 @@ export default {
         context.dispatch('GET_SCRIPT_REVISIONS');
         Vue.$toast.success('Added new script revision!');
       } else {
+        const data = await response.json().catch(() => ({}));
         log.error('Unable to add new script revision');
-        Vue.$toast.error('Unable to add new script revision');
+        Vue.$toast.error(data.message || 'Unable to add new script revision');
       }
     },
     async DELETE_SCRIPT_REVISION(context, revisionID) {
@@ -91,8 +92,9 @@ export default {
         context.dispatch('GET_SCRIPT_REVISIONS');
         Vue.$toast.success('Deleted script revision!');
       } else {
+        const data = await response.json().catch(() => ({}));
         log.error('Unable to delete script revision');
-        Vue.$toast.error('Unable to delete script revision');
+        Vue.$toast.error(data.message || 'Unable to delete script revision');
       }
     },
     async LOAD_SCRIPT_REVISION(context, revisionID) {
@@ -109,8 +111,9 @@ export default {
         context.dispatch('GET_SCRIPT_REVISIONS');
         Vue.$toast.success('Loaded script revision!');
       } else {
+        const data = await response.json().catch(() => ({}));
         log.error('Unable to load script revision');
-        Vue.$toast.error('Unable to load script revision');
+        Vue.$toast.error(data.message || 'Unable to load script revision');
       }
     },
     async SCRIPT_REVISION_CHANGED(context) {

client/src/vue_components/show/config/script/ScriptRevisions.vue

@@ -26,20 +26,29 @@
       <template #cell(current)="data">
         <b-icon-check-square-fill v-if="data.item.id === CURRENT_REVISION" variant="success" />
         <b-button-group v-else>
-          <b-button
+          <span
             v-if="IS_SCRIPT_EDITOR"
-            variant="warning"
-            :disabled="
-              !canChangeRevisions ||
-              data.item.id === CURRENT_REVISION ||
-              submittingLoadRevision ||
-              submittingNewRevision ||
-              deletingRevision
+            v-b-tooltip.hover="
+              !canLoadRevision
+                ? 'Cannot load revision while a collaborative editing session is active'
+                : ''
             "
-            @click="loadRevision(data)"
+            class="btn-group-item"
           >
-            Load
-          </b-button>
+            <b-button
+              variant="warning"
+              :disabled="
+                !canLoadRevision ||
+                data.item.id === CURRENT_REVISION ||
+                submittingLoadRevision ||
+                submittingNewRevision ||
+                deletingRevision
+              "
+              @click="loadRevision(data)"
+            >
+              Load
+            </b-button>
+          </span>
         </b-button-group>
       </template>
       <template #cell(previous_revision_id)="data">
@@ -53,7 +62,7 @@
           <b-button
             variant="warning"
             :disabled="
-              !canChangeRevisions ||
+              !canDeleteRevision ||
               submittingLoadRevision ||
               submittingNewRevision ||
               deletingRevision
@@ -62,36 +71,55 @@
           >
             Edit
           </b-button>
-          <b-button
-            variant="danger"
-            :disabled="
-              !canChangeRevisions ||
-              submittingLoadRevision ||
-              submittingNewRevision ||
-              deletingRevision
+          <span
+            v-b-tooltip.hover="
+              !canDeleteRevision || revisionHasDraft(data.item.id)
+                ? 'Cannot delete revision — it has an active room or unsaved draft'
+                : ''
             "
-            @click="deleteRev(data)"
+            class="btn-group-item"
           >
-            Delete
-          </b-button>
-        </b-button-group>
-      </template>
-      <template #custom-foot="data">
-        <b-tr>
-          <b-td>
             <b-button
-              v-if="IS_SCRIPT_EDITOR"
-              v-b-modal.new-revision
-              variant="outline-success"
+              variant="danger"
               :disabled="
-                !canChangeRevisions ||
+                !canDeleteRevision ||
+                revisionHasDraft(data.item.id) ||
                 submittingLoadRevision ||
                 submittingNewRevision ||
                 deletingRevision
               "
+              @click="deleteRev(data)"
             >
-              New Revision
+              Delete
             </b-button>
+          </span>
+        </b-button-group>
+      </template>
+      <template #custom-foot="data">
+        <b-tr>
+          <b-td>
+            <span
+              v-if="IS_SCRIPT_EDITOR"
+              v-b-tooltip.hover="
+                revisionHasDraft(CURRENT_REVISION)
+                  ? 'Cannot create a new revision — the current revision has an unsaved draft'
+                  : ''
+              "
+              class="btn-group-item"
+            >
+              <b-button
+                v-b-modal.new-revision
+                variant="outline-success"
+                :disabled="
+                  revisionHasDraft(CURRENT_REVISION) ||
+                  submittingLoadRevision ||
+                  submittingNewRevision ||
+                  deletingRevision
+                "
+              >
+                New Revision
+              </b-button>
+            </span>
           </b-td>
           <b-td />
           <b-td />
@@ -144,7 +172,11 @@
       :revision="selectedRevision"
       :revisions="SCRIPT_REVISIONS"
       :current-revision-id="CURRENT_REVISION"
-      :can-edit="IS_SCRIPT_EDITOR && canChangeRevisions"
+      :can-edit="
+        IS_SCRIPT_EDITOR &&
+        canDeleteRevision &&
+        !revisionHasDraft(selectedRevision && selectedRevision.id)
+      "
       :submitting="modalSubmitting"
       @load-revision="handleModalLoadRevision"
       @create-from="handleModalCreateFrom"
@@ -256,8 +288,12 @@ export default {
       'CUTTERS',
       'HAS_DRAFT',
       'IS_SCRIPT_EDITOR',
+      'IS_DRAFT_ACTIVE',
     ]),
-    canChangeRevisions() {
+    canLoadRevision() {
+      return this.EDITORS.length === 0 && this.CUTTERS.length === 0 && !this.IS_DRAFT_ACTIVE;
+    },
+    canDeleteRevision() {
       return this.EDITORS.length === 0 && this.CUTTERS.length === 0;
     },
   },
@@ -270,6 +306,10 @@ export default {
     await this.GET_SCRIPT_CONFIG_STATUS();
   },
   methods: {
+    revisionHasDraft(revisionId) {
+      const rev = this.SCRIPT_REVISIONS.find((r) => r.id === revisionId);
+      return rev ? !!rev.has_draft : false;
+    },
     resetNewRevForm() {
       this.newRevFormState = {
         description: '',
@@ -451,4 +491,18 @@ export default {
 .collapsed-card >>> .card-body {
   padding: 0;
 }
+
+.btn-group-item {
+  display: flex;
+}
+
+.btn-group-item:not(:last-child) > .btn {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+.btn-group-item:not(:first-child) > .btn {
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
 </style>

server/controllers/api/constants.py

@@ -123,3 +123,7 @@
 ERROR_CUTS_BLOCKED_BY_EDITOR = "Cannot enter cuts mode: another user is editing"
 ERROR_CUTS_BLOCKED_BY_CUTTER = "Cannot enter cuts mode: another user is already cutting"
 ERROR_CUTS_BLOCKED_BY_DRAFT = "Cannot enter cuts mode: unsaved draft exists"
+ERROR_ROOM_OPEN_LOAD = "Cannot load revision while a collaborative edit session is active for the current revision"
+ERROR_ROOM_OPEN_OR_DRAFT = (
+    "Cannot perform this operation: target revision has an active room or unsaved draft"
+)

server/controllers/api/show/script/revisions.py

@@ -7,6 +7,8 @@
 
 from controllers.api.constants import (
     ERROR_DESCRIPTION_MISSING,
+    ERROR_ROOM_OPEN_LOAD,
+    ERROR_ROOM_OPEN_OR_DRAFT,
     ERROR_SCRIPT_NOT_FOUND,
     ERROR_SCRIPT_REVISION_NOT_FOUND,
     ERROR_SHOW_NOT_FOUND,
@@ -20,6 +22,7 @@
     ScriptLineRevisionAssociation,
     ScriptRevision,
 )
+from models.script_draft import ScriptDraft
 from models.show import Show
 from rbac.role import Role
 from schemas.schemas import ScriptRevisionsSchema
@@ -28,6 +31,25 @@
 from utils.web.web_decorators import no_live_session, requires_show
 
 
+def _revision_is_locked(session, application, rev_id: int) -> bool:
+    """Return True if a revision has an active draft or a non-empty room.
+
+    :param session: Active SQLAlchemy session.
+    :param application: Tornado application instance.
+    :param rev_id: Revision ID to check.
+    :returns: True if the revision is locked; False otherwise.
+    """
+    draft = session.scalar(select(ScriptDraft).where(ScriptDraft.revision_id == rev_id))
+    if draft:
+        return True
+    room_manager = getattr(application, "room_manager", None)
+    if room_manager:
+        room = room_manager.get_room(rev_id)
+        if room and not room.is_empty:
+            return True
+    return False
+
+
 @ApiRoute("show/script/revisions", ApiVersion.V1)
 class ScriptRevisionsController(BaseAPIController):
     @requires_show
@@ -44,7 +66,13 @@ def get(self):
                 ).first()
 
                 if script:
-                    revisions = [revisions_schema.dump(c) for c in script.revisions]
+                    revisions = []
+                    for c in script.revisions:
+                        rev_dict = revisions_schema.dump(c)
+                        rev_dict["has_draft"] = _revision_is_locked(
+                            session, self.application, c.id
+                        )
+                        revisions.append(rev_dict)
                     self.set_status(200)
                     self.finish(
                         {
@@ -107,6 +135,11 @@ async def post(self):
                     )
                     return
 
+                if _revision_is_locked(session, self.application, parent_rev.id):
+                    self.set_status(409)
+                    await self.finish({"message": ERROR_ROOM_OPEN_OR_DRAFT})
+                    return
+
                 max_rev = session.scalar(
                     select(func.max(ScriptRevision.revision)).where(
                         ScriptRevision.script_id == script.id
@@ -222,6 +255,11 @@ async def delete(self):
                     )
                     return
 
+                if _revision_is_locked(session, self.application, rev.id):
+                    self.set_status(409)
+                    await self.finish({"message": ERROR_ROOM_OPEN_OR_DRAFT})
+                    return
+
                 changed_rev = False
                 if script.current_revision == rev.id:
                     changed_rev = True
@@ -341,6 +379,14 @@ async def post(self):
                     )
                     return
 
+                room_manager = getattr(self.application, "room_manager", None)
+                if room_manager:
+                    room = room_manager.get_room(script.current_revision)
+                    if room and not room.is_empty:
+                        self.set_status(409)
+                        await self.finish({"message": ERROR_ROOM_OPEN_LOAD})
+                        return
+
                 script.current_revision = new_rev.id
                 session.commit()
 

server/controllers/ws_controller.py

@@ -110,6 +110,7 @@ async def _broadcast():
                     if was_editor and not room.has_editors:
                         if room._dirty:
                             await rm._checkpoint_room(room)
+                            await app.ws_send_to_all("NOOP", "GET_SCRIPT_REVISIONS", {})
                         await rm.close_room(room.revision_id)
 
                 IOLoop.current().add_callback(_broadcast)
@@ -496,6 +497,9 @@ async def on_message(self, message: Union[str, bytes]):
                             if not room.has_editors:
                                 if room._dirty:
                                     await room_manager._checkpoint_room(room)
+                                    await self.application.ws_send_to_all(
+                                        "NOOP", "GET_SCRIPT_REVISIONS", {}
+                                    )
                                 await room_manager.close_room(room.revision_id)
 
                     await self.application.ws_send_to_all(
@@ -751,6 +755,7 @@ async def _handle_collab_op(self, ws_op: str, message: dict):
             await room.broadcast_awareness(decoded, sender=self)
         elif ws_op == "SAVE_SCRIPT_DRAFT":
             await room_manager.save_room(self)
+            await self.application.ws_send_to_all("NOOP", "GET_SCRIPT_REVISIONS", {})
         elif ws_op == "DISCARD_SCRIPT_DRAFT":
             revision_id = None
             current_show_id = await self.application.digi_settings.get("current_show")
@@ -767,6 +772,7 @@ async def _handle_collab_op(self, ws_op: str, message: dict):
             await self.application.ws_send_to_all(
                 "NOOP", "GET_SCRIPT_CONFIG_STATUS", {}
             )
+            await self.application.ws_send_to_all("NOOP", "GET_SCRIPT_REVISIONS", {})
 
     def on_pong(self, data: bytes) -> None:
         self._last_pong = IOLoop.current().time()