@open-mercato/scheduler 0.6.5-develop.5187.1.82e5532561 → 0.6.5-develop.5200.1.871eca3402

package/dist/modules/scheduler/__integration__/TC-UNDO-001-scheduler-jobs.spec.js

@@ -1,123 +1,56 @@
 import { expect, test } from "@playwright/test";
 import { apiRequest, getAuthToken } from "@open-mercato/core/helpers/integration/api";
-import { skipIfUndoTestsDisabled } from "@open-mercato/core/helpers/integration/undoHarness";
-async function settleAuditClock() {
-  await new Promise((resolve) => setTimeout(resolve, 50));
+import {
+  extractOperation,
+  runCrudUndoRoundTrip,
+  skipIfUndoTestsDisabled
+} from "@open-mercato/core/helpers/integration/undoHarness";
+import {
+  SCHEDULER_JOBS_PATH,
+  SCHEDULER_TRIGGER_PATH,
+  createScheduleJob,
+  deleteScheduleJob
+} from "./helpers/scheduler.js";
+function jobCreatePayload(stamp) {
+  return {
+    name: `TC-UNDO-001 Scheduler ${stamp}`,
+    description: "TC-UNDO-001 undo/redo probe",
+    scopeType: "organization",
+    scheduleType: "interval",
+    scheduleValue: "15m",
+    timezone: "UTC",
+    targetType: "queue",
+    targetQueue: "scheduler-execution",
+    isEnabled: true,
+    sourceType: "user"
+  };
 }
-function readUndoToken(res) {
-  const header = res.headers()["x-om-operation"] ?? "";
-  const enc = header.startsWith("omop:") ? header.slice(5) : "";
-  expect(enc, "x-om-operation header should carry an omop: payload").not.toBe("");
-  const payload = JSON.parse(decodeURIComponent(enc));
-  expect(typeof payload.undoToken, "undoToken present in operation payload").toBe("string");
-  return payload.undoToken;
-}
-async function getById(request, token, id) {
-  const res = await apiRequest(request, "GET", `/api/scheduler/jobs?id=${encodeURIComponent(id)}`, { token });
-  expect(res.status()).toBe(200);
-  const body = await res.json();
-  return (body.items ?? [])[0];
-}
-async function createJob(request, token, name) {
-  const res = await apiRequest(request, "POST", "/api/scheduler/jobs", {
-    token,
-    data: {
-      name,
-      description: "TC-UNDO-001 probe",
-      scopeType: "tenant",
-      scheduleType: "cron",
-      scheduleValue: "0 0 * * *",
-      timezone: "UTC",
-      targetType: "queue",
-      targetQueue: "default",
-      isEnabled: true,
-      sourceType: "user"
-    }
-  });
-  expect(res.status(), "create returns 201").toBe(201);
-  const id = (await res.json()).id;
-  expect(id, "create returns an id").toBeTruthy();
-  return { id, res };
-}
-async function undo(request, token, undoToken) {
-  const res = await apiRequest(request, "POST", "/api/audit_logs/audit-logs/actions/undo", {
-    token,
-    data: { undoToken }
-  });
-  const raw = await res.text();
-  expect(res.status(), `undo returns 200 (body: ${raw})`).toBe(200);
-  const body = JSON.parse(raw);
-  expect(body.ok, "undo body is { ok: true }").toBe(true);
-}
-async function cleanup(request, token, id) {
-  if (!token || !id) return;
-  try {
-    await apiRequest(request, "DELETE", "/api/scheduler/jobs", { token, data: { id } });
-  } catch {
-  }
-}
-test.describe("TC-UNDO-001: scheduler.jobs undo actually restores state (#2504)", () => {
+test.describe("TC-UNDO-001 scheduler.jobs undo/redo (#2504)", () => {
   test.beforeAll(() => {
     skipIfUndoTestsDisabled();
   });
-  test("UPDATE -> undo restores the prior name", async ({ request }) => {
-    let token = null;
-    let id = null;
-    try {
-      token = await getAuthToken(request, "admin");
-      const originalName = `TC-UNDO-001 Update ${Date.now()}`;
-      ({ id } = await createJob(request, token, originalName));
-      await settleAuditClock();
-      const updateRes = await apiRequest(request, "PUT", "/api/scheduler/jobs", {
-        token,
-        data: { id, name: `${originalName} RENAMED` }
-      });
-      expect(updateRes.status(), "update returns 200").toBe(200);
-      expect((await getById(request, token, id))?.name).toBe(`${originalName} RENAMED`);
-      await undo(request, token, readUndoToken(updateRes));
-      const restored = await getById(request, token, id);
-      expect(restored, "job still exists after update-undo").toBeTruthy();
-      expect(restored.name, "name restored to original by undo").toBe(originalName);
-    } finally {
-      await cleanup(request, token, id);
-    }
+  test("jobs CRUD commands restore scalar state on undo/redo (I1/I2/I3/I5/I6)", async ({ request }) => {
+    const token = await getAuthToken(request, "admin");
+    await runCrudUndoRoundTrip(request, token, {
+      label: "scheduler.jobs",
+      collectionPath: SCHEDULER_JOBS_PATH,
+      field: "name",
+      createPayload: jobCreatePayload,
+      updatePayload: (id, stamp) => ({ id, name: `TC-UNDO-001 Scheduler Renamed ${stamp}` })
+    });
   });
-  test("DELETE -> undo re-lists the soft-deleted job", async ({ request }) => {
-    let token = null;
-    let id = null;
+  test("\xA74 trigger exposes no undo token", async ({ request }) => {
+    const token = await getAuthToken(request, "admin");
+    let jobId = null;
     try {
-      token = await getAuthToken(request, "admin");
-      const name = `TC-UNDO-001 Delete ${Date.now()}`;
-      ({ id } = await createJob(request, token, name));
-      await settleAuditClock();
-      const deleteRes = await apiRequest(request, "DELETE", "/api/scheduler/jobs", {
+      jobId = await createScheduleJob(request, token);
+      const triggerRes = await apiRequest(request, "POST", SCHEDULER_TRIGGER_PATH, {
         token,
-        data: { id }
+        data: { id: jobId }
       });
-      expect(deleteRes.status(), "delete returns 200").toBe(200);
-      expect(await getById(request, token, id), "job is gone after delete").toBeFalsy();
-      await undo(request, token, readUndoToken(deleteRes));
-      const restored = await getById(request, token, id);
-      expect(restored, "job re-materialized by delete-undo").toBeTruthy();
-      expect(restored.name).toBe(name);
-    } finally {
-      await cleanup(request, token, id);
-    }
-  });
-  test("CREATE -> undo removes the created job", async ({ request }) => {
-    let token = null;
-    let id = null;
-    try {
-      token = await getAuthToken(request, "admin");
-      const name = `TC-UNDO-001 Create ${Date.now()}`;
-      const created = await createJob(request, token, name);
-      id = created.id;
-      expect(await getById(request, token, id), "job exists after create").toBeTruthy();
-      await undo(request, token, readUndoToken(created.res));
-      expect(await getById(request, token, id), "job removed by create-undo").toBeFalsy();
-      id = null;
+      expect(extractOperation(triggerRes), "trigger response carries no undo token (\xA74)").toBeNull();
     } finally {
-      await cleanup(request, token, id);
+      await deleteScheduleJob(request, token, jobId);
     }
   });
 });

package/dist/modules/scheduler/__integration__/TC-UNDO-001-scheduler-jobs.spec.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/scheduler/__integration__/TC-UNDO-001-scheduler-jobs.spec.ts"],
-  "sourcesContent": ["import { expect, test, type APIRequestContext, type APIResponse } from '@playwright/test'\nimport { apiRequest, getAuthToken } from '@open-mercato/core/helpers/integration/api'\nimport { skipIfUndoTestsDisabled } from '@open-mercato/core/helpers/integration/undoHarness'\n\n/**\n * TC-UNDO-001: scheduler.jobs undo round-trip (regression for issue #2504).\n *\n * Before the fix, every scheduler.jobs undo handler read `logEntry.payload`\n * (always undefined \u2014 the command bus persists the undo snapshot under\n * `commandPayload`), so undo returned `{ ok: true }` while silently changing\n * nothing. This spec exercises the real HTTP path end-to-end:\n *   - CREATE -> undo  => job is soft-deleted (no longer listed)\n *   - UPDATE -> undo  => renamed field is restored to its prior value\n *   - DELETE -> undo  => soft-deleted job is re-materialized\n *\n * Endpoints covered:\n *   - POST   /api/scheduler/jobs                       (create)\n *   - GET    /api/scheduler/jobs?id=                   (read)\n *   - PUT    /api/scheduler/jobs                       (update)\n *   - DELETE /api/scheduler/jobs                       (delete, cleanup)\n *   - POST   /api/audit_logs/audit-logs/actions/undo   (undo)\n */\n\ntype ScheduleRow = {\n  id: string\n  name: string\n  description: string | null\n  scheduleValue: string\n}\n\n// The undo endpoint only honors the *latest* undoable log for a resource, and\n// `latestUndoableForResource` orders by `created_at` alone. Audit `created_at` is\n// millisecond-precision (`new Date()` at log time), so a create + a follow-up\n// mutation issued within the same millisecond tie and the lookup may resolve to\n// the wrong log. A short settle guarantees the operation under undo is strictly\n// the most recent, keeping the round-trip deterministic.\nasync function settleAuditClock(): Promise<void> {\n  await new Promise((resolve) => setTimeout(resolve, 50))\n}\n\nfunction readUndoToken(res: APIResponse): string {\n  const header = res.headers()['x-om-operation'] ?? ''\n  const enc = header.startsWith('omop:') ? header.slice(5) : ''\n  expect(enc, 'x-om-operation header should carry an omop: payload').not.toBe('')\n  const payload = JSON.parse(decodeURIComponent(enc)) as { undoToken?: string }\n  expect(typeof payload.undoToken, 'undoToken present in operation payload').toBe('string')\n  return payload.undoToken as string\n}\n\nasync function getById(\n  request: APIRequestContext,\n  token: string,\n  id: string,\n): Promise<ScheduleRow | undefined> {\n  const res = await apiRequest(request, 'GET', `/api/scheduler/jobs?id=${encodeURIComponent(id)}`, { token })\n  expect(res.status()).toBe(200)\n  const body = (await res.json()) as { items?: ScheduleRow[] }\n  return (body.items ?? [])[0]\n}\n\nasync function createJob(request: APIRequestContext, token: string, name: string): Promise<{ id: string; res: APIResponse }> {\n  const res = await apiRequest(request, 'POST', '/api/scheduler/jobs', {\n    token,\n    data: {\n      name,\n      description: 'TC-UNDO-001 probe',\n      scopeType: 'tenant',\n      scheduleType: 'cron',\n      scheduleValue: '0 0 * * *',\n      timezone: 'UTC',\n      targetType: 'queue',\n      targetQueue: 'default',\n      isEnabled: true,\n      sourceType: 'user',\n    },\n  })\n  expect(res.status(), 'create returns 201').toBe(201)\n  const id = ((await res.json()) as { id: string }).id\n  expect(id, 'create returns an id').toBeTruthy()\n  return { id, res }\n}\n\nasync function undo(request: APIRequestContext, token: string, undoToken: string): Promise<void> {\n  const res = await apiRequest(request, 'POST', '/api/audit_logs/audit-logs/actions/undo', {\n    token,\n    data: { undoToken },\n  })\n  const raw = await res.text()\n  expect(res.status(), `undo returns 200 (body: ${raw})`).toBe(200)\n  const body = JSON.parse(raw) as { ok?: boolean }\n  expect(body.ok, 'undo body is { ok: true }').toBe(true)\n}\n\nasync function cleanup(request: APIRequestContext, token: string | null, id: string | null): Promise<void> {\n  if (!token || !id) return\n  try {\n    await apiRequest(request, 'DELETE', '/api/scheduler/jobs', { token, data: { id } })\n  } catch {\n    /* ignore */\n  }\n}\n\ntest.describe('TC-UNDO-001: scheduler.jobs undo actually restores state (#2504)', () => {\n  test.beforeAll(() => {\n    skipIfUndoTestsDisabled()\n  })\n\n  test('UPDATE -> undo restores the prior name', async ({ request }) => {\n    let token: string | null = null\n    let id: string | null = null\n    try {\n      token = await getAuthToken(request, 'admin')\n      const originalName = `TC-UNDO-001 Update ${Date.now()}`\n      ;({ id } = await createJob(request, token, originalName))\n      await settleAuditClock()\n\n      const updateRes = await apiRequest(request, 'PUT', '/api/scheduler/jobs', {\n        token,\n        data: { id, name: `${originalName} RENAMED` },\n      })\n      expect(updateRes.status(), 'update returns 200').toBe(200)\n      expect((await getById(request, token, id))?.name).toBe(`${originalName} RENAMED`)\n\n      await undo(request, token, readUndoToken(updateRes))\n\n      const restored = await getById(request, token, id)\n      expect(restored, 'job still exists after update-undo').toBeTruthy()\n      expect(restored!.name, 'name restored to original by undo').toBe(originalName)\n    } finally {\n      await cleanup(request, token, id)\n    }\n  })\n\n  test('DELETE -> undo re-lists the soft-deleted job', async ({ request }) => {\n    let token: string | null = null\n    let id: string | null = null\n    try {\n      token = await getAuthToken(request, 'admin')\n      const name = `TC-UNDO-001 Delete ${Date.now()}`\n      ;({ id } = await createJob(request, token, name))\n      await settleAuditClock()\n\n      const deleteRes = await apiRequest(request, 'DELETE', '/api/scheduler/jobs', {\n        token,\n        data: { id },\n      })\n      expect(deleteRes.status(), 'delete returns 200').toBe(200)\n      expect(await getById(request, token, id), 'job is gone after delete').toBeFalsy()\n\n      await undo(request, token, readUndoToken(deleteRes))\n\n      const restored = await getById(request, token, id)\n      expect(restored, 'job re-materialized by delete-undo').toBeTruthy()\n      expect(restored!.name).toBe(name)\n    } finally {\n      await cleanup(request, token, id)\n    }\n  })\n\n  test('CREATE -> undo removes the created job', async ({ request }) => {\n    let token: string | null = null\n    let id: string | null = null\n    try {\n      token = await getAuthToken(request, 'admin')\n      const name = `TC-UNDO-001 Create ${Date.now()}`\n      const created = await createJob(request, token, name)\n      id = created.id\n\n      expect(await getById(request, token, id), 'job exists after create').toBeTruthy()\n\n      await undo(request, token, readUndoToken(created.res))\n\n      expect(await getById(request, token, id), 'job removed by create-undo').toBeFalsy()\n      id = null // already undone; nothing to clean up\n    } finally {\n      await cleanup(request, token, id)\n    }\n  })\n})\n"],
-  "mappings": "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",
+  "sourcesContent": ["import { expect, test } from '@playwright/test'\nimport { apiRequest, getAuthToken } from '@open-mercato/core/helpers/integration/api'\nimport {\n  extractOperation,\n  runCrudUndoRoundTrip,\n  skipIfUndoTestsDisabled,\n} from '@open-mercato/core/helpers/integration/undoHarness'\nimport {\n  SCHEDULER_JOBS_PATH,\n  SCHEDULER_TRIGGER_PATH,\n  createScheduleJob,\n  deleteScheduleJob,\n} from './helpers/scheduler'\n\n/**\n * TC-UNDO-001 (#2582, refs #2468) \u2014 scheduler.jobs undo/redo correctness.\n *\n * Regression lock for #2504: scheduler.jobs undo was a silent no-op because every\n * undo handler read `logEntry.payload` (always undefined \u2014 the command bus persists\n * the undo snapshot under `commandPayload`), so undo returned `{ ok: true }` while\n * changing nothing. Fixed in PR #2514 via `extractUndoPayload`. This spec asserts the\n * corrected behavior (full restoration), driving the real command bus through the\n * public API + the audit-log undo/redo endpoints.\n *\n * scheduler.jobs is a standard `makeCrudRoute` entity (POST/PUT/DELETE on the\n * collection, `?id=` read-back, camelCase serializer, no custom fields), so the shared\n * `runCrudUndoRoundTrip` harness covers the full round-trip in one pass:\n *   - I1 update \u2192 undo restores every scalar (and bumps `updatedAt`)\n *   - I2 delete \u2192 undo re-materializes the soft-deleted job\n *   - I3 create \u2192 undo soft-deletes (never hard-deletes)\n *   - I5 a consumed undo token is rejected on a second undo\n *   - I6 redo re-applies the command's after-snapshot\n *\n * I4 (custom fields) is N/A \u2014 `scheduled_job` declares no `ce.ts`, so it has no `cf_*`.\n */\nfunction jobCreatePayload(stamp: string): Record<string, unknown> {\n  return {\n    name: `TC-UNDO-001 Scheduler ${stamp}`,\n    description: 'TC-UNDO-001 undo/redo probe',\n    scopeType: 'organization',\n    scheduleType: 'interval',\n    scheduleValue: '15m',\n    timezone: 'UTC',\n    targetType: 'queue',\n    targetQueue: 'scheduler-execution',\n    isEnabled: true,\n    sourceType: 'user',\n  }\n}\n\ntest.describe('TC-UNDO-001 scheduler.jobs undo/redo (#2504)', () => {\n  test.beforeAll(() => {\n    skipIfUndoTestsDisabled()\n  })\n\n  test('jobs CRUD commands restore scalar state on undo/redo (I1/I2/I3/I5/I6)', async ({ request }) => {\n    const token = await getAuthToken(request, 'admin')\n\n    await runCrudUndoRoundTrip(request, token, {\n      label: 'scheduler.jobs',\n      collectionPath: SCHEDULER_JOBS_PATH,\n      field: 'name',\n      createPayload: jobCreatePayload,\n      updatePayload: (id, stamp) => ({ id, name: `TC-UNDO-001 Scheduler Renamed ${stamp}` }),\n    })\n  })\n\n  // \u00A74 \u2014 manual trigger is a fire-and-forget enqueue that never goes through the\n  // command bus, so it exposes no undo affordance. The assertion holds regardless of\n  // QUEUE_STRATEGY: async returns 200 (enqueued), local returns 400 (rejected) \u2014 neither\n  // issues an `x-om-operation` undo token.\n  test('\u00A74 trigger exposes no undo token', async ({ request }) => {\n    const token = await getAuthToken(request, 'admin')\n    let jobId: string | null = null\n    try {\n      jobId = await createScheduleJob(request, token)\n      const triggerRes = await apiRequest(request, 'POST', SCHEDULER_TRIGGER_PATH, {\n        token,\n        data: { id: jobId },\n      })\n      expect(extractOperation(triggerRes), 'trigger response carries no undo token (\u00A74)').toBeNull()\n    } finally {\n      await deleteScheduleJob(request, token, jobId)\n    }\n  })\n})\n"],
+  "mappings": "AAAA,SAAS,QAAQ,YAAY;AAC7B,SAAS,YAAY,oBAAoB;AACzC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAuBP,SAAS,iBAAiB,OAAwC;AAChE,SAAO;AAAA,IACL,MAAM,yBAAyB,KAAK;AAAA,IACpC,aAAa;AAAA,IACb,WAAW;AAAA,IACX,cAAc;AAAA,IACd,eAAe;AAAA,IACf,UAAU;AAAA,IACV,YAAY;AAAA,IACZ,aAAa;AAAA,IACb,WAAW;AAAA,IACX,YAAY;AAAA,EACd;AACF;AAEA,KAAK,SAAS,gDAAgD,MAAM;AAClE,OAAK,UAAU,MAAM;AACnB,4BAAwB;AAAA,EAC1B,CAAC;AAED,OAAK,yEAAyE,OAAO,EAAE,QAAQ,MAAM;AACnG,UAAM,QAAQ,MAAM,aAAa,SAAS,OAAO;AAEjD,UAAM,qBAAqB,SAAS,OAAO;AAAA,MACzC,OAAO;AAAA,MACP,gBAAgB;AAAA,MAChB,OAAO;AAAA,MACP,eAAe;AAAA,MACf,eAAe,CAAC,IAAI,WAAW,EAAE,IAAI,MAAM,iCAAiC,KAAK,GAAG;AAAA,IACtF,CAAC;AAAA,EACH,CAAC;AAMD,OAAK,uCAAoC,OAAO,EAAE,QAAQ,MAAM;AAC9D,UAAM,QAAQ,MAAM,aAAa,SAAS,OAAO;AACjD,QAAI,QAAuB;AAC3B,QAAI;AACF,cAAQ,MAAM,kBAAkB,SAAS,KAAK;AAC9C,YAAM,aAAa,MAAM,WAAW,SAAS,QAAQ,wBAAwB;AAAA,QAC3E;AAAA,QACA,MAAM,EAAE,IAAI,MAAM;AAAA,MACpB,CAAC;AACD,aAAO,iBAAiB,UAAU,GAAG,gDAA6C,EAAE,SAAS;AAAA,IAC/F,UAAE;AACA,YAAM,kBAAkB,SAAS,OAAO,KAAK;AAAA,IAC/C;AAAA,EACF,CAAC;AACH,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/scheduler",
-  "version": "0.6.5-develop.5187.1.82e5532561",
+  "version": "0.6.5-develop.5200.1.871eca3402",
   "description": "Database-managed scheduled jobs with admin UI",
   "type": "module",
   "main": "./dist/index.js",
@@ -58,13 +58,13 @@
     "./*/*/*/*/*/*.json": "./src/*/*/*/*/*/*.json"
   },
   "dependencies": {
-    "@open-mercato/events": "0.6.5-develop.5187.1.82e5532561",
-    "@open-mercato/queue": "0.6.5-develop.5187.1.82e5532561",
+    "@open-mercato/events": "0.6.5-develop.5200.1.871eca3402",
+    "@open-mercato/queue": "0.6.5-develop.5200.1.871eca3402",
     "cron-parser": "^5.5.0"
   },
   "peerDependencies": {
     "@mikro-orm/core": "^7.0.14",
-    "@open-mercato/shared": "0.6.5-develop.5187.1.82e5532561",
+    "@open-mercato/shared": "0.6.5-develop.5200.1.871eca3402",
     "bullmq": "^5.0.0",
     "ioredis": "^5.0.0",
     "zod": ">=3.23.0"
@@ -78,7 +78,7 @@
     }
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.5-develop.5187.1.82e5532561",
+    "@open-mercato/shared": "0.6.5-develop.5200.1.871eca3402",
     "@types/jest": "^30.0.0",
     "@types/node": "^25.9.2",
     "jest": "^30.4.2",

package/src/modules/scheduler/__integration__/TC-UNDO-001-scheduler-jobs.spec.ts

@@ -1,179 +1,86 @@
-import { expect, test, type APIRequestContext, type APIResponse } from '@playwright/test'
+import { expect, test } from '@playwright/test'
 import { apiRequest, getAuthToken } from '@open-mercato/core/helpers/integration/api'
-import { skipIfUndoTestsDisabled } from '@open-mercato/core/helpers/integration/undoHarness'
+import {
+  extractOperation,
+  runCrudUndoRoundTrip,
+  skipIfUndoTestsDisabled,
+} from '@open-mercato/core/helpers/integration/undoHarness'
+import {
+  SCHEDULER_JOBS_PATH,
+  SCHEDULER_TRIGGER_PATH,
+  createScheduleJob,
+  deleteScheduleJob,
+} from './helpers/scheduler'
 
 /**
- * TC-UNDO-001: scheduler.jobs undo round-trip (regression for issue #2504).
+ * TC-UNDO-001 (#2582, refs #2468) — scheduler.jobs undo/redo correctness.
  *
- * Before the fix, every scheduler.jobs undo handler read `logEntry.payload`
- * (always undefined — the command bus persists the undo snapshot under
- * `commandPayload`), so undo returned `{ ok: true }` while silently changing
- * nothing. This spec exercises the real HTTP path end-to-end:
- *   - CREATE -> undo  => job is soft-deleted (no longer listed)
- *   - UPDATE -> undo  => renamed field is restored to its prior value
- *   - DELETE -> undo  => soft-deleted job is re-materialized
+ * Regression lock for #2504: scheduler.jobs undo was a silent no-op because every
+ * undo handler read `logEntry.payload` (always undefined — the command bus persists
+ * the undo snapshot under `commandPayload`), so undo returned `{ ok: true }` while
+ * changing nothing. Fixed in PR #2514 via `extractUndoPayload`. This spec asserts the
+ * corrected behavior (full restoration), driving the real command bus through the
+ * public API + the audit-log undo/redo endpoints.
  *
- * Endpoints covered:
- *   - POST   /api/scheduler/jobs                       (create)
- *   - GET    /api/scheduler/jobs?id=                   (read)
- *   - PUT    /api/scheduler/jobs                       (update)
- *   - DELETE /api/scheduler/jobs                       (delete, cleanup)
- *   - POST   /api/audit_logs/audit-logs/actions/undo   (undo)
+ * scheduler.jobs is a standard `makeCrudRoute` entity (POST/PUT/DELETE on the
+ * collection, `?id=` read-back, camelCase serializer, no custom fields), so the shared
+ * `runCrudUndoRoundTrip` harness covers the full round-trip in one pass:
+ *   - I1 update → undo restores every scalar (and bumps `updatedAt`)
+ *   - I2 delete → undo re-materializes the soft-deleted job
+ *   - I3 create → undo soft-deletes (never hard-deletes)
+ *   - I5 a consumed undo token is rejected on a second undo
+ *   - I6 redo re-applies the command's after-snapshot
+ *
+ * I4 (custom fields) is N/A — `scheduled_job` declares no `ce.ts`, so it has no `cf_*`.
  */
-
-type ScheduleRow = {
-  id: string
-  name: string
-  description: string | null
-  scheduleValue: string
-}
-
-// The undo endpoint only honors the *latest* undoable log for a resource, and
-// `latestUndoableForResource` orders by `created_at` alone. Audit `created_at` is
-// millisecond-precision (`new Date()` at log time), so a create + a follow-up
-// mutation issued within the same millisecond tie and the lookup may resolve to
-// the wrong log. A short settle guarantees the operation under undo is strictly
-// the most recent, keeping the round-trip deterministic.
-async function settleAuditClock(): Promise<void> {
-  await new Promise((resolve) => setTimeout(resolve, 50))
-}
-
-function readUndoToken(res: APIResponse): string {
-  const header = res.headers()['x-om-operation'] ?? ''
-  const enc = header.startsWith('omop:') ? header.slice(5) : ''
-  expect(enc, 'x-om-operation header should carry an omop: payload').not.toBe('')
-  const payload = JSON.parse(decodeURIComponent(enc)) as { undoToken?: string }
-  expect(typeof payload.undoToken, 'undoToken present in operation payload').toBe('string')
-  return payload.undoToken as string
-}
-
-async function getById(
-  request: APIRequestContext,
-  token: string,
-  id: string,
-): Promise<ScheduleRow | undefined> {
-  const res = await apiRequest(request, 'GET', `/api/scheduler/jobs?id=${encodeURIComponent(id)}`, { token })
-  expect(res.status()).toBe(200)
-  const body = (await res.json()) as { items?: ScheduleRow[] }
-  return (body.items ?? [])[0]
-}
-
-async function createJob(request: APIRequestContext, token: string, name: string): Promise<{ id: string; res: APIResponse }> {
-  const res = await apiRequest(request, 'POST', '/api/scheduler/jobs', {
-    token,
-    data: {
-      name,
-      description: 'TC-UNDO-001 probe',
-      scopeType: 'tenant',
-      scheduleType: 'cron',
-      scheduleValue: '0 0 * * *',
-      timezone: 'UTC',
-      targetType: 'queue',
-      targetQueue: 'default',
-      isEnabled: true,
-      sourceType: 'user',
-    },
-  })
-  expect(res.status(), 'create returns 201').toBe(201)
-  const id = ((await res.json()) as { id: string }).id
-  expect(id, 'create returns an id').toBeTruthy()
-  return { id, res }
-}
-
-async function undo(request: APIRequestContext, token: string, undoToken: string): Promise<void> {
-  const res = await apiRequest(request, 'POST', '/api/audit_logs/audit-logs/actions/undo', {
-    token,
-    data: { undoToken },
-  })
-  const raw = await res.text()
-  expect(res.status(), `undo returns 200 (body: ${raw})`).toBe(200)
-  const body = JSON.parse(raw) as { ok?: boolean }
-  expect(body.ok, 'undo body is { ok: true }').toBe(true)
-}
-
-async function cleanup(request: APIRequestContext, token: string | null, id: string | null): Promise<void> {
-  if (!token || !id) return
-  try {
-    await apiRequest(request, 'DELETE', '/api/scheduler/jobs', { token, data: { id } })
-  } catch {
-    /* ignore */
+function jobCreatePayload(stamp: string): Record<string, unknown> {
+  return {
+    name: `TC-UNDO-001 Scheduler ${stamp}`,
+    description: 'TC-UNDO-001 undo/redo probe',
+    scopeType: 'organization',
+    scheduleType: 'interval',
+    scheduleValue: '15m',
+    timezone: 'UTC',
+    targetType: 'queue',
+    targetQueue: 'scheduler-execution',
+    isEnabled: true,
+    sourceType: 'user',
   }
 }
 
-test.describe('TC-UNDO-001: scheduler.jobs undo actually restores state (#2504)', () => {
+test.describe('TC-UNDO-001 scheduler.jobs undo/redo (#2504)', () => {
   test.beforeAll(() => {
     skipIfUndoTestsDisabled()
   })
 
-  test('UPDATE -> undo restores the prior name', async ({ request }) => {
-    let token: string | null = null
-    let id: string | null = null
-    try {
-      token = await getAuthToken(request, 'admin')
-      const originalName = `TC-UNDO-001 Update ${Date.now()}`
-      ;({ id } = await createJob(request, token, originalName))
-      await settleAuditClock()
-
-      const updateRes = await apiRequest(request, 'PUT', '/api/scheduler/jobs', {
-        token,
-        data: { id, name: `${originalName} RENAMED` },
-      })
-      expect(updateRes.status(), 'update returns 200').toBe(200)
-      expect((await getById(request, token, id))?.name).toBe(`${originalName} RENAMED`)
+  test('jobs CRUD commands restore scalar state on undo/redo (I1/I2/I3/I5/I6)', async ({ request }) => {
+    const token = await getAuthToken(request, 'admin')
 
-      await undo(request, token, readUndoToken(updateRes))
-
-      const restored = await getById(request, token, id)
-      expect(restored, 'job still exists after update-undo').toBeTruthy()
-      expect(restored!.name, 'name restored to original by undo').toBe(originalName)
-    } finally {
-      await cleanup(request, token, id)
-    }
+    await runCrudUndoRoundTrip(request, token, {
+      label: 'scheduler.jobs',
+      collectionPath: SCHEDULER_JOBS_PATH,
+      field: 'name',
+      createPayload: jobCreatePayload,
+      updatePayload: (id, stamp) => ({ id, name: `TC-UNDO-001 Scheduler Renamed ${stamp}` }),
+    })
   })
 
-  test('DELETE -> undo re-lists the soft-deleted job', async ({ request }) => {
-    let token: string | null = null
-    let id: string | null = null
+  // §4 — manual trigger is a fire-and-forget enqueue that never goes through the
+  // command bus, so it exposes no undo affordance. The assertion holds regardless of
+  // QUEUE_STRATEGY: async returns 200 (enqueued), local returns 400 (rejected) — neither
+  // issues an `x-om-operation` undo token.
+  test('§4 trigger exposes no undo token', async ({ request }) => {
+    const token = await getAuthToken(request, 'admin')
+    let jobId: string | null = null
     try {
-      token = await getAuthToken(request, 'admin')
-      const name = `TC-UNDO-001 Delete ${Date.now()}`
-      ;({ id } = await createJob(request, token, name))
-      await settleAuditClock()
-
-      const deleteRes = await apiRequest(request, 'DELETE', '/api/scheduler/jobs', {
+      jobId = await createScheduleJob(request, token)
+      const triggerRes = await apiRequest(request, 'POST', SCHEDULER_TRIGGER_PATH, {
         token,
-        data: { id },
+        data: { id: jobId },
       })
-      expect(deleteRes.status(), 'delete returns 200').toBe(200)
-      expect(await getById(request, token, id), 'job is gone after delete').toBeFalsy()
-
-      await undo(request, token, readUndoToken(deleteRes))
-
-      const restored = await getById(request, token, id)
-      expect(restored, 'job re-materialized by delete-undo').toBeTruthy()
-      expect(restored!.name).toBe(name)
-    } finally {
-      await cleanup(request, token, id)
-    }
-  })
-
-  test('CREATE -> undo removes the created job', async ({ request }) => {
-    let token: string | null = null
-    let id: string | null = null
-    try {
-      token = await getAuthToken(request, 'admin')
-      const name = `TC-UNDO-001 Create ${Date.now()}`
-      const created = await createJob(request, token, name)
-      id = created.id
-
-      expect(await getById(request, token, id), 'job exists after create').toBeTruthy()
-
-      await undo(request, token, readUndoToken(created.res))
-
-      expect(await getById(request, token, id), 'job removed by create-undo').toBeFalsy()
-      id = null // already undone; nothing to clean up
+      expect(extractOperation(triggerRes), 'trigger response carries no undo token (§4)').toBeNull()
     } finally {
-      await cleanup(request, token, id)
+      await deleteScheduleJob(request, token, jobId)
     }
   })
 })