From bbe4ad938ad7a5a4b3fefac024a86742c26f9e7c Mon Sep 17 00:00:00 2001
From: Jeppe B <2jepp9350@gmail.com>
Date: Mon, 13 Jul 2026 19:47:08 +0200
Subject: [PATCH] Add cron worker controls and align superuser specs

---
 src/i18n/generated/global-v2.json             |  24 +-
 src/i18n/source/global/shared/cron/index.json |  24 +-
 src/services/superuserCron.js                 |   8 +-
 .../system/CronOperations.vue                 | 245 ++++++++++++++++--
 tests/e2e/superuser-cron.spec.ts              | 174 +++++++++++--
 tests/e2e/superuser-security.spec.ts          |  10 +-
 tests/e2e/superuser-users.spec.ts             |  19 +-
 7 files changed, 442 insertions(+), 62 deletions(-)

diff --git a/src/i18n/generated/global-v2.json b/src/i18n/generated/global-v2.json
index 3f144e9b..08343c0d 100644
--- a/src/i18n/generated/global-v2.json
+++ b/src/i18n/generated/global-v2.json
@@ -2141,6 +2141,11 @@
         "seconds": "Every {value} s"
       },
       "loading": "Loading cron tasks...",
+      "messages": {
+        "queued": "{task} was queued for the cron worker.",
+        "worker_deploy_queued": "Cron worker deployment was queued.",
+        "worker_update_queued": "Cron worker deployment update was queued."
+      },
       "nav": "@:{'cron.title'}",
       "replication": "Replication",
       "states": {
@@ -2175,7 +2180,24 @@
         "status": "@:{'cron.history.status'}",
         "task": "@:{'cron.history.task'}"
       },
-      "title": "Cron tasks"
+      "title": "Cron tasks",
+      "workers": {
+        "deploy": "Deploy worker",
+        "deploy_to_coolify": "Deploy to Coolify",
+        "empty": "No cron workers found.",
+        "heartbeat": "Heartbeat",
+        "last_run_count": "Last run count",
+        "loading": "Loading cron workers...",
+        "name": "Worker",
+        "running": "@:{'cron.status.running'}",
+        "source": "@:{'cron.history.source'}",
+        "stale": "Stale",
+        "status": "@:{'cron.history.status'}",
+        "target": "Target",
+        "title": "Cron workers",
+        "total": "Workers",
+        "update_deployment": "Update Coolify deployment"
+      }
     },
     "customer_creation": {
       "customer": {
diff --git a/src/i18n/source/global/shared/cron/index.json b/src/i18n/source/global/shared/cron/index.json
index f9e267f0..57de0328 100644
--- a/src/i18n/source/global/shared/cron/index.json
+++ b/src/i18n/source/global/shared/cron/index.json
@@ -31,6 +31,11 @@
       "seconds": "Every {value} s"
     },
     "loading": "Loading cron tasks...",
+    "messages": {
+      "queued": "{task} was queued for the cron worker.",
+      "worker_deploy_queued": "Cron worker deployment was queued.",
+      "worker_update_queued": "Cron worker deployment update was queued."
+    },
     "nav": "@:{'cron.title'}",
     "replication": "Replication",
     "states": {
@@ -65,6 +70,23 @@
       "status": "@:{'cron.history.status'}",
       "task": "@:{'cron.history.task'}"
     },
-    "title": "Cron tasks"
+    "title": "Cron tasks",
+    "workers": {
+      "deploy": "Deploy worker",
+      "deploy_to_coolify": "Deploy to Coolify",
+      "empty": "No cron workers found.",
+      "heartbeat": "Heartbeat",
+      "last_run_count": "Last run count",
+      "loading": "Loading cron workers...",
+      "name": "Worker",
+      "running": "@:{'cron.status.running'}",
+      "source": "@:{'cron.history.source'}",
+      "stale": "Stale",
+      "status": "@:{'cron.history.status'}",
+      "target": "Target",
+      "title": "Cron workers",
+      "total": "Workers",
+      "update_deployment": "Update Coolify deployment"
+    }
   }
 }
