@nicnocquee/dataqueue 1.31.0 → 1.32.0

package/dist/index.js

@@ -1,12 +1,14 @@
-import { AsyncLocalStorage } from 'async_hooks';
-import { randomUUID } from 'crypto';
 import { Worker } from 'worker_threads';
+import { AsyncLocalStorage } from 'async_hooks';
 import { Pool } from 'pg';
 import { parse } from 'pg-connection-string';
 import fs from 'fs';
+import { randomUUID } from 'crypto';
 import { createRequire } from 'module';
 import { Cron } from 'croner';
 
+// src/processor.ts
+
 // src/types.ts
 var JobEventType = /* @__PURE__ */ ((JobEventType2) => {
   JobEventType2["Added"] = "added";
@@ -20,11 +22,11 @@ var JobEventType = /* @__PURE__ */ ((JobEventType2) => {
   JobEventType2["Waiting"] = "waiting";
   return JobEventType2;
 })(JobEventType || {});
-var FailureReason = /* @__PURE__ */ ((FailureReason5) => {
-  FailureReason5["Timeout"] = "timeout";
-  FailureReason5["HandlerError"] = "handler_error";
-  FailureReason5["NoHandler"] = "no_handler";
-  return FailureReason5;
+var FailureReason = /* @__PURE__ */ ((FailureReason4) => {
+  FailureReason4["Timeout"] = "timeout";
+  FailureReason4["HandlerError"] = "handler_error";
+  FailureReason4["NoHandler"] = "no_handler";
+  return FailureReason4;
 })(FailureReason || {});
 var WaitSignal = class extends Error {
   constructor(type, waitUntil, tokenId, stepData) {
@@ -51,804 +53,942 @@ var log = (message) => {
   }
 };
 
-// src/backends/postgres.ts
-var PostgresBackend = class {
-  constructor(pool) {
-    this.pool = pool;
-  }
-  /** Expose the raw pool for advanced usage. */
-  getPool() {
-    return this.pool;
-  }
-  // ── Events ──────────────────────────────────────────────────────────
-  async recordJobEvent(jobId, eventType, metadata) {
-    const client = await this.pool.connect();
-    try {
-      await client.query(
-        `INSERT INTO job_events (job_id, event_type, metadata) VALUES ($1, $2, $3)`,
-        [jobId, eventType, metadata ? JSON.stringify(metadata) : null]
-      );
-    } catch (error) {
-      log(`Error recording job event for job ${jobId}: ${error}`);
-    } finally {
-      client.release();
-    }
-  }
-  async getJobEvents(jobId) {
-    const client = await this.pool.connect();
-    try {
-      const res = await client.query(
-        `SELECT id, job_id AS "jobId", event_type AS "eventType", metadata, created_at AS "createdAt" FROM job_events WHERE job_id = $1 ORDER BY created_at ASC`,
-        [jobId]
-      );
-      return res.rows;
-    } finally {
-      client.release();
-    }
-  }
-  // ── Job CRUD ──────────────────────────────────────────────────────────
-  async addJob({
-    jobType,
-    payload,
-    maxAttempts = 3,
-    priority = 0,
-    runAt = null,
-    timeoutMs = void 0,
-    forceKillOnTimeout = false,
-    tags = void 0,
-    idempotencyKey = void 0
-  }) {
-    const client = await this.pool.connect();
-    try {
-      let result;
-      const onConflict = idempotencyKey ? `ON CONFLICT (idempotency_key) WHERE idempotency_key IS NOT NULL DO NOTHING` : "";
-      if (runAt) {
-        result = await client.query(
-          `INSERT INTO job_queue 
-            (job_type, payload, max_attempts, priority, run_at, timeout_ms, force_kill_on_timeout, tags, idempotency_key) 
-           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 
-           ${onConflict}
-           RETURNING id`,
-          [
-            jobType,
-            payload,
-            maxAttempts,
-            priority,
-            runAt,
-            timeoutMs ?? null,
-            forceKillOnTimeout ?? false,
-            tags ?? null,
-            idempotencyKey ?? null
-          ]
-        );
-      } else {
-        result = await client.query(
-          `INSERT INTO job_queue 
-            (job_type, payload, max_attempts, priority, timeout_ms, force_kill_on_timeout, tags, idempotency_key) 
-           VALUES ($1, $2, $3, $4, $5, $6, $7, $8) 
-           ${onConflict}
-           RETURNING id`,
-          [
-            jobType,
-            payload,
-            maxAttempts,
-            priority,
-            timeoutMs ?? null,
-            forceKillOnTimeout ?? false,
-            tags ?? null,
-            idempotencyKey ?? null
-          ]
-        );
-      }
-      if (result.rows.length === 0 && idempotencyKey) {
-        const existing = await client.query(
-          `SELECT id FROM job_queue WHERE idempotency_key = $1`,
-          [idempotencyKey]
-        );
-        if (existing.rows.length > 0) {
-          log(
-            `Job with idempotency key "${idempotencyKey}" already exists (id: ${existing.rows[0].id}), returning existing job`
-          );
-          return existing.rows[0].id;
-        }
-        throw new Error(
-          `Failed to insert job and could not find existing job with idempotency key "${idempotencyKey}"`
-        );
-      }
-      const jobId = result.rows[0].id;
-      log(
-        `Added job ${jobId}: payload ${JSON.stringify(payload)}, ${runAt ? `runAt ${runAt.toISOString()}, ` : ""}priority ${priority}, maxAttempts ${maxAttempts}, jobType ${jobType}, tags ${JSON.stringify(tags)}${idempotencyKey ? `, idempotencyKey "${idempotencyKey}"` : ""}`
+// src/processor.ts
+function validateHandlerSerializable(handler, jobType) {
+  try {
+    const handlerString = handler.toString();
+    if (handlerString.includes("this.") && !handlerString.match(/\([^)]*this[^)]*\)/)) {
+      throw new Error(
+        `Handler for job type "${jobType}" uses 'this' context which cannot be serialized. Use a regular function or avoid 'this' references when forceKillOnTimeout is enabled.`
       );
-      await this.recordJobEvent(jobId, "added" /* Added */, {
-        jobType,
-        payload,
-        tags,
-        idempotencyKey
-      });
-      return jobId;
-    } catch (error) {
-      log(`Error adding job: ${error}`);
-      throw error;
-    } finally {
-      client.release();
     }
-  }
-  async getJob(id) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue WHERE id = $1`,
-        [id]
+    if (handlerString.includes("[native code]")) {
+      throw new Error(
+        `Handler for job type "${jobType}" contains native code which cannot be serialized. Ensure your handler is a plain function when forceKillOnTimeout is enabled.`
       );
-      if (result.rows.length === 0) {
-        log(`Job ${id} not found`);
-        return null;
-      }
-      log(`Found job ${id}`);
-      const job = result.rows[0];
-      return {
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout,
-        failureReason: job.failureReason
-      };
-    } catch (error) {
-      log(`Error getting job ${id}: ${error}`);
-      throw error;
-    } finally {
-      client.release();
     }
-  }
-  async getJobsByStatus(status, limit = 100, offset = 0) {
-    const client = await this.pool.connect();
     try {
-      const result = await client.query(
-        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue WHERE status = $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3`,
-        [status, limit, offset]
+      new Function("return " + handlerString);
+    } catch (parseError) {
+      throw new Error(
+        `Handler for job type "${jobType}" cannot be serialized: ${parseError instanceof Error ? parseError.message : String(parseError)}. When using forceKillOnTimeout, handlers must be serializable functions without closures over external variables.`
       );
-      log(`Found ${result.rows.length} jobs by status ${status}`);
-      return result.rows.map((job) => ({
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout,
-        failureReason: job.failureReason
-      }));
-    } catch (error) {
-      log(`Error getting jobs by status ${status}: ${error}`);
-      throw error;
-    } finally {
-      client.release();
     }
-  }
-  async getAllJobs(limit = 100, offset = 0) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue ORDER BY created_at DESC LIMIT $1 OFFSET $2`,
-        [limit, offset]
-      );
-      log(`Found ${result.rows.length} jobs (all)`);
-      return result.rows.map((job) => ({
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout
-      }));
-    } catch (error) {
-      log(`Error getting all jobs: ${error}`);
+  } catch (error) {
+    if (error instanceof Error) {
       throw error;
-    } finally {
-      client.release();
     }
+    throw new Error(
+      `Failed to validate handler serialization for job type "${jobType}": ${String(error)}`
+    );
   }
-  async getJobs(filters, limit = 100, offset = 0) {
-    const client = await this.pool.connect();
-    try {
-      let query = `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue`;
-      const params = [];
-      const where = [];
-      let paramIdx = 1;
-      if (filters) {
-        if (filters.jobType) {
-          where.push(`job_type = $${paramIdx++}`);
-          params.push(filters.jobType);
-        }
-        if (filters.priority !== void 0) {
-          where.push(`priority = $${paramIdx++}`);
-          params.push(filters.priority);
-        }
-        if (filters.runAt) {
-          if (filters.runAt instanceof Date) {
-            where.push(`run_at = $${paramIdx++}`);
-            params.push(filters.runAt);
-          } else if (typeof filters.runAt === "object" && (filters.runAt.gt !== void 0 || filters.runAt.gte !== void 0 || filters.runAt.lt !== void 0 || filters.runAt.lte !== void 0 || filters.runAt.eq !== void 0)) {
-            const ops = filters.runAt;
-            if (ops.gt) {
-              where.push(`run_at > $${paramIdx++}`);
-              params.push(ops.gt);
-            }
-            if (ops.gte) {
-              where.push(`run_at >= $${paramIdx++}`);
-              params.push(ops.gte);
-            }
-            if (ops.lt) {
-              where.push(`run_at < $${paramIdx++}`);
-              params.push(ops.lt);
-            }
-            if (ops.lte) {
-              where.push(`run_at <= $${paramIdx++}`);
-              params.push(ops.lte);
-            }
-            if (ops.eq) {
-              where.push(`run_at = $${paramIdx++}`);
-              params.push(ops.eq);
-            }
-          }
-        }
-        if (filters.tags && filters.tags.values && filters.tags.values.length > 0) {
-          const mode = filters.tags.mode || "all";
-          const tagValues = filters.tags.values;
-          switch (mode) {
-            case "exact":
-              where.push(`tags = $${paramIdx++}`);
-              params.push(tagValues);
-              break;
-            case "all":
-              where.push(`tags @> $${paramIdx++}`);
-              params.push(tagValues);
-              break;
-            case "any":
-              where.push(`tags && $${paramIdx++}`);
-              params.push(tagValues);
-              break;
-            case "none":
-              where.push(`NOT (tags && $${paramIdx++})`);
-              params.push(tagValues);
-              break;
-            default:
-              where.push(`tags @> $${paramIdx++}`);
-              params.push(tagValues);
+}
+async function runHandlerInWorker(handler, payload, timeoutMs, jobType) {
+  validateHandlerSerializable(handler, jobType);
+  return new Promise((resolve, reject) => {
+    const workerCode = `
+      (function() {
+        const { parentPort, workerData } = require('worker_threads');
+        const { handlerCode, payload, timeoutMs } = workerData;
+        
+        // Create an AbortController for the handler
+        const controller = new AbortController();
+        const signal = controller.signal;
+        
+        // Set up timeout
+        const timeoutId = setTimeout(() => {
+          controller.abort();
+          parentPort.postMessage({ type: 'timeout' });
+        }, timeoutMs);
+        
+        try {
+          // Execute the handler
+          // Note: This uses Function constructor which requires the handler to be serializable.
+          // The handler should be validated before reaching this point.
+          let handlerFn;
+          try {
+            // Wrap handlerCode in parentheses to ensure it's treated as an expression
+            // This handles both arrow functions and regular functions
+            const wrappedCode = handlerCode.trim().startsWith('async') || handlerCode.trim().startsWith('function')
+              ? handlerCode
+              : '(' + handlerCode + ')';
+            handlerFn = new Function('return ' + wrappedCode)();
+          } catch (parseError) {
+            clearTimeout(timeoutId);
+            parentPort.postMessage({
+              type: 'error',
+              error: {
+                message: 'Handler cannot be deserialized in worker thread. ' +
+                  'Ensure your handler is a standalone function without closures over external variables. ' +
+                  'Original error: ' + (parseError instanceof Error ? parseError.message : String(parseError)),
+                stack: parseError instanceof Error ? parseError.stack : undefined,
+                name: 'SerializationError',
+              },
+            });
+            return;
           }
+          
+          // Ensure handlerFn is actually a function
+          if (typeof handlerFn !== 'function') {
+            clearTimeout(timeoutId);
+            parentPort.postMessage({
+              type: 'error',
+              error: {
+                message: 'Handler deserialization did not produce a function. ' +
+                  'Ensure your handler is a valid function when forceKillOnTimeout is enabled.',
+                name: 'SerializationError',
+              },
+            });
+            return;
+          }
+          
+          handlerFn(payload, signal)
+            .then(() => {
+              clearTimeout(timeoutId);
+              parentPort.postMessage({ type: 'success' });
+            })
+            .catch((error) => {
+              clearTimeout(timeoutId);
+              parentPort.postMessage({
+                type: 'error',
+                error: {
+                  message: error.message,
+                  stack: error.stack,
+                  name: error.name,
+                },
+              });
+            });
+        } catch (error) {
+          clearTimeout(timeoutId);
+          parentPort.postMessage({
+            type: 'error',
+            error: {
+              message: error.message,
+              stack: error.stack,
+              name: error.name,
+            },
+          });
         }
-        if (filters.cursor !== void 0) {
-          where.push(`id < $${paramIdx++}`);
-          params.push(filters.cursor);
-        }
+      })();
+    `;
+    const worker = new Worker(workerCode, {
+      eval: true,
+      workerData: {
+        handlerCode: handler.toString(),
+        payload,
+        timeoutMs
       }
-      if (where.length > 0) {
-        query += ` WHERE ${where.join(" AND ")}`;
+    });
+    let resolved = false;
+    worker.on("message", (message) => {
+      if (resolved) return;
+      resolved = true;
+      if (message.type === "success") {
+        resolve();
+      } else if (message.type === "timeout") {
+        const timeoutError = new Error(
+          `Job timed out after ${timeoutMs} ms and was forcefully terminated`
+        );
+        timeoutError.failureReason = "timeout" /* Timeout */;
+        reject(timeoutError);
+      } else if (message.type === "error") {
+        const error = new Error(message.error.message);
+        error.stack = message.error.stack;
+        error.name = message.error.name;
+        reject(error);
       }
-      paramIdx = params.length + 1;
-      query += ` ORDER BY id DESC LIMIT $${paramIdx++}`;
-      if (!filters?.cursor) {
-        query += ` OFFSET $${paramIdx}`;
-        params.push(limit, offset);
-      } else {
-        params.push(limit);
+    });
+    worker.on("error", (error) => {
+      if (resolved) return;
+      resolved = true;
+      reject(error);
+    });
+    worker.on("exit", (code) => {
+      if (resolved) return;
+      if (code !== 0) {
+        resolved = true;
+        reject(new Error(`Worker stopped with exit code ${code}`));
       }
-      const result = await client.query(query, params);
-      log(`Found ${result.rows.length} jobs`);
-      return result.rows.map((job) => ({
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout,
-        failureReason: job.failureReason
-      }));
-    } catch (error) {
-      log(`Error getting jobs: ${error}`);
-      throw error;
-    } finally {
-      client.release();
-    }
+    });
+    setTimeout(() => {
+      if (!resolved) {
+        resolved = true;
+        worker.terminate().then(() => {
+          const timeoutError = new Error(
+            `Job timed out after ${timeoutMs} ms and was forcefully terminated`
+          );
+          timeoutError.failureReason = "timeout" /* Timeout */;
+          reject(timeoutError);
+        }).catch((err) => {
+          reject(err);
+        });
+      }
+    }, timeoutMs + 100);
+  });
+}
+function calculateWaitUntil(duration) {
+  const now = Date.now();
+  let ms = 0;
+  if (duration.seconds) ms += duration.seconds * 1e3;
+  if (duration.minutes) ms += duration.minutes * 60 * 1e3;
+  if (duration.hours) ms += duration.hours * 60 * 60 * 1e3;
+  if (duration.days) ms += duration.days * 24 * 60 * 60 * 1e3;
+  if (duration.weeks) ms += duration.weeks * 7 * 24 * 60 * 60 * 1e3;
+  if (duration.months) ms += duration.months * 30 * 24 * 60 * 60 * 1e3;
+  if (duration.years) ms += duration.years * 365 * 24 * 60 * 60 * 1e3;
+  if (ms <= 0) {
+    throw new Error(
+      "waitFor duration must be positive. Provide at least one positive duration field."
+    );
   }
-  async getJobsByTags(tags, mode = "all", limit = 100, offset = 0) {
-    const client = await this.pool.connect();
-    try {
-      let query = `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress
-         FROM job_queue`;
-      let params = [];
-      switch (mode) {
-        case "exact":
-          query += " WHERE tags = $1";
-          params = [tags];
-          break;
-        case "all":
-          query += " WHERE tags @> $1";
-          params = [tags];
-          break;
-        case "any":
-          query += " WHERE tags && $1";
-          params = [tags];
-          break;
-        case "none":
-          query += " WHERE NOT (tags && $1)";
-          params = [tags];
-          break;
-        default:
-          query += " WHERE tags @> $1";
-          params = [tags];
+  return new Date(now + ms);
+}
+async function resolveCompletedWaits(backend, stepData) {
+  for (const key of Object.keys(stepData)) {
+    if (!key.startsWith("__wait_")) continue;
+    const entry = stepData[key];
+    if (!entry || typeof entry !== "object" || entry.completed) continue;
+    if (entry.type === "duration" || entry.type === "date") {
+      stepData[key] = { ...entry, completed: true };
+    } else if (entry.type === "token" && entry.tokenId) {
+      const wp = await backend.getWaitpoint(entry.tokenId);
+      if (wp && wp.status === "completed") {
+        stepData[key] = {
+          ...entry,
+          completed: true,
+          result: { ok: true, output: wp.output }
+        };
+      } else if (wp && wp.status === "timed_out") {
+        stepData[key] = {
+          ...entry,
+          completed: true,
+          result: { ok: false, error: "Token timed out" }
+        };
       }
-      query += " ORDER BY created_at DESC LIMIT $2 OFFSET $3";
-      params.push(limit, offset);
-      const result = await client.query(query, params);
-      log(
-        `Found ${result.rows.length} jobs by tags ${JSON.stringify(tags)} (mode: ${mode})`
-      );
-      return result.rows.map((job) => ({
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout,
-        failureReason: job.failureReason
-      }));
-    } catch (error) {
-      log(
-        `Error getting jobs by tags ${JSON.stringify(tags)} (mode: ${mode}): ${error}`
-      );
-      throw error;
-    } finally {
-      client.release();
     }
   }
-  // ── Processing lifecycle ──────────────────────────────────────────────
-  async getNextBatch(workerId, batchSize = 10, jobType) {
-    const client = await this.pool.connect();
-    try {
-      await client.query("BEGIN");
-      let jobTypeFilter = "";
-      const params = [workerId, batchSize];
-      if (jobType) {
-        if (Array.isArray(jobType)) {
-          jobTypeFilter = ` AND job_type = ANY($3)`;
-          params.push(jobType);
-        } else {
-          jobTypeFilter = ` AND job_type = $3`;
-          params.push(jobType);
-        }
+}
+function buildWaitContext(backend, jobId, stepData, baseCtx) {
+  let waitCounter = 0;
+  const ctx = {
+    prolong: baseCtx.prolong,
+    onTimeout: baseCtx.onTimeout,
+    run: async (stepName, fn) => {
+      const cached = stepData[stepName];
+      if (cached && typeof cached === "object" && cached.__completed) {
+        log(`Step "${stepName}" replayed from cache for job ${jobId}`);
+        return cached.result;
       }
-      const result = await client.query(
-        `
-        UPDATE job_queue
-        SET status = 'processing', 
-            locked_at = NOW(), 
-            locked_by = $1,
-            attempts = CASE WHEN status = 'waiting' THEN attempts ELSE attempts + 1 END,
-            updated_at = NOW(),
-            pending_reason = NULL,
-            started_at = COALESCE(started_at, NOW()),
-            last_retried_at = CASE WHEN status != 'waiting' AND attempts > 0 THEN NOW() ELSE last_retried_at END,
-            wait_until = NULL
-        WHERE id IN (
-          SELECT id FROM job_queue
-          WHERE (
-            (
-              (status = 'pending' OR (status = 'failed' AND next_attempt_at <= NOW()))
-              AND (attempts < max_attempts)
-              AND run_at <= NOW()
-            )
-            OR (
-              status = 'waiting'
-              AND wait_until IS NOT NULL
-              AND wait_until <= NOW()
-              AND wait_token_id IS NULL
-            )
-          )
-          ${jobTypeFilter}
-          ORDER BY priority DESC, created_at ASC
-          LIMIT $2
-          FOR UPDATE SKIP LOCKED
-        )
-        RETURNING id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress
-      `,
-        params
-      );
-      log(`Found ${result.rows.length} jobs to process`);
-      await client.query("COMMIT");
-      if (result.rows.length > 0) {
-        await this.recordJobEventsBatch(
-          result.rows.map((row) => ({
-            jobId: row.id,
-            eventType: "processing" /* Processing */
-          }))
-        );
+      const result = await fn();
+      stepData[stepName] = { __completed: true, result };
+      await backend.updateStepData(jobId, stepData);
+      return result;
+    },
+    waitFor: async (duration) => {
+      const waitKey = `__wait_${waitCounter++}`;
+      const cached = stepData[waitKey];
+      if (cached && typeof cached === "object" && cached.completed) {
+        log(`Wait "${waitKey}" already completed for job ${jobId}, skipping`);
+        return;
       }
-      return result.rows.map((job) => ({
-        ...job,
-        payload: job.payload,
-        timeoutMs: job.timeoutMs,
-        forceKillOnTimeout: job.forceKillOnTimeout
-      }));
-    } catch (error) {
-      log(`Error getting next batch: ${error}`);
-      await client.query("ROLLBACK");
-      throw error;
-    } finally {
-      client.release();
-    }
-  }
-  async completeJob(jobId) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `
-        UPDATE job_queue
-        SET status = 'completed', updated_at = NOW(), completed_at = NOW(),
-            step_data = NULL, wait_until = NULL, wait_token_id = NULL
-        WHERE id = $1 AND status = 'processing'
-      `,
-        [jobId]
-      );
-      if (result.rowCount === 0) {
+      const waitUntilDate = calculateWaitUntil(duration);
+      stepData[waitKey] = { type: "duration", completed: false };
+      throw new WaitSignal("duration", waitUntilDate, void 0, stepData);
+    },
+    waitUntil: async (date) => {
+      const waitKey = `__wait_${waitCounter++}`;
+      const cached = stepData[waitKey];
+      if (cached && typeof cached === "object" && cached.completed) {
+        log(`Wait "${waitKey}" already completed for job ${jobId}, skipping`);
+        return;
+      }
+      stepData[waitKey] = { type: "date", completed: false };
+      throw new WaitSignal("date", date, void 0, stepData);
+    },
+    createToken: async (options) => {
+      const token = await backend.createWaitpoint(jobId, options);
+      return token;
+    },
+    waitForToken: async (tokenId) => {
+      const waitKey = `__wait_${waitCounter++}`;
+      const cached = stepData[waitKey];
+      if (cached && typeof cached === "object" && cached.completed) {
         log(
-          `Job ${jobId} could not be completed (not in processing state or does not exist)`
+          `Token wait "${waitKey}" already completed for job ${jobId}, returning cached result`
         );
+        return cached.result;
       }
-      await this.recordJobEvent(jobId, "completed" /* Completed */);
-      log(`Completed job ${jobId}`);
-    } catch (error) {
-      log(`Error completing job ${jobId}: ${error}`);
-      throw error;
-    } finally {
-      client.release();
+      const wp = await backend.getWaitpoint(tokenId);
+      if (wp && wp.status === "completed") {
+        const result = {
+          ok: true,
+          output: wp.output
+        };
+        stepData[waitKey] = {
+          type: "token",
+          tokenId,
+          completed: true,
+          result
+        };
+        await backend.updateStepData(jobId, stepData);
+        return result;
+      }
+      if (wp && wp.status === "timed_out") {
+        const result = {
+          ok: false,
+          error: "Token timed out"
+        };
+        stepData[waitKey] = {
+          type: "token",
+          tokenId,
+          completed: true,
+          result
+        };
+        await backend.updateStepData(jobId, stepData);
+        return result;
+      }
+      stepData[waitKey] = { type: "token", tokenId, completed: false };
+      throw new WaitSignal("token", void 0, tokenId, stepData);
+    },
+    setProgress: async (percent) => {
+      if (percent < 0 || percent > 100)
+        throw new Error("Progress must be between 0 and 100");
+      await backend.updateProgress(jobId, Math.round(percent));
     }
+  };
+  return ctx;
+}
+async function processJobWithHandlers(backend, job, jobHandlers) {
+  const handler = jobHandlers[job.jobType];
+  if (!handler) {
+    await backend.setPendingReasonForUnpickedJobs(
+      `No handler registered for job type: ${job.jobType}`,
+      job.jobType
+    );
+    await backend.failJob(
+      job.id,
+      new Error(`No handler registered for job type: ${job.jobType}`),
+      "no_handler" /* NoHandler */
+    );
+    return;
   }
-  async failJob(jobId, error, failureReason) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `
-        UPDATE job_queue
-        SET status = 'failed', 
-            updated_at = NOW(),
-            next_attempt_at = CASE 
-              WHEN attempts < max_attempts THEN NOW() + (POWER(2, attempts) * INTERVAL '1 minute')
-              ELSE NULL
-            END,
-            error_history = COALESCE(error_history, '[]'::jsonb) || $2::jsonb,
-            failure_reason = $3,
-            last_failed_at = NOW()
-        WHERE id = $1 AND status IN ('processing', 'pending')
-      `,
-        [
-          jobId,
-          JSON.stringify([
-            {
-              message: error.message || String(error),
-              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+  const stepData = { ...job.stepData || {} };
+  const hasStepHistory = Object.keys(stepData).some(
+    (k) => k.startsWith("__wait_")
+  );
+  if (hasStepHistory) {
+    await resolveCompletedWaits(backend, stepData);
+    await backend.updateStepData(job.id, stepData);
+  }
+  const timeoutMs = job.timeoutMs ?? void 0;
+  const forceKillOnTimeout = job.forceKillOnTimeout ?? false;
+  let timeoutId;
+  const controller = new AbortController();
+  try {
+    if (forceKillOnTimeout && timeoutMs && timeoutMs > 0) {
+      await runHandlerInWorker(handler, job.payload, timeoutMs, job.jobType);
+    } else {
+      let onTimeoutCallback;
+      let timeoutReject;
+      const armTimeout = (ms) => {
+        if (timeoutId) clearTimeout(timeoutId);
+        timeoutId = setTimeout(() => {
+          if (onTimeoutCallback) {
+            try {
+              const extension = onTimeoutCallback();
+              if (typeof extension === "number" && extension > 0) {
+                backend.prolongJob(job.id).catch(() => {
+                });
+                armTimeout(extension);
+                return;
+              }
+            } catch (callbackError) {
+              log(
+                `onTimeout callback threw for job ${job.id}: ${callbackError}`
+              );
             }
-          ]),
-          failureReason ?? null
-        ]
-      );
-      if (result.rowCount === 0) {
+          }
+          controller.abort();
+          const timeoutError = new Error(`Job timed out after ${ms} ms`);
+          timeoutError.failureReason = "timeout" /* Timeout */;
+          if (timeoutReject) {
+            timeoutReject(timeoutError);
+          }
+        }, ms);
+      };
+      const hasTimeout = timeoutMs != null && timeoutMs > 0;
+      const baseCtx = hasTimeout ? {
+        prolong: (ms) => {
+          const duration = ms ?? timeoutMs;
+          if (duration != null && duration > 0) {
+            armTimeout(duration);
+            backend.prolongJob(job.id).catch(() => {
+            });
+          }
+        },
+        onTimeout: (callback) => {
+          onTimeoutCallback = callback;
+        }
+      } : {
+        prolong: () => {
+          log("prolong() called but ignored: job has no timeout set");
+        },
+        onTimeout: () => {
+          log("onTimeout() called but ignored: job has no timeout set");
+        }
+      };
+      const ctx = buildWaitContext(backend, job.id, stepData, baseCtx);
+      if (forceKillOnTimeout && !hasTimeout) {
         log(
-          `Job ${jobId} could not be failed (not in processing/pending state or does not exist)`
+          `forceKillOnTimeout is set but no timeoutMs for job ${job.id}, running without force kill`
         );
       }
-      await this.recordJobEvent(jobId, "failed" /* Failed */, {
-        message: error.message || String(error),
-        failureReason
+      const jobPromise = handler(job.payload, controller.signal, ctx);
+      if (hasTimeout) {
+        await Promise.race([
+          jobPromise,
+          new Promise((_, reject) => {
+            timeoutReject = reject;
+            armTimeout(timeoutMs);
+          })
+        ]);
+      } else {
+        await jobPromise;
+      }
+    }
+    if (timeoutId) clearTimeout(timeoutId);
+    await backend.completeJob(job.id);
+  } catch (error) {
+    if (timeoutId) clearTimeout(timeoutId);
+    if (error instanceof WaitSignal) {
+      log(
+        `Job ${job.id} entering wait: type=${error.type}, waitUntil=${error.waitUntil?.toISOString() ?? "none"}, tokenId=${error.tokenId ?? "none"}`
+      );
+      await backend.waitJob(job.id, {
+        waitUntil: error.waitUntil,
+        waitTokenId: error.tokenId,
+        stepData: error.stepData
       });
-      log(`Failed job ${jobId}`);
-    } catch (err) {
-      log(`Error failing job ${jobId}: ${err}`);
-      throw err;
-    } finally {
-      client.release();
+      return;
+    }
+    console.error(`Error processing job ${job.id}:`, error);
+    let failureReason = "handler_error" /* HandlerError */;
+    if (error && typeof error === "object" && "failureReason" in error && error.failureReason === "timeout" /* Timeout */) {
+      failureReason = "timeout" /* Timeout */;
+    }
+    await backend.failJob(
+      job.id,
+      error instanceof Error ? error : new Error(String(error)),
+      failureReason
+    );
+  }
+}
+async function processBatchWithHandlers(backend, workerId, batchSize, jobType, jobHandlers, concurrency, onError) {
+  const jobs = await backend.getNextBatch(
+    workerId,
+    batchSize,
+    jobType
+  );
+  if (!concurrency || concurrency >= jobs.length) {
+    await Promise.all(
+      jobs.map((job) => processJobWithHandlers(backend, job, jobHandlers))
+    );
+    return jobs.length;
+  }
+  let idx = 0;
+  let running = 0;
+  let finished = 0;
+  return new Promise((resolve, reject) => {
+    const next = () => {
+      if (finished === jobs.length) return resolve(jobs.length);
+      while (running < concurrency && idx < jobs.length) {
+        const job = jobs[idx++];
+        running++;
+        processJobWithHandlers(backend, job, jobHandlers).then(() => {
+          running--;
+          finished++;
+          next();
+        }).catch((err) => {
+          running--;
+          finished++;
+          if (onError) {
+            onError(err instanceof Error ? err : new Error(String(err)));
+          }
+          next();
+        });
+      }
+    };
+    next();
+  });
+}
+var createProcessor = (backend, handlers, options = {}, onBeforeBatch) => {
+  const {
+    workerId = `worker-${Math.random().toString(36).substring(2, 9)}`,
+    batchSize = 10,
+    pollInterval = 5e3,
+    onError = (error) => console.error("Job processor error:", error),
+    jobType,
+    concurrency = 3
+  } = options;
+  let running = false;
+  let intervalId = null;
+  let currentBatchPromise = null;
+  setLogContext(options.verbose ?? false);
+  const processJobs = async () => {
+    if (!running) return 0;
+    if (onBeforeBatch) {
+      try {
+        await onBeforeBatch();
+      } catch (hookError) {
+        log(`onBeforeBatch hook error: ${hookError}`);
+        if (onError) {
+          onError(
+            hookError instanceof Error ? hookError : new Error(String(hookError))
+          );
+        }
+      }
     }
-  }
-  async prolongJob(jobId) {
-    const client = await this.pool.connect();
+    log(
+      `Processing jobs with workerId: ${workerId}${jobType ? ` and jobType: ${Array.isArray(jobType) ? jobType.join(",") : jobType}` : ""}`
+    );
     try {
-      await client.query(
-        `
-        UPDATE job_queue
-        SET locked_at = NOW(), updated_at = NOW()
-        WHERE id = $1 AND status = 'processing'
-      `,
-        [jobId]
+      const processed = await processBatchWithHandlers(
+        backend,
+        workerId,
+        batchSize,
+        jobType,
+        handlers,
+        concurrency,
+        onError
       );
-      await this.recordJobEvent(jobId, "prolonged" /* Prolonged */);
-      log(`Prolonged job ${jobId}`);
+      return processed;
     } catch (error) {
-      log(`Error prolonging job ${jobId}: ${error}`);
-    } finally {
-      client.release();
+      onError(error instanceof Error ? error : new Error(String(error)));
     }
+    return 0;
+  };
+  return {
+    /**
+     * Start the job processor in the background.
+     * - This will run periodically (every pollInterval milliseconds or 5 seconds if not provided) and process jobs as they become available.
+     * - You have to call the stop method to stop the processor.
+     */
+    startInBackground: () => {
+      if (running) return;
+      log(`Starting job processor with workerId: ${workerId}`);
+      running = true;
+      const scheduleNext = (immediate) => {
+        if (!running) return;
+        if (immediate) {
+          intervalId = setTimeout(loop, 0);
+        } else {
+          intervalId = setTimeout(loop, pollInterval);
+        }
+      };
+      const loop = async () => {
+        if (!running) return;
+        currentBatchPromise = processJobs();
+        const processed = await currentBatchPromise;
+        currentBatchPromise = null;
+        scheduleNext(processed === batchSize);
+      };
+      loop();
+    },
+    /**
+     * Stop the job processor that runs in the background.
+     * Does not wait for in-flight jobs.
+     */
+    stop: () => {
+      log(`Stopping job processor with workerId: ${workerId}`);
+      running = false;
+      if (intervalId) {
+        clearTimeout(intervalId);
+        intervalId = null;
+      }
+    },
+    /**
+     * Stop the job processor and wait for all in-flight jobs to complete.
+     * Useful for graceful shutdown (e.g., SIGTERM handling).
+     */
+    stopAndDrain: async (drainTimeoutMs = 3e4) => {
+      log(`Stopping and draining job processor with workerId: ${workerId}`);
+      running = false;
+      if (intervalId) {
+        clearTimeout(intervalId);
+        intervalId = null;
+      }
+      if (currentBatchPromise) {
+        await Promise.race([
+          currentBatchPromise.catch(() => {
+          }),
+          new Promise((resolve) => setTimeout(resolve, drainTimeoutMs))
+        ]);
+        currentBatchPromise = null;
+      }
+      log(`Job processor ${workerId} drained`);
+    },
+    /**
+     * Start the job processor synchronously.
+     * - This will process all jobs immediately and then stop.
+     * - The pollInterval is ignored.
+     */
+    start: async () => {
+      log(`Starting job processor with workerId: ${workerId}`);
+      running = true;
+      const processed = await processJobs();
+      running = false;
+      return processed;
+    },
+    isRunning: () => running
+  };
+};
+function loadPemOrFile(value) {
+  if (!value) return void 0;
+  if (value.startsWith("file://")) {
+    const filePath = value.slice(7);
+    return fs.readFileSync(filePath, "utf8");
   }
-  // ── Progress ──────────────────────────────────────────────────────────
-  async updateProgress(jobId, progress) {
-    const client = await this.pool.connect();
+  return value;
+}
+var createPool = (config) => {
+  let searchPath;
+  let ssl = void 0;
+  let customCA;
+  let sslmode;
+  if (config.connectionString) {
     try {
-      await client.query(
-        `UPDATE job_queue SET progress = $2, updated_at = NOW() WHERE id = $1`,
-        [jobId, progress]
-      );
-      log(`Updated progress for job ${jobId}: ${progress}%`);
-    } catch (error) {
-      log(`Error updating progress for job ${jobId}: ${error}`);
-    } finally {
-      client.release();
+      const url = new URL(config.connectionString);
+      searchPath = url.searchParams.get("search_path") || void 0;
+      sslmode = url.searchParams.get("sslmode") || void 0;
+      if (sslmode === "no-verify") {
+        ssl = { rejectUnauthorized: false };
+      }
+    } catch (e) {
+      const parsed = parse(config.connectionString);
+      if (parsed.options) {
+        const match = parsed.options.match(/search_path=([^\s]+)/);
+        if (match) {
+          searchPath = match[1];
+        }
+      }
+      sslmode = typeof parsed.sslmode === "string" ? parsed.sslmode : void 0;
+      if (sslmode === "no-verify") {
+        ssl = { rejectUnauthorized: false };
+      }
     }
   }
-  // ── Job management ────────────────────────────────────────────────────
-  async retryJob(jobId) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `
-        UPDATE job_queue
-        SET status = 'pending', 
-            updated_at = NOW(),
-            locked_at = NULL,
-            locked_by = NULL,
-            next_attempt_at = NOW(),
-            last_retried_at = NOW()
-        WHERE id = $1 AND status IN ('failed', 'processing')
-      `,
-        [jobId]
+  if (config.ssl) {
+    if (typeof config.ssl.ca === "string") {
+      customCA = config.ssl.ca;
+    } else if (typeof process.env.PGSSLROOTCERT === "string") {
+      customCA = process.env.PGSSLROOTCERT;
+    } else {
+      customCA = void 0;
+    }
+    const caValue = typeof customCA === "string" ? loadPemOrFile(customCA) : void 0;
+    ssl = {
+      ...ssl,
+      ...caValue ? { ca: caValue } : {},
+      cert: loadPemOrFile(
+        typeof config.ssl.cert === "string" ? config.ssl.cert : process.env.PGSSLCERT
+      ),
+      key: loadPemOrFile(
+        typeof config.ssl.key === "string" ? config.ssl.key : process.env.PGSSLKEY
+      ),
+      rejectUnauthorized: config.ssl.rejectUnauthorized !== void 0 ? config.ssl.rejectUnauthorized : true
+    };
+  }
+  if (sslmode && customCA) {
+    const warning = `
+
+\x1B[33m**************************************************
+\u26A0\uFE0F  WARNING: SSL CONFIGURATION ISSUE
+**************************************************
+Both sslmode ('${sslmode}') is set in the connection string
+and a custom CA is provided (via config.ssl.ca or PGSSLROOTCERT).
+This combination may cause connection failures or unexpected behavior.
+
+Recommended: Remove sslmode from the connection string when using a custom CA.
+**************************************************\x1B[0m
+`;
+    console.warn(warning);
+  }
+  const pool = new Pool({
+    ...config,
+    ...ssl ? { ssl } : {}
+  });
+  if (searchPath) {
+    pool.on("connect", (client) => {
+      client.query(`SET search_path TO ${searchPath}`);
+    });
+  }
+  return pool;
+};
+var MAX_TIMEOUT_MS = 365 * 24 * 60 * 60 * 1e3;
+function parseTimeoutString(timeout) {
+  const match = timeout.match(/^(\d+)(s|m|h|d)$/);
+  if (!match) {
+    throw new Error(
+      `Invalid timeout format: "${timeout}". Expected format like "10m", "1h", "24h", "7d".`
+    );
+  }
+  const value = parseInt(match[1], 10);
+  const unit = match[2];
+  let ms;
+  switch (unit) {
+    case "s":
+      ms = value * 1e3;
+      break;
+    case "m":
+      ms = value * 60 * 1e3;
+      break;
+    case "h":
+      ms = value * 60 * 60 * 1e3;
+      break;
+    case "d":
+      ms = value * 24 * 60 * 60 * 1e3;
+      break;
+    default:
+      throw new Error(`Unknown timeout unit: "${unit}"`);
+  }
+  if (!Number.isFinite(ms) || ms > MAX_TIMEOUT_MS) {
+    throw new Error(
+      `Timeout value "${timeout}" is too large. Maximum allowed is 365 days.`
+    );
+  }
+  return ms;
+}
+var PostgresBackend = class {
+  constructor(pool) {
+    this.pool = pool;
+  }
+  /** Expose the raw pool for advanced usage. */
+  getPool() {
+    return this.pool;
+  }
+  // ── Events ──────────────────────────────────────────────────────────
+  async recordJobEvent(jobId, eventType, metadata) {
+    const client = await this.pool.connect();
+    try {
+      await client.query(
+        `INSERT INTO job_events (job_id, event_type, metadata) VALUES ($1, $2, $3)`,
+        [jobId, eventType, metadata ? JSON.stringify(metadata) : null]
       );
-      if (result.rowCount === 0) {
-        log(
-          `Job ${jobId} could not be retried (not in failed/processing state or does not exist)`
-        );
-      }
-      await this.recordJobEvent(jobId, "retried" /* Retried */);
-      log(`Retried job ${jobId}`);
     } catch (error) {
-      log(`Error retrying job ${jobId}: ${error}`);
-      throw error;
+      log(`Error recording job event for job ${jobId}: ${error}`);
     } finally {
       client.release();
     }
   }
-  async cancelJob(jobId) {
+  async getJobEvents(jobId) {
     const client = await this.pool.connect();
     try {
-      await client.query(
-        `
-        UPDATE job_queue
-        SET status = 'cancelled', updated_at = NOW(), last_cancelled_at = NOW(),
-            wait_until = NULL, wait_token_id = NULL
-        WHERE id = $1 AND status IN ('pending', 'waiting')
-      `,
+      const res = await client.query(
+        `SELECT id, job_id AS "jobId", event_type AS "eventType", metadata, created_at AS "createdAt" FROM job_events WHERE job_id = $1 ORDER BY created_at ASC`,
         [jobId]
       );
-      await this.recordJobEvent(jobId, "cancelled" /* Cancelled */);
-      log(`Cancelled job ${jobId}`);
-    } catch (error) {
-      log(`Error cancelling job ${jobId}: ${error}`);
-      throw error;
+      return res.rows;
     } finally {
       client.release();
     }
   }
-  async cancelAllUpcomingJobs(filters) {
+  // ── Job CRUD ──────────────────────────────────────────────────────────
+  async addJob({
+    jobType,
+    payload,
+    maxAttempts = 3,
+    priority = 0,
+    runAt = null,
+    timeoutMs = void 0,
+    forceKillOnTimeout = false,
+    tags = void 0,
+    idempotencyKey = void 0
+  }) {
     const client = await this.pool.connect();
     try {
-      let query = `
-        UPDATE job_queue
-        SET status = 'cancelled', updated_at = NOW()
-        WHERE status = 'pending'`;
-      const params = [];
-      let paramIdx = 1;
-      if (filters) {
-        if (filters.jobType) {
-          query += ` AND job_type = $${paramIdx++}`;
-          params.push(filters.jobType);
-        }
-        if (filters.priority !== void 0) {
-          query += ` AND priority = $${paramIdx++}`;
-          params.push(filters.priority);
-        }
-        if (filters.runAt) {
-          if (filters.runAt instanceof Date) {
-            query += ` AND run_at = $${paramIdx++}`;
-            params.push(filters.runAt);
-          } else if (typeof filters.runAt === "object") {
-            const ops = filters.runAt;
-            if (ops.gt) {
-              query += ` AND run_at > $${paramIdx++}`;
-              params.push(ops.gt);
-            }
-            if (ops.gte) {
-              query += ` AND run_at >= $${paramIdx++}`;
-              params.push(ops.gte);
-            }
-            if (ops.lt) {
-              query += ` AND run_at < $${paramIdx++}`;
-              params.push(ops.lt);
-            }
-            if (ops.lte) {
-              query += ` AND run_at <= $${paramIdx++}`;
-              params.push(ops.lte);
-            }
-            if (ops.eq) {
-              query += ` AND run_at = $${paramIdx++}`;
-              params.push(ops.eq);
-            }
-          }
-        }
-        if (filters.tags && filters.tags.values && filters.tags.values.length > 0) {
-          const mode = filters.tags.mode || "all";
-          const tagValues = filters.tags.values;
-          switch (mode) {
-            case "exact":
-              query += ` AND tags = $${paramIdx++}`;
-              params.push(tagValues);
-              break;
-            case "all":
-              query += ` AND tags @> $${paramIdx++}`;
-              params.push(tagValues);
-              break;
-            case "any":
-              query += ` AND tags && $${paramIdx++}`;
-              params.push(tagValues);
-              break;
-            case "none":
-              query += ` AND NOT (tags && $${paramIdx++})`;
-              params.push(tagValues);
-              break;
-            default:
-              query += ` AND tags @> $${paramIdx++}`;
-              params.push(tagValues);
-          }
+      let result;
+      const onConflict = idempotencyKey ? `ON CONFLICT (idempotency_key) WHERE idempotency_key IS NOT NULL DO NOTHING` : "";
+      if (runAt) {
+        result = await client.query(
+          `INSERT INTO job_queue 
+            (job_type, payload, max_attempts, priority, run_at, timeout_ms, force_kill_on_timeout, tags, idempotency_key) 
+           VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9) 
+           ${onConflict}
+           RETURNING id`,
+          [
+            jobType,
+            payload,
+            maxAttempts,
+            priority,
+            runAt,
+            timeoutMs ?? null,
+            forceKillOnTimeout ?? false,
+            tags ?? null,
+            idempotencyKey ?? null
+          ]
+        );
+      } else {
+        result = await client.query(
+          `INSERT INTO job_queue 
+            (job_type, payload, max_attempts, priority, timeout_ms, force_kill_on_timeout, tags, idempotency_key) 
+           VALUES ($1, $2, $3, $4, $5, $6, $7, $8) 
+           ${onConflict}
+           RETURNING id`,
+          [
+            jobType,
+            payload,
+            maxAttempts,
+            priority,
+            timeoutMs ?? null,
+            forceKillOnTimeout ?? false,
+            tags ?? null,
+            idempotencyKey ?? null
+          ]
+        );
+      }
+      if (result.rows.length === 0 && idempotencyKey) {
+        const existing = await client.query(
+          `SELECT id FROM job_queue WHERE idempotency_key = $1`,
+          [idempotencyKey]
+        );
+        if (existing.rows.length > 0) {
+          log(
+            `Job with idempotency key "${idempotencyKey}" already exists (id: ${existing.rows[0].id}), returning existing job`
+          );
+          return existing.rows[0].id;
         }
+        throw new Error(
+          `Failed to insert job and could not find existing job with idempotency key "${idempotencyKey}"`
+        );
       }
-      query += "\nRETURNING id";
-      const result = await client.query(query, params);
-      log(`Cancelled ${result.rowCount} jobs`);
-      return result.rowCount || 0;
+      const jobId = result.rows[0].id;
+      log(
+        `Added job ${jobId}: payload ${JSON.stringify(payload)}, ${runAt ? `runAt ${runAt.toISOString()}, ` : ""}priority ${priority}, maxAttempts ${maxAttempts}, jobType ${jobType}, tags ${JSON.stringify(tags)}${idempotencyKey ? `, idempotencyKey "${idempotencyKey}"` : ""}`
+      );
+      await this.recordJobEvent(jobId, "added" /* Added */, {
+        jobType,
+        payload,
+        tags,
+        idempotencyKey
+      });
+      return jobId;
     } catch (error) {
-      log(`Error cancelling upcoming jobs: ${error}`);
+      log(`Error adding job: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  async editJob(jobId, updates) {
+  async getJob(id) {
     const client = await this.pool.connect();
     try {
-      const updateFields = [];
-      const params = [];
-      let paramIdx = 1;
-      if (updates.payload !== void 0) {
-        updateFields.push(`payload = $${paramIdx++}`);
-        params.push(updates.payload);
-      }
-      if (updates.maxAttempts !== void 0) {
-        updateFields.push(`max_attempts = $${paramIdx++}`);
-        params.push(updates.maxAttempts);
-      }
-      if (updates.priority !== void 0) {
-        updateFields.push(`priority = $${paramIdx++}`);
-        params.push(updates.priority);
-      }
-      if (updates.runAt !== void 0) {
-        if (updates.runAt === null) {
-          updateFields.push(`run_at = NOW()`);
-        } else {
-          updateFields.push(`run_at = $${paramIdx++}`);
-          params.push(updates.runAt);
-        }
-      }
-      if (updates.timeoutMs !== void 0) {
-        updateFields.push(`timeout_ms = $${paramIdx++}`);
-        params.push(updates.timeoutMs ?? null);
-      }
-      if (updates.tags !== void 0) {
-        updateFields.push(`tags = $${paramIdx++}`);
-        params.push(updates.tags ?? null);
-      }
-      if (updateFields.length === 0) {
-        log(`No fields to update for job ${jobId}`);
-        return;
+      const result = await client.query(
+        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue WHERE id = $1`,
+        [id]
+      );
+      if (result.rows.length === 0) {
+        log(`Job ${id} not found`);
+        return null;
       }
-      updateFields.push(`updated_at = NOW()`);
-      params.push(jobId);
-      const query = `
-        UPDATE job_queue
-        SET ${updateFields.join(", ")}
-        WHERE id = $${paramIdx} AND status = 'pending'
-      `;
-      await client.query(query, params);
-      const metadata = {};
-      if (updates.payload !== void 0) metadata.payload = updates.payload;
-      if (updates.maxAttempts !== void 0)
-        metadata.maxAttempts = updates.maxAttempts;
-      if (updates.priority !== void 0) metadata.priority = updates.priority;
-      if (updates.runAt !== void 0) metadata.runAt = updates.runAt;
-      if (updates.timeoutMs !== void 0)
-        metadata.timeoutMs = updates.timeoutMs;
-      if (updates.tags !== void 0) metadata.tags = updates.tags;
-      await this.recordJobEvent(jobId, "edited" /* Edited */, metadata);
-      log(`Edited job ${jobId}: ${JSON.stringify(metadata)}`);
+      log(`Found job ${id}`);
+      const job = result.rows[0];
+      return {
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout,
+        failureReason: job.failureReason
+      };
+    } catch (error) {
+      log(`Error getting job ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  async getJobsByStatus(status, limit = 100, offset = 0) {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue WHERE status = $1 ORDER BY created_at DESC LIMIT $2 OFFSET $3`,
+        [status, limit, offset]
+      );
+      log(`Found ${result.rows.length} jobs by status ${status}`);
+      return result.rows.map((job) => ({
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout,
+        failureReason: job.failureReason
+      }));
     } catch (error) {
-      log(`Error editing job ${jobId}: ${error}`);
+      log(`Error getting jobs by status ${status}: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  async editAllPendingJobs(filters = void 0, updates) {
+  async getAllJobs(limit = 100, offset = 0) {
     const client = await this.pool.connect();
     try {
-      const updateFields = [];
+      const result = await client.query(
+        `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue ORDER BY created_at DESC LIMIT $1 OFFSET $2`,
+        [limit, offset]
+      );
+      log(`Found ${result.rows.length} jobs (all)`);
+      return result.rows.map((job) => ({
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout
+      }));
+    } catch (error) {
+      log(`Error getting all jobs: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  async getJobs(filters, limit = 100, offset = 0) {
+    const client = await this.pool.connect();
+    try {
+      let query = `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress FROM job_queue`;
       const params = [];
+      const where = [];
       let paramIdx = 1;
-      if (updates.payload !== void 0) {
-        updateFields.push(`payload = $${paramIdx++}`);
-        params.push(updates.payload);
-      }
-      if (updates.maxAttempts !== void 0) {
-        updateFields.push(`max_attempts = $${paramIdx++}`);
-        params.push(updates.maxAttempts);
-      }
-      if (updates.priority !== void 0) {
-        updateFields.push(`priority = $${paramIdx++}`);
-        params.push(updates.priority);
-      }
-      if (updates.runAt !== void 0) {
-        if (updates.runAt === null) {
-          updateFields.push(`run_at = NOW()`);
-        } else {
-          updateFields.push(`run_at = $${paramIdx++}`);
-          params.push(updates.runAt);
-        }
-      }
-      if (updates.timeoutMs !== void 0) {
-        updateFields.push(`timeout_ms = $${paramIdx++}`);
-        params.push(updates.timeoutMs ?? null);
-      }
-      if (updates.tags !== void 0) {
-        updateFields.push(`tags = $${paramIdx++}`);
-        params.push(updates.tags ?? null);
-      }
-      if (updateFields.length === 0) {
-        log(`No fields to update for batch edit`);
-        return 0;
-      }
-      updateFields.push(`updated_at = NOW()`);
-      let query = `
-        UPDATE job_queue
-        SET ${updateFields.join(", ")}
-        WHERE status = 'pending'`;
       if (filters) {
         if (filters.jobType) {
-          query += ` AND job_type = $${paramIdx++}`;
+          where.push(`job_type = $${paramIdx++}`);
           params.push(filters.jobType);
         }
         if (filters.priority !== void 0) {
-          query += ` AND priority = $${paramIdx++}`;
+          where.push(`priority = $${paramIdx++}`);
           params.push(filters.priority);
         }
         if (filters.runAt) {
           if (filters.runAt instanceof Date) {
-            query += ` AND run_at = $${paramIdx++}`;
+            where.push(`run_at = $${paramIdx++}`);
             params.push(filters.runAt);
-          } else if (typeof filters.runAt === "object") {
+          } else if (typeof filters.runAt === "object" && (filters.runAt.gt !== void 0 || filters.runAt.gte !== void 0 || filters.runAt.lt !== void 0 || filters.runAt.lte !== void 0 || filters.runAt.eq !== void 0)) {
             const ops = filters.runAt;
             if (ops.gt) {
-              query += ` AND run_at > $${paramIdx++}`;
+              where.push(`run_at > $${paramIdx++}`);
               params.push(ops.gt);
             }
             if (ops.gte) {
-              query += ` AND run_at >= $${paramIdx++}`;
+              where.push(`run_at >= $${paramIdx++}`);
               params.push(ops.gte);
             }
             if (ops.lt) {
-              query += ` AND run_at < $${paramIdx++}`;
+              where.push(`run_at < $${paramIdx++}`);
               params.push(ops.lt);
             }
             if (ops.lte) {
-              query += ` AND run_at <= $${paramIdx++}`;
+              where.push(`run_at <= $${paramIdx++}`);
               params.push(ops.lte);
             }
             if (ops.eq) {
-              query += ` AND run_at = $${paramIdx++}`;
+              where.push(`run_at = $${paramIdx++}`);
               params.push(ops.eq);
             }
           }
@@ -858,1370 +998,1264 @@ var PostgresBackend = class {
           const tagValues = filters.tags.values;
           switch (mode) {
             case "exact":
-              query += ` AND tags = $${paramIdx++}`;
+              where.push(`tags = $${paramIdx++}`);
               params.push(tagValues);
               break;
             case "all":
-              query += ` AND tags @> $${paramIdx++}`;
+              where.push(`tags @> $${paramIdx++}`);
               params.push(tagValues);
               break;
             case "any":
-              query += ` AND tags && $${paramIdx++}`;
+              where.push(`tags && $${paramIdx++}`);
               params.push(tagValues);
               break;
             case "none":
-              query += ` AND NOT (tags && $${paramIdx++})`;
+              where.push(`NOT (tags && $${paramIdx++})`);
               params.push(tagValues);
               break;
             default:
-              query += ` AND tags @> $${paramIdx++}`;
+              where.push(`tags @> $${paramIdx++}`);
               params.push(tagValues);
           }
         }
+        if (filters.cursor !== void 0) {
+          where.push(`id < $${paramIdx++}`);
+          params.push(filters.cursor);
+        }
+      }
+      if (where.length > 0) {
+        query += ` WHERE ${where.join(" AND ")}`;
+      }
+      paramIdx = params.length + 1;
+      query += ` ORDER BY id DESC LIMIT $${paramIdx++}`;
+      if (!filters?.cursor) {
+        query += ` OFFSET $${paramIdx}`;
+        params.push(limit, offset);
+      } else {
+        params.push(limit);
       }
-      query += "\nRETURNING id";
       const result = await client.query(query, params);
-      const editedCount = result.rowCount || 0;
-      const metadata = {};
-      if (updates.payload !== void 0) metadata.payload = updates.payload;
-      if (updates.maxAttempts !== void 0)
-        metadata.maxAttempts = updates.maxAttempts;
-      if (updates.priority !== void 0) metadata.priority = updates.priority;
-      if (updates.runAt !== void 0) metadata.runAt = updates.runAt;
-      if (updates.timeoutMs !== void 0)
-        metadata.timeoutMs = updates.timeoutMs;
-      if (updates.tags !== void 0) metadata.tags = updates.tags;
-      for (const row of result.rows) {
-        await this.recordJobEvent(row.id, "edited" /* Edited */, metadata);
+      log(`Found ${result.rows.length} jobs`);
+      return result.rows.map((job) => ({
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout,
+        failureReason: job.failureReason
+      }));
+    } catch (error) {
+      log(`Error getting jobs: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  async getJobsByTags(tags, mode = "all", limit = 100, offset = 0) {
+    const client = await this.pool.connect();
+    try {
+      let query = `SELECT id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_failed_at AS "lastFailedAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", tags, idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress
+         FROM job_queue`;
+      let params = [];
+      switch (mode) {
+        case "exact":
+          query += " WHERE tags = $1";
+          params = [tags];
+          break;
+        case "all":
+          query += " WHERE tags @> $1";
+          params = [tags];
+          break;
+        case "any":
+          query += " WHERE tags && $1";
+          params = [tags];
+          break;
+        case "none":
+          query += " WHERE NOT (tags && $1)";
+          params = [tags];
+          break;
+        default:
+          query += " WHERE tags @> $1";
+          params = [tags];
+      }
+      query += " ORDER BY created_at DESC LIMIT $2 OFFSET $3";
+      params.push(limit, offset);
+      const result = await client.query(query, params);
+      log(
+        `Found ${result.rows.length} jobs by tags ${JSON.stringify(tags)} (mode: ${mode})`
+      );
+      return result.rows.map((job) => ({
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout,
+        failureReason: job.failureReason
+      }));
+    } catch (error) {
+      log(
+        `Error getting jobs by tags ${JSON.stringify(tags)} (mode: ${mode}): ${error}`
+      );
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  // ── Processing lifecycle ──────────────────────────────────────────────
+  async getNextBatch(workerId, batchSize = 10, jobType) {
+    const client = await this.pool.connect();
+    try {
+      await client.query("BEGIN");
+      let jobTypeFilter = "";
+      const params = [workerId, batchSize];
+      if (jobType) {
+        if (Array.isArray(jobType)) {
+          jobTypeFilter = ` AND job_type = ANY($3)`;
+          params.push(jobType);
+        } else {
+          jobTypeFilter = ` AND job_type = $3`;
+          params.push(jobType);
+        }
+      }
+      const result = await client.query(
+        `
+        UPDATE job_queue
+        SET status = 'processing', 
+            locked_at = NOW(), 
+            locked_by = $1,
+            attempts = CASE WHEN status = 'waiting' THEN attempts ELSE attempts + 1 END,
+            updated_at = NOW(),
+            pending_reason = NULL,
+            started_at = COALESCE(started_at, NOW()),
+            last_retried_at = CASE WHEN status != 'waiting' AND attempts > 0 THEN NOW() ELSE last_retried_at END,
+            wait_until = NULL
+        WHERE id IN (
+          SELECT id FROM job_queue
+          WHERE (
+            (
+              (status = 'pending' OR (status = 'failed' AND next_attempt_at <= NOW()))
+              AND (attempts < max_attempts)
+              AND run_at <= NOW()
+            )
+            OR (
+              status = 'waiting'
+              AND wait_until IS NOT NULL
+              AND wait_until <= NOW()
+              AND wait_token_id IS NULL
+            )
+          )
+          ${jobTypeFilter}
+          ORDER BY priority DESC, created_at ASC
+          LIMIT $2
+          FOR UPDATE SKIP LOCKED
+        )
+        RETURNING id, job_type AS "jobType", payload, status, max_attempts AS "maxAttempts", attempts, priority, run_at AS "runAt", timeout_ms AS "timeoutMs", force_kill_on_timeout AS "forceKillOnTimeout", created_at AS "createdAt", updated_at AS "updatedAt", started_at AS "startedAt", completed_at AS "completedAt", last_failed_at AS "lastFailedAt", locked_at AS "lockedAt", locked_by AS "lockedBy", error_history AS "errorHistory", failure_reason AS "failureReason", next_attempt_at AS "nextAttemptAt", last_retried_at AS "lastRetriedAt", last_cancelled_at AS "lastCancelledAt", pending_reason AS "pendingReason", idempotency_key AS "idempotencyKey", wait_until AS "waitUntil", wait_token_id AS "waitTokenId", step_data AS "stepData", progress
+      `,
+        params
+      );
+      log(`Found ${result.rows.length} jobs to process`);
+      await client.query("COMMIT");
+      if (result.rows.length > 0) {
+        await this.recordJobEventsBatch(
+          result.rows.map((row) => ({
+            jobId: row.id,
+            eventType: "processing" /* Processing */
+          }))
+        );
       }
-      log(`Edited ${editedCount} pending jobs: ${JSON.stringify(metadata)}`);
-      return editedCount;
+      return result.rows.map((job) => ({
+        ...job,
+        payload: job.payload,
+        timeoutMs: job.timeoutMs,
+        forceKillOnTimeout: job.forceKillOnTimeout
+      }));
     } catch (error) {
-      log(`Error editing pending jobs: ${error}`);
+      log(`Error getting next batch: ${error}`);
+      await client.query("ROLLBACK");
       throw error;
     } finally {
       client.release();
     }
   }
-  async cleanupOldJobs(daysToKeep = 30) {
+  async completeJob(jobId) {
     const client = await this.pool.connect();
     try {
       const result = await client.query(
         `
-        DELETE FROM job_queue
-        WHERE status = 'completed'
-        AND updated_at < NOW() - INTERVAL '1 day' * $1::int
-        RETURNING id
+        UPDATE job_queue
+        SET status = 'completed', updated_at = NOW(), completed_at = NOW(),
+            step_data = NULL, wait_until = NULL, wait_token_id = NULL
+        WHERE id = $1 AND status = 'processing'
       `,
-        [daysToKeep]
+        [jobId]
       );
-      log(`Deleted ${result.rowCount} old jobs`);
-      return result.rowCount || 0;
+      if (result.rowCount === 0) {
+        log(
+          `Job ${jobId} could not be completed (not in processing state or does not exist)`
+        );
+      }
+      await this.recordJobEvent(jobId, "completed" /* Completed */);
+      log(`Completed job ${jobId}`);
     } catch (error) {
-      log(`Error cleaning up old jobs: ${error}`);
+      log(`Error completing job ${jobId}: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  async cleanupOldJobEvents(daysToKeep = 30) {
+  async failJob(jobId, error, failureReason) {
     const client = await this.pool.connect();
     try {
       const result = await client.query(
         `
-        DELETE FROM job_events
-        WHERE created_at < NOW() - INTERVAL '1 day' * $1::int
-        RETURNING id
+        UPDATE job_queue
+        SET status = 'failed', 
+            updated_at = NOW(),
+            next_attempt_at = CASE 
+              WHEN attempts < max_attempts THEN NOW() + (POWER(2, attempts) * INTERVAL '1 minute')
+              ELSE NULL
+            END,
+            error_history = COALESCE(error_history, '[]'::jsonb) || $2::jsonb,
+            failure_reason = $3,
+            last_failed_at = NOW()
+        WHERE id = $1 AND status IN ('processing', 'pending')
       `,
-        [daysToKeep]
+        [
+          jobId,
+          JSON.stringify([
+            {
+              message: error.message || String(error),
+              timestamp: (/* @__PURE__ */ new Date()).toISOString()
+            }
+          ]),
+          failureReason ?? null
+        ]
       );
-      log(`Deleted ${result.rowCount} old job events`);
-      return result.rowCount || 0;
-    } catch (error) {
-      log(`Error cleaning up old job events: ${error}`);
-      throw error;
+      if (result.rowCount === 0) {
+        log(
+          `Job ${jobId} could not be failed (not in processing/pending state or does not exist)`
+        );
+      }
+      await this.recordJobEvent(jobId, "failed" /* Failed */, {
+        message: error.message || String(error),
+        failureReason
+      });
+      log(`Failed job ${jobId}`);
+    } catch (err) {
+      log(`Error failing job ${jobId}: ${err}`);
+      throw err;
     } finally {
       client.release();
     }
   }
-  async reclaimStuckJobs(maxProcessingTimeMinutes = 10) {
+  async prolongJob(jobId) {
     const client = await this.pool.connect();
     try {
-      const result = await client.query(
+      await client.query(
         `
         UPDATE job_queue
-        SET status = 'pending', locked_at = NULL, locked_by = NULL, updated_at = NOW()
-        WHERE status = 'processing'
-          AND locked_at < NOW() - GREATEST(
-            INTERVAL '1 minute' * $1::int,
-            INTERVAL '1 millisecond' * COALESCE(timeout_ms, 0)
-          )
-        RETURNING id
-        `,
-        [maxProcessingTimeMinutes]
+        SET locked_at = NOW(), updated_at = NOW()
+        WHERE id = $1 AND status = 'processing'
+      `,
+        [jobId]
       );
-      log(`Reclaimed ${result.rowCount} stuck jobs`);
-      return result.rowCount || 0;
+      await this.recordJobEvent(jobId, "prolonged" /* Prolonged */);
+      log(`Prolonged job ${jobId}`);
     } catch (error) {
-      log(`Error reclaiming stuck jobs: ${error}`);
-      throw error;
+      log(`Error prolonging job ${jobId}: ${error}`);
     } finally {
       client.release();
     }
   }
-  // ── Internal helpers ──────────────────────────────────────────────────
-  /**
-   * Batch-insert multiple job events in a single query.
-   * More efficient than individual recordJobEvent calls.
-   */
-  async recordJobEventsBatch(events) {
-    if (events.length === 0) return;
+  // ── Progress ──────────────────────────────────────────────────────────
+  async updateProgress(jobId, progress) {
     const client = await this.pool.connect();
     try {
-      const values = [];
-      const params = [];
-      let paramIdx = 1;
-      for (const event of events) {
-        values.push(`($${paramIdx++}, $${paramIdx++}, $${paramIdx++})`);
-        params.push(
-          event.jobId,
-          event.eventType,
-          event.metadata ? JSON.stringify(event.metadata) : null
-        );
-      }
       await client.query(
-        `INSERT INTO job_events (job_id, event_type, metadata) VALUES ${values.join(", ")}`,
-        params
+        `UPDATE job_queue SET progress = $2, updated_at = NOW() WHERE id = $1`,
+        [jobId, progress]
       );
+      log(`Updated progress for job ${jobId}: ${progress}%`);
     } catch (error) {
-      log(`Error recording batch job events: ${error}`);
+      log(`Error updating progress for job ${jobId}: ${error}`);
     } finally {
       client.release();
     }
   }
-  // ── Cron schedules ──────────────────────────────────────────────────
-  /** Create a cron schedule and return its ID. */
-  async addCronSchedule(input) {
+  // ── Job management ────────────────────────────────────────────────────
+  async retryJob(jobId) {
     const client = await this.pool.connect();
     try {
       const result = await client.query(
-        `INSERT INTO cron_schedules
-          (schedule_name, cron_expression, job_type, payload, max_attempts,
-           priority, timeout_ms, force_kill_on_timeout, tags, timezone,
-           allow_overlap, next_run_at)
-         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
-         RETURNING id`,
-        [
-          input.scheduleName,
-          input.cronExpression,
-          input.jobType,
-          input.payload,
-          input.maxAttempts,
-          input.priority,
-          input.timeoutMs,
-          input.forceKillOnTimeout,
-          input.tags ?? null,
-          input.timezone,
-          input.allowOverlap,
-          input.nextRunAt
-        ]
+        `
+        UPDATE job_queue
+        SET status = 'pending', 
+            updated_at = NOW(),
+            locked_at = NULL,
+            locked_by = NULL,
+            next_attempt_at = NOW(),
+            last_retried_at = NOW()
+        WHERE id = $1 AND status IN ('failed', 'processing')
+      `,
+        [jobId]
       );
-      const id = result.rows[0].id;
-      log(`Added cron schedule ${id}: "${input.scheduleName}"`);
-      return id;
-    } catch (error) {
-      if (error?.code === "23505") {
-        throw new Error(
-          `Cron schedule with name "${input.scheduleName}" already exists`
+      if (result.rowCount === 0) {
+        log(
+          `Job ${jobId} could not be retried (not in failed/processing state or does not exist)`
         );
       }
-      log(`Error adding cron schedule: ${error}`);
-      throw error;
-    } finally {
-      client.release();
-    }
-  }
-  /** Get a cron schedule by ID. */
-  async getCronSchedule(id) {
-    const client = await this.pool.connect();
-    try {
-      const result = await client.query(
-        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
-                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
-                priority, timeout_ms AS "timeoutMs",
-                force_kill_on_timeout AS "forceKillOnTimeout", tags,
-                timezone, allow_overlap AS "allowOverlap", status,
-                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
-                next_run_at AS "nextRunAt",
-                created_at AS "createdAt", updated_at AS "updatedAt"
-         FROM cron_schedules WHERE id = $1`,
-        [id]
-      );
-      if (result.rows.length === 0) return null;
-      return result.rows[0];
+      await this.recordJobEvent(jobId, "retried" /* Retried */);
+      log(`Retried job ${jobId}`);
     } catch (error) {
-      log(`Error getting cron schedule ${id}: ${error}`);
+      log(`Error retrying job ${jobId}: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  /** Get a cron schedule by its unique name. */
-  async getCronScheduleByName(name) {
+  async cancelJob(jobId) {
     const client = await this.pool.connect();
     try {
-      const result = await client.query(
-        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
-                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
-                priority, timeout_ms AS "timeoutMs",
-                force_kill_on_timeout AS "forceKillOnTimeout", tags,
-                timezone, allow_overlap AS "allowOverlap", status,
-                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
-                next_run_at AS "nextRunAt",
-                created_at AS "createdAt", updated_at AS "updatedAt"
-         FROM cron_schedules WHERE schedule_name = $1`,
-        [name]
+      await client.query(
+        `
+        UPDATE job_queue
+        SET status = 'cancelled', updated_at = NOW(), last_cancelled_at = NOW(),
+            wait_until = NULL, wait_token_id = NULL
+        WHERE id = $1 AND status IN ('pending', 'waiting')
+      `,
+        [jobId]
       );
-      if (result.rows.length === 0) return null;
-      return result.rows[0];
-    } catch (error) {
-      log(`Error getting cron schedule by name "${name}": ${error}`);
-      throw error;
-    } finally {
-      client.release();
-    }
-  }
-  /** List cron schedules, optionally filtered by status. */
-  async listCronSchedules(status) {
-    const client = await this.pool.connect();
-    try {
-      let query = `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
-                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
-                priority, timeout_ms AS "timeoutMs",
-                force_kill_on_timeout AS "forceKillOnTimeout", tags,
-                timezone, allow_overlap AS "allowOverlap", status,
-                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
-                next_run_at AS "nextRunAt",
-                created_at AS "createdAt", updated_at AS "updatedAt"
-         FROM cron_schedules`;
-      const params = [];
-      if (status) {
-        query += ` WHERE status = $1`;
-        params.push(status);
-      }
-      query += ` ORDER BY created_at ASC`;
-      const result = await client.query(query, params);
-      return result.rows;
+      await this.recordJobEvent(jobId, "cancelled" /* Cancelled */);
+      log(`Cancelled job ${jobId}`);
     } catch (error) {
-      log(`Error listing cron schedules: ${error}`);
+      log(`Error cancelling job ${jobId}: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  /** Delete a cron schedule by ID. */
-  async removeCronSchedule(id) {
+  async cancelAllUpcomingJobs(filters) {
     const client = await this.pool.connect();
     try {
-      await client.query(`DELETE FROM cron_schedules WHERE id = $1`, [id]);
-      log(`Removed cron schedule ${id}`);
+      let query = `
+        UPDATE job_queue
+        SET status = 'cancelled', updated_at = NOW()
+        WHERE status = 'pending'`;
+      const params = [];
+      let paramIdx = 1;
+      if (filters) {
+        if (filters.jobType) {
+          query += ` AND job_type = $${paramIdx++}`;
+          params.push(filters.jobType);
+        }
+        if (filters.priority !== void 0) {
+          query += ` AND priority = $${paramIdx++}`;
+          params.push(filters.priority);
+        }
+        if (filters.runAt) {
+          if (filters.runAt instanceof Date) {
+            query += ` AND run_at = $${paramIdx++}`;
+            params.push(filters.runAt);
+          } else if (typeof filters.runAt === "object") {
+            const ops = filters.runAt;
+            if (ops.gt) {
+              query += ` AND run_at > $${paramIdx++}`;
+              params.push(ops.gt);
+            }
+            if (ops.gte) {
+              query += ` AND run_at >= $${paramIdx++}`;
+              params.push(ops.gte);
+            }
+            if (ops.lt) {
+              query += ` AND run_at < $${paramIdx++}`;
+              params.push(ops.lt);
+            }
+            if (ops.lte) {
+              query += ` AND run_at <= $${paramIdx++}`;
+              params.push(ops.lte);
+            }
+            if (ops.eq) {
+              query += ` AND run_at = $${paramIdx++}`;
+              params.push(ops.eq);
+            }
+          }
+        }
+        if (filters.tags && filters.tags.values && filters.tags.values.length > 0) {
+          const mode = filters.tags.mode || "all";
+          const tagValues = filters.tags.values;
+          switch (mode) {
+            case "exact":
+              query += ` AND tags = $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "all":
+              query += ` AND tags @> $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "any":
+              query += ` AND tags && $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "none":
+              query += ` AND NOT (tags && $${paramIdx++})`;
+              params.push(tagValues);
+              break;
+            default:
+              query += ` AND tags @> $${paramIdx++}`;
+              params.push(tagValues);
+          }
+        }
+      }
+      query += "\nRETURNING id";
+      const result = await client.query(query, params);
+      log(`Cancelled ${result.rowCount} jobs`);
+      return result.rowCount || 0;
     } catch (error) {
-      log(`Error removing cron schedule ${id}: ${error}`);
+      log(`Error cancelling upcoming jobs: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  /** Pause a cron schedule. */
-  async pauseCronSchedule(id) {
+  async editJob(jobId, updates) {
     const client = await this.pool.connect();
     try {
-      await client.query(
-        `UPDATE cron_schedules SET status = 'paused', updated_at = NOW() WHERE id = $1`,
-        [id]
-      );
-      log(`Paused cron schedule ${id}`);
+      const updateFields = [];
+      const params = [];
+      let paramIdx = 1;
+      if (updates.payload !== void 0) {
+        updateFields.push(`payload = $${paramIdx++}`);
+        params.push(updates.payload);
+      }
+      if (updates.maxAttempts !== void 0) {
+        updateFields.push(`max_attempts = $${paramIdx++}`);
+        params.push(updates.maxAttempts);
+      }
+      if (updates.priority !== void 0) {
+        updateFields.push(`priority = $${paramIdx++}`);
+        params.push(updates.priority);
+      }
+      if (updates.runAt !== void 0) {
+        if (updates.runAt === null) {
+          updateFields.push(`run_at = NOW()`);
+        } else {
+          updateFields.push(`run_at = $${paramIdx++}`);
+          params.push(updates.runAt);
+        }
+      }
+      if (updates.timeoutMs !== void 0) {
+        updateFields.push(`timeout_ms = $${paramIdx++}`);
+        params.push(updates.timeoutMs ?? null);
+      }
+      if (updates.tags !== void 0) {
+        updateFields.push(`tags = $${paramIdx++}`);
+        params.push(updates.tags ?? null);
+      }
+      if (updateFields.length === 0) {
+        log(`No fields to update for job ${jobId}`);
+        return;
+      }
+      updateFields.push(`updated_at = NOW()`);
+      params.push(jobId);
+      const query = `
+        UPDATE job_queue
+        SET ${updateFields.join(", ")}
+        WHERE id = $${paramIdx} AND status = 'pending'
+      `;
+      await client.query(query, params);
+      const metadata = {};
+      if (updates.payload !== void 0) metadata.payload = updates.payload;
+      if (updates.maxAttempts !== void 0)
+        metadata.maxAttempts = updates.maxAttempts;
+      if (updates.priority !== void 0) metadata.priority = updates.priority;
+      if (updates.runAt !== void 0) metadata.runAt = updates.runAt;
+      if (updates.timeoutMs !== void 0)
+        metadata.timeoutMs = updates.timeoutMs;
+      if (updates.tags !== void 0) metadata.tags = updates.tags;
+      await this.recordJobEvent(jobId, "edited" /* Edited */, metadata);
+      log(`Edited job ${jobId}: ${JSON.stringify(metadata)}`);
     } catch (error) {
-      log(`Error pausing cron schedule ${id}: ${error}`);
+      log(`Error editing job ${jobId}: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  /** Resume a paused cron schedule. */
-  async resumeCronSchedule(id) {
+  async editAllPendingJobs(filters = void 0, updates) {
     const client = await this.pool.connect();
     try {
-      await client.query(
-        `UPDATE cron_schedules SET status = 'active', updated_at = NOW() WHERE id = $1`,
-        [id]
-      );
-      log(`Resumed cron schedule ${id}`);
+      const updateFields = [];
+      const params = [];
+      let paramIdx = 1;
+      if (updates.payload !== void 0) {
+        updateFields.push(`payload = $${paramIdx++}`);
+        params.push(updates.payload);
+      }
+      if (updates.maxAttempts !== void 0) {
+        updateFields.push(`max_attempts = $${paramIdx++}`);
+        params.push(updates.maxAttempts);
+      }
+      if (updates.priority !== void 0) {
+        updateFields.push(`priority = $${paramIdx++}`);
+        params.push(updates.priority);
+      }
+      if (updates.runAt !== void 0) {
+        if (updates.runAt === null) {
+          updateFields.push(`run_at = NOW()`);
+        } else {
+          updateFields.push(`run_at = $${paramIdx++}`);
+          params.push(updates.runAt);
+        }
+      }
+      if (updates.timeoutMs !== void 0) {
+        updateFields.push(`timeout_ms = $${paramIdx++}`);
+        params.push(updates.timeoutMs ?? null);
+      }
+      if (updates.tags !== void 0) {
+        updateFields.push(`tags = $${paramIdx++}`);
+        params.push(updates.tags ?? null);
+      }
+      if (updateFields.length === 0) {
+        log(`No fields to update for batch edit`);
+        return 0;
+      }
+      updateFields.push(`updated_at = NOW()`);
+      let query = `
+        UPDATE job_queue
+        SET ${updateFields.join(", ")}
+        WHERE status = 'pending'`;
+      if (filters) {
+        if (filters.jobType) {
+          query += ` AND job_type = $${paramIdx++}`;
+          params.push(filters.jobType);
+        }
+        if (filters.priority !== void 0) {
+          query += ` AND priority = $${paramIdx++}`;
+          params.push(filters.priority);
+        }
+        if (filters.runAt) {
+          if (filters.runAt instanceof Date) {
+            query += ` AND run_at = $${paramIdx++}`;
+            params.push(filters.runAt);
+          } else if (typeof filters.runAt === "object") {
+            const ops = filters.runAt;
+            if (ops.gt) {
+              query += ` AND run_at > $${paramIdx++}`;
+              params.push(ops.gt);
+            }
+            if (ops.gte) {
+              query += ` AND run_at >= $${paramIdx++}`;
+              params.push(ops.gte);
+            }
+            if (ops.lt) {
+              query += ` AND run_at < $${paramIdx++}`;
+              params.push(ops.lt);
+            }
+            if (ops.lte) {
+              query += ` AND run_at <= $${paramIdx++}`;
+              params.push(ops.lte);
+            }
+            if (ops.eq) {
+              query += ` AND run_at = $${paramIdx++}`;
+              params.push(ops.eq);
+            }
+          }
+        }
+        if (filters.tags && filters.tags.values && filters.tags.values.length > 0) {
+          const mode = filters.tags.mode || "all";
+          const tagValues = filters.tags.values;
+          switch (mode) {
+            case "exact":
+              query += ` AND tags = $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "all":
+              query += ` AND tags @> $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "any":
+              query += ` AND tags && $${paramIdx++}`;
+              params.push(tagValues);
+              break;
+            case "none":
+              query += ` AND NOT (tags && $${paramIdx++})`;
+              params.push(tagValues);
+              break;
+            default:
+              query += ` AND tags @> $${paramIdx++}`;
+              params.push(tagValues);
+          }
+        }
+      }
+      query += "\nRETURNING id";
+      const result = await client.query(query, params);
+      const editedCount = result.rowCount || 0;
+      const metadata = {};
+      if (updates.payload !== void 0) metadata.payload = updates.payload;
+      if (updates.maxAttempts !== void 0)
+        metadata.maxAttempts = updates.maxAttempts;
+      if (updates.priority !== void 0) metadata.priority = updates.priority;
+      if (updates.runAt !== void 0) metadata.runAt = updates.runAt;
+      if (updates.timeoutMs !== void 0)
+        metadata.timeoutMs = updates.timeoutMs;
+      if (updates.tags !== void 0) metadata.tags = updates.tags;
+      for (const row of result.rows) {
+        await this.recordJobEvent(row.id, "edited" /* Edited */, metadata);
+      }
+      log(`Edited ${editedCount} pending jobs: ${JSON.stringify(metadata)}`);
+      return editedCount;
     } catch (error) {
-      log(`Error resuming cron schedule ${id}: ${error}`);
+      log(`Error editing pending jobs: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
-  /** Edit a cron schedule. */
-  async editCronSchedule(id, updates, nextRunAt) {
-    const client = await this.pool.connect();
+  /**
+   * Delete completed jobs older than the given number of days.
+   * Deletes in batches of 1000 to avoid long-running transactions
+   * and excessive WAL bloat at scale.
+   *
+   * @param daysToKeep - Number of days to retain completed jobs (default 30).
+   * @param batchSize - Number of rows to delete per batch (default 1000).
+   * @returns Total number of deleted jobs.
+   */
+  async cleanupOldJobs(daysToKeep = 30, batchSize = 1e3) {
+    let totalDeleted = 0;
     try {
-      const updateFields = [];
-      const params = [];
-      let paramIdx = 1;
-      if (updates.cronExpression !== void 0) {
-        updateFields.push(`cron_expression = $${paramIdx++}`);
-        params.push(updates.cronExpression);
-      }
-      if (updates.payload !== void 0) {
-        updateFields.push(`payload = $${paramIdx++}`);
-        params.push(updates.payload);
-      }
-      if (updates.maxAttempts !== void 0) {
-        updateFields.push(`max_attempts = $${paramIdx++}`);
-        params.push(updates.maxAttempts);
-      }
-      if (updates.priority !== void 0) {
-        updateFields.push(`priority = $${paramIdx++}`);
-        params.push(updates.priority);
-      }
-      if (updates.timeoutMs !== void 0) {
-        updateFields.push(`timeout_ms = $${paramIdx++}`);
-        params.push(updates.timeoutMs);
-      }
-      if (updates.forceKillOnTimeout !== void 0) {
-        updateFields.push(`force_kill_on_timeout = $${paramIdx++}`);
-        params.push(updates.forceKillOnTimeout);
-      }
-      if (updates.tags !== void 0) {
-        updateFields.push(`tags = $${paramIdx++}`);
-        params.push(updates.tags);
-      }
-      if (updates.timezone !== void 0) {
-        updateFields.push(`timezone = $${paramIdx++}`);
-        params.push(updates.timezone);
-      }
-      if (updates.allowOverlap !== void 0) {
-        updateFields.push(`allow_overlap = $${paramIdx++}`);
-        params.push(updates.allowOverlap);
-      }
-      if (nextRunAt !== void 0) {
-        updateFields.push(`next_run_at = $${paramIdx++}`);
-        params.push(nextRunAt);
-      }
-      if (updateFields.length === 0) {
-        log(`No fields to update for cron schedule ${id}`);
-        return;
-      }
-      updateFields.push(`updated_at = NOW()`);
-      params.push(id);
-      const query = `UPDATE cron_schedules SET ${updateFields.join(", ")} WHERE id = $${paramIdx}`;
-      await client.query(query, params);
-      log(`Edited cron schedule ${id}`);
+      let deletedInBatch;
+      do {
+        const client = await this.pool.connect();
+        try {
+          const result = await client.query(
+            `
+            DELETE FROM job_queue
+            WHERE id IN (
+              SELECT id FROM job_queue
+              WHERE status = 'completed'
+              AND updated_at < NOW() - INTERVAL '1 day' * $1::int
+              LIMIT $2
+            )
+          `,
+            [daysToKeep, batchSize]
+          );
+          deletedInBatch = result.rowCount || 0;
+          totalDeleted += deletedInBatch;
+        } finally {
+          client.release();
+        }
+      } while (deletedInBatch === batchSize);
+      log(`Deleted ${totalDeleted} old jobs`);
+      return totalDeleted;
     } catch (error) {
-      log(`Error editing cron schedule ${id}: ${error}`);
+      log(`Error cleaning up old jobs: ${error}`);
       throw error;
-    } finally {
-      client.release();
     }
   }
   /**
-   * Atomically fetch all active cron schedules whose nextRunAt <= NOW().
-   * Uses FOR UPDATE SKIP LOCKED to prevent duplicate enqueuing across workers.
+   * Delete job events older than the given number of days.
+   * Deletes in batches of 1000 to avoid long-running transactions
+   * and excessive WAL bloat at scale.
+   *
+   * @param daysToKeep - Number of days to retain events (default 30).
+   * @param batchSize - Number of rows to delete per batch (default 1000).
+   * @returns Total number of deleted events.
    */
-  async getDueCronSchedules() {
-    const client = await this.pool.connect();
+  async cleanupOldJobEvents(daysToKeep = 30, batchSize = 1e3) {
+    let totalDeleted = 0;
     try {
-      const result = await client.query(
-        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
-                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
-                priority, timeout_ms AS "timeoutMs",
-                force_kill_on_timeout AS "forceKillOnTimeout", tags,
-                timezone, allow_overlap AS "allowOverlap", status,
-                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
-                next_run_at AS "nextRunAt",
-                created_at AS "createdAt", updated_at AS "updatedAt"
-         FROM cron_schedules
-         WHERE status = 'active'
-           AND next_run_at IS NOT NULL
-           AND next_run_at <= NOW()
-         ORDER BY next_run_at ASC
-         FOR UPDATE SKIP LOCKED`
-      );
-      log(`Found ${result.rows.length} due cron schedules`);
-      return result.rows;
+      let deletedInBatch;
+      do {
+        const client = await this.pool.connect();
+        try {
+          const result = await client.query(
+            `
+            DELETE FROM job_events
+            WHERE id IN (
+              SELECT id FROM job_events
+              WHERE created_at < NOW() - INTERVAL '1 day' * $1::int
+              LIMIT $2
+            )
+          `,
+            [daysToKeep, batchSize]
+          );
+          deletedInBatch = result.rowCount || 0;
+          totalDeleted += deletedInBatch;
+        } finally {
+          client.release();
+        }
+      } while (deletedInBatch === batchSize);
+      log(`Deleted ${totalDeleted} old job events`);
+      return totalDeleted;
     } catch (error) {
-      if (error?.code === "42P01") {
-        log("cron_schedules table does not exist, skipping cron enqueue");
-        return [];
-      }
-      log(`Error getting due cron schedules: ${error}`);
+      log(`Error cleaning up old job events: ${error}`);
       throw error;
-    } finally {
-      client.release();
     }
   }
-  /**
-   * Update a cron schedule after a job has been enqueued.
-   * Sets lastEnqueuedAt, lastJobId, and advances nextRunAt.
-   */
-  async updateCronScheduleAfterEnqueue(id, lastEnqueuedAt, lastJobId, nextRunAt) {
+  async reclaimStuckJobs(maxProcessingTimeMinutes = 10) {
     const client = await this.pool.connect();
     try {
-      await client.query(
-        `UPDATE cron_schedules
-         SET last_enqueued_at = $2,
-             last_job_id = $3,
-             next_run_at = $4,
-             updated_at = NOW()
-         WHERE id = $1`,
-        [id, lastEnqueuedAt, lastJobId, nextRunAt]
-      );
-      log(
-        `Updated cron schedule ${id}: lastJobId=${lastJobId}, nextRunAt=${nextRunAt?.toISOString() ?? "null"}`
+      const result = await client.query(
+        `
+        UPDATE job_queue
+        SET status = 'pending', locked_at = NULL, locked_by = NULL, updated_at = NOW()
+        WHERE status = 'processing'
+          AND locked_at < NOW() - GREATEST(
+            INTERVAL '1 minute' * $1::int,
+            INTERVAL '1 millisecond' * COALESCE(timeout_ms, 0)
+          )
+        RETURNING id
+        `,
+        [maxProcessingTimeMinutes]
       );
+      log(`Reclaimed ${result.rowCount} stuck jobs`);
+      return result.rowCount || 0;
     } catch (error) {
-      log(`Error updating cron schedule ${id} after enqueue: ${error}`);
+      log(`Error reclaiming stuck jobs: ${error}`);
       throw error;
     } finally {
       client.release();
     }
   }
   // ── Internal helpers ──────────────────────────────────────────────────
-  async setPendingReasonForUnpickedJobs(reason, jobType) {
+  /**
+   * Batch-insert multiple job events in a single query.
+   * More efficient than individual recordJobEvent calls.
+   */
+  async recordJobEventsBatch(events) {
+    if (events.length === 0) return;
     const client = await this.pool.connect();
     try {
-      let jobTypeFilter = "";
-      const params = [reason];
-      if (jobType) {
-        if (Array.isArray(jobType)) {
-          jobTypeFilter = ` AND job_type = ANY($2)`;
-          params.push(jobType);
-        } else {
-          jobTypeFilter = ` AND job_type = $2`;
-          params.push(jobType);
-        }
-      }
-      await client.query(
-        `UPDATE job_queue SET pending_reason = $1 WHERE status = 'pending'${jobTypeFilter}`,
-        params
-      );
-    } finally {
-      client.release();
-    }
-  }
-};
-var recordJobEvent = async (pool, jobId, eventType, metadata) => new PostgresBackend(pool).recordJobEvent(jobId, eventType, metadata);
-var waitJob = async (pool, jobId, options) => {
-  const client = await pool.connect();
-  try {
-    const result = await client.query(
-      `
-      UPDATE job_queue
-      SET status = 'waiting',
-          wait_until = $2,
-          wait_token_id = $3,
-          step_data = $4,
-          locked_at = NULL,
-          locked_by = NULL,
-          updated_at = NOW()
-      WHERE id = $1 AND status = 'processing'
-    `,
-      [
-        jobId,
-        options.waitUntil ?? null,
-        options.waitTokenId ?? null,
-        JSON.stringify(options.stepData)
-      ]
-    );
-    if (result.rowCount === 0) {
-      log(
-        `Job ${jobId} could not be set to waiting (may have been reclaimed or is no longer processing)`
-      );
-      return;
-    }
-    await recordJobEvent(pool, jobId, "waiting" /* Waiting */, {
-      waitUntil: options.waitUntil?.toISOString() ?? null,
-      waitTokenId: options.waitTokenId ?? null
-    });
-    log(`Job ${jobId} set to waiting`);
-  } catch (error) {
-    log(`Error setting job ${jobId} to waiting: ${error}`);
-    throw error;
-  } finally {
-    client.release();
-  }
-};
-var updateStepData = async (pool, jobId, stepData) => {
-  const client = await pool.connect();
-  try {
-    await client.query(
-      `UPDATE job_queue SET step_data = $2, updated_at = NOW() WHERE id = $1`,
-      [jobId, JSON.stringify(stepData)]
-    );
-  } catch (error) {
-    log(`Error updating step_data for job ${jobId}: ${error}`);
-  } finally {
-    client.release();
-  }
-};
-var MAX_TIMEOUT_MS = 365 * 24 * 60 * 60 * 1e3;
-function parseTimeoutString(timeout) {
-  const match = timeout.match(/^(\d+)(s|m|h|d)$/);
-  if (!match) {
-    throw new Error(
-      `Invalid timeout format: "${timeout}". Expected format like "10m", "1h", "24h", "7d".`
-    );
-  }
-  const value = parseInt(match[1], 10);
-  const unit = match[2];
-  let ms;
-  switch (unit) {
-    case "s":
-      ms = value * 1e3;
-      break;
-    case "m":
-      ms = value * 60 * 1e3;
-      break;
-    case "h":
-      ms = value * 60 * 60 * 1e3;
-      break;
-    case "d":
-      ms = value * 24 * 60 * 60 * 1e3;
-      break;
-    default:
-      throw new Error(`Unknown timeout unit: "${unit}"`);
-  }
-  if (!Number.isFinite(ms) || ms > MAX_TIMEOUT_MS) {
-    throw new Error(
-      `Timeout value "${timeout}" is too large. Maximum allowed is 365 days.`
-    );
-  }
-  return ms;
-}
-var createWaitpoint = async (pool, jobId, options) => {
-  const client = await pool.connect();
-  try {
-    const id = `wp_${randomUUID()}`;
-    let timeoutAt = null;
-    if (options?.timeout) {
-      const ms = parseTimeoutString(options.timeout);
-      timeoutAt = new Date(Date.now() + ms);
-    }
-    await client.query(
-      `INSERT INTO waitpoints (id, job_id, status, timeout_at, tags) VALUES ($1, $2, 'waiting', $3, $4)`,
-      [id, jobId, timeoutAt, options?.tags ?? null]
-    );
-    log(`Created waitpoint ${id} for job ${jobId}`);
-    return { id };
-  } catch (error) {
-    log(`Error creating waitpoint: ${error}`);
-    throw error;
-  } finally {
-    client.release();
-  }
-};
-var completeWaitpoint = async (pool, tokenId, data) => {
-  const client = await pool.connect();
-  try {
-    await client.query("BEGIN");
-    const wpResult = await client.query(
-      `UPDATE waitpoints SET status = 'completed', output = $2, completed_at = NOW()
-       WHERE id = $1 AND status = 'waiting'
-       RETURNING job_id`,
-      [tokenId, data != null ? JSON.stringify(data) : null]
-    );
-    if (wpResult.rows.length === 0) {
-      await client.query("ROLLBACK");
-      log(`Waitpoint ${tokenId} not found or already completed`);
-      return;
-    }
-    const jobId = wpResult.rows[0].job_id;
-    if (jobId != null) {
+      const values = [];
+      const params = [];
+      let paramIdx = 1;
+      for (const event of events) {
+        values.push(`($${paramIdx++}, $${paramIdx++}, $${paramIdx++})`);
+        params.push(
+          event.jobId,
+          event.eventType,
+          event.metadata ? JSON.stringify(event.metadata) : null
+        );
+      }
       await client.query(
-        `UPDATE job_queue
-         SET status = 'pending', wait_token_id = NULL, wait_until = NULL, updated_at = NOW()
-         WHERE id = $1 AND status = 'waiting'`,
-        [jobId]
+        `INSERT INTO job_events (job_id, event_type, metadata) VALUES ${values.join(", ")}`,
+        params
       );
+    } catch (error) {
+      log(`Error recording batch job events: ${error}`);
+    } finally {
+      client.release();
     }
-    await client.query("COMMIT");
-    log(`Completed waitpoint ${tokenId} for job ${jobId}`);
-  } catch (error) {
-    await client.query("ROLLBACK");
-    log(`Error completing waitpoint ${tokenId}: ${error}`);
-    throw error;
-  } finally {
-    client.release();
-  }
-};
-var getWaitpoint = async (pool, tokenId) => {
-  const client = await pool.connect();
-  try {
-    const result = await client.query(
-      `SELECT id, job_id AS "jobId", status, output, timeout_at AS "timeoutAt", created_at AS "createdAt", completed_at AS "completedAt", tags FROM waitpoints WHERE id = $1`,
-      [tokenId]
-    );
-    if (result.rows.length === 0) return null;
-    return result.rows[0];
-  } catch (error) {
-    log(`Error getting waitpoint ${tokenId}: ${error}`);
-    throw error;
-  } finally {
-    client.release();
   }
-};
-var expireTimedOutWaitpoints = async (pool) => {
-  const client = await pool.connect();
-  try {
-    await client.query("BEGIN");
-    const result = await client.query(
-      `UPDATE waitpoints
-       SET status = 'timed_out'
-       WHERE status = 'waiting' AND timeout_at IS NOT NULL AND timeout_at <= NOW()
-       RETURNING id, job_id`
-    );
-    for (const row of result.rows) {
-      if (row.job_id != null) {
-        await client.query(
-          `UPDATE job_queue
-           SET status = 'pending', wait_token_id = NULL, wait_until = NULL, updated_at = NOW()
-           WHERE id = $1 AND status = 'waiting'`,
-          [row.job_id]
+  // ── Cron schedules ──────────────────────────────────────────────────
+  /** Create a cron schedule and return its ID. */
+  async addCronSchedule(input) {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `INSERT INTO cron_schedules
+          (schedule_name, cron_expression, job_type, payload, max_attempts,
+           priority, timeout_ms, force_kill_on_timeout, tags, timezone,
+           allow_overlap, next_run_at)
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12)
+         RETURNING id`,
+        [
+          input.scheduleName,
+          input.cronExpression,
+          input.jobType,
+          input.payload,
+          input.maxAttempts,
+          input.priority,
+          input.timeoutMs,
+          input.forceKillOnTimeout,
+          input.tags ?? null,
+          input.timezone,
+          input.allowOverlap,
+          input.nextRunAt
+        ]
+      );
+      const id = result.rows[0].id;
+      log(`Added cron schedule ${id}: "${input.scheduleName}"`);
+      return id;
+    } catch (error) {
+      if (error?.code === "23505") {
+        throw new Error(
+          `Cron schedule with name "${input.scheduleName}" already exists`
         );
       }
+      log(`Error adding cron schedule: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-    await client.query("COMMIT");
-    const count = result.rowCount || 0;
-    if (count > 0) {
-      log(`Expired ${count} timed-out waitpoints`);
-    }
-    return count;
-  } catch (error) {
-    await client.query("ROLLBACK");
-    log(`Error expiring timed-out waitpoints: ${error}`);
-    throw error;
-  } finally {
-    client.release();
-  }
-};
-function tryExtractPool(backend) {
-  if (backend instanceof PostgresBackend) {
-    return backend.getPool();
   }
-  return null;
-}
-function buildBasicContext(backend, jobId, baseCtx) {
-  const waitError = () => new Error(
-    "Wait features (waitFor, waitUntil, createToken, waitForToken, ctx.run) are currently only supported with the PostgreSQL backend."
-  );
-  return {
-    prolong: baseCtx.prolong,
-    onTimeout: baseCtx.onTimeout,
-    run: async (_stepName, fn) => {
-      return fn();
-    },
-    waitFor: async () => {
-      throw waitError();
-    },
-    waitUntil: async () => {
-      throw waitError();
-    },
-    createToken: async () => {
-      throw waitError();
-    },
-    waitForToken: async () => {
-      throw waitError();
-    },
-    setProgress: async (percent) => {
-      if (percent < 0 || percent > 100)
-        throw new Error("Progress must be between 0 and 100");
-      await backend.updateProgress(jobId, Math.round(percent));
-    }
-  };
-}
-function validateHandlerSerializable(handler, jobType) {
-  try {
-    const handlerString = handler.toString();
-    if (handlerString.includes("this.") && !handlerString.match(/\([^)]*this[^)]*\)/)) {
-      throw new Error(
-        `Handler for job type "${jobType}" uses 'this' context which cannot be serialized. Use a regular function or avoid 'this' references when forceKillOnTimeout is enabled.`
-      );
-    }
-    if (handlerString.includes("[native code]")) {
-      throw new Error(
-        `Handler for job type "${jobType}" contains native code which cannot be serialized. Ensure your handler is a plain function when forceKillOnTimeout is enabled.`
+  /** Get a cron schedule by ID. */
+  async getCronSchedule(id) {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
+                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
+                priority, timeout_ms AS "timeoutMs",
+                force_kill_on_timeout AS "forceKillOnTimeout", tags,
+                timezone, allow_overlap AS "allowOverlap", status,
+                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
+                next_run_at AS "nextRunAt",
+                created_at AS "createdAt", updated_at AS "updatedAt"
+         FROM cron_schedules WHERE id = $1`,
+        [id]
       );
+      if (result.rows.length === 0) return null;
+      return result.rows[0];
+    } catch (error) {
+      log(`Error getting cron schedule ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
+  }
+  /** Get a cron schedule by its unique name. */
+  async getCronScheduleByName(name) {
+    const client = await this.pool.connect();
     try {
-      new Function("return " + handlerString);
-    } catch (parseError) {
-      throw new Error(
-        `Handler for job type "${jobType}" cannot be serialized: ${parseError instanceof Error ? parseError.message : String(parseError)}. When using forceKillOnTimeout, handlers must be serializable functions without closures over external variables.`
+      const result = await client.query(
+        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
+                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
+                priority, timeout_ms AS "timeoutMs",
+                force_kill_on_timeout AS "forceKillOnTimeout", tags,
+                timezone, allow_overlap AS "allowOverlap", status,
+                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
+                next_run_at AS "nextRunAt",
+                created_at AS "createdAt", updated_at AS "updatedAt"
+         FROM cron_schedules WHERE schedule_name = $1`,
+        [name]
       );
-    }
-  } catch (error) {
-    if (error instanceof Error) {
+      if (result.rows.length === 0) return null;
+      return result.rows[0];
+    } catch (error) {
+      log(`Error getting cron schedule by name "${name}": ${error}`);
       throw error;
+    } finally {
+      client.release();
     }
-    throw new Error(
-      `Failed to validate handler serialization for job type "${jobType}": ${String(error)}`
-    );
   }
-}
-async function runHandlerInWorker(handler, payload, timeoutMs, jobType) {
-  validateHandlerSerializable(handler, jobType);
-  return new Promise((resolve, reject) => {
-    const workerCode = `
-      (function() {
-        const { parentPort, workerData } = require('worker_threads');
-        const { handlerCode, payload, timeoutMs } = workerData;
-        
-        // Create an AbortController for the handler
-        const controller = new AbortController();
-        const signal = controller.signal;
-        
-        // Set up timeout
-        const timeoutId = setTimeout(() => {
-          controller.abort();
-          parentPort.postMessage({ type: 'timeout' });
-        }, timeoutMs);
-        
-        try {
-          // Execute the handler
-          // Note: This uses Function constructor which requires the handler to be serializable.
-          // The handler should be validated before reaching this point.
-          let handlerFn;
-          try {
-            // Wrap handlerCode in parentheses to ensure it's treated as an expression
-            // This handles both arrow functions and regular functions
-            const wrappedCode = handlerCode.trim().startsWith('async') || handlerCode.trim().startsWith('function')
-              ? handlerCode
-              : '(' + handlerCode + ')';
-            handlerFn = new Function('return ' + wrappedCode)();
-          } catch (parseError) {
-            clearTimeout(timeoutId);
-            parentPort.postMessage({
-              type: 'error',
-              error: {
-                message: 'Handler cannot be deserialized in worker thread. ' +
-                  'Ensure your handler is a standalone function without closures over external variables. ' +
-                  'Original error: ' + (parseError instanceof Error ? parseError.message : String(parseError)),
-                stack: parseError instanceof Error ? parseError.stack : undefined,
-                name: 'SerializationError',
-              },
-            });
-            return;
-          }
-          
-          // Ensure handlerFn is actually a function
-          if (typeof handlerFn !== 'function') {
-            clearTimeout(timeoutId);
-            parentPort.postMessage({
-              type: 'error',
-              error: {
-                message: 'Handler deserialization did not produce a function. ' +
-                  'Ensure your handler is a valid function when forceKillOnTimeout is enabled.',
-                name: 'SerializationError',
-              },
-            });
-            return;
-          }
-          
-          handlerFn(payload, signal)
-            .then(() => {
-              clearTimeout(timeoutId);
-              parentPort.postMessage({ type: 'success' });
-            })
-            .catch((error) => {
-              clearTimeout(timeoutId);
-              parentPort.postMessage({
-                type: 'error',
-                error: {
-                  message: error.message,
-                  stack: error.stack,
-                  name: error.name,
-                },
-              });
-            });
-        } catch (error) {
-          clearTimeout(timeoutId);
-          parentPort.postMessage({
-            type: 'error',
-            error: {
-              message: error.message,
-              stack: error.stack,
-              name: error.name,
-            },
-          });
-        }
-      })();
-    `;
-    const worker = new Worker(workerCode, {
-      eval: true,
-      workerData: {
-        handlerCode: handler.toString(),
-        payload,
-        timeoutMs
+  /** List cron schedules, optionally filtered by status. */
+  async listCronSchedules(status) {
+    const client = await this.pool.connect();
+    try {
+      let query = `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
+                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
+                priority, timeout_ms AS "timeoutMs",
+                force_kill_on_timeout AS "forceKillOnTimeout", tags,
+                timezone, allow_overlap AS "allowOverlap", status,
+                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
+                next_run_at AS "nextRunAt",
+                created_at AS "createdAt", updated_at AS "updatedAt"
+         FROM cron_schedules`;
+      const params = [];
+      if (status) {
+        query += ` WHERE status = $1`;
+        params.push(status);
       }
-    });
-    let resolved = false;
-    worker.on("message", (message) => {
-      if (resolved) return;
-      resolved = true;
-      if (message.type === "success") {
-        resolve();
-      } else if (message.type === "timeout") {
-        const timeoutError = new Error(
-          `Job timed out after ${timeoutMs} ms and was forcefully terminated`
-        );
-        timeoutError.failureReason = "timeout" /* Timeout */;
-        reject(timeoutError);
-      } else if (message.type === "error") {
-        const error = new Error(message.error.message);
-        error.stack = message.error.stack;
-        error.name = message.error.name;
-        reject(error);
+      query += ` ORDER BY created_at ASC`;
+      const result = await client.query(query, params);
+      return result.rows;
+    } catch (error) {
+      log(`Error listing cron schedules: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  /** Delete a cron schedule by ID. */
+  async removeCronSchedule(id) {
+    const client = await this.pool.connect();
+    try {
+      await client.query(`DELETE FROM cron_schedules WHERE id = $1`, [id]);
+      log(`Removed cron schedule ${id}`);
+    } catch (error) {
+      log(`Error removing cron schedule ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  /** Pause a cron schedule. */
+  async pauseCronSchedule(id) {
+    const client = await this.pool.connect();
+    try {
+      await client.query(
+        `UPDATE cron_schedules SET status = 'paused', updated_at = NOW() WHERE id = $1`,
+        [id]
+      );
+      log(`Paused cron schedule ${id}`);
+    } catch (error) {
+      log(`Error pausing cron schedule ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  /** Resume a paused cron schedule. */
+  async resumeCronSchedule(id) {
+    const client = await this.pool.connect();
+    try {
+      await client.query(
+        `UPDATE cron_schedules SET status = 'active', updated_at = NOW() WHERE id = $1`,
+        [id]
+      );
+      log(`Resumed cron schedule ${id}`);
+    } catch (error) {
+      log(`Error resuming cron schedule ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  /** Edit a cron schedule. */
+  async editCronSchedule(id, updates, nextRunAt) {
+    const client = await this.pool.connect();
+    try {
+      const updateFields = [];
+      const params = [];
+      let paramIdx = 1;
+      if (updates.cronExpression !== void 0) {
+        updateFields.push(`cron_expression = $${paramIdx++}`);
+        params.push(updates.cronExpression);
       }
-    });
-    worker.on("error", (error) => {
-      if (resolved) return;
-      resolved = true;
-      reject(error);
-    });
-    worker.on("exit", (code) => {
-      if (resolved) return;
-      if (code !== 0) {
-        resolved = true;
-        reject(new Error(`Worker stopped with exit code ${code}`));
+      if (updates.payload !== void 0) {
+        updateFields.push(`payload = $${paramIdx++}`);
+        params.push(updates.payload);
       }
-    });
-    setTimeout(() => {
-      if (!resolved) {
-        resolved = true;
-        worker.terminate().then(() => {
-          const timeoutError = new Error(
-            `Job timed out after ${timeoutMs} ms and was forcefully terminated`
-          );
-          timeoutError.failureReason = "timeout" /* Timeout */;
-          reject(timeoutError);
-        }).catch((err) => {
-          reject(err);
-        });
+      if (updates.maxAttempts !== void 0) {
+        updateFields.push(`max_attempts = $${paramIdx++}`);
+        params.push(updates.maxAttempts);
       }
-    }, timeoutMs + 100);
-  });
-}
-function calculateWaitUntil(duration) {
-  const now = Date.now();
-  let ms = 0;
-  if (duration.seconds) ms += duration.seconds * 1e3;
-  if (duration.minutes) ms += duration.minutes * 60 * 1e3;
-  if (duration.hours) ms += duration.hours * 60 * 60 * 1e3;
-  if (duration.days) ms += duration.days * 24 * 60 * 60 * 1e3;
-  if (duration.weeks) ms += duration.weeks * 7 * 24 * 60 * 60 * 1e3;
-  if (duration.months) ms += duration.months * 30 * 24 * 60 * 60 * 1e3;
-  if (duration.years) ms += duration.years * 365 * 24 * 60 * 60 * 1e3;
-  if (ms <= 0) {
-    throw new Error(
-      "waitFor duration must be positive. Provide at least one positive duration field."
-    );
-  }
-  return new Date(now + ms);
-}
-async function resolveCompletedWaits(pool, stepData) {
-  for (const key of Object.keys(stepData)) {
-    if (!key.startsWith("__wait_")) continue;
-    const entry = stepData[key];
-    if (!entry || typeof entry !== "object" || entry.completed) continue;
-    if (entry.type === "duration" || entry.type === "date") {
-      stepData[key] = { ...entry, completed: true };
-    } else if (entry.type === "token" && entry.tokenId) {
-      const wp = await getWaitpoint(pool, entry.tokenId);
-      if (wp && wp.status === "completed") {
-        stepData[key] = {
-          ...entry,
-          completed: true,
-          result: { ok: true, output: wp.output }
-        };
-      } else if (wp && wp.status === "timed_out") {
-        stepData[key] = {
-          ...entry,
-          completed: true,
-          result: { ok: false, error: "Token timed out" }
-        };
+      if (updates.priority !== void 0) {
+        updateFields.push(`priority = $${paramIdx++}`);
+        params.push(updates.priority);
       }
-    }
-  }
-}
-function buildWaitContext(backend, pool, jobId, stepData, baseCtx) {
-  let waitCounter = 0;
-  const ctx = {
-    prolong: baseCtx.prolong,
-    onTimeout: baseCtx.onTimeout,
-    run: async (stepName, fn) => {
-      const cached = stepData[stepName];
-      if (cached && typeof cached === "object" && cached.__completed) {
-        log(`Step "${stepName}" replayed from cache for job ${jobId}`);
-        return cached.result;
+      if (updates.timeoutMs !== void 0) {
+        updateFields.push(`timeout_ms = $${paramIdx++}`);
+        params.push(updates.timeoutMs);
       }
-      const result = await fn();
-      stepData[stepName] = { __completed: true, result };
-      await updateStepData(pool, jobId, stepData);
-      return result;
-    },
-    waitFor: async (duration) => {
-      const waitKey = `__wait_${waitCounter++}`;
-      const cached = stepData[waitKey];
-      if (cached && typeof cached === "object" && cached.completed) {
-        log(`Wait "${waitKey}" already completed for job ${jobId}, skipping`);
-        return;
+      if (updates.forceKillOnTimeout !== void 0) {
+        updateFields.push(`force_kill_on_timeout = $${paramIdx++}`);
+        params.push(updates.forceKillOnTimeout);
       }
-      const waitUntilDate = calculateWaitUntil(duration);
-      stepData[waitKey] = { type: "duration", completed: false };
-      throw new WaitSignal("duration", waitUntilDate, void 0, stepData);
-    },
-    waitUntil: async (date) => {
-      const waitKey = `__wait_${waitCounter++}`;
-      const cached = stepData[waitKey];
-      if (cached && typeof cached === "object" && cached.completed) {
-        log(`Wait "${waitKey}" already completed for job ${jobId}, skipping`);
-        return;
+      if (updates.tags !== void 0) {
+        updateFields.push(`tags = $${paramIdx++}`);
+        params.push(updates.tags);
       }
-      stepData[waitKey] = { type: "date", completed: false };
-      throw new WaitSignal("date", date, void 0, stepData);
-    },
-    createToken: async (options) => {
-      const token = await createWaitpoint(pool, jobId, options);
-      return token;
-    },
-    waitForToken: async (tokenId) => {
-      const waitKey = `__wait_${waitCounter++}`;
-      const cached = stepData[waitKey];
-      if (cached && typeof cached === "object" && cached.completed) {
-        log(
-          `Token wait "${waitKey}" already completed for job ${jobId}, returning cached result`
-        );
-        return cached.result;
+      if (updates.timezone !== void 0) {
+        updateFields.push(`timezone = $${paramIdx++}`);
+        params.push(updates.timezone);
       }
-      const wp = await getWaitpoint(pool, tokenId);
-      if (wp && wp.status === "completed") {
-        const result = {
-          ok: true,
-          output: wp.output
-        };
-        stepData[waitKey] = {
-          type: "token",
-          tokenId,
-          completed: true,
-          result
-        };
-        await updateStepData(pool, jobId, stepData);
-        return result;
+      if (updates.allowOverlap !== void 0) {
+        updateFields.push(`allow_overlap = $${paramIdx++}`);
+        params.push(updates.allowOverlap);
       }
-      if (wp && wp.status === "timed_out") {
-        const result = {
-          ok: false,
-          error: "Token timed out"
-        };
-        stepData[waitKey] = {
-          type: "token",
-          tokenId,
-          completed: true,
-          result
-        };
-        await updateStepData(pool, jobId, stepData);
-        return result;
+      if (nextRunAt !== void 0) {
+        updateFields.push(`next_run_at = $${paramIdx++}`);
+        params.push(nextRunAt);
+      }
+      if (updateFields.length === 0) {
+        log(`No fields to update for cron schedule ${id}`);
+        return;
       }
-      stepData[waitKey] = { type: "token", tokenId, completed: false };
-      throw new WaitSignal("token", void 0, tokenId, stepData);
-    },
-    setProgress: async (percent) => {
-      if (percent < 0 || percent > 100)
-        throw new Error("Progress must be between 0 and 100");
-      await backend.updateProgress(jobId, Math.round(percent));
+      updateFields.push(`updated_at = NOW()`);
+      params.push(id);
+      const query = `UPDATE cron_schedules SET ${updateFields.join(", ")} WHERE id = $${paramIdx}`;
+      await client.query(query, params);
+      log(`Edited cron schedule ${id}`);
+    } catch (error) {
+      log(`Error editing cron schedule ${id}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-  };
-  return ctx;
-}
-async function processJobWithHandlers(backend, job, jobHandlers) {
-  const handler = jobHandlers[job.jobType];
-  if (!handler) {
-    await backend.setPendingReasonForUnpickedJobs(
-      `No handler registered for job type: ${job.jobType}`,
-      job.jobType
-    );
-    await backend.failJob(
-      job.id,
-      new Error(`No handler registered for job type: ${job.jobType}`),
-      "no_handler" /* NoHandler */
-    );
-    return;
-  }
-  const stepData = { ...job.stepData || {} };
-  const pool = tryExtractPool(backend);
-  const hasStepHistory = Object.keys(stepData).some(
-    (k) => k.startsWith("__wait_")
-  );
-  if (hasStepHistory && pool) {
-    await resolveCompletedWaits(pool, stepData);
-    await updateStepData(pool, job.id, stepData);
   }
-  const timeoutMs = job.timeoutMs ?? void 0;
-  const forceKillOnTimeout = job.forceKillOnTimeout ?? false;
-  let timeoutId;
-  const controller = new AbortController();
-  try {
-    if (forceKillOnTimeout && timeoutMs && timeoutMs > 0) {
-      await runHandlerInWorker(handler, job.payload, timeoutMs, job.jobType);
-    } else {
-      let onTimeoutCallback;
-      let timeoutReject;
-      const armTimeout = (ms) => {
-        if (timeoutId) clearTimeout(timeoutId);
-        timeoutId = setTimeout(() => {
-          if (onTimeoutCallback) {
-            try {
-              const extension = onTimeoutCallback();
-              if (typeof extension === "number" && extension > 0) {
-                backend.prolongJob(job.id).catch(() => {
-                });
-                armTimeout(extension);
-                return;
-              }
-            } catch (callbackError) {
-              log(
-                `onTimeout callback threw for job ${job.id}: ${callbackError}`
-              );
-            }
-          }
-          controller.abort();
-          const timeoutError = new Error(`Job timed out after ${ms} ms`);
-          timeoutError.failureReason = "timeout" /* Timeout */;
-          if (timeoutReject) {
-            timeoutReject(timeoutError);
-          }
-        }, ms);
-      };
-      const hasTimeout = timeoutMs != null && timeoutMs > 0;
-      const baseCtx = hasTimeout ? {
-        prolong: (ms) => {
-          const duration = ms ?? timeoutMs;
-          if (duration != null && duration > 0) {
-            armTimeout(duration);
-            backend.prolongJob(job.id).catch(() => {
-            });
-          }
-        },
-        onTimeout: (callback) => {
-          onTimeoutCallback = callback;
-        }
-      } : {
-        prolong: () => {
-          log("prolong() called but ignored: job has no timeout set");
-        },
-        onTimeout: () => {
-          log("onTimeout() called but ignored: job has no timeout set");
-        }
-      };
-      const ctx = pool ? buildWaitContext(backend, pool, job.id, stepData, baseCtx) : buildBasicContext(backend, job.id, baseCtx);
-      if (forceKillOnTimeout && !hasTimeout) {
-        log(
-          `forceKillOnTimeout is set but no timeoutMs for job ${job.id}, running without force kill`
-        );
-      }
-      const jobPromise = handler(job.payload, controller.signal, ctx);
-      if (hasTimeout) {
-        await Promise.race([
-          jobPromise,
-          new Promise((_, reject) => {
-            timeoutReject = reject;
-            armTimeout(timeoutMs);
-          })
-        ]);
-      } else {
-        await jobPromise;
+  /**
+   * Atomically fetch all active cron schedules whose nextRunAt <= NOW().
+   * Uses FOR UPDATE SKIP LOCKED to prevent duplicate enqueuing across workers.
+   */
+  async getDueCronSchedules() {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `SELECT id, schedule_name AS "scheduleName", cron_expression AS "cronExpression",
+                job_type AS "jobType", payload, max_attempts AS "maxAttempts",
+                priority, timeout_ms AS "timeoutMs",
+                force_kill_on_timeout AS "forceKillOnTimeout", tags,
+                timezone, allow_overlap AS "allowOverlap", status,
+                last_enqueued_at AS "lastEnqueuedAt", last_job_id AS "lastJobId",
+                next_run_at AS "nextRunAt",
+                created_at AS "createdAt", updated_at AS "updatedAt"
+         FROM cron_schedules
+         WHERE status = 'active'
+           AND next_run_at IS NOT NULL
+           AND next_run_at <= NOW()
+         ORDER BY next_run_at ASC
+         FOR UPDATE SKIP LOCKED`
+      );
+      log(`Found ${result.rows.length} due cron schedules`);
+      return result.rows;
+    } catch (error) {
+      if (error?.code === "42P01") {
+        log("cron_schedules table does not exist, skipping cron enqueue");
+        return [];
       }
+      log(`Error getting due cron schedules: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-    if (timeoutId) clearTimeout(timeoutId);
-    await backend.completeJob(job.id);
-  } catch (error) {
-    if (timeoutId) clearTimeout(timeoutId);
-    if (error instanceof WaitSignal) {
-      if (!pool) {
-        await backend.failJob(
-          job.id,
-          new Error(
-            "WaitSignal received but wait features require the PostgreSQL backend."
-          ),
-          "handler_error" /* HandlerError */
-        );
-        return;
-      }
+  }
+  /**
+   * Update a cron schedule after a job has been enqueued.
+   * Sets lastEnqueuedAt, lastJobId, and advances nextRunAt.
+   */
+  async updateCronScheduleAfterEnqueue(id, lastEnqueuedAt, lastJobId, nextRunAt) {
+    const client = await this.pool.connect();
+    try {
+      await client.query(
+        `UPDATE cron_schedules
+         SET last_enqueued_at = $2,
+             last_job_id = $3,
+             next_run_at = $4,
+             updated_at = NOW()
+         WHERE id = $1`,
+        [id, lastEnqueuedAt, lastJobId, nextRunAt]
+      );
       log(
-        `Job ${job.id} entering wait: type=${error.type}, waitUntil=${error.waitUntil?.toISOString() ?? "none"}, tokenId=${error.tokenId ?? "none"}`
+        `Updated cron schedule ${id}: lastJobId=${lastJobId}, nextRunAt=${nextRunAt?.toISOString() ?? "null"}`
       );
-      await waitJob(pool, job.id, {
-        waitUntil: error.waitUntil,
-        waitTokenId: error.tokenId,
-        stepData: error.stepData
-      });
-      return;
-    }
-    console.error(`Error processing job ${job.id}:`, error);
-    let failureReason = "handler_error" /* HandlerError */;
-    if (error && typeof error === "object" && "failureReason" in error && error.failureReason === "timeout" /* Timeout */) {
-      failureReason = "timeout" /* Timeout */;
+    } catch (error) {
+      log(`Error updating cron schedule ${id} after enqueue: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-    await backend.failJob(
-      job.id,
-      error instanceof Error ? error : new Error(String(error)),
-      failureReason
-    );
-  }
-}
-async function processBatchWithHandlers(backend, workerId, batchSize, jobType, jobHandlers, concurrency, onError) {
-  const jobs = await backend.getNextBatch(
-    workerId,
-    batchSize,
-    jobType
-  );
-  if (!concurrency || concurrency >= jobs.length) {
-    await Promise.all(
-      jobs.map((job) => processJobWithHandlers(backend, job, jobHandlers))
-    );
-    return jobs.length;
-  }
-  let idx = 0;
-  let running = 0;
-  let finished = 0;
-  return new Promise((resolve, reject) => {
-    const next = () => {
-      if (finished === jobs.length) return resolve(jobs.length);
-      while (running < concurrency && idx < jobs.length) {
-        const job = jobs[idx++];
-        running++;
-        processJobWithHandlers(backend, job, jobHandlers).then(() => {
-          running--;
-          finished++;
-          next();
-        }).catch((err) => {
-          running--;
-          finished++;
-          if (onError) {
-            onError(err instanceof Error ? err : new Error(String(err)));
-          }
-          next();
-        });
-      }
-    };
-    next();
-  });
-}
-var createProcessor = (backend, handlers, options = {}, onBeforeBatch) => {
-  const {
-    workerId = `worker-${Math.random().toString(36).substring(2, 9)}`,
-    batchSize = 10,
-    pollInterval = 5e3,
-    onError = (error) => console.error("Job processor error:", error),
-    jobType,
-    concurrency = 3
-  } = options;
-  let running = false;
-  let intervalId = null;
-  let currentBatchPromise = null;
-  setLogContext(options.verbose ?? false);
-  const processJobs = async () => {
-    if (!running) return 0;
-    if (onBeforeBatch) {
-      try {
-        await onBeforeBatch();
-      } catch (hookError) {
-        log(`onBeforeBatch hook error: ${hookError}`);
-        if (onError) {
-          onError(
-            hookError instanceof Error ? hookError : new Error(String(hookError))
-          );
-        }
+  }
+  // ── Wait / step-data support ────────────────────────────────────────
+  /**
+   * Transition a job from 'processing' to 'waiting' status.
+   * Persists step data so the handler can resume from where it left off.
+   *
+   * @param jobId - The job to pause.
+   * @param options - Wait configuration including optional waitUntil date, token ID, and step data.
+   */
+  async waitJob(jobId, options) {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `
+        UPDATE job_queue
+        SET status = 'waiting',
+            wait_until = $2,
+            wait_token_id = $3,
+            step_data = $4,
+            locked_at = NULL,
+            locked_by = NULL,
+            updated_at = NOW()
+        WHERE id = $1 AND status = 'processing'
+      `,
+        [
+          jobId,
+          options.waitUntil ?? null,
+          options.waitTokenId ?? null,
+          JSON.stringify(options.stepData)
+        ]
+      );
+      if (result.rowCount === 0) {
+        log(
+          `Job ${jobId} could not be set to waiting (may have been reclaimed or is no longer processing)`
+        );
+        return;
       }
+      await this.recordJobEvent(jobId, "waiting" /* Waiting */, {
+        waitUntil: options.waitUntil?.toISOString() ?? null,
+        waitTokenId: options.waitTokenId ?? null
+      });
+      log(`Job ${jobId} set to waiting`);
+    } catch (error) {
+      log(`Error setting job ${jobId} to waiting: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-    log(
-      `Processing jobs with workerId: ${workerId}${jobType ? ` and jobType: ${Array.isArray(jobType) ? jobType.join(",") : jobType}` : ""}`
-    );
+  }
+  /**
+   * Persist step data for a job. Called after each ctx.run() step completes.
+   * Best-effort: does not throw to avoid killing the running handler.
+   *
+   * @param jobId - The job to update.
+   * @param stepData - The step data to persist.
+   */
+  async updateStepData(jobId, stepData) {
+    const client = await this.pool.connect();
     try {
-      const processed = await processBatchWithHandlers(
-        backend,
-        workerId,
-        batchSize,
-        jobType,
-        handlers,
-        concurrency,
-        onError
+      await client.query(
+        `UPDATE job_queue SET step_data = $2, updated_at = NOW() WHERE id = $1`,
+        [jobId, JSON.stringify(stepData)]
       );
-      return processed;
     } catch (error) {
-      onError(error instanceof Error ? error : new Error(String(error)));
+      log(`Error updating step_data for job ${jobId}: ${error}`);
+    } finally {
+      client.release();
     }
-    return 0;
-  };
-  return {
-    /**
-     * Start the job processor in the background.
-     * - This will run periodically (every pollInterval milliseconds or 5 seconds if not provided) and process jobs as they become available.
-     * - You have to call the stop method to stop the processor.
-     */
-    startInBackground: () => {
-      if (running) return;
-      log(`Starting job processor with workerId: ${workerId}`);
-      running = true;
-      const scheduleNext = (immediate) => {
-        if (!running) return;
-        if (immediate) {
-          intervalId = setTimeout(loop, 0);
-        } else {
-          intervalId = setTimeout(loop, pollInterval);
-        }
-      };
-      const loop = async () => {
-        if (!running) return;
-        currentBatchPromise = processJobs();
-        const processed = await currentBatchPromise;
-        currentBatchPromise = null;
-        scheduleNext(processed === batchSize);
-      };
-      loop();
-    },
-    /**
-     * Stop the job processor that runs in the background.
-     * Does not wait for in-flight jobs.
-     */
-    stop: () => {
-      log(`Stopping job processor with workerId: ${workerId}`);
-      running = false;
-      if (intervalId) {
-        clearTimeout(intervalId);
-        intervalId = null;
-      }
-    },
-    /**
-     * Stop the job processor and wait for all in-flight jobs to complete.
-     * Useful for graceful shutdown (e.g., SIGTERM handling).
-     */
-    stopAndDrain: async (drainTimeoutMs = 3e4) => {
-      log(`Stopping and draining job processor with workerId: ${workerId}`);
-      running = false;
-      if (intervalId) {
-        clearTimeout(intervalId);
-        intervalId = null;
-      }
-      if (currentBatchPromise) {
-        await Promise.race([
-          currentBatchPromise.catch(() => {
-          }),
-          new Promise((resolve) => setTimeout(resolve, drainTimeoutMs))
-        ]);
-        currentBatchPromise = null;
-      }
-      log(`Job processor ${workerId} drained`);
-    },
-    /**
-     * Start the job processor synchronously.
-     * - This will process all jobs immediately and then stop.
-     * - The pollInterval is ignored.
-     */
-    start: async () => {
-      log(`Starting job processor with workerId: ${workerId}`);
-      running = true;
-      const processed = await processJobs();
-      running = false;
-      return processed;
-    },
-    isRunning: () => running
-  };
-};
-function loadPemOrFile(value) {
-  if (!value) return void 0;
-  if (value.startsWith("file://")) {
-    const filePath = value.slice(7);
-    return fs.readFileSync(filePath, "utf8");
   }
-  return value;
-}
-var createPool = (config) => {
-  let searchPath;
-  let ssl = void 0;
-  let customCA;
-  let sslmode;
-  if (config.connectionString) {
+  /**
+   * Create a waitpoint token in the database.
+   *
+   * @param jobId - The job ID to associate with the token (null if created outside a handler).
+   * @param options - Optional timeout string (e.g. '10m', '1h') and tags.
+   * @returns The created waitpoint with its unique ID.
+   */
+  async createWaitpoint(jobId, options) {
+    const client = await this.pool.connect();
     try {
-      const url = new URL(config.connectionString);
-      searchPath = url.searchParams.get("search_path") || void 0;
-      sslmode = url.searchParams.get("sslmode") || void 0;
-      if (sslmode === "no-verify") {
-        ssl = { rejectUnauthorized: false };
+      const id = `wp_${randomUUID()}`;
+      let timeoutAt = null;
+      if (options?.timeout) {
+        const ms = parseTimeoutString(options.timeout);
+        timeoutAt = new Date(Date.now() + ms);
       }
-    } catch (e) {
-      const parsed = parse(config.connectionString);
-      if (parsed.options) {
-        const match = parsed.options.match(/search_path=([^\s]+)/);
-        if (match) {
-          searchPath = match[1];
-        }
+      await client.query(
+        `INSERT INTO waitpoints (id, job_id, status, timeout_at, tags) VALUES ($1, $2, 'waiting', $3, $4)`,
+        [id, jobId, timeoutAt, options?.tags ?? null]
+      );
+      log(`Created waitpoint ${id} for job ${jobId}`);
+      return { id };
+    } catch (error) {
+      log(`Error creating waitpoint: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
+  }
+  /**
+   * Complete a waitpoint token and move the associated job back to 'pending'.
+   *
+   * @param tokenId - The waitpoint token ID to complete.
+   * @param data - Optional data to pass to the waiting handler.
+   */
+  async completeWaitpoint(tokenId, data) {
+    const client = await this.pool.connect();
+    try {
+      await client.query("BEGIN");
+      const wpResult = await client.query(
+        `UPDATE waitpoints SET status = 'completed', output = $2, completed_at = NOW()
+         WHERE id = $1 AND status = 'waiting'
+         RETURNING job_id`,
+        [tokenId, data != null ? JSON.stringify(data) : null]
+      );
+      if (wpResult.rows.length === 0) {
+        await client.query("ROLLBACK");
+        log(`Waitpoint ${tokenId} not found or already completed`);
+        return;
       }
-      sslmode = typeof parsed.sslmode === "string" ? parsed.sslmode : void 0;
-      if (sslmode === "no-verify") {
-        ssl = { rejectUnauthorized: false };
+      const jobId = wpResult.rows[0].job_id;
+      if (jobId != null) {
+        await client.query(
+          `UPDATE job_queue
+           SET status = 'pending', wait_token_id = NULL, wait_until = NULL, updated_at = NOW()
+           WHERE id = $1 AND status = 'waiting'`,
+          [jobId]
+        );
       }
+      await client.query("COMMIT");
+      log(`Completed waitpoint ${tokenId} for job ${jobId}`);
+    } catch (error) {
+      await client.query("ROLLBACK");
+      log(`Error completing waitpoint ${tokenId}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
   }
-  if (config.ssl) {
-    if (typeof config.ssl.ca === "string") {
-      customCA = config.ssl.ca;
-    } else if (typeof process.env.PGSSLROOTCERT === "string") {
-      customCA = process.env.PGSSLROOTCERT;
-    } else {
-      customCA = void 0;
+  /**
+   * Retrieve a waitpoint token by its ID.
+   *
+   * @param tokenId - The waitpoint token ID to look up.
+   * @returns The waitpoint record, or null if not found.
+   */
+  async getWaitpoint(tokenId) {
+    const client = await this.pool.connect();
+    try {
+      const result = await client.query(
+        `SELECT id, job_id AS "jobId", status, output, timeout_at AS "timeoutAt", created_at AS "createdAt", completed_at AS "completedAt", tags FROM waitpoints WHERE id = $1`,
+        [tokenId]
+      );
+      if (result.rows.length === 0) return null;
+      return result.rows[0];
+    } catch (error) {
+      log(`Error getting waitpoint ${tokenId}: ${error}`);
+      throw error;
+    } finally {
+      client.release();
     }
-    const caValue = typeof customCA === "string" ? loadPemOrFile(customCA) : void 0;
-    ssl = {
-      ...ssl,
-      ...caValue ? { ca: caValue } : {},
-      cert: loadPemOrFile(
-        typeof config.ssl.cert === "string" ? config.ssl.cert : process.env.PGSSLCERT
-      ),
-      key: loadPemOrFile(
-        typeof config.ssl.key === "string" ? config.ssl.key : process.env.PGSSLKEY
-      ),
-      rejectUnauthorized: config.ssl.rejectUnauthorized !== void 0 ? config.ssl.rejectUnauthorized : true
-    };
   }
-  if (sslmode && customCA) {
-    const warning = `
-
-\x1B[33m**************************************************
-\u26A0\uFE0F  WARNING: SSL CONFIGURATION ISSUE
-**************************************************
-Both sslmode ('${sslmode}') is set in the connection string
-and a custom CA is provided (via config.ssl.ca or PGSSLROOTCERT).
-This combination may cause connection failures or unexpected behavior.
-
-Recommended: Remove sslmode from the connection string when using a custom CA.
-**************************************************\x1B[0m
-`;
-    console.warn(warning);
+  /**
+   * Expire timed-out waitpoint tokens and move their associated jobs back to 'pending'.
+   *
+   * @returns The number of tokens that were expired.
+   */
+  async expireTimedOutWaitpoints() {
+    const client = await this.pool.connect();
+    try {
+      await client.query("BEGIN");
+      const result = await client.query(
+        `UPDATE waitpoints
+         SET status = 'timed_out'
+         WHERE status = 'waiting' AND timeout_at IS NOT NULL AND timeout_at <= NOW()
+         RETURNING id, job_id`
+      );
+      for (const row of result.rows) {
+        if (row.job_id != null) {
+          await client.query(
+            `UPDATE job_queue
+             SET status = 'pending', wait_token_id = NULL, wait_until = NULL, updated_at = NOW()
+             WHERE id = $1 AND status = 'waiting'`,
+            [row.job_id]
+          );
+        }
+      }
+      await client.query("COMMIT");
+      const count = result.rowCount || 0;
+      if (count > 0) {
+        log(`Expired ${count} timed-out waitpoints`);
+      }
+      return count;
+    } catch (error) {
+      await client.query("ROLLBACK");
+      log(`Error expiring timed-out waitpoints: ${error}`);
+      throw error;
+    } finally {
+      client.release();
+    }
   }
-  const pool = new Pool({
-    ...config,
-    ...ssl ? { ssl } : {}
-  });
-  if (searchPath) {
-    pool.on("connect", (client) => {
-      client.query(`SET search_path TO ${searchPath}`);
-    });
+  // ── Internal helpers ──────────────────────────────────────────────────
+  async setPendingReasonForUnpickedJobs(reason, jobType) {
+    const client = await this.pool.connect();
+    try {
+      let jobTypeFilter = "";
+      const params = [reason];
+      if (jobType) {
+        if (Array.isArray(jobType)) {
+          jobTypeFilter = ` AND job_type = ANY($2)`;
+          params.push(jobType);
+        } else {
+          jobTypeFilter = ` AND job_type = $2`;
+          params.push(jobType);
+        }
+      }
+      await client.query(
+        `UPDATE job_queue SET pending_reason = $1 WHERE status = 'pending'${jobTypeFilter}`,
+        params
+      );
+    } finally {
+      client.release();
+    }
   }
-  return pool;
 };
 
 // src/backends/redis-scripts.ts
@@ -2278,7 +2312,10 @@ redis.call('HMSET', jobKey,
   'lastFailedAt', 'null',
   'lastCancelledAt', 'null',
   'tags', tagsJson,
-  'idempotencyKey', idempotencyKey
+  'idempotencyKey', idempotencyKey,
+  'waitUntil', 'null',
+  'waitTokenId', 'null',
+  'stepData', 'null'
 )
 
 -- Status index
@@ -2361,7 +2398,25 @@ for _, jobId in ipairs(retries) do
   redis.call('ZREM', prefix .. 'retry', jobId)
 end
 
--- 3. Parse job type filter
+-- 3. Move ready waiting jobs (time-based, no token) into queue
+local waitingJobs = redis.call('ZRANGEBYSCORE', prefix .. 'waiting', '-inf', nowMs, 'LIMIT', 0, 200)
+for _, jobId in ipairs(waitingJobs) do
+  local jk = prefix .. 'job:' .. jobId
+  local status = redis.call('HGET', jk, 'status')
+  local waitTokenId = redis.call('HGET', jk, 'waitTokenId')
+  if status == 'waiting' and (waitTokenId == false or waitTokenId == 'null') then
+    local pri = tonumber(redis.call('HGET', jk, 'priority') or '0')
+    local ca = tonumber(redis.call('HGET', jk, 'createdAt'))
+    local score = pri * ${SCORE_RANGE} + (${SCORE_RANGE} - ca)
+    redis.call('ZADD', prefix .. 'queue', score, jobId)
+    redis.call('SREM', prefix .. 'status:waiting', jobId)
+    redis.call('SADD', prefix .. 'status:pending', jobId)
+    redis.call('HMSET', jk, 'status', 'pending', 'waitUntil', 'null')
+  end
+  redis.call('ZREM', prefix .. 'waiting', jobId)
+end
+
+-- 4. Parse job type filter
 local filterTypes = nil
 if jobTypeFilter ~= "null" then
   -- Could be a JSON array or a plain string
@@ -2374,7 +2429,7 @@ if jobTypeFilter ~= "null" then
   end
 end
 
--- 4. Pop candidates from queue (highest score first)
+-- 5. Pop candidates from queue (highest score first)
 -- We pop more than batchSize because some may be filtered out
 local popCount = batchSize * 3
 local candidates = redis.call('ZPOPMAX', prefix .. 'queue', popCount)
@@ -2458,7 +2513,10 @@ local jk = prefix .. 'job:' .. jobId
 redis.call('HMSET', jk,
   'status', 'completed',
   'updatedAt', nowMs,
-  'completedAt', nowMs
+  'completedAt', nowMs,
+  'stepData', 'null',
+  'waitUntil', 'null',
+  'waitTokenId', 'null'
 )
 redis.call('SREM', prefix .. 'status:processing', jobId)
 redis.call('SADD', prefix .. 'status:completed', jobId)
@@ -2517,6 +2575,7 @@ local nowMs = tonumber(ARGV[2])
 local jk = prefix .. 'job:' .. jobId
 
 local oldStatus = redis.call('HGET', jk, 'status')
+if oldStatus ~= 'failed' and oldStatus ~= 'processing' then return 0 end
 
 redis.call('HMSET', jk,
   'status', 'pending',
@@ -2528,9 +2587,7 @@ redis.call('HMSET', jk,
 )
 
 -- Remove from old status, add to pending
-if oldStatus then
-  redis.call('SREM', prefix .. 'status:' .. oldStatus, jobId)
-end
+redis.call('SREM', prefix .. 'status:' .. oldStatus, jobId)
 redis.call('SADD', prefix .. 'status:pending', jobId)
 
 -- Remove from retry sorted set if present
@@ -2551,18 +2608,21 @@ local nowMs = ARGV[2]
 local jk = prefix .. 'job:' .. jobId
 
 local status = redis.call('HGET', jk, 'status')
-if status ~= 'pending' then return 0 end
+if status ~= 'pending' and status ~= 'waiting' then return 0 end
 
 redis.call('HMSET', jk,
   'status', 'cancelled',
   'updatedAt', nowMs,
-  'lastCancelledAt', nowMs
+  'lastCancelledAt', nowMs,
+  'waitUntil', 'null',
+  'waitTokenId', 'null'
 )
-redis.call('SREM', prefix .. 'status:pending', jobId)
+redis.call('SREM', prefix .. 'status:' .. status, jobId)
 redis.call('SADD', prefix .. 'status:cancelled', jobId)
--- Remove from queue / delayed
+-- Remove from queue / delayed / waiting
 redis.call('ZREM', prefix .. 'queue', jobId)
 redis.call('ZREM', prefix .. 'delayed', jobId)
+redis.call('ZREM', prefix .. 'waiting', jobId)
 
 return 1
 `;
@@ -2630,18 +2690,16 @@ end
 
 return count
 `;
-var CLEANUP_OLD_JOBS_SCRIPT = `
+var CLEANUP_OLD_JOBS_BATCH_SCRIPT = `
 local prefix = KEYS[1]
 local cutoffMs = tonumber(ARGV[1])
-
-local completed = redis.call('SMEMBERS', prefix .. 'status:completed')
 local count = 0
 
-for _, jobId in ipairs(completed) do
+for i = 2, #ARGV do
+  local jobId = ARGV[i]
   local jk = prefix .. 'job:' .. jobId
   local updatedAt = tonumber(redis.call('HGET', jk, 'updatedAt'))
   if updatedAt and updatedAt < cutoffMs then
-    -- Remove all indexes
     local jobType = redis.call('HGET', jk, 'jobType')
     local tagsJson = redis.call('HGET', jk, 'tags')
     local idempotencyKey = redis.call('HGET', jk, 'idempotencyKey')
@@ -2664,7 +2722,6 @@ for _, jobId in ipairs(completed) do
     if idempotencyKey and idempotencyKey ~= 'null' then
       redis.call('DEL', prefix .. 'idempotency:' .. idempotencyKey)
     end
-    -- Delete events
     redis.call('DEL', prefix .. 'events:' .. jobId)
 
     count = count + 1
@@ -2673,8 +2730,158 @@ end
 
 return count
 `;
+var WAIT_JOB_SCRIPT = `
+local prefix = KEYS[1]
+local jobId = ARGV[1]
+local waitUntilMs = ARGV[2]
+local waitTokenId = ARGV[3]
+local stepDataJson = ARGV[4]
+local nowMs = ARGV[5]
+local jk = prefix .. 'job:' .. jobId
+
+local status = redis.call('HGET', jk, 'status')
+if status ~= 'processing' then return 0 end
+
+redis.call('HMSET', jk,
+  'status', 'waiting',
+  'waitUntil', waitUntilMs,
+  'waitTokenId', waitTokenId,
+  'stepData', stepDataJson,
+  'lockedAt', 'null',
+  'lockedBy', 'null',
+  'updatedAt', nowMs
+)
+redis.call('SREM', prefix .. 'status:processing', jobId)
+redis.call('SADD', prefix .. 'status:waiting', jobId)
+
+-- Add to waiting sorted set if time-based wait
+if waitUntilMs ~= 'null' then
+  redis.call('ZADD', prefix .. 'waiting', tonumber(waitUntilMs), jobId)
+end
+
+return 1
+`;
+var COMPLETE_WAITPOINT_SCRIPT = `
+local prefix = KEYS[1]
+local tokenId = ARGV[1]
+local outputJson = ARGV[2]
+local nowMs = ARGV[3]
+local wpk = prefix .. 'waitpoint:' .. tokenId
+
+local wpStatus = redis.call('HGET', wpk, 'status')
+if not wpStatus or wpStatus ~= 'waiting' then return 0 end
+
+redis.call('HMSET', wpk,
+  'status', 'completed',
+  'output', outputJson,
+  'completedAt', nowMs
+)
+
+-- Move associated job back to pending
+local jobId = redis.call('HGET', wpk, 'jobId')
+if jobId and jobId ~= 'null' then
+  local jk = prefix .. 'job:' .. jobId
+  local jobStatus = redis.call('HGET', jk, 'status')
+  if jobStatus == 'waiting' then
+    redis.call('HMSET', jk,
+      'status', 'pending',
+      'waitTokenId', 'null',
+      'waitUntil', 'null',
+      'updatedAt', nowMs
+    )
+    redis.call('SREM', prefix .. 'status:waiting', jobId)
+    redis.call('SADD', prefix .. 'status:pending', jobId)
+    redis.call('ZREM', prefix .. 'waiting', jobId)
+
+    -- Re-add to queue
+    local priority = tonumber(redis.call('HGET', jk, 'priority') or '0')
+    local createdAt = tonumber(redis.call('HGET', jk, 'createdAt'))
+    local score = priority * ${SCORE_RANGE} + (${SCORE_RANGE} - createdAt)
+    redis.call('ZADD', prefix .. 'queue', score, jobId)
+  end
+end
+
+return 1
+`;
+var EXPIRE_TIMED_OUT_WAITPOINTS_SCRIPT = `
+local prefix = KEYS[1]
+local nowMs = tonumber(ARGV[1])
+
+local expiredIds = redis.call('ZRANGEBYSCORE', prefix .. 'waitpoint_timeout', '-inf', nowMs)
+local count = 0
+
+for _, tokenId in ipairs(expiredIds) do
+  local wpk = prefix .. 'waitpoint:' .. tokenId
+  local wpStatus = redis.call('HGET', wpk, 'status')
+  if wpStatus == 'waiting' then
+    redis.call('HMSET', wpk,
+      'status', 'timed_out'
+    )
+
+    -- Move associated job back to pending
+    local jobId = redis.call('HGET', wpk, 'jobId')
+    if jobId and jobId ~= 'null' then
+      local jk = prefix .. 'job:' .. jobId
+      local jobStatus = redis.call('HGET', jk, 'status')
+      if jobStatus == 'waiting' then
+        redis.call('HMSET', jk,
+          'status', 'pending',
+          'waitTokenId', 'null',
+          'waitUntil', 'null',
+          'updatedAt', nowMs
+        )
+        redis.call('SREM', prefix .. 'status:waiting', jobId)
+        redis.call('SADD', prefix .. 'status:pending', jobId)
+        redis.call('ZREM', prefix .. 'waiting', jobId)
+
+        local priority = tonumber(redis.call('HGET', jk, 'priority') or '0')
+        local createdAt = tonumber(redis.call('HGET', jk, 'createdAt'))
+        local score = priority * ${SCORE_RANGE} + (${SCORE_RANGE} - createdAt)
+        redis.call('ZADD', prefix .. 'queue', score, jobId)
+      end
+    end
+
+    count = count + 1
+  end
+  redis.call('ZREM', prefix .. 'waitpoint_timeout', tokenId)
+end
 
-// src/backends/redis.ts
+return count
+`;
+var MAX_TIMEOUT_MS2 = 365 * 24 * 60 * 60 * 1e3;
+function parseTimeoutString2(timeout) {
+  const match = timeout.match(/^(\d+)(s|m|h|d)$/);
+  if (!match) {
+    throw new Error(
+      `Invalid timeout format: "${timeout}". Expected format like "10m", "1h", "24h", "7d".`
+    );
+  }
+  const value = parseInt(match[1], 10);
+  const unit = match[2];
+  let ms;
+  switch (unit) {
+    case "s":
+      ms = value * 1e3;
+      break;
+    case "m":
+      ms = value * 60 * 1e3;
+      break;
+    case "h":
+      ms = value * 60 * 60 * 1e3;
+      break;
+    case "d":
+      ms = value * 24 * 60 * 60 * 1e3;
+      break;
+    default:
+      throw new Error(`Unknown timeout unit: "${unit}"`);
+  }
+  if (!Number.isFinite(ms) || ms > MAX_TIMEOUT_MS2) {
+    throw new Error(
+      `Timeout value "${timeout}" is too large. Maximum allowed is 365 days.`
+    );
+  }
+  return ms;
+}
 function hashToObject(arr) {
   const obj = {};
   for (let i = 0; i < arr.length; i += 2) {
@@ -2740,9 +2947,20 @@ function deserializeJob(h) {
     lastCancelledAt: dateOrNull(h.lastCancelledAt),
     tags,
     idempotencyKey: nullish(h.idempotencyKey),
-    progress: numOrNull(h.progress)
+    progress: numOrNull(h.progress),
+    waitUntil: dateOrNull(h.waitUntil),
+    waitTokenId: nullish(h.waitTokenId),
+    stepData: parseStepData(h.stepData)
   };
 }
+function parseStepData(raw) {
+  if (!raw || raw === "null") return void 0;
+  try {
+    return JSON.parse(raw);
+  } catch {
+    return void 0;
+  }
+}
 var RedisBackend = class {
   constructor(redisConfig) {
     let IORedis;
@@ -2898,8 +3116,14 @@ var RedisBackend = class {
       if (filters.runAt) {
         jobs = this.filterByRunAt(jobs, filters.runAt);
       }
+      if (filters.cursor !== void 0) {
+        jobs = jobs.filter((j) => j.id < filters.cursor);
+      }
+    }
+    jobs.sort((a, b) => b.id - a.id);
+    if (filters?.cursor !== void 0) {
+      return jobs.slice(0, limit);
     }
-    jobs.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime());
     return jobs.slice(offset, offset + limit);
   }
   async getJobsByTags(tags, mode = "all", limit = 100, offset = 0) {
@@ -3131,35 +3355,302 @@ var RedisBackend = class {
     log(`Edited ${count} pending jobs`);
     return count;
   }
-  async cleanupOldJobs(daysToKeep = 30) {
+  /**
+   * Delete completed jobs older than the given number of days.
+   * Uses SSCAN to iterate the completed set in batches, avoiding
+   * loading all IDs into memory and preventing long Redis blocks.
+   *
+   * @param daysToKeep - Number of days to retain completed jobs (default 30).
+   * @param batchSize - Number of IDs to scan per SSCAN iteration (default 200).
+   * @returns Total number of deleted jobs.
+   */
+  async cleanupOldJobs(daysToKeep = 30, batchSize = 200) {
+    const cutoffMs = this.nowMs() - daysToKeep * 24 * 60 * 60 * 1e3;
+    const setKey = `${this.prefix}status:completed`;
+    let totalDeleted = 0;
+    let cursor = "0";
+    do {
+      const [nextCursor, ids] = await this.client.sscan(
+        setKey,
+        cursor,
+        "COUNT",
+        batchSize
+      );
+      cursor = nextCursor;
+      if (ids.length > 0) {
+        const result = await this.client.eval(
+          CLEANUP_OLD_JOBS_BATCH_SCRIPT,
+          1,
+          this.prefix,
+          cutoffMs,
+          ...ids
+        );
+        totalDeleted += Number(result);
+      }
+    } while (cursor !== "0");
+    log(`Deleted ${totalDeleted} old jobs`);
+    return totalDeleted;
+  }
+  /**
+   * Delete job events older than the given number of days.
+   * Iterates all event lists and removes events whose createdAt is before the cutoff.
+   * Also removes orphaned event lists (where the job no longer exists).
+   *
+   * @param daysToKeep - Number of days to retain events (default 30).
+   * @param batchSize - Number of event keys to scan per SCAN iteration (default 200).
+   * @returns Total number of deleted events.
+   */
+  async cleanupOldJobEvents(daysToKeep = 30, batchSize = 200) {
     const cutoffMs = this.nowMs() - daysToKeep * 24 * 60 * 60 * 1e3;
+    const pattern = `${this.prefix}events:*`;
+    let totalDeleted = 0;
+    let cursor = "0";
+    do {
+      const [nextCursor, keys] = await this.client.scan(
+        cursor,
+        "MATCH",
+        pattern,
+        "COUNT",
+        batchSize
+      );
+      cursor = nextCursor;
+      for (const key of keys) {
+        const jobIdStr = key.slice(`${this.prefix}events:`.length);
+        const jobExists = await this.client.exists(
+          `${this.prefix}job:${jobIdStr}`
+        );
+        if (!jobExists) {
+          const len = await this.client.llen(key);
+          await this.client.del(key);
+          totalDeleted += len;
+          continue;
+        }
+        const events = await this.client.lrange(key, 0, -1);
+        const kept = [];
+        for (const raw of events) {
+          try {
+            const e = JSON.parse(raw);
+            if (e.createdAt >= cutoffMs) {
+              kept.push(raw);
+            } else {
+              totalDeleted++;
+            }
+          } catch {
+            totalDeleted++;
+          }
+        }
+        if (kept.length === 0) {
+          await this.client.del(key);
+        } else if (kept.length < events.length) {
+          const pipeline = this.client.pipeline();
+          pipeline.del(key);
+          for (const raw of kept) {
+            pipeline.rpush(key, raw);
+          }
+          await pipeline.exec();
+        }
+      }
+    } while (cursor !== "0");
+    log(`Deleted ${totalDeleted} old job events`);
+    return totalDeleted;
+  }
+  async reclaimStuckJobs(maxProcessingTimeMinutes = 10) {
+    const maxAgeMs = maxProcessingTimeMinutes * 60 * 1e3;
+    const now = this.nowMs();
     const result = await this.client.eval(
-      CLEANUP_OLD_JOBS_SCRIPT,
+      RECLAIM_STUCK_JOBS_SCRIPT,
       1,
       this.prefix,
-      cutoffMs
+      maxAgeMs,
+      now
     );
-    log(`Deleted ${result} old jobs`);
+    log(`Reclaimed ${result} stuck jobs`);
     return Number(result);
   }
-  async cleanupOldJobEvents(daysToKeep = 30) {
-    log(
-      `cleanupOldJobEvents is a no-op for Redis backend (events are cleaned up with their jobs)`
+  // ── Wait / step-data support ────────────────────────────────────────
+  /**
+   * Transition a job from 'processing' to 'waiting' status.
+   * Persists step data so the handler can resume from where it left off.
+   *
+   * @param jobId - The job to pause.
+   * @param options - Wait configuration including optional waitUntil date, token ID, and step data.
+   */
+  async waitJob(jobId, options) {
+    const now = this.nowMs();
+    const waitUntilMs = options.waitUntil ? options.waitUntil.getTime().toString() : "null";
+    const waitTokenId = options.waitTokenId ?? "null";
+    const stepDataJson = JSON.stringify(options.stepData);
+    const result = await this.client.eval(
+      WAIT_JOB_SCRIPT,
+      1,
+      this.prefix,
+      jobId,
+      waitUntilMs,
+      waitTokenId,
+      stepDataJson,
+      now
     );
-    return 0;
+    if (Number(result) === 0) {
+      log(
+        `Job ${jobId} could not be set to waiting (may have been reclaimed or is no longer processing)`
+      );
+      return;
+    }
+    await this.recordJobEvent(jobId, "waiting" /* Waiting */, {
+      waitUntil: options.waitUntil?.toISOString() ?? null,
+      waitTokenId: options.waitTokenId ?? null
+    });
+    log(`Job ${jobId} set to waiting`);
   }
-  async reclaimStuckJobs(maxProcessingTimeMinutes = 10) {
-    const maxAgeMs = maxProcessingTimeMinutes * 60 * 1e3;
+  /**
+   * Persist step data for a job. Called after each ctx.run() step completes.
+   * Best-effort: does not throw to avoid killing the running handler.
+   *
+   * @param jobId - The job to update.
+   * @param stepData - The step data to persist.
+   */
+  async updateStepData(jobId, stepData) {
+    try {
+      const now = this.nowMs();
+      await this.client.hset(
+        `${this.prefix}job:${jobId}`,
+        "stepData",
+        JSON.stringify(stepData),
+        "updatedAt",
+        now.toString()
+      );
+    } catch (error) {
+      log(`Error updating stepData for job ${jobId}: ${error}`);
+    }
+  }
+  /**
+   * Create a waitpoint token.
+   *
+   * @param jobId - The job ID to associate with the token (null if created outside a handler).
+   * @param options - Optional timeout string (e.g. '10m', '1h') and tags.
+   * @returns The created waitpoint with its unique ID.
+   */
+  async createWaitpoint(jobId, options) {
+    const id = `wp_${randomUUID()}`;
+    const now = this.nowMs();
+    let timeoutAt = null;
+    if (options?.timeout) {
+      const ms = parseTimeoutString2(options.timeout);
+      timeoutAt = now + ms;
+    }
+    const key = `${this.prefix}waitpoint:${id}`;
+    const fields = [
+      "id",
+      id,
+      "jobId",
+      jobId !== null ? jobId.toString() : "null",
+      "status",
+      "waiting",
+      "output",
+      "null",
+      "timeoutAt",
+      timeoutAt !== null ? timeoutAt.toString() : "null",
+      "createdAt",
+      now.toString(),
+      "completedAt",
+      "null",
+      "tags",
+      options?.tags ? JSON.stringify(options.tags) : "null"
+    ];
+    await this.client.hmset(key, ...fields);
+    if (timeoutAt !== null) {
+      await this.client.zadd(`${this.prefix}waitpoint_timeout`, timeoutAt, id);
+    }
+    log(`Created waitpoint ${id} for job ${jobId}`);
+    return { id };
+  }
+  /**
+   * Complete a waitpoint token and move the associated job back to 'pending'.
+   *
+   * @param tokenId - The waitpoint token ID to complete.
+   * @param data - Optional data to pass to the waiting handler.
+   */
+  async completeWaitpoint(tokenId, data) {
     const now = this.nowMs();
+    const outputJson = data != null ? JSON.stringify(data) : "null";
     const result = await this.client.eval(
-      RECLAIM_STUCK_JOBS_SCRIPT,
+      COMPLETE_WAITPOINT_SCRIPT,
       1,
       this.prefix,
-      maxAgeMs,
+      tokenId,
+      outputJson,
       now
     );
-    log(`Reclaimed ${result} stuck jobs`);
-    return Number(result);
+    if (Number(result) === 0) {
+      log(`Waitpoint ${tokenId} not found or already completed`);
+      return;
+    }
+    log(`Completed waitpoint ${tokenId}`);
+  }
+  /**
+   * Retrieve a waitpoint token by its ID.
+   *
+   * @param tokenId - The waitpoint token ID to look up.
+   * @returns The waitpoint record, or null if not found.
+   */
+  async getWaitpoint(tokenId) {
+    const data = await this.client.hgetall(
+      `${this.prefix}waitpoint:${tokenId}`
+    );
+    if (!data || Object.keys(data).length === 0) return null;
+    const nullish = (v) => v === void 0 || v === "null" || v === "" ? null : v;
+    const numOrNull = (v) => {
+      const n = nullish(v);
+      return n === null ? null : Number(n);
+    };
+    const dateOrNull = (v) => {
+      const n = numOrNull(v);
+      return n === null ? null : new Date(n);
+    };
+    let output = null;
+    if (data.output && data.output !== "null") {
+      try {
+        output = JSON.parse(data.output);
+      } catch {
+        output = data.output;
+      }
+    }
+    let tags = null;
+    if (data.tags && data.tags !== "null") {
+      try {
+        tags = JSON.parse(data.tags);
+      } catch {
+      }
+    }
+    return {
+      id: data.id,
+      jobId: numOrNull(data.jobId),
+      status: data.status,
+      output,
+      timeoutAt: dateOrNull(data.timeoutAt),
+      createdAt: new Date(Number(data.createdAt)),
+      completedAt: dateOrNull(data.completedAt),
+      tags
+    };
+  }
+  /**
+   * Expire timed-out waitpoint tokens and move their associated jobs back to 'pending'.
+   *
+   * @returns The number of tokens that were expired.
+   */
+  async expireTimedOutWaitpoints() {
+    const now = this.nowMs();
+    const result = await this.client.eval(
+      EXPIRE_TIMED_OUT_WAITPOINTS_SCRIPT,
+      1,
+      this.prefix,
+      now
+    );
+    const count = Number(result);
+    if (count > 0) {
+      log(`Expired ${count} timed-out waitpoints`);
+    }
+    return count;
   }
   // ── Internal helpers ──────────────────────────────────────────────────
   async setPendingReasonForUnpickedJobs(reason, jobType) {
@@ -3708,10 +4199,9 @@ var initJobQueue = (config) => {
   const backendType = config.backend ?? "postgres";
   setLogContext(config.verbose ?? false);
   let backend;
-  let pool;
   if (backendType === "postgres") {
     const pgConfig = config;
-    pool = createPool(pgConfig.databaseConfig);
+    const pool = createPool(pgConfig.databaseConfig);
     backend = new PostgresBackend(pool);
   } else if (backendType === "redis") {
     const redisConfig = config.redisConfig;
@@ -3719,14 +4209,6 @@ var initJobQueue = (config) => {
   } else {
     throw new Error(`Unknown backend: ${backendType}`);
   }
-  const requirePool = () => {
-    if (!pool) {
-      throw new Error(
-        'Wait/Token features require the PostgreSQL backend. Configure with backend: "postgres" to use these features.'
-      );
-    }
-    return pool;
-  };
   const enqueueDueCronJobsImpl = async () => {
     const dueSchedules = await backend.getDueCronSchedules();
     let count = 0;
@@ -3793,8 +4275,8 @@ var initJobQueue = (config) => {
       config.verbose ?? false
     ),
     retryJob: (jobId) => backend.retryJob(jobId),
-    cleanupOldJobs: (daysToKeep) => backend.cleanupOldJobs(daysToKeep),
-    cleanupOldJobEvents: (daysToKeep) => backend.cleanupOldJobEvents(daysToKeep),
+    cleanupOldJobs: (daysToKeep, batchSize) => backend.cleanupOldJobs(daysToKeep, batchSize),
+    cleanupOldJobEvents: (daysToKeep, batchSize) => backend.cleanupOldJobEvents(daysToKeep, batchSize),
     cancelJob: withLogContext(
       (jobId) => backend.cancelJob(jobId),
       config.verbose ?? false
@@ -3831,21 +4313,21 @@ var initJobQueue = (config) => {
       (jobId) => backend.getJobEvents(jobId),
       config.verbose ?? false
     ),
-    // Wait / Token support (PostgreSQL-only for now)
+    // Wait / Token support (works with all backends)
     createToken: withLogContext(
-      (options) => createWaitpoint(requirePool(), null, options),
+      (options) => backend.createWaitpoint(null, options),
       config.verbose ?? false
     ),
     completeToken: withLogContext(
-      (tokenId, data) => completeWaitpoint(requirePool(), tokenId, data),
+      (tokenId, data) => backend.completeWaitpoint(tokenId, data),
       config.verbose ?? false
     ),
     getToken: withLogContext(
-      (tokenId) => getWaitpoint(requirePool(), tokenId),
+      (tokenId) => backend.getWaitpoint(tokenId),
       config.verbose ?? false
     ),
     expireTimedOutTokens: withLogContext(
-      () => expireTimedOutWaitpoints(requirePool()),
+      () => backend.expireTimedOutWaitpoints(),
       config.verbose ?? false
     ),
     // Cron schedule operations
@@ -3926,7 +4408,7 @@ var initJobQueue = (config) => {
     ),
     // Advanced access
     getPool: () => {
-      if (backendType !== "postgres") {
+      if (!(backend instanceof PostgresBackend)) {
         throw new Error(
           "getPool() is only available with the PostgreSQL backend."
         );