diff --git a/core/templates/base.html b/core/templates/base.html
index 4f0f5ab..1599978 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -27,74 +27,63 @@
     <script src="{% static 'js/gridstack-all.js' %}"></script>
     <script defer src="{% static 'js/magnet.min.js' %}"></script>
     <script>
-      document.addEventListener("restore-scroll", function(event) {
-        var scrollpos = localStorage.getItem('scrollpos');
+      document.addEventListener("restore-scroll", function () {
+        var scrollpos = localStorage.getItem("scrollpos");
         if (scrollpos) {
-          window.scrollTo(0, scrollpos)
-        };
+          window.scrollTo(0, scrollpos);
+        }
       });
 
-      document.addEventListener("htmx:beforeSwap", function(event) {
-        localStorage.setItem('scrollpos', window.scrollY);
-
+      document.addEventListener("htmx:beforeSwap", function () {
+        localStorage.setItem("scrollpos", window.scrollY);
       });
-    </script>
-    <script>
-      document.addEventListener('DOMContentLoaded', () => {
-
-        // Get all "navbar-burger" elements
-        const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0);
-
-        // Add a click event on each of them
-        $navbarBurgers.forEach( el => {
-          el.addEventListener('click', () => {
-
-            // Get the target from the "data-target" attribute
-            const target = el.dataset.target;
-            const $target = document.getElementById(target);
-
-            // Toggle the "is-active" class on both the "navbar-burger" and the "navbar-menu"
-            el.classList.toggle('is-active');
-            $target.classList.toggle('is-active');
 
+      document.addEventListener("DOMContentLoaded", function () {
+        document.querySelectorAll(".navbar-burger").forEach(function (el) {
+          el.addEventListener("click", function () {
+            var target = document.getElementById(el.dataset.target);
+            el.classList.toggle("is-active");
+            if (target) {
+              target.classList.toggle("is-active");
+            }
           });
         });
 
-        const composeLink = document.getElementById('nav-compose-link');
-        const composeDropdown = document.getElementById('nav-compose-contacts');
-        let composePreviewLoaded = false;
-        let composePreviewLoading = false;
-        if (composeLink && composeDropdown) {
-          composeLink.addEventListener('mouseenter', () => {
-            const previewUrl = composeLink.dataset.previewUrl || '';
-            if (!previewUrl || composePreviewLoaded || composePreviewLoading) {
-              return;
-            }
-            composePreviewLoading = true;
-            fetch(previewUrl, {
-              method: 'GET',
-              credentials: 'same-origin',
-              headers: { 'HX-Request': 'true' },
-            })
-              .then((response) => {
+        var composeLink = document.getElementById("nav-compose-link");
+        var composeDropdown = document.getElementById("nav-compose-contacts");
+        var composePreviewLoaded = false;
+        var composePreviewLoading = false;
+        if (!composeLink || !composeDropdown) {
+          return;
+        }
+        composeLink.addEventListener("mouseenter", function () {
+          var previewUrl = composeLink.dataset.previewUrl || "";
+          if (!previewUrl || composePreviewLoaded || composePreviewLoading) {
+            return;
+          }
+          composePreviewLoading = true;
+          fetch(previewUrl, {
+            method: "GET",
+            credentials: "same-origin",
+            headers: { "HX-Request": "true" },
+          })
+            .then(function (response) {
               if (!response.ok) {
-                throw new Error('Failed contacts preview fetch.');
+                throw new Error("Failed contacts preview fetch.");
               }
               return response.text();
             })
-              .then((html) => {
+            .then(function (html) {
               composeDropdown.innerHTML = html;
               composePreviewLoaded = true;
             })
-              .catch(() => {
+            .catch(function () {
               composePreviewLoaded = false;
             })
-              .finally(() => {
+            .finally(function () {
               composePreviewLoading = false;
             });
-          });
-        }
-
+        });
       });
     </script>
     <style>
@@ -112,9 +101,7 @@
         opacity:0;
         transition: opacity 500ms ease-in;
       }
-      .htmx-request .htmx-indicator{
-        opacity:1
-      }
+      .htmx-request .htmx-indicator,
       .htmx-request.htmx-indicator{
         opacity:1
       }
@@ -142,15 +129,11 @@
         transition: all 0.2s ease-in-out;
       }
 
-      tr:hover {
-        cursor:pointer;
-        background-color:rgba(221, 224, 255, 0.3) !important;
-      }
-
       a.panel-block {
         transition: all 0.2s ease-in-out;
       }
 
+      tr:hover,
       a.panel-block:hover {
         cursor:pointer;
         background-color:rgba(221, 224, 255, 0.3) !important;
@@ -180,11 +163,9 @@
       }
 
       .panel, .box, .modal {
-        /* background-color:rgba(250, 250, 250, 0.5) !important; */
         background-color: var(--modal-color) !important;
       }
       .modal, .modal.box{
-        /* background-color:rgba(210, 210, 210, 0.9) !important; */
         background-color: var(--background-color) !important;
       }
       .modal-background{
@@ -218,7 +199,8 @@
         background-color:rgba(0, 0, 0, 0.03) !important;
       }
 
-      .grid-stack-item-content {
+      .grid-stack-item-content,
+      .floating-window {
         display: flex !important;
         flex-direction: column !important;
         overflow-x: hidden !important;
@@ -239,11 +221,6 @@
       }
 
       .floating-window {
-        /* background-color:rgba(210, 210, 210, 0.6) !important; */
-        display: flex !important;
-        flex-direction: column !important;
-        overflow-x: hidden !important;
-        overflow-y: hidden !important;
         max-height: 300px;
         z-index: 9000;
         position: absolute;
@@ -257,8 +234,7 @@
 
       .float-right {
         float: right;
-        padding-right: 5px;
-        padding-left: 5px;
+        padding: 0 5px;
       }
       .grid-stack-item:hover .ui-resizable-handle {
         display: block !important;
diff --git a/core/templates/partials/ai-workspace-mitigation-panel.html b/core/templates/partials/ai-workspace-mitigation-panel.html
index d51c9ce..6608161 100644
--- a/core/templates/partials/ai-workspace-mitigation-panel.html
+++ b/core/templates/partials/ai-workspace-mitigation-panel.html
@@ -819,135 +819,104 @@
   (function() {
     const personId = "{{ person.id }}";
     const canSend = "{{ send_state.can_send|yesno:'1,0' }}" === "1";
-    function resizeEditableTextareas(root) {
+    const TAB_NAMES = ["plan_board", "corrections", "engage", "fundamentals", "auto", "ask_ai"];
+    const defineGlobal = function(name, handler) {
+      if (typeof window[name] !== "function") {
+        window[name] = handler;
+      }
+    };
+    const resizeEditableTextareas = function(root) {
       if (!root) return;
       root.querySelectorAll('textarea[data-editable="1"]').forEach(function(area) {
         area.style.height = "auto";
         area.style.height = Math.max(area.scrollHeight, 72) + "px";
       });
-    }
-
-    window.giaEngageSyncSendOverride = function(pid) {
-      if (pid !== personId) return;
-      const forceInput = document.getElementById("engage-force-send-" + pid);
-      const sendBtn = document.getElementById("engage-send-btn-" + pid);
-      const force =
-      !!(window.giaWorkspaceState
-        && window.giaWorkspaceState[pid]
-        && window.giaWorkspaceState[pid].forceSend);
-      if (forceInput) {
-        forceInput.value = force ? "1" : "0";
-      }
-      if (sendBtn) {
-        sendBtn.disabled = !canSend && !force;
-      }
     };
 
-    function setActiveTabHiddenFields(tabName) {
+    const syncActiveTab = function(tabName) {
       const root = document.getElementById("mitigation-shell-" + personId);
       if (!root) return;
       root.querySelectorAll('input[name="active_tab"]').forEach(function(input) {
         input.value = tabName;
       });
       resizeEditableTextareas(root);
-    }
+    };
+
+    window.giaEngageSyncSendOverride = function(pid) {
+      if (pid !== personId) return;
+      const forceInput = document.getElementById("engage-force-send-" + pid);
+      const sendBtn = document.getElementById("engage-send-btn-" + pid);
+      const force = !!(window.giaWorkspaceState && window.giaWorkspaceState[pid] && window.giaWorkspaceState[pid].forceSend);
+      if (forceInput) forceInput.value = force ? "1" : "0";
+      if (sendBtn) {
+        sendBtn.disabled = !canSend && !force;
+      }
+    };
 
     window.giaMitigationShowTab = function(pid, tabName) {
       if (pid !== personId) return;
-      ["plan_board", "corrections", "engage", "fundamentals", "auto", "ask_ai"].forEach(function(name) {
+      TAB_NAMES.forEach(function(name) {
         const pane = document.getElementById("mitigation-tab-" + personId + "-" + name);
         const tab = document.getElementById("mitigation-tab-btn-" + personId + "-" + name);
         if (!pane) return;
         const active = name === tabName;
         pane.style.display = active ? "block" : "none";
-        if (tab) {
-          tab.classList.toggle("is-active", active);
-        }
+        if (tab) tab.classList.toggle("is-active", active);
       });
-      setActiveTabHiddenFields(tabName);
+      syncActiveTab(tabName);
     };
 
-    window.giaMitigationToggleEdit = function(button) {
-      const form = button.closest("form");
-      if (!form) return;
-      const card = form.closest(".mitigation-artifact-card");
-      const editing = button.dataset.editState === "edit";
-      const fields = form.querySelectorAll('[data-editable="1"]');
-      const toggles = form.querySelectorAll('[data-editable-toggle="1"]');
-      if (!editing) {
-        fields.forEach(function(field) {
-          field.removeAttribute("readonly");
-        });
-        toggles.forEach(function(field) {
-          field.removeAttribute("disabled");
-        });
-        if (card) {
-          card.classList.add("is-editing");
+    defineGlobal("giaMitigationToggleEdit", function(button) {
+        const form = button && button.closest ? button.closest("form") : null;
+        if (!form) return;
+        const editing = button.dataset.editState === "edit";
+        if (!editing) {
+          form.querySelectorAll('[data-editable="1"]').forEach(function(field) { field.removeAttribute("readonly"); });
+          form.querySelectorAll('[data-editable-toggle="1"]').forEach(function(field) { field.removeAttribute("disabled"); });
+          const card = form.closest(".mitigation-artifact-card");
+          if (card) card.classList.add("is-editing");
+          button.dataset.editState = "edit";
+          button.classList.remove("is-light");
+          button.title = "Save";
+          button.innerHTML = '<span class="icon is-small"><i class="fa-solid fa-check"></i></span>';
+          resizeEditableTextareas(form);
+          return;
         }
-        button.dataset.editState = "edit";
-        button.classList.remove("is-light");
-        button.title = "Save";
-        button.innerHTML = '<span class="icon is-small"><i class="fa-solid fa-check"></i></span>';
-        resizeEditableTextareas(form);
-      } else {
         form.requestSubmit();
-      }
-    };
+    });
 
-    window.giaEngageSetAction = function(pid, action) {
-      if (pid !== personId) return;
-      const actionInput = document.getElementById("engage-action-input-" + pid);
-      if (actionInput) {
-        actionInput.value = action;
-      }
-      if (action === "send") {
-        window.giaEngageSyncSendOverride(pid);
-      }
-    };
+    defineGlobal("giaEngageSetAction", function(pid, action) {
+        const actionInput = document.getElementById("engage-action-input-" + pid);
+        if (actionInput) actionInput.value = action;
+        if (action === "send") window.giaEngageSyncSendOverride(pid);
+    });
 
-    window.giaEngageAutoPreview = function(pid) {
-      if (pid !== personId) return;
-      const form = document.getElementById("engage-form-" + pid);
-      if (!form) return;
-      window.giaEngageSetAction(pid, "preview");
-      form.requestSubmit();
-    };
+    defineGlobal("giaEngageAutoPreview", function(pid) {
+        const form = document.getElementById("engage-form-" + pid);
+        if (!form) return;
+        window.giaEngageSetAction(pid, "preview");
+        form.requestSubmit();
+    });
 
     window.giaEngageSetTarget = function(pid, targetId) {
       if (pid !== personId) return;
       const normalized = String(targetId || "").trim();
       const input = document.getElementById("engage-target-input-" + pid);
-      if (input) {
-        input.value = normalized;
-      }
+      if (input) input.value = normalized;
       const parentSelect = document.getElementById("ai-target-select-" + pid);
-      if (parentSelect && normalized) {
-        parentSelect.value = normalized;
-      }
+      if (parentSelect && normalized) parentSelect.value = normalized;
     };
 
-    window.giaEngageSelect = function(pid, kind, value, node) {
-      if (pid !== personId) return;
-      let inputId = "";
-      if (kind === "share") {
-        inputId = "engage-share-input-" + pid;
-      } else if (kind === "framing") {
-        inputId = "engage-framing-input-" + pid;
-      }
-      const input = inputId ? document.getElementById(inputId) : null;
-      if (input) {
-        input.value = value;
-      }
-      const li = node && node.closest ? node.closest("li") : null;
-      if (!li) return;
-      const ul = li.parentElement;
-      if (!ul) return;
-      Array.from(ul.children).forEach(function(child) {
-        child.classList.remove("is-active");
-      });
-      li.classList.add("is-active");
-      window.giaEngageAutoPreview(pid);
-    };
+    defineGlobal("giaEngageSelect", function(pid, kind, value, node) {
+        const inputId = kind === "share" ? ("engage-share-input-" + pid) : (kind === "framing" ? ("engage-framing-input-" + pid) : "");
+        const input = inputId ? document.getElementById(inputId) : null;
+        if (input) input.value = value;
+        const li = node && node.closest ? node.closest("li") : null;
+        if (!li || !li.parentElement) return;
+        Array.from(li.parentElement.children).forEach(function(child) { child.classList.remove("is-active"); });
+        li.classList.add("is-active");
+        window.giaEngageAutoPreview(pid);
+    });
 
     window.giaMitigationShowTab(personId, "{{ active_tab|default:'plan_board' }}");
     resizeEditableTextareas(document.getElementById("mitigation-shell-" + personId));
diff --git a/core/templates/partials/ai-workspace-person-widget.html b/core/templates/partials/ai-workspace-person-widget.html
index a7e9561..34fe65c 100644
--- a/core/templates/partials/ai-workspace-person-widget.html
+++ b/core/templates/partials/ai-workspace-person-widget.html
@@ -833,8 +833,14 @@
       syncTargetInputs();
     });
 
-    if (typeof window.giaMitigationShowTab !== "function") {
-      window.giaMitigationShowTab = function(pid, tabName) {
+    const defineGlobal = function(name, handler) {
+      if (typeof window[name] === "function") {
+        return;
+      }
+      window[name] = handler;
+    };
+
+    defineGlobal("giaMitigationShowTab", function(pid, tabName) {
         const names = ["plan_board", "corrections", "engage", "fundamentals", "ask_ai"];
         names.forEach(function(name) {
           const pane = document.getElementById("mitigation-tab-" + pid + "-" + name);
@@ -855,11 +861,9 @@
         shell.querySelectorAll('input[name="active_tab"]').forEach(function(input) {
           input.value = tabName;
         });
-      };
-    }
+      });
 
-    if (typeof window.giaMitigationToggleEdit !== "function") {
-      window.giaMitigationToggleEdit = function(button) {
+    defineGlobal("giaMitigationToggleEdit", function(button) {
         const form = button ? button.closest("form") : null;
         if (!form) {
           return;
@@ -885,31 +889,25 @@
         } else {
           form.requestSubmit();
         }
-      };
-    }
+      });
 
-    if (typeof window.giaEngageSetAction !== "function") {
-      window.giaEngageSetAction = function(pid, action) {
+    defineGlobal("giaEngageSetAction", function(pid, action) {
         const actionInput = document.getElementById("engage-action-input-" + pid);
         if (actionInput) {
           actionInput.value = action;
         }
-      };
-    }
+      });
 
-    if (typeof window.giaEngageAutoPreview !== "function") {
-      window.giaEngageAutoPreview = function(pid) {
+    defineGlobal("giaEngageAutoPreview", function(pid) {
         const form = document.getElementById("engage-form-" + pid);
         if (!form) {
           return;
         }
         window.giaEngageSetAction(pid, "preview");
         form.requestSubmit();
-      };
-    }
+      });
 
-    if (typeof window.giaEngageSelect !== "function") {
-      window.giaEngageSelect = function(pid, kind, value, node) {
+    defineGlobal("giaEngageSelect", function(pid, kind, value, node) {
         let inputId = "";
         if (kind === "share") {
           inputId = "engage-share-input-" + pid;
@@ -928,8 +926,7 @@
           li.classList.add("is-active");
         }
         window.giaEngageAutoPreview(pid);
-      };
-    }
+      });
 
     window.giaWorkspaceOpenTab(personId, "plan_board", false);
     syncTargetInputs();
diff --git a/core/templates/partials/compose-panel.html b/core/templates/partials/compose-panel.html
index 236cc1a..2a657ce 100644
--- a/core/templates/partials/compose-panel.html
+++ b/core/templates/partials/compose-panel.html
@@ -1650,24 +1650,7 @@
           button.classList.add("is-loading");
           setStatus("Requesting history sync…", "info");
           try {
-            const payload = new URLSearchParams();
-            payload.set("service", thread.dataset.service || "");
-            payload.set("identifier", thread.dataset.identifier || "");
-            if (thread.dataset.person) {
-              payload.set("person", thread.dataset.person);
-            }
-            payload.set("limit", thread.dataset.limit || "60");
-            const response = await fetch(historySyncUrl, {
-              method: "POST",
-              credentials: "same-origin",
-              headers: {
-                "X-CSRFToken": csrfToken,
-                "Content-Type": "application/x-www-form-urlencoded",
-                Accept: "application/json"
-              },
-              body: payload.toString(),
-            });
-            const result = await response.json();
+            const result = await postFormJson(historySyncUrl, queryParams());
             if (!result.ok) {
               setStatus(
                 String(result.message || result.error || "History sync failed."),
@@ -2352,14 +2335,7 @@
       }
       panelState.polling = true;
       try {
-        const params = new URLSearchParams();
-        params.set("service", thread.dataset.service || "");
-        params.set("identifier", thread.dataset.identifier || "");
-        if (thread.dataset.person) {
-          params.set("person", thread.dataset.person);
-        }
-        params.set("limit", thread.dataset.limit || "60");
-        params.set("after_ts", String(lastTs));
+        const params = queryParams({ after_ts: String(lastTs) });
         const response = await fetch(thread.dataset.pollUrl + "?" + params.toString(), {
           method: "GET",
           credentials: "same-origin",
@@ -2532,7 +2508,7 @@
       return active;
     };
 
-    const queryParams = function () {
+    const queryParams = function (extraParams) {
       const params = new URLSearchParams();
       params.set("service", thread.dataset.service || "");
       params.set("identifier", thread.dataset.identifier || "");
@@ -2540,9 +2516,47 @@
         params.set("person", thread.dataset.person);
       }
       params.set("limit", thread.dataset.limit || "60");
+      const extras =
+        extraParams && typeof extraParams === "object" ? extraParams : {};
+      Object.keys(extras).forEach(function (key) {
+        const value = extras[key];
+        if (value === undefined || value === null || value === "") {
+          return;
+        }
+        params.set(String(key), String(value));
+      });
       return params;
     };
 
+    const postFormJson = async function (url, params) {
+      const response = await fetch(url, {
+        method: "POST",
+        credentials: "same-origin",
+        headers: {
+          "X-CSRFToken": csrfToken,
+          "Content-Type": "application/x-www-form-urlencoded",
+          Accept: "application/json"
+        },
+        body: params.toString(),
+      });
+      if (!response.ok) {
+        throw new Error("Request failed");
+      }
+      return response.json();
+    };
+
+    const getJson = async function (url) {
+      const response = await fetch(url, {
+        method: "GET",
+        credentials: "same-origin",
+        headers: { Accept: "application/json" }
+      });
+      if (!response.ok) {
+        throw new Error("Request failed");
+      }
+      return response.json();
+    };
+
     const titleCase = function (value) {
       const raw = String(value || "").trim().toLowerCase();
       if (!raw) {
@@ -2625,6 +2639,17 @@
       }
     };
 
+    const cardContentNode = function (card) {
+      return card ? card.querySelector(".compose-ai-content") : null;
+    };
+
+    const setCardMessage = function (card, message) {
+      const node = cardContentNode(card);
+      if (node) {
+        node.textContent = String(message || "");
+      }
+    };
+
     const openEngage = function (sourceRef) {
       const engageCard = showCard("engage");
       if (!engageCard) {
@@ -2644,19 +2669,19 @@
       }
       setCardLoading(card, true);
       try {
-        const response = await fetch(thread.dataset.draftsUrl + "?" + queryParams().toString(), {
-          method: "GET",
-          credentials: "same-origin",
-          headers: { Accept: "application/json" }
-        });
-        const payload = await response.json();
+        const payload = await getJson(
+          thread.dataset.draftsUrl + "?" + queryParams().toString()
+        );
         setCardLoading(card, false);
         if (!payload.ok) {
-          card.querySelector(".compose-ai-content").textContent = payload.error || "Failed to load drafts.";
+          setCardMessage(card, payload.error || "Failed to load drafts.");
           return;
         }
         const drafts = Array.isArray(payload.drafts) ? payload.drafts : [];
-        const container = card.querySelector(".compose-ai-content");
+        const container = cardContentNode(card);
+        if (!container) {
+          return;
+        }
         container.innerHTML = "";
         const engageButton = document.createElement("button");
         engageButton.type = "button";
@@ -2695,7 +2720,7 @@
         });
       } catch (err) {
         setCardLoading(card, false);
-        card.querySelector(".compose-ai-content").textContent = "Failed to load drafts.";
+        setCardMessage(card, "Failed to load drafts.");
       }
     };
 
@@ -2706,21 +2731,18 @@
       }
       setCardLoading(card, true);
       try {
-        const response = await fetch(thread.dataset.summaryUrl + "?" + queryParams().toString(), {
-          method: "GET",
-          credentials: "same-origin",
-          headers: { Accept: "application/json" }
-        });
-        const payload = await response.json();
+        const payload = await getJson(
+          thread.dataset.summaryUrl + "?" + queryParams().toString()
+        );
         setCardLoading(card, false);
         if (!payload.ok) {
-          card.querySelector(".compose-ai-content").textContent = payload.error || "Failed to load summary.";
+          setCardMessage(card, payload.error || "Failed to load summary.");
           return;
         }
-        card.querySelector(".compose-ai-content").textContent = String(payload.summary || "");
+        setCardMessage(card, String(payload.summary || ""));
       } catch (err) {
         setCardLoading(card, false);
-        card.querySelector(".compose-ai-content").textContent = "Failed to load summary.";
+        setCardMessage(card, "Failed to load summary.");
       }
     };
 
@@ -2731,17 +2753,14 @@
       }
       setCardLoading(card, true);
       try {
-        const response = await fetch(
-          thread.dataset.quickInsightsUrl + "?" + queryParams().toString(),
-          {
-            method: "GET",
-            credentials: "same-origin",
-            headers: { Accept: "application/json" }
-          }
+        const payload = await getJson(
+          thread.dataset.quickInsightsUrl + "?" + queryParams().toString()
         );
-        const payload = await response.json();
         setCardLoading(card, false);
-        const container = card.querySelector(".compose-ai-content");
+        const container = cardContentNode(card);
+        if (!container) {
+          return;
+        }
         if (!payload.ok) {
           container.textContent = payload.error || "Failed to load quick insights.";
           return;
@@ -2994,8 +3013,7 @@
         }
       } catch (err) {
         setCardLoading(card, false);
-        card.querySelector(".compose-ai-content").textContent =
-        "Failed to load quick insights.";
+        setCardMessage(card, "Failed to load quick insights.");
       }
     };
 
@@ -3035,18 +3053,12 @@
         if (showCustom && customValue) {
           params.set("custom_text", customValue);
         }
-        const response = await fetch(
-          thread.dataset.engagePreviewUrl + "?" + params.toString(),
-          {
-            method: "GET",
-            credentials: "same-origin",
-            headers: { Accept: "application/json" }
-          }
+        const payload = await getJson(
+          thread.dataset.engagePreviewUrl + "?" + params.toString()
         );
-        const payload = await response.json();
         setCardLoading(card, false);
         if (!payload.ok) {
-          card.querySelector(".compose-ai-content").textContent = payload.error || "Failed to load engage preview.";
+          setCardMessage(card, payload.error || "Failed to load engage preview.");
           panelState.engageToken = "";
           return;
         }
@@ -3081,11 +3093,11 @@
         if (payload.artifact) {
           text = text + "\n\nSource: " + String(payload.artifact);
         }
-        card.querySelector(".compose-ai-content").textContent = text;
+        setCardMessage(card, text);
         sendBtn.disabled = !(confirm.checked && panelState.engageToken);
       } catch (err) {
         setCardLoading(card, false);
-        card.querySelector(".compose-ai-content").textContent = "Failed to load engage preview.";
+        setCardMessage(card, "Failed to load engage preview.");
         panelState.engageToken = "";
       } finally {
         if (refreshBtn) {
@@ -3141,27 +3153,13 @@
         if (!panelState.engageToken) {
           return;
         }
-        const formData = new URLSearchParams();
-        formData.set("service", thread.dataset.service || "");
-        formData.set("identifier", thread.dataset.identifier || "");
-        if (thread.dataset.person) {
-          formData.set("person", thread.dataset.person);
-        }
-        formData.set("engage_token", panelState.engageToken);
-        formData.set("failsafe_arm", confirm.checked ? "1" : "0");
-        formData.set("failsafe_confirm", confirm.checked ? "1" : "0");
+        const formData = queryParams({
+          engage_token: panelState.engageToken,
+          failsafe_arm: confirm.checked ? "1" : "0",
+          failsafe_confirm: confirm.checked ? "1" : "0",
+        });
         try {
-          const response = await fetch(thread.dataset.engageSendUrl, {
-            method: "POST",
-            credentials: "same-origin",
-            headers: {
-              "X-CSRFToken": csrfToken,
-              "Content-Type": "application/x-www-form-urlencoded",
-              Accept: "application/json"
-            },
-            body: formData.toString()
-          });
-          const payload = await response.json();
+          const payload = await postFormJson(thread.dataset.engageSendUrl, formData);
           if (!payload.ok) {
             flashCompose("is-send-fail");
             setStatus(payload.error || "Engage send failed.", "danger");
@@ -3352,28 +3350,26 @@
 
     // Cancel send support: show a cancel button while the form request is pending.
     let cancelBtn = null;
+    const cancelSendRequest = function (commandId) {
+      return postFormJson(
+        '{% url "compose_cancel_send" %}',
+        queryParams({ command_id: String(commandId || "") })
+      );
+    };
     const showCancelButton = function () {
       if (cancelBtn) return;
       cancelBtn = document.createElement('button');
       cancelBtn.type = 'button';
       cancelBtn.className = 'button is-danger is-light is-small compose-cancel-send-btn';
       cancelBtn.textContent = 'Cancel Send';
-      cancelBtn.addEventListener('click', function () {
-        // Post cancel by service+identifier
-        const payload = new URLSearchParams();
-        payload.set('service', thread.dataset.service || '');
-        payload.set('identifier', thread.dataset.identifier || '');
-        fetch('{% url "compose_cancel_send" %}', {
-          method: 'POST',
-          credentials: 'same-origin',
-          headers: { 'X-CSRFToken': '{{ csrf_token }}', 'Content-Type': 'application/x-www-form-urlencoded' },
-          body: payload.toString(),
-        }).then(function (resp) {
-          // Hide cancel once requested
+      cancelBtn.addEventListener('click', async function () {
+        try {
+          await cancelSendRequest("");
+        } catch (e) {
+          // Ignore cancel failures.
+        } finally {
           hideCancelButton();
-        }).catch(function () {
-          hideCancelButton();
-        });
+        }
       });
       if (statusBox) {
         statusBox.appendChild(cancelBtn);
@@ -3498,24 +3494,16 @@
       btn.type = 'button';
       btn.className = 'button is-danger is-light is-small compose-persistent-cancel-btn';
       btn.textContent = 'Cancel Queued Send';
-      btn.addEventListener('click', function () {
-        const payload = new URLSearchParams();
-        payload.set('service', thread.dataset.service || '');
-        payload.set('identifier', thread.dataset.identifier || '');
-        payload.set('command_id', String(commandId || ''));
-        fetch('{% url "compose_cancel_send" %}', {
-          method: 'POST',
-          credentials: 'same-origin',
-          headers: { 'X-CSRFToken': '{{ csrf_token }}', 'Content-Type': 'application/x-www-form-urlencoded' },
-          body: payload.toString(),
-        }).then(function (resp) {
+      btn.addEventListener('click', async function () {
+        try {
+          await cancelSendRequest(String(commandId || ''));
           stopPendingCommandPolling();
           hidePersistentCancelButton();
           setStatus('Send cancelled.', 'warning');
-          poll(true);
-        }).catch(function () {
+          await poll(true);
+        } catch (e) {
           hidePersistentCancelButton();
-        });
+        }
       });
       container.appendChild(btn);
       if (statusBox) {
diff --git a/core/views/compose.py b/core/views/compose.py
index 9c892d9..3b810bf 100644
--- a/core/views/compose.py
+++ b/core/views/compose.py
@@ -108,6 +108,17 @@ def _safe_after_ts(raw) -> int:
     return max(0, value)
 
 
+def _request_scope(request, source: str = "GET"):
+    data = request.GET if str(source).upper() == "GET" else request.POST
+    service = _default_service(data.get("service"))
+    identifier = str(data.get("identifier") or "").strip()
+    person = None
+    person_id = data.get("person")
+    if person_id:
+        person = get_object_or_404(Person, id=person_id, user=request.user)
+    return service, identifier, person
+
+
 def _format_ts_label(ts_value: int) -> str:
     try:
         as_dt = datetime.fromtimestamp(int(ts_value) / 1000, tz=dt_timezone.utc)
@@ -2111,12 +2122,7 @@ class ComposeWorkspace(LoginRequiredMixin, View):
     template_name = "pages/compose-workspace.html"
 
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = Person.objects.filter(id=person_id, user=request.user).first()
+        service, identifier, person = _request_scope(request, "GET")
         limit = _safe_limit(request.GET.get("limit") or 40)
 
         initial_widget_url = ""
@@ -2307,12 +2313,7 @@ class ComposePage(LoginRequiredMixin, View):
     template_name = "pages/compose.html"
 
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return HttpResponseBadRequest("Missing contact identifier.")
 
@@ -2328,12 +2329,7 @@ class ComposePage(LoginRequiredMixin, View):
 
 class ComposeWidget(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return HttpResponseBadRequest("Missing contact identifier.")
 
@@ -2361,12 +2357,7 @@ class ComposeWidget(LoginRequiredMixin, View):
 
 class ComposeThread(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return HttpResponseBadRequest("Missing contact identifier.")
 
@@ -2565,12 +2556,7 @@ class ComposeHistorySync(LoginRequiredMixin, View):
         return len(duplicate_ids)
 
     def post(self, request):
-        service = _default_service(request.POST.get("service"))
-        identifier = str(request.POST.get("identifier") or "").strip()
-        person = None
-        person_id = request.POST.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "POST")
         if not identifier and person is None:
             return JsonResponse(
                 {
@@ -2737,8 +2723,7 @@ class ComposeHistorySync(LoginRequiredMixin, View):
 
 class ComposeCancelSend(LoginRequiredMixin, View):
     def post(self, request):
-        service = _default_service(request.POST.get("service"))
-        identifier = str(request.POST.get("identifier") or "").strip()
+        service, identifier, _ = _request_scope(request, "POST")
         command_id = str(request.POST.get("command_id") or "").strip()
         if not identifier:
             return JsonResponse({"ok": False, "error": "missing_identifier"})
@@ -2842,12 +2827,7 @@ class ComposeMediaBlob(LoginRequiredMixin, View):
 
 class ComposeDrafts(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return JsonResponse({"ok": False, "error": "Missing contact identifier."})
 
@@ -2908,12 +2888,7 @@ class ComposeDrafts(LoginRequiredMixin, View):
 
 class ComposeSummary(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return JsonResponse({"ok": False, "error": "Missing contact identifier."})
 
@@ -2976,12 +2951,7 @@ class ComposeSummary(LoginRequiredMixin, View):
 
 class ComposeQuickInsights(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return JsonResponse({"ok": False, "error": "Missing contact identifier."})
 
@@ -3097,12 +3067,7 @@ class ComposeQuickInsights(LoginRequiredMixin, View):
 
 class ComposeEngagePreview(LoginRequiredMixin, View):
     def get(self, request):
-        service = _default_service(request.GET.get("service"))
-        identifier = str(request.GET.get("identifier") or "").strip()
-        person = None
-        person_id = request.GET.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "GET")
         if not identifier and person is None:
             return JsonResponse({"ok": False, "error": "Missing contact identifier."})
 
@@ -3228,12 +3193,7 @@ class ComposeEngagePreview(LoginRequiredMixin, View):
 
 class ComposeEngageSend(LoginRequiredMixin, View):
     def post(self, request):
-        service = _default_service(request.POST.get("service"))
-        identifier = str(request.POST.get("identifier") or "").strip()
-        person = None
-        person_id = request.POST.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "POST")
         if not identifier and person is None:
             return JsonResponse({"ok": False, "error": "Missing contact identifier."})
 
@@ -3319,12 +3279,7 @@ class ComposeSend(LoginRequiredMixin, View):
         return response
 
     def post(self, request):
-        service = _default_service(request.POST.get("service"))
-        identifier = str(request.POST.get("identifier") or "").strip()
-        person = None
-        person_id = request.POST.get("person")
-        if person_id:
-            person = get_object_or_404(Person, id=person_id, user=request.user)
+        service, identifier, person = _request_scope(request, "POST")
         render_mode = str(request.POST.get("render_mode") or "page").strip().lower()
         if render_mode not in {"page", "widget"}:
             render_mode = "page"
diff --git a/core/views/workspace.py b/core/views/workspace.py
index ae4f604..4e65926 100644
--- a/core/views/workspace.py
+++ b/core/views/workspace.py
@@ -3455,6 +3455,54 @@ def _latest_plan_bundle(conversation):
     }
 
 
+def _render_send_status(request, ok, message, level):
+    return render(
+        request,
+        "partials/ai-workspace-send-status.html",
+        {"ok": ok, "message": message, "level": level},
+    )
+
+
+def _render_mitigation_status(request, person, message, level="info"):
+    return render(
+        request,
+        "partials/ai-workspace-mitigation-status.html",
+        {"person": person, "level": level, "message": message},
+    )
+
+
+def _render_mitigation_panel(request, person, plan, **kwargs):
+    return render(
+        request,
+        "partials/ai-workspace-mitigation-panel.html",
+        _mitigation_panel_context(person=person, plan=plan, **kwargs),
+    )
+
+
+def _workspace_nav_urls(person):
+    return {
+        "graphs_url": reverse(
+            "ai_workspace_insight_graphs",
+            kwargs={"type": "page", "person_id": person.id},
+        ),
+        "information_url": reverse(
+            "ai_workspace_information",
+            kwargs={"type": "page", "person_id": person.id},
+        ),
+        "help_url": reverse(
+            "ai_workspace_insight_help",
+            kwargs={"type": "page", "person_id": person.id},
+        ),
+        "workspace_url": f"{reverse('ai_workspace')}?person={person.id}",
+    }
+
+
+def _person_plan_or_404(request, person_id, plan_id):
+    person = get_object_or_404(Person, pk=person_id, user=request.user)
+    plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+    return person, plan
+
+
 class AIWorkspace(LoginRequiredMixin, View):
     template_name = "pages/ai-workspace.html"
 
@@ -3615,19 +3663,7 @@ class AIWorkspaceInsightDetail(LoginRequiredMixin, View):
             "metric_group": group,
             "graph_points": points,
             "graph_applicable": graph_applicable,
-            "graphs_url": reverse(
-                "ai_workspace_insight_graphs",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "help_url": reverse(
-                "ai_workspace_insight_help",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "information_url": reverse(
-                "ai_workspace_information",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "workspace_url": f"{reverse('ai_workspace')}?person={person.id}",
+            **_workspace_nav_urls(person),
         }
         return render(request, "pages/ai-workspace-insight-detail.html", context)
 
@@ -3646,15 +3682,7 @@ class AIWorkspaceInsightGraphs(LoginRequiredMixin, View):
             "person": person,
             "workspace_conversation": conversation,
             "graph_cards": graph_cards,
-            "help_url": reverse(
-                "ai_workspace_insight_help",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "information_url": reverse(
-                "ai_workspace_information",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "workspace_url": f"{reverse('ai_workspace')}?person={person.id}",
+            **_workspace_nav_urls(person),
         }
         return render(request, "pages/ai-workspace-insight-graphs.html", context)
 
@@ -3696,19 +3724,7 @@ class AIWorkspaceInformation(LoginRequiredMixin, View):
             "directionality": directionality,
             "overview_rows": _information_overview_rows(conversation),
             "commitment_graph_cards": commitment_graph_cards,
-            "graphs_url": reverse(
-                "ai_workspace_insight_graphs",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "information_url": reverse(
-                "ai_workspace_information",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "help_url": reverse(
-                "ai_workspace_insight_help",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "workspace_url": f"{reverse('ai_workspace')}?person={person.id}",
+            **_workspace_nav_urls(person),
         }
         return render(request, "pages/ai-workspace-information.html", context)
 
@@ -3746,15 +3762,7 @@ class AIWorkspaceInsightHelp(LoginRequiredMixin, View):
             "workspace_conversation": conversation,
             "groups": INSIGHT_GROUPS,
             "metrics": metrics,
-            "graphs_url": reverse(
-                "ai_workspace_insight_graphs",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "information_url": reverse(
-                "ai_workspace_information",
-                kwargs={"type": "page", "person_id": person.id},
-            ),
-            "workspace_url": f"{reverse('ai_workspace')}?person={person.id}",
+            **_workspace_nav_urls(person),
         }
         return render(request, "pages/ai-workspace-insight-help.html", context)
 
@@ -3763,6 +3771,40 @@ class AIWorkspaceRunOperation(LoginRequiredMixin, View):
     allowed_types = {"widget"}
     allowed_operations = {"artifacts", "summarise", "draft_reply", "extract_patterns"}
 
+    def _empty_plan_bundle(self):
+        return {
+            "latest_plan": None,
+            "latest_plan_rules": [],
+            "latest_plan_games": [],
+            "latest_plan_corrections": [],
+            "latest_plan_messages": [],
+            "latest_plan_export": None,
+        }
+
+    def _render_result(
+        self,
+        request,
+        operation,
+        person,
+        send_state,
+        send_target_bundle,
+        **extra,
+    ):
+        return render(
+            request,
+            "partials/ai-workspace-ai-result.html",
+            {
+                "operation_label": OPERATION_LABELS.get(
+                    operation, operation.replace("_", " ").title()
+                ),
+                "operation": operation,
+                "person": person,
+                "send_state": send_state,
+                "send_target_bundle": send_target_bundle,
+                **extra,
+            },
+        )
+
     def _ensure_message_events(self, user, conversation, person_identifiers, messages):
         """
         Materialize workspace MessageEvent rows from legacy Message rows and
@@ -3938,47 +3980,35 @@ class AIWorkspaceRunOperation(LoginRequiredMixin, View):
                     if auto_result.get("created_corrections"):
                         plan_bundle = _latest_plan_bundle(conversation)
 
-            context = {
-                "operation_label": OPERATION_LABELS.get(
-                    operation, operation.replace("_", " ").title()
-                ),
-                "operation": operation,
-                "result_text": "",
-                "result_sections": [],
-                "error": False,
-                "person": person,
-                "send_state": send_state,
-                "send_target_bundle": send_target_bundle,
-                "ai_result_id": "",
-                "mitigation_notice_message": mitigation_notice_message,
-                "mitigation_notice_level": mitigation_notice_level,
+            return self._render_result(
+                request,
+                operation,
+                person,
+                send_state,
+                send_target_bundle,
+                result_text="",
+                result_sections=[],
+                error=False,
+                ai_result_id="",
+                mitigation_notice_message=mitigation_notice_message,
+                mitigation_notice_level=mitigation_notice_level,
                 **plan_bundle,
-            }
-            return render(request, "partials/ai-workspace-ai-result.html", context)
+            )
 
         ai_obj = AI.objects.filter(user=request.user).first()
         if ai_obj is None:
-            context = {
-                "operation_label": OPERATION_LABELS.get(
-                    operation, operation.replace("_", " ").title()
-                ),
-                "operation": operation,
-                "result_text": "No AI configured for this user yet.",
-                "result_sections": _parse_result_sections(
-                    "No AI configured for this user yet."
-                ),
-                "error": True,
-                "person": person,
-                "send_state": send_state,
-                "send_target_bundle": send_target_bundle,
-                "latest_plan": None,
-                "latest_plan_rules": [],
-                "latest_plan_games": [],
-                "latest_plan_corrections": [],
-                "latest_plan_messages": [],
-                "latest_plan_export": None,
-            }
-            return render(request, "partials/ai-workspace-ai-result.html", context)
+            message = "No AI configured for this user yet."
+            return self._render_result(
+                request,
+                operation,
+                person,
+                send_state,
+                send_target_bundle,
+                result_text=message,
+                result_sections=_parse_result_sections(message),
+                error=True,
+                **self._empty_plan_bundle(),
+            )
 
         try:
             limit = int(request.GET.get("limit", 20))
@@ -4079,64 +4109,54 @@ class AIWorkspaceRunOperation(LoginRequiredMixin, View):
             conversation.last_ai_run_at = dj_timezone.now()
             conversation.save(update_fields=["last_ai_run_at"])
             plan_bundle = _latest_plan_bundle(conversation)
-            context = {
-                "operation_label": OPERATION_LABELS.get(
-                    operation, operation.replace("_", " ").title()
-                ),
-                "operation": operation,
-                "result_text": result_text,
-                "result_sections": _parse_result_sections(result_text),
-                "draft_replies": ai_result.draft_replies,
-                "interaction_signals": ai_result.interaction_signals,
-                "memory_proposals": ai_result.memory_proposals,
-                "memory_proposal_groups": _group_memory_proposals(
+            return self._render_result(
+                request,
+                operation,
+                person,
+                send_state,
+                send_target_bundle,
+                result_text=result_text,
+                result_sections=_parse_result_sections(result_text),
+                draft_replies=ai_result.draft_replies,
+                interaction_signals=ai_result.interaction_signals,
+                memory_proposals=ai_result.memory_proposals,
+                memory_proposal_groups=_group_memory_proposals(
                     ai_result.memory_proposals
                 ),
-                "citations": ai_result.citations,
-                "citation_rows": self._citation_rows(request.user, ai_result.citations),
-                "error": False,
-                "person": person,
-                "send_state": send_state,
-                "send_target_bundle": send_target_bundle,
-                "ai_result_id": str(ai_result.id),
-                "ai_result_created_at": ai_result.created_at,
-                "ai_request_status": ai_request.status,
-                "ai_request_started_at": ai_request.started_at,
-                "ai_request_finished_at": ai_request.finished_at,
-                "ai_request_window_spec": ai_request.window_spec,
-                "ai_request_window_tags": _window_spec_tags(ai_request.window_spec),
-                "ai_request_message_count": len(ai_request.message_ids or []),
-                "ai_request_policy_snapshot": ai_request.policy_snapshot,
-                "ai_request_policy_tags": _policy_snapshot_tags(
+                citations=ai_result.citations,
+                citation_rows=self._citation_rows(request.user, ai_result.citations),
+                error=False,
+                ai_result_id=str(ai_result.id),
+                ai_result_created_at=ai_result.created_at,
+                ai_request_status=ai_request.status,
+                ai_request_started_at=ai_request.started_at,
+                ai_request_finished_at=ai_request.finished_at,
+                ai_request_window_spec=ai_request.window_spec,
+                ai_request_window_tags=_window_spec_tags(ai_request.window_spec),
+                ai_request_message_count=len(ai_request.message_ids or []),
+                ai_request_policy_snapshot=ai_request.policy_snapshot,
+                ai_request_policy_tags=_policy_snapshot_tags(
                     ai_request.policy_snapshot
                 ),
                 **plan_bundle,
-            }
+            )
         except Exception as exc:
             ai_request.status = "failed"
             ai_request.error = str(exc)
             ai_request.finished_at = dj_timezone.now()
             ai_request.save(update_fields=["status", "error", "finished_at"])
-            context = {
-                "operation_label": OPERATION_LABELS.get(
-                    operation, operation.replace("_", " ").title()
-                ),
-                "operation": operation,
-                "result_text": str(exc),
-                "result_sections": _parse_result_sections(str(exc)),
-                "error": True,
-                "person": person,
-                "send_state": send_state,
-                "send_target_bundle": send_target_bundle,
-                "latest_plan": None,
-                "latest_plan_rules": [],
-                "latest_plan_games": [],
-                "latest_plan_corrections": [],
-                "latest_plan_messages": [],
-                "latest_plan_export": None,
-            }
-
-        return render(request, "partials/ai-workspace-ai-result.html", context)
+            error_text = str(exc)
+            return self._render_result(
+                request,
+                operation,
+                person,
+                send_state,
+                send_target_bundle,
+                result_text=error_text,
+                result_sections=_parse_result_sections(error_text),
+                error=True,
+                **self._empty_plan_bundle(),
+            )
 
 
 class AIWorkspaceSendDraft(LoginRequiredMixin, View):
@@ -4151,20 +4171,13 @@ class AIWorkspaceSendDraft(LoginRequiredMixin, View):
         text = (request.POST.get("draft_text") or "").strip()
         force_send = _is_truthy(request.POST.get("force_send"))
         if not text:
-            return render(
-                request,
-                "partials/ai-workspace-send-status.html",
-                {"ok": False, "message": "Draft is empty.", "level": "danger"},
-            )
+            return _render_send_status(request, False, "Draft is empty.", "danger")
         if not send_state["can_send"] and not force_send:
-            return render(
+            return _render_send_status(
                 request,
-                "partials/ai-workspace-send-status.html",
-                {
-                    "ok": False,
-                    "message": f"Send blocked. {send_state['text']}",
-                    "level": "warning",
-                },
+                False,
+                f"Send blocked. {send_state['text']}",
+                "warning",
             )
 
         identifier = _resolve_person_identifier_target(
@@ -4175,30 +4188,19 @@ class AIWorkspaceSendDraft(LoginRequiredMixin, View):
             fallback_service=_preferred_service_for_person(request.user, person),
         )
         if identifier is None:
-            return render(
+            return _render_send_status(
                 request,
-                "partials/ai-workspace-send-status.html",
-                {
-                    "ok": False,
-                    "message": "No recipient identifier found.",
-                    "level": "danger",
-                },
+                False,
+                "No recipient identifier found.",
+                "danger",
             )
 
         try:
             ts = async_to_sync(identifier.send)(text)
         except Exception as exc:
-            return render(
-                request,
-                "partials/ai-workspace-send-status.html",
-                {"ok": False, "message": f"Send failed: {exc}", "level": "danger"},
-            )
+            return _render_send_status(request, False, f"Send failed: {exc}", "danger")
         if ts is False or ts is None:
-            return render(
-                request,
-                "partials/ai-workspace-send-status.html",
-                {"ok": False, "message": "Send failed.", "level": "danger"},
-            )
+            return _render_send_status(request, False, "Send failed.", "danger")
 
         session, _ = ChatSession.objects.get_or_create(
             user=request.user,
@@ -4222,11 +4224,7 @@ class AIWorkspaceSendDraft(LoginRequiredMixin, View):
         success_message = "Draft sent."
         if force_send and not send_state["can_send"]:
             success_message = "Draft sent with override."
-        response = render(
-            request,
-            "partials/ai-workspace-send-status.html",
-            {"ok": True, "message": success_message, "level": "success"},
-        )
+        response = _render_send_status(request, True, success_message, "success")
         response["HX-Trigger"] = json.dumps(
             {
                 "gia-message-sent": {
@@ -4250,14 +4248,11 @@ class AIWorkspaceQueueDraft(LoginRequiredMixin, View):
         person = get_object_or_404(Person, pk=person_id, user=request.user)
         text = (request.POST.get("draft_text") or "").strip()
         if not text:
-            return render(
+            return _render_send_status(
                 request,
-                "partials/ai-workspace-send-status.html",
-                {
-                    "ok": False,
-                    "message": "Select a draft before queueing.",
-                    "level": "warning",
-                },
+                False,
+                "Select a draft before queueing.",
+                "warning",
             )
 
         identifier = _resolve_person_identifier_target(
@@ -4268,26 +4263,20 @@ class AIWorkspaceQueueDraft(LoginRequiredMixin, View):
             fallback_service=_preferred_service_for_person(request.user, person),
         )
         if identifier is None:
-            return render(
+            return _render_send_status(
                 request,
-                "partials/ai-workspace-send-status.html",
-                {
-                    "ok": False,
-                    "message": "No recipient identifier found.",
-                    "level": "danger",
-                },
+                False,
+                "No recipient identifier found.",
+                "danger",
             )
 
         manipulation = _get_queue_manipulation(request.user, person)
         if manipulation is None:
-            return render(
+            return _render_send_status(
                 request,
-                "partials/ai-workspace-send-status.html",
-                {
-                    "ok": False,
-                    "message": "No enabled manipulation found for this recipient. Queue entry not created.",
-                    "level": "warning",
-                },
+                False,
+                "No enabled manipulation found for this recipient. Queue entry not created.",
+                "warning",
             )
 
         session, _ = ChatSession.objects.get_or_create(
@@ -4303,11 +4292,7 @@ class AIWorkspaceQueueDraft(LoginRequiredMixin, View):
             text=text,
             custom_author="BOT",
         )
-        return render(
-            request,
-            "partials/ai-workspace-send-status.html",
-            {"ok": True, "message": "Draft added to queue.", "level": "success"},
-        )
+        return _render_send_status(request, True, "Draft added to queue.", "success")
 
 
 class AIWorkspaceCreateMitigation(LoginRequiredMixin, View):
@@ -4321,14 +4306,11 @@ class AIWorkspaceCreateMitigation(LoginRequiredMixin, View):
         ai_result_id = (request.POST.get("ai_result_id") or "").strip()
         output_profile = (request.POST.get("output_profile") or "").strip()
         if output_profile not in {"framework", "rule", "rules", "game", "games"}:
-            return render(
+            return _render_mitigation_status(
                 request,
-                "partials/ai-workspace-mitigation-status.html",
-                {
-                    "person": person,
-                    "level": "warning",
-                    "message": "Choose one mitigation output type: framework, rules, or games.",
-                },
+                person,
+                "Choose one mitigation output type: framework, rules, or games.",
+                level="warning",
             )
         user_context = (request.POST.get("user_context") or "").strip()
         creation_mode = "guided" if user_context else "auto"
@@ -4455,12 +4437,7 @@ class AIWorkspaceMitigationChat(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(
-            PatternMitigationPlan,
-            id=plan_id,
-            user=request.user,
-        )
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         text = (request.POST.get("message") or "").strip()
         active_tab = _sanitize_active_tab(
             request.POST.get("active_tab"), default="ask_ai"
@@ -4542,14 +4519,11 @@ class AIWorkspaceMitigationChat(LoginRequiredMixin, View):
             text=assistant_text,
         )
 
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                active_tab=active_tab,
-            ),
+            person,
+            plan,
+            active_tab=active_tab,
         )
 
 
@@ -4560,12 +4534,7 @@ class AIWorkspaceExportArtifact(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(
-            PatternMitigationPlan,
-            id=plan_id,
-            user=request.user,
-        )
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
 
         artifact_type = (request.POST.get("artifact_type") or "rulebook").strip()
         if artifact_type not in {"rulebook", "rules", "games", "corrections"}:
@@ -4589,17 +4558,14 @@ class AIWorkspaceExportArtifact(LoginRequiredMixin, View):
             meta=meta,
         )
 
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=f"Exported {artifact_type} ({export_format}).",
-                notice_level="success",
-                export_record=export_record,
-                active_tab=active_tab,
-            ),
+            person,
+            plan,
+            notice_message=f"Exported {artifact_type} ({export_format}).",
+            notice_level="success",
+            export_record=export_record,
+            active_tab=active_tab,
         )
 
 
@@ -4615,8 +4581,7 @@ class AIWorkspaceCreateArtifact(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         kind_key = (kind or "").strip().lower()
         if kind_key not in self.kind_map:
             return HttpResponseBadRequest("Invalid artifact kind")
@@ -4628,16 +4593,13 @@ class AIWorkspaceCreateArtifact(LoginRequiredMixin, View):
                 tab = _sanitize_active_tab(
                     request.POST.get("active_tab"), default="corrections"
                 )
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="Duplicate correction skipped.",
-                        notice_level="warning",
-                        active_tab=tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="Duplicate correction skipped.",
+                    notice_level="warning",
+                    active_tab=tab,
                 )
         payload = {
             "user": request.user,
@@ -4651,16 +4613,13 @@ class AIWorkspaceCreateArtifact(LoginRequiredMixin, View):
             request.POST.get("active_tab"),
             default=("corrections" if kind_key == "correction" else "plan_board"),
         )
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=f"{label} created.",
-                notice_level="success",
-                active_tab=tab,
-            ),
+            person,
+            plan,
+            notice_message=f"{label} created.",
+            notice_level="success",
+            active_tab=tab,
         )
 
 
@@ -4676,8 +4635,7 @@ class AIWorkspaceUpdateArtifact(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         kind_key = (kind or "").strip().lower()
         if kind_key not in self.kind_map:
             return HttpResponseBadRequest("Invalid artifact kind")
@@ -4705,16 +4663,13 @@ class AIWorkspaceUpdateArtifact(LoginRequiredMixin, View):
             if candidate_signature in _existing_correction_signatures(
                 plan, exclude_id=artifact.id
             ):
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="Duplicate correction not saved.",
-                        notice_level="warning",
-                        active_tab=tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="Duplicate correction not saved.",
+                    notice_level="warning",
+                    active_tab=tab,
                 )
 
         artifact.title = title[:255]
@@ -4733,16 +4688,13 @@ class AIWorkspaceUpdateArtifact(LoginRequiredMixin, View):
                 artifact.language_style = language_style
         artifact.save()
 
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=f"{label} saved.",
-                notice_level="success",
-                active_tab=tab,
-            ),
+            person,
+            plan,
+            notice_message=f"{label} saved.",
+            notice_level="success",
+            active_tab=tab,
         )
 
 
@@ -4758,8 +4710,7 @@ class AIWorkspaceDeleteArtifact(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         kind_key = (kind or "").strip().lower()
         if kind_key not in self.kind_map:
             return HttpResponseBadRequest("Invalid artifact kind")
@@ -4776,16 +4727,13 @@ class AIWorkspaceDeleteArtifact(LoginRequiredMixin, View):
             request.POST.get("active_tab"),
             default=("corrections" if kind_key == "correction" else "plan_board"),
         )
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=f"{label} deleted.",
-                notice_level="success",
-                active_tab=tab,
-            ),
+            person,
+            plan,
+            notice_message=f"{label} deleted.",
+            notice_level="success",
+            active_tab=tab,
         )
 
 
@@ -4801,8 +4749,7 @@ class AIWorkspaceDeleteArtifactList(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         kind_key = (kind or "").strip().lower()
         if kind_key not in self.kind_map:
             return HttpResponseBadRequest("Invalid artifact kind")
@@ -4822,16 +4769,13 @@ class AIWorkspaceDeleteArtifactList(LoginRequiredMixin, View):
             request.POST.get("active_tab"),
             default=("corrections" if kind_key == "correction" else "plan_board"),
         )
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=notice_message,
-                notice_level=notice_level,
-                active_tab=tab,
-            ),
+            person,
+            plan,
+            notice_message=notice_message,
+            notice_level=notice_level,
+            active_tab=tab,
         )
 
 
@@ -4842,8 +4786,7 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
 
         source_ref = (request.POST.get("source_ref") or "").strip()
         share_target = (request.POST.get("share_target") or "self").strip()
@@ -4866,17 +4809,14 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
         )
 
         if ":" not in source_ref:
-            return render(
+            return _render_mitigation_panel(
                 request,
-                "partials/ai-workspace-mitigation-panel.html",
-                _mitigation_panel_context(
-                    person=person,
-                    plan=plan,
-                    notice_message="Select a source item to engage.",
-                    notice_level="warning",
-                    engage_form=engage_form,
-                    active_tab=active_tab,
-                ),
+                person,
+                plan,
+                notice_message="Select a source item to engage.",
+                notice_level="warning",
+                engage_form=engage_form,
+                active_tab=active_tab,
             )
 
         source_kind, source_id = source_ref.split(":", 1)
@@ -4888,17 +4828,14 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
             "correction": PatternMitigationCorrection,
         }
         if source_kind not in model_map:
-            return render(
+            return _render_mitigation_panel(
                 request,
-                "partials/ai-workspace-mitigation-panel.html",
-                _mitigation_panel_context(
-                    person=person,
-                    plan=plan,
-                    notice_message="Invalid source type for engage.",
-                    notice_level="danger",
-                    engage_form=engage_form,
-                    active_tab=active_tab,
-                ),
+                person,
+                plan,
+                notice_message="Invalid source type for engage.",
+                notice_level="danger",
+                engage_form=engage_form,
+                active_tab=active_tab,
             )
 
         source_obj = get_object_or_404(
@@ -4926,34 +4863,28 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
         share_target = payload["share_target"]
 
         if action == "preview":
-            return render(
+            return _render_mitigation_panel(
                 request,
-                "partials/ai-workspace-mitigation-panel.html",
-                _mitigation_panel_context(
-                    person=person,
-                    plan=plan,
-                    engage_preview=engage_preview,
-                    engage_preview_flash=True,
-                    engage_form=engage_form,
-                    active_tab=active_tab,
-                ),
+                person,
+                plan,
+                engage_preview=engage_preview,
+                engage_preview_flash=True,
+                engage_form=engage_form,
+                active_tab=active_tab,
             )
 
         if action == "send":
             send_state = _get_send_state(request.user, person)
             if not send_state["can_send"] and not force_send:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message=f"Send blocked. {send_state['text']}",
-                        notice_level="warning",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message=f"Send blocked. {send_state['text']}",
+                    notice_level="warning",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
 
             identifier = _resolve_person_identifier_target(
@@ -4964,49 +4895,40 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
                 fallback_service=plan.conversation.platform_type,
             )
             if identifier is None:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="No recipient identifier found.",
-                        notice_level="danger",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="No recipient identifier found.",
+                    notice_level="danger",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
 
             try:
                 ts = async_to_sync(identifier.send)(outbound_text)
             except Exception as exc:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message=f"Send failed: {exc}",
-                        notice_level="danger",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message=f"Send failed: {exc}",
+                    notice_level="danger",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
             if ts is False or ts is None:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="Send failed.",
-                        notice_level="danger",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="Send failed.",
+                    notice_level="danger",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
 
             session, _ = ChatSession.objects.get_or_create(
@@ -5031,18 +4953,15 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
             notice = "Shared via engage."
             if force_send and not send_state["can_send"]:
                 notice = "Shared via engage with override."
-            response = render(
+            response = _render_mitigation_panel(
                 request,
-                "partials/ai-workspace-mitigation-panel.html",
-                _mitigation_panel_context(
-                    person=person,
-                    plan=plan,
-                    notice_message=notice,
-                    notice_level="success",
-                    engage_preview=engage_preview,
-                    engage_form=engage_form,
-                    active_tab=active_tab,
-                ),
+                person,
+                plan,
+                notice_message=notice,
+                notice_level="success",
+                engage_preview=engage_preview,
+                engage_form=engage_form,
+                active_tab=active_tab,
             )
             response["HX-Trigger"] = json.dumps(
                 {
@@ -5065,34 +4984,28 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
                 fallback_service=plan.conversation.platform_type,
             )
             if identifier is None:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="No recipient identifier found.",
-                        notice_level="danger",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="No recipient identifier found.",
+                    notice_level="danger",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
 
             manipulation = _get_queue_manipulation(request.user, person)
             if manipulation is None:
-                return render(
+                return _render_mitigation_panel(
                     request,
-                    "partials/ai-workspace-mitigation-panel.html",
-                    _mitigation_panel_context(
-                        person=person,
-                        plan=plan,
-                        notice_message="No enabled manipulation found for this recipient. Queue entry not created.",
-                        notice_level="warning",
-                        engage_preview=engage_preview,
-                        engage_form=engage_form,
-                        active_tab=active_tab,
-                    ),
+                    person,
+                    plan,
+                    notice_message="No enabled manipulation found for this recipient. Queue entry not created.",
+                    notice_level="warning",
+                    engage_preview=engage_preview,
+                    engage_form=engage_form,
+                    active_tab=active_tab,
                 )
 
             session, _ = ChatSession.objects.get_or_create(
@@ -5108,32 +5021,26 @@ class AIWorkspaceEngageShare(LoginRequiredMixin, View):
                 text=outbound_text,
                 custom_author="BOT",
             )
-            return render(
+            return _render_mitigation_panel(
                 request,
-                "partials/ai-workspace-mitigation-panel.html",
-                _mitigation_panel_context(
-                    person=person,
-                    plan=plan,
-                    notice_message="Engage text added to queue.",
-                    notice_level="success",
-                    engage_preview=engage_preview,
-                    engage_form=engage_form,
-                    active_tab=active_tab,
-                ),
-            )
-
-        return render(
-            request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message="Unknown engage action.",
-                notice_level="warning",
+                person,
+                plan,
+                notice_message="Engage text added to queue.",
+                notice_level="success",
                 engage_preview=engage_preview,
                 engage_form=engage_form,
                 active_tab=active_tab,
-            ),
+            )
+
+        return _render_mitigation_panel(
+            request,
+            person,
+            plan,
+            notice_message="Unknown engage action.",
+            notice_level="warning",
+            engage_preview=engage_preview,
+            engage_form=engage_form,
+            active_tab=active_tab,
         )
 
 
@@ -5144,8 +5051,7 @@ class AIWorkspaceAutoSettings(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         auto_settings = _get_or_create_auto_settings(request.user, plan.conversation)
 
         auto_settings.enabled = _is_truthy(request.POST.get("enabled"))
@@ -5197,17 +5103,14 @@ class AIWorkspaceAutoSettings(LoginRequiredMixin, View):
             notice_message = "Automation settings saved."
             notice_level = "success"
 
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message=notice_message,
-                notice_level=notice_level,
-                active_tab="auto",
-                auto_settings=auto_settings,
-            ),
+            person,
+            plan,
+            notice_message=notice_message,
+            notice_level=notice_level,
+            active_tab="auto",
+            auto_settings=auto_settings,
         )
 
 
@@ -5218,24 +5121,20 @@ class AIWorkspaceUpdateFundamentals(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         fundamentals_text = request.POST.get("fundamentals_text") or ""
         active_tab = _sanitize_active_tab(
             request.POST.get("active_tab"), default="fundamentals"
         )
         plan.fundamental_items = _parse_fundamentals(fundamentals_text)
         plan.save(update_fields=["fundamental_items", "updated_at"])
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message="Fundamentals saved.",
-                notice_level="success",
-                active_tab=active_tab,
-            ),
+            person,
+            plan,
+            notice_message="Fundamentals saved.",
+            notice_level="success",
+            active_tab=active_tab,
         )
 
 
@@ -5246,8 +5145,7 @@ class AIWorkspaceUpdatePlanMeta(LoginRequiredMixin, View):
         if type not in self.allowed_types:
             return HttpResponseBadRequest("Invalid type specified")
 
-        person = get_object_or_404(Person, pk=person_id, user=request.user)
-        plan = get_object_or_404(PatternMitigationPlan, id=plan_id, user=request.user)
+        person, plan = _person_plan_or_404(request, person_id, plan_id)
         active_tab = _sanitize_active_tab(
             request.POST.get("active_tab"), default="plan_board"
         )
@@ -5282,14 +5180,11 @@ class AIWorkspaceUpdatePlanMeta(LoginRequiredMixin, View):
         if len(update_fields) > 1:
             plan.save(update_fields=update_fields)
 
-        return render(
+        return _render_mitigation_panel(
             request,
-            "partials/ai-workspace-mitigation-panel.html",
-            _mitigation_panel_context(
-                person=person,
-                plan=plan,
-                notice_message="Plan metadata saved.",
-                notice_level="success",
-                active_tab=active_tab,
-            ),
+            person,
+            plan,
+            notice_message="Plan metadata saved.",
+            notice_level="success",
+            active_tab=active_tab,
         )