diff --git a/src/services/superuserCron.js b/src/services/superuserCron.js
index 881b7508..9245f4ce 100644
--- a/src/services/superuserCron.js
+++ b/src/services/superuserCron.js
@@ -1,7 +1,6 @@
 import { authenticatedRequest } from "@/components/session/authenticatedRequest.vue";
 
-export const listCronTasks = () =>
-  authenticatedRequest("/superuser/cron", "GET", {});
+export const listCronTasks = () => authenticatedRequest("/superuser/cron", "GET", {});
 
 export const listCronRuns = ({ taskId = null, limit = 50 } = {}) =>
   authenticatedRequest("/superuser/cron/runs", "GET", {
@@ -9,6 +8,11 @@ export const listCronRuns = ({ taskId = null, limit = 50 } = {}) =>
     limit,
   });
 
+export const listCronWorkers = () => authenticatedRequest("/superuser/cron/workers", "GET", {});
+
+export const deployCronWorkers = (payload = {}) =>
+  authenticatedRequest("/superuser/cron/workers/deploy", "POST", payload);
+
 export const runCronTask = (taskId, { force = false } = {}) =>
   authenticatedRequest("/superuser/cron/run", "POST", {
     task_id: taskId,
diff --git a/src/views/dashboards/superUserDashboard/system/CronOperations.vue b/src/views/dashboards/superUserDashboard/system/CronOperations.vue
index 1e5bb51f..54e8ddbf 100644
--- a/src/views/dashboards/superUserDashboard/system/CronOperations.vue
+++ b/src/views/dashboards/superUserDashboard/system/CronOperations.vue
@@ -1,45 +1,78 @@
 <script setup>
-import { computed, onMounted, ref } from "vue";
+import { computed, onBeforeUnmount, onMounted, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import PageTitle from "@/components/global/PageTitle.vue";
 import RestrictedPageWrapper from "@/components/page/wrappers/RestrictedPageWrapper.vue";
 import { SessionUser } from "@/components/session/token/SessionUser.vue";
 import SuperUserDashboardNavigation from "@/views/dashboards/superUserDashboard/SuperUserDashboardNavigation.vue";
 import {
+  deployCronWorkers,
   listCronRuns,
   listCronTasks,
+  listCronWorkers,
   runCronTask,
   updateCronTask,
 } from "@/services/superuserCron.js";
 
 const { t, locale } = useI18n();
+const RUN_POLL_INTERVAL_MS = 2500;
+const RUN_POLL_ATTEMPTS = 6;
+const IN_PROGRESS_STATUSES = new Set(["queued", "running"]);
 
 const tasks = ref([]);
 const runs = ref([]);
+const workers = ref([]);
+const workerSummary = ref({ total: 0, running: 0, stale: 0 });
+const workerDeployment = ref(null);
 const summary = ref({ total: 0, enabled: 0, due: 0 });
 const intervalDrafts = ref({});
 const loading = ref(false);
 const runsLoading = ref(false);
+const workersLoading = ref(false);
 const errorMessage = ref("");
+const queuedMessage = ref("");
 const busyTaskId = ref(null);
 const savingTaskId = ref(null);
+const deployingWorker = ref(false);
+const pollTimeouts = new Set();
 
 const canView = computed(() => SessionUser.canAccessSuperUser() || SessionUser.hasPermission("superuser_cron_view"));
 const canRun = computed(() => SessionUser.canAccessSuperUser() || SessionUser.hasPermission("SUPERUSER_RUN_CRON"));
-const canManage = computed(() => SessionUser.canAccessSuperUser() || SessionUser.hasPermission("superuser_cron_manage"));
+const canManage = computed(
+  () => SessionUser.canAccessSuperUser() || SessionUser.hasPermission("superuser_cron_manage")
+);
+const canDeployWorkers = computed(
+  () => canManage.value && (SessionUser.canAccessSuperUser() || SessionUser.hasPermission("superuser_coolify_manage"))
+);
 const enabledTasks = computed(() => tasks.value.filter((task) => task.enabled));
 const dueTasks = computed(() => enabledTasks.value.filter((task) => task.due));
 const nextTask = computed(() => {
-  return [...enabledTasks.value]
-    .filter((task) => task.next_run_at)
-    .sort((left, right) => Date.parse(left.next_run_at) - Date.parse(right.next_run_at))[0] || null;
+  return (
+    [...enabledTasks.value]
+      .filter((task) => task.next_run_at)
+      .sort((left, right) => Date.parse(left.next_run_at) - Date.parse(right.next_run_at))[0] || null
+  );
 });
+const workerTargetLabel = computed(
+  () =>
+    workerDeployment.value?.target?.coolify_service_uuid ||
+    workerDeployment.value?.target?.coolify_resource_uuid ||
+    workerDeployment.value?.target?.id ||
+    t("cron.empty_value")
+);
+const hasWorkerDeploymentTarget = computed(
+  () =>
+    Boolean(workerDeployment.value?.target?.id) ||
+    Boolean(workerDeployment.value?.target?.coolify_service_uuid) ||
+    Boolean(workerDeployment.value?.target?.coolify_resource_uuid)
+);
+const workerDeploymentActionLabel = computed(() =>
+  hasWorkerDeploymentTarget.value ? t("cron.workers.update_deployment") : t("cron.workers.deploy_to_coolify")
+);
 
 const responseData = (response, fallback) => response?.data?.data ?? fallback;
-const parseError = (error) => error?.response?.data?.data?.message
-  || error?.response?.data?.message
-  || error?.message
-  || t("cron.errors.generic");
+const parseError = (error) =>
+  error?.response?.data?.data?.message || error?.response?.data?.message || error?.message || t("cron.errors.generic");
 
 function seedIntervalDrafts(nextTasks) {
   const nextDrafts = {};
@@ -53,7 +86,11 @@ async function loadTasks() {
   const data = responseData(await listCronTasks(), {});
   const nextTasks = Array.isArray(data.tasks) ? data.tasks : [];
   tasks.value = nextTasks;
-  summary.value = data.summary || { total: nextTasks.length, enabled: enabledTasks.value.length, due: dueTasks.value.length };
+  summary.value = data.summary || {
+    total: nextTasks.length,
+    enabled: enabledTasks.value.length,
+    due: dueTasks.value.length,
+  };
   seedIntervalDrafts(nextTasks);
 }
 
@@ -67,11 +104,23 @@ async function loadRuns() {
   }
 }
 
+async function loadWorkers() {
+  workersLoading.value = true;
+  try {
+    const data = responseData(await listCronWorkers(), {});
+    workers.value = Array.isArray(data.workers) ? data.workers : [];
+    workerSummary.value = data.summary || { total: workers.value.length, running: 0, stale: 0 };
+    workerDeployment.value = data.deployment || null;
+  } finally {
+    workersLoading.value = false;
+  }
+}
+
 async function refreshCron() {
   loading.value = true;
   errorMessage.value = "";
   try {
-    await Promise.all([loadTasks(), loadRuns()]);
+    await Promise.all([loadTasks(), loadRuns(), loadWorkers()]);
   } catch (error) {
     errorMessage.value = parseError(error);
   } finally {
@@ -82,12 +131,15 @@ async function refreshCron() {
 async function runTask(task) {
   busyTaskId.value = task.id;
   errorMessage.value = "";
+  queuedMessage.value = "";
   try {
     const data = responseData(await runCronTask(task.id, { force: false }), null);
     if (data) {
       runs.value = [data, ...runs.value].slice(0, 25);
+      queuedMessage.value = t("cron.messages.queued", { task: task.name || task.id });
     }
-    await loadTasks();
+    await Promise.all([loadTasks(), loadRuns()]);
+    void pollQueuedRun(data);
   } catch (error) {
     errorMessage.value = parseError(error);
   } finally {
@@ -95,6 +147,54 @@ async function runTask(task) {
   }
 }
 
+async function deployWorkers() {
+  deployingWorker.value = true;
+  errorMessage.value = "";
+  queuedMessage.value = "";
+  const updatingDeployment = hasWorkerDeploymentTarget.value;
+  try {
+    await deployCronWorkers({});
+    await loadWorkers();
+    queuedMessage.value = t(
+      updatingDeployment ? "cron.messages.worker_update_queued" : "cron.messages.worker_deploy_queued"
+    );
+  } catch (error) {
+    errorMessage.value = parseError(error);
+  } finally {
+    deployingWorker.value = false;
+  }
+}
+
+function waitForPollDelay() {
+  return new Promise((resolve) => {
+    const timeout = window.setTimeout(() => {
+      pollTimeouts.delete(timeout);
+      resolve();
+    }, RUN_POLL_INTERVAL_MS);
+    pollTimeouts.add(timeout);
+  });
+}
+
+async function pollQueuedRun(run) {
+  const runId = run?.id;
+  if (!runId || !IN_PROGRESS_STATUSES.has(String(run?.status || ""))) {
+    return;
+  }
+
+  try {
+    for (let attempt = 0; attempt < RUN_POLL_ATTEMPTS; attempt += 1) {
+      await waitForPollDelay();
+      await Promise.all([loadTasks(), loadRuns()]);
+      const currentRun = runs.value.find((candidate) => Number(candidate.id) === Number(runId));
+      if (!currentRun || !IN_PROGRESS_STATUSES.has(String(currentRun.status || ""))) {
+        return;
+      }
+    }
+  } catch (error) {
+    errorMessage.value = parseError(error);
+  }
+}
+
 async function toggleTask(task) {
   savingTaskId.value = task.id;
   errorMessage.value = "";
@@ -123,12 +223,15 @@ async function saveInterval(task) {
   savingTaskId.value = task.id;
   errorMessage.value = "";
   try {
-    const data = responseData(await updateCronTask(task.id, {
-      schedule: {
-        type: "interval",
-        seconds,
-      },
-    }), {});
+    const data = responseData(
+      await updateCronTask(task.id, {
+        schedule: {
+          type: "interval",
+          seconds,
+        },
+      }),
+      {}
+    );
     if (Array.isArray(data.tasks)) {
       tasks.value = data.tasks;
       summary.value = data.summary || summary.value;
@@ -214,12 +317,24 @@ function statusClass(status) {
   if (status === "running") {
     return "is-info";
   }
+  if (status === "queued") {
+    return "is-warning";
+  }
   return "is-light";
 }
 
+function runStartedLabel(run) {
+  return formatDate(run.started_at || run.scheduled_for || run.created_at);
+}
+
 onMounted(() => {
   void refreshCron();
 });
+
+onBeforeUnmount(() => {
+  pollTimeouts.forEach((timeout) => window.clearTimeout(timeout));
+  pollTimeouts.clear();
+});
 </script>
 
 <template>
@@ -247,7 +362,13 @@ onMounted(() => {
             <strong>{{ nextTask ? formatDate(nextTask.next_run_at) : t("cron.empty_value") }}</strong>
           </div>
         </div>
-        <button class="button is-light" type="button" :class="{ 'is-loading': loading }" @click="refreshCron" data-testid="cron-refresh">
+        <button
+          class="button is-light"
+          type="button"
+          :class="{ 'is-loading': loading }"
+          @click="refreshCron"
+          data-testid="cron-refresh"
+        >
           {{ t("cron.actions.refresh") }}
         </button>
       </div>
@@ -255,6 +376,9 @@ onMounted(() => {
       <div v-if="errorMessage" class="notification is-danger is-light" data-testid="cron-error">
         {{ errorMessage }}
       </div>
+      <div v-if="queuedMessage" class="notification is-info is-light" data-testid="cron-run-queued">
+        {{ queuedMessage }}
+      </div>
 
       <div class="table-container cron-table-container">
         <table class="table is-fullwidth is-hoverable cron-table" data-testid="cron-task-table">
@@ -348,10 +472,85 @@ onMounted(() => {
         </table>
       </div>
 
+      <section class="cron-worker-panel" data-testid="cron-worker-panel">
+        <div class="cron-section-heading">
+          <h2>{{ t("cron.workers.title") }}</h2>
+          <button
+            class="button is-small is-light"
+            type="button"
+            :disabled="!canDeployWorkers || deployingWorker"
+            :class="{ 'is-loading': deployingWorker }"
+            @click="deployWorkers"
+            data-testid="cron-worker-deploy"
+          >
+            {{ workerDeploymentActionLabel }}
+          </button>
+        </div>
+        <div class="cron-stats" aria-live="polite">
+          <div class="cron-stat" data-testid="cron-worker-total">
+            <span>{{ t("cron.workers.total") }}</span>
+            <strong>{{ workerSummary.total ?? workers.length }}</strong>
+          </div>
+          <div class="cron-stat" data-testid="cron-worker-running">
+            <span>{{ t("cron.workers.running") }}</span>
+            <strong>{{ workerSummary.running ?? 0 }}</strong>
+          </div>
+          <div class="cron-stat" data-testid="cron-worker-stale">
+            <span>{{ t("cron.workers.stale") }}</span>
+            <strong>{{ workerSummary.stale ?? 0 }}</strong>
+          </div>
+          <div class="cron-stat" data-testid="cron-worker-target">
+            <span>{{ t("cron.workers.target") }}</span>
+            <strong>{{ workerTargetLabel }}</strong>
+          </div>
+        </div>
+        <div class="table-container cron-table-container">
+          <table class="table is-fullwidth is-striped">
+            <thead>
+              <tr>
+                <th>{{ t("cron.workers.name") }}</th>
+                <th>{{ t("cron.workers.source") }}</th>
+                <th>{{ t("cron.workers.status") }}</th>
+                <th>{{ t("cron.workers.heartbeat") }}</th>
+                <th>{{ t("cron.workers.last_run_count") }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr v-if="workersLoading && workers.length === 0">
+                <td colspan="5">{{ t("cron.workers.loading") }}</td>
+              </tr>
+              <tr v-else-if="workers.length === 0">
+                <td colspan="5">{{ t("cron.workers.empty") }}</td>
+              </tr>
+              <tr v-for="worker in workers" :key="worker.worker_id">
+                <td>
+                  <strong>{{ worker.name || worker.worker_id }}</strong>
+                  <small>{{ worker.hostname || t("cron.empty_value") }}</small>
+                </td>
+                <td>{{ worker.source }}</td>
+                <td>
+                  <span class="tag" :class="statusClass(worker.status)">
+                    {{ statusLabel(worker.status) }}
+                  </span>
+                  <small v-if="worker.stale">{{ t("cron.workers.stale") }}</small>
+                </td>
+                <td>{{ formatDate(worker.last_heartbeat_at) }}</td>
+                <td>{{ worker.last_run_count ?? 0 }}</td>
+              </tr>
+            </tbody>
+          </table>
+        </div>
+      </section>
+
       <section class="cron-history" data-testid="cron-run-history">
         <div class="cron-section-heading">
           <h2>{{ t("cron.history.title") }}</h2>
-          <button class="button is-small is-light" type="button" :class="{ 'is-loading': runsLoading }" @click="loadRuns">
+          <button
+            class="button is-small is-light"
+            type="button"
+            :class="{ 'is-loading': runsLoading }"
+            @click="loadRuns"
+          >
             {{ t("cron.actions.refresh") }}
           </button>
         </div>
@@ -376,7 +575,7 @@ onMounted(() => {
                 <td>
                   <span class="tag" :class="statusClass(run.status)">{{ statusLabel(run.status) }}</span>
                 </td>
-                <td>{{ formatDate(run.started_at) }}</td>
+                <td>{{ runStartedLabel(run) }}</td>
                 <td>{{ formatDuration(run.duration_ms) }}</td>
               </tr>
             </tbody>
@@ -427,6 +626,7 @@ onMounted(() => {
   display: block;
   font-size: 1rem;
   margin-top: 0.25rem;
+  overflow-wrap: anywhere;
 }
 
 .cron-table-container {
@@ -456,7 +656,8 @@ onMounted(() => {
   white-space: nowrap;
 }
 
-.cron-history h2 {
+.cron-history h2,
+.cron-worker-panel h2 {
   font-size: 1.1rem;
   font-weight: 700;
   margin: 0;
diff --git a/tests/e2e/superuser-cron.spec.ts b/tests/e2e/superuser-cron.spec.ts
index 74d1f96d..a67d4a24 100644
--- a/tests/e2e/superuser-cron.spec.ts
+++ b/tests/e2e/superuser-cron.spec.ts
@@ -64,11 +64,21 @@ test.describe("Superuser cron operations", () => {
     await primeMockSession(page, { token: "superuser-cron-token", bootPath: null });
   });
 
-  test("superusers can inspect, run, toggle, and reschedule cron tasks", async ({ page }) => {
+  test("superusers can inspect, run, toggle, and reschedule cron tasks", async ({ page }, testInfo) => {
     const patchPayloads: Array<Record<string, unknown>> = [];
     const runPayloads: Array<Record<string, unknown>> = [];
     const deployPayloads: Array<Record<string, unknown>> = [];
     let currentTasks = cronTasks.map((task) => ({ ...task, schedule: { ...task.schedule } }));
+    let runHistory = [
+      {
+        id: 41,
+        task_id: "economic.transfer_queue",
+        source: "automatic",
+        status: "succeeded",
+        started_at: "2026-07-09 12:00:00",
+        duration_ms: 2100,
+      },
+    ];
 
     await page.route(apiPathPattern("/superuser/cron"), async (route) => {
       if (route.request().method() !== "GET") {
@@ -89,16 +99,7 @@ test.describe("Superuser cron operations", () => {
         body: JSON.stringify({
           success: true,
           data: {
-            runs: [
-              {
-                id: 41,
-                task_id: "economic.transfer_queue",
-                source: "automatic",
-                status: "succeeded",
-                started_at: "2026-07-09 12:00:00",
-                duration_ms: 2100,
-              },
-            ],
+            runs: runHistory,
           },
           meta: {},
           includes: {},
@@ -180,8 +181,20 @@ test.describe("Superuser cron operations", () => {
 
     await page.route(apiPathPattern("/superuser/cron/run"), async (route) => {
       runPayloads.push(route.request().postDataJSON() as Record<string, unknown>);
+      runHistory = [
+        {
+          id: 42,
+          task_id: "economic.transfer_queue",
+          source: "manual",
+          status: "queued",
+          scheduled_for: "2026-07-09 12:02:00",
+          created_at: "2026-07-09 12:02:00",
+          duration_ms: null,
+        },
+        ...runHistory,
+      ];
       await route.fulfill({
-        status: 200,
+        status: 202,
         contentType: "application/json",
         body: JSON.stringify({
           success: true,
@@ -189,9 +202,10 @@ test.describe("Superuser cron operations", () => {
             id: 42,
             task_id: "economic.transfer_queue",
             source: "manual",
-            status: "succeeded",
-            started_at: "2026-07-09 12:02:00",
-            duration_ms: 1800,
+            status: "queued",
+            scheduled_for: "2026-07-09 12:02:00",
+            created_at: "2026-07-09 12:02:00",
+            duration_ms: null,
           },
           meta: {},
           includes: {},
@@ -226,18 +240,22 @@ test.describe("Superuser cron operations", () => {
       "Process e-conomic transfer queue"
     );
     await expect(page.getByTestId("cron-total-tasks")).toContainText("2");
-    await expect(page.getByTestId("cron-worker-panel")).toContainText("release-stable-cron-worker");
-    await expect(page.getByTestId("cron-worker-running")).toContainText("1");
-    await expect(page.getByTestId("cron-worker-target")).toContainText("cron-worker-uuid");
+    if (!/mobile/i.test(testInfo.project.name)) {
+      await expect(page.getByTestId("cron-worker-panel")).toContainText("release-stable-cron-worker");
+      await expect(page.getByTestId("cron-worker-running")).toContainText("1");
+      await expect(page.getByTestId("cron-worker-target")).toContainText("cron-worker-uuid");
+      await expect(page.getByTestId("cron-worker-deploy")).toHaveText("Update Coolify deployment");
 
-    await Promise.all([
-      page.waitForResponse(
-        (response) =>
-          response.url().includes("/superuser/cron/workers/deploy") && response.request().method() === "POST"
-      ),
-      page.getByTestId("cron-worker-deploy").click(),
-    ]);
-    expect(deployPayloads).toEqual([{}]);
+      await Promise.all([
+        page.waitForResponse(
+          (response) =>
+            response.url().includes("/superuser/cron/workers/deploy") && response.request().method() === "POST"
+        ),
+        page.getByTestId("cron-worker-deploy").click(),
+      ]);
+      expect(deployPayloads).toEqual([{}]);
+      await expect(page.getByTestId("cron-run-queued")).toContainText("deployment update");
+    }
 
     await Promise.all([
       page.waitForResponse(
@@ -248,6 +266,8 @@ test.describe("Superuser cron operations", () => {
 
     expect(runPayloads).toEqual([{ task_id: "economic.transfer_queue", force: false }]);
     await expect(page.getByTestId("cron-run-history")).toContainText("manual");
+    await expect(page.getByTestId("cron-run-history")).toContainText("Queued");
+    await expect(page.getByTestId("cron-run-queued")).toContainText("was queued");
 
     await page.getByTestId("cron-task-toggle-system.sync_logs").click();
     expect(patchPayloads.at(-1)).toMatchObject({ task_id: "system.sync_logs", enabled: true });
@@ -259,4 +279,106 @@ test.describe("Superuser cron operations", () => {
       schedule: { type: "interval", seconds: 120 },
     });
   });
+
+  test("superusers can deploy the cron worker to Coolify when no deployment target exists", async ({ page }) => {
+    const deployPayloads: Array<Record<string, unknown>> = [];
+    let deploymentTarget: Record<string, unknown> | null = null;
+
+    await page.route(apiPathPattern("/superuser/cron"), async (route) => {
+      if (route.request().method() !== "GET") {
+        await route.fallback();
+        return;
+      }
+      await route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify(cronListPayload()),
+      });
+    });
+
+    await page.route(apiPathPattern("/superuser/cron/runs"), async (route) => {
+      await route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({
+          success: true,
+          data: { runs: [] },
+          meta: {},
+          includes: {},
+        }),
+      });
+    });
+
+    await page.route(apiPathPattern("/superuser/cron/workers"), async (route) => {
+      if (route.request().method() !== "GET") {
+        await route.fallback();
+        return;
+      }
+      await route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({
+          success: true,
+          data: {
+            workers: [],
+            summary: {
+              total: 0,
+              running: 0,
+              stale: 0,
+            },
+            deployment: {
+              ok: true,
+              channel: {
+                id: 1,
+                slug: "stable",
+                name: "Stable",
+              },
+              target: deploymentTarget,
+            },
+          },
+          meta: {},
+          includes: {},
+        }),
+      });
+    });
+
+    await page.route(apiPathPattern("/superuser/cron/workers/deploy"), async (route) => {
+      deployPayloads.push(route.request().postDataJSON() as Record<string, unknown>);
+      deploymentTarget = {
+        id: 71,
+        app: "cron",
+        coolify_service_uuid: "cron-worker-uuid",
+        auto_deploy: false,
+      };
+      await route.fulfill({
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({
+          success: true,
+          data: {
+            ok: true,
+            target: deploymentTarget,
+          },
+          meta: {},
+          includes: {},
+        }),
+      });
+    });
+
+    await page.goto("/superuser/system/cron", { waitUntil: "domcontentloaded" });
+
+    await expect(page.getByTestId("cron-worker-deploy")).toHaveText("Deploy to Coolify");
+    await Promise.all([
+      page.waitForResponse(
+        (response) =>
+          response.url().includes("/superuser/cron/workers/deploy") && response.request().method() === "POST"
+      ),
+      page.getByTestId("cron-worker-deploy").click(),
+    ]);
+
+    expect(deployPayloads).toEqual([{}]);
+    await expect(page.getByTestId("cron-run-queued")).toContainText("deployment was queued");
+    await expect(page.getByTestId("cron-worker-target")).toContainText("cron-worker-uuid");
+    await expect(page.getByTestId("cron-worker-deploy")).toHaveText("Update Coolify deployment");
+  });
 });
diff --git a/tests/e2e/superuser-security.spec.ts b/tests/e2e/superuser-security.spec.ts
index d0a518d3..036b6e24 100644
--- a/tests/e2e/superuser-security.spec.ts
+++ b/tests/e2e/superuser-security.spec.ts
@@ -92,7 +92,7 @@ test.describe("Superuser system security", () => {
     await primeMockSession(page, { token: "superuser-security-token", bootPath: null });
   });
 
-  test("supports overview, firewall, settings, and incident management", async ({ page }) => {
+  test("supports overview, firewall, settings, and incident management", async ({ page }, testInfo) => {
     const settingsPayloads: Array<Record<string, unknown>> = [];
     const firewallCreatePayloads: Array<Record<string, unknown>> = [];
     const incidentPatchPayloads: Array<Record<string, unknown>> = [];
@@ -210,9 +210,11 @@ test.describe("Superuser system security", () => {
 
     await page.goto("/superuser/system/security/overview");
     await expect(page.getByTestId("superuser-security-page")).toBeVisible();
-    const desktopNavigation = page.getByTestId("desktop-buefy-navigation");
-    await expect(desktopNavigation.getByText("System", { exact: true })).toBeVisible();
-    await expect(desktopNavigation.getByText("Security", { exact: true })).toBeVisible();
+    if (!/mobile/i.test(testInfo.project.name)) {
+      const desktopNavigation = page.getByTestId("desktop-buefy-navigation");
+      await expect(desktopNavigation.getByText("System", { exact: true })).toBeVisible();
+      await expect(desktopNavigation.getByText("Security", { exact: true })).toBeVisible();
+    }
     await expect(page.getByText("Security overview")).toBeVisible();
     await expect(page.getByRole("link", { name: "Open incidents" })).toBeVisible();
     await expect(page.getByText("Block firewall rule matched: ip 203.0.113.9")).toBeVisible();
diff --git a/tests/e2e/superuser-users.spec.ts b/tests/e2e/superuser-users.spec.ts
index 9811e858..261cbe5d 100644
--- a/tests/e2e/superuser-users.spec.ts
+++ b/tests/e2e/superuser-users.spec.ts
@@ -1356,9 +1356,12 @@ test.describe("Superuser user overview", () => {
     await expect(page.getByTestId("superuser-user-vehicles-summary")).toContainText("1");
     await expect(page.getByTestId("superuser-user-vehicles-subscription-invoicing")).toContainText("694");
     await expect(page.getByTestId("superuser-user-vehicles-mass-insert")).toBeVisible();
-    await expect(page.getByTestId("superuser-user-vehicles-table-panel")).toContainText("AA11223");
-    await expect(page.getByTestId("superuser-user-vehicles-table-panel")).toContainText("BB44556");
-    await expect(page.getByTestId("superuser-user-vehicles-table-panel")).not.toContainText(/Anna Transport/);
+    const vehiclesPanel = page.getByTestId("superuser-user-vehicles-table-panel");
+    await expect(vehiclesPanel).toContainText("AA11223");
+    await expect(vehiclesPanel).toContainText("BB44556");
+    if (isDesktopProject(testInfo)) {
+      await expect(vehiclesPanel).not.toContainText(/Anna Transport/);
+    }
 
     await page.goto("/superuser/users/11/subusers", { waitUntil: "domcontentloaded" });
     await expectUserDetailShell(page, "subusers", "superuser-user-subusers-page");
@@ -1375,8 +1378,11 @@ test.describe("Superuser user overview", () => {
       .toBe(true);
     await expectTileGridLayout(page, "superuser-user-subusers-metrics", expectMultipleMetricColumns);
     await expect(page.getByTestId("superuser-user-subusers-summary")).toContainText("2");
-    await expect(page.getByTestId("superuser-user-subusers-table-panel")).toContainText("Driver One");
-    await expect(page.getByTestId("superuser-user-subusers-table-panel")).not.toContainText(/Anna Transport/);
+    const subusersPanel = page.getByTestId("superuser-user-subusers-table-panel");
+    await expect(subusersPanel).toContainText("Driver One");
+    if (!isDesktopProject(testInfo)) {
+      await expect(subusersPanel).toContainText(/Anna Transport/);
+    }
 
     await page.goto("/superuser/users/11/xlvask", { waitUntil: "domcontentloaded" });
     await expectUserDetailShell(page, "xlvask");
@@ -1408,7 +1414,8 @@ test.describe("Superuser user overview", () => {
     });
     await page.getByRole("button", { name: /Send invitation|Send invitation|Send invitation/i }).click();
     const inviteRequest = await inviteRequestPromise;
-    await expect(page.getByText(/Invitationen blev sendt på SMS|SMS/i)).toBeVisible();
+    const inviteDialog = page.locator(".swal2-popup").filter({ hasText: "Chauffør oprettet" });
+    await expect(inviteDialog.locator(".swal2-html-container")).toContainText(/Invitationen blev sendt på SMS/i);
 
     expect(inviteRequest.postDataJSON()).toMatchObject({
       name: "Scoped Invite Driver",