okengine 0.6.0 → 0.7.0

package/src/drivers/signal-postgres.ts

@@ -8,21 +8,25 @@
 import type { SignalDecl } from "../elements/signal/declare.ts";
 import type { SignalDelivery } from "../manifest/types.ts";
 import { DryRunWriteIsolationError, setDryRunMessageId, withDryRun } from "../kernel/dry-run.ts";
-import type {
-  DeadLetter,
-  LiveHandler,
-  SignalBus,
-  SignalDiscardOptions,
-  SignalDriver,
-  SignalFailureReason,
-  SignalHandler,
-  SignalMessage,
-  SignalOpenOptions,
-  SignalReplayOptions,
-  SignalReplayResult,
-  SignalStats,
-  SignalTransaction,
-  SignalUnsubscribe,
+import { OkeError, OKE_ERRORS } from "../kernel/errors.ts";
+import {
+  SIGNAL_DEFAULT_LEASE_MS,
+  validateSignalEmitPayload,
+  type DeadLetter,
+  type LiveHandler,
+  type SignalBus,
+  type SignalDiscardOptions,
+  type SignalDriver,
+  type SignalEmitOptions,
+  type SignalFailureReason,
+  type SignalHandler,
+  type SignalMessage,
+  type SignalOpenOptions,
+  type SignalReplayOptions,
+  type SignalReplayResult,
+  type SignalStats,
+  type SignalTransaction,
+  type SignalUnsubscribe,
 } from "./signal-types.ts";
 
 /** Row shape in `oke_signal_messages`. */
@@ -30,6 +34,7 @@ interface MsgRow {
   id: string;
   signal: string;
   payload: string;
+  ordering_key: string | null;
   delivery: SignalDelivery;
   attempts: number;
   failures: string;
@@ -37,6 +42,7 @@ interface MsgRow {
   available_at: number;
   status: "pending" | "inflight" | "delivered" | "dead";
   locked_by: string | null;
+  lease_expires_at: number | null;
   delivered_to: string;
 }
 
@@ -69,6 +75,9 @@ export interface PostgresSignalSql {
 
 const CHANNEL = "oke_signal";
 
+/** Claim next once-row: pending/unlocked or lease-expired, blocked by same-key inflight. */
+const CLAIM_ONCE_SQL = `SELECT * FROM oke_signal_messages WHERE signal=? AND delivery='once' AND available_at<=? AND ((status='pending' AND locked_by IS NULL) OR (status='inflight' AND lease_expires_at IS NOT NULL AND lease_expires_at<=?)) AND (ordering_key IS NULL OR NOT EXISTS (SELECT 1 FROM oke_signal_messages h WHERE h.signal=oke_signal_messages.signal AND h.ordering_key=oke_signal_messages.ordering_key AND h.id<>oke_signal_messages.id AND h.status='inflight' AND h.lease_expires_at IS NOT NULL AND h.lease_expires_at>?)) ORDER BY created_at ASC LIMIT 1 FOR UPDATE SKIP LOCKED`;
+
 /**
  * In-memory Postgres-protocol fake with transactions, SKIP LOCKED, LISTEN/NOTIFY.
  */
@@ -100,7 +109,11 @@ export function createPostgresSignalFake(options?: {
       writes: Array<[string, unknown]>;
     };
     committed = {
-      messages: snap.messages,
+      messages: snap.messages.map((m) => ({
+        ...m,
+        ordering_key: m.ordering_key ?? null,
+        lease_expires_at: m.lease_expires_at ?? null,
+      })),
       writes: new Map(snap.writes),
     };
   }
@@ -150,26 +163,40 @@ export function createPostgresSignalFake(options?: {
       const text = sql.trim();
       const state = view();
 
-      // Claim: SELECT … FOR UPDATE SKIP LOCKED
-      const claim =
-        /^SELECT\s+\*\s+FROM\s+oke_signal_messages\s+WHERE\s+signal\s*=\s*\?\s+AND\s+delivery\s*=\s*'once'\s+AND\s+status\s*=\s*'pending'\s+AND\s+available_at\s*<=\s*\?\s+AND\s+locked_by\s+IS\s+NULL\s+ORDER\s+BY\s+created_at\s+ASC\s+LIMIT\s+1\s+FOR\s+UPDATE\s+SKIP\s+LOCKED$/i.exec(
-          text,
-        );
-      if (claim) {
+      // Claim: SELECT … FOR UPDATE SKIP LOCKED (pending or lease-expired inflight),
+      // with per-key serialization when ordering_key is set.
+      const isOnceClaim =
+        /FOR\s+UPDATE\s+SKIP\s+LOCKED/i.test(text) &&
+        /oke_signal_messages/i.test(text) &&
+        /delivery\s*=\s*'once'/i.test(text);
+      if (isOnceClaim) {
         const signal = String(params[0]);
         const t = Number(params[1]);
-        const row = state.messages.find(
-          (m) =>
-            m.signal === signal &&
-            m.delivery === "once" &&
-            m.status === "pending" &&
-            m.available_at <= t &&
-            m.locked_by === null,
-        );
+        const leaseCutoff = Number(params[2]);
+        const keyLeaseCutoff = params.length >= 4 ? Number(params[3]) : t;
+        const row = state.messages.find((m) => {
+          if (m.signal !== signal || m.delivery !== "once" || m.available_at > t) return false;
+          const pendingOk = m.status === "pending" && m.locked_by === null;
+          const leaseExpired =
+            m.status === "inflight" &&
+            m.lease_expires_at !== null &&
+            m.lease_expires_at <= leaseCutoff;
+          if (!pendingOk && !leaseExpired) return false;
+          if (m.ordering_key != null && m.ordering_key !== "") {
+            const blocked = state.messages.some(
+              (other) =>
+                other.id !== m.id &&
+                other.signal === m.signal &&
+                other.ordering_key === m.ordering_key &&
+                other.status === "inflight" &&
+                other.lease_expires_at !== null &&
+                other.lease_expires_at > keyLeaseCutoff,
+            );
+            if (blocked) return false;
+          }
+          return true;
+        });
         if (!row) return [];
-        row.status = "inflight";
-        row.locked_by = String(params[2] ?? "worker");
-        row.attempts += 1;
         return [{ ...row }];
       }
 
@@ -261,6 +288,10 @@ export function createPostgresSignalFake(options?: {
           id: String(row.id),
           signal: String(row.signal),
           payload: String(row.payload),
+          ordering_key:
+            row.ordering_key === undefined || row.ordering_key === null
+              ? null
+              : String(row.ordering_key),
           delivery: row.delivery as SignalDelivery,
           attempts: Number(row.attempts ?? 0),
           failures: String(row.failures ?? "[]"),
@@ -268,6 +299,10 @@ export function createPostgresSignalFake(options?: {
           available_at: Number(row.available_at),
           status: (row.status as MsgRow["status"]) ?? "pending",
           locked_by: (row.locked_by as string | null) ?? null,
+          lease_expires_at:
+            row.lease_expires_at === undefined || row.lease_expires_at === null
+              ? null
+              : Number(row.lease_expires_at),
           delivered_to: String(row.delivered_to ?? "[]"),
         });
         return { changes: 1 };
@@ -308,6 +343,10 @@ export function createPostgresSignalFake(options?: {
         return { changes: 1 };
       }
 
+      if (/^ALTER\s+TABLE\s+oke_signal_messages\s+ADD\s+COLUMN/i.test(text)) {
+        return { changes: 0 };
+      }
+
       throw new Error(`postgres signal fake: unsupported exec: ${sql}`);
     },
     async begin(fn) {
@@ -361,6 +400,7 @@ async function ensureSchema(sql: PostgresSignalSql): Promise<void> {
     id TEXT PRIMARY KEY,
     signal TEXT,
     payload TEXT,
+    ordering_key TEXT,
     delivery TEXT,
     attempts INTEGER,
     failures TEXT,
@@ -368,8 +408,22 @@ async function ensureSchema(sql: PostgresSignalSql): Promise<void> {
     available_at BIGINT,
     status TEXT,
     locked_by TEXT,
+    lease_expires_at BIGINT,
     delivered_to TEXT
   )`);
+  // Existing tables created before leases / keys: add columns in place.
+  try {
+    await sql.exec(
+      `ALTER TABLE oke_signal_messages ADD COLUMN IF NOT EXISTS lease_expires_at BIGINT`,
+    );
+  } catch {
+    /* fake / older engines without IF NOT EXISTS — ignore */
+  }
+  try {
+    await sql.exec(`ALTER TABLE oke_signal_messages ADD COLUMN IF NOT EXISTS ordering_key TEXT`);
+  } catch {
+    /* fake / older engines without IF NOT EXISTS — ignore */
+  }
   await sql.exec(`CREATE TABLE IF NOT EXISTS oke_signal_writes (
     key TEXT PRIMARY KEY,
     value TEXT
@@ -377,10 +431,15 @@ async function ensureSchema(sql: PostgresSignalSql): Promise<void> {
 }
 
 function rowToMessage(row: Record<string, unknown>): SignalMessage {
+  const key =
+    row.ordering_key === undefined || row.ordering_key === null || row.ordering_key === ""
+      ? undefined
+      : String(row.ordering_key);
   return {
     id: String(row.id),
     signal: String(row.signal),
     payload: JSON.parse(String(row.payload)),
+    ...(key !== undefined ? { key } : {}),
     delivery: row.delivery as SignalDelivery,
     attempts: Number(row.attempts),
     failures: JSON.parse(String(row.failures ?? "[]")) as SignalFailureReason[],
@@ -398,6 +457,7 @@ function rowToMessage(row: Record<string, unknown>): SignalMessage {
 export async function openPostgresSignal(options: SignalOpenOptions): Promise<SignalBus> {
   const now = options.now ?? (() => Date.now());
   const signals = options.signals;
+  const leaseMs = options.leaseMs ?? SIGNAL_DEFAULT_LEASE_MS;
   const sql =
     (options.sql as PostgresSignalSql | undefined) ??
     createPostgresSignalFake({
@@ -468,19 +528,39 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
     return decl;
   }
 
+  function hasSubscriber(name: string): boolean {
+    if (consumers.some((c) => c.signal === name)) return true;
+    const live = liveHandlers.get(name);
+    return live !== undefined && live.size > 0;
+  }
+
+  function assertEmitAllowed(name: string): void {
+    const decl = requireDecl(name);
+    if (decl.optional) return;
+    if (hasSubscriber(name)) return;
+    throw new OkeError(OKE_ERRORS.ORPHAN_EMIT, {
+      flow: "unknown",
+      resource: name,
+    });
+  }
+
   async function insertEmit(
     tx: PostgresSignalSql,
     signal: string,
     payload: unknown,
+    options?: SignalEmitOptions,
   ): Promise<void> {
     const decl = requireDecl(signal);
     const t = now();
+    const orderingKey =
+      typeof options?.key === "string" && options.key.length > 0 ? options.key : null;
     await tx.exec(
-      `INSERT INTO oke_signal_messages (id, signal, payload, delivery, attempts, failures, created_at, available_at, status, locked_by, delivered_to) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
+      `INSERT INTO oke_signal_messages (id, signal, payload, ordering_key, delivery, attempts, failures, created_at, available_at, status, locked_by, lease_expires_at, delivered_to) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`,
       [
         crypto.randomUUID(),
         signal,
         JSON.stringify(payload ?? null),
+        orderingKey,
         decl.delivery,
         0,
         "[]",
@@ -488,6 +568,7 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
         t,
         "pending",
         null,
+        null,
         "[]",
       ],
     );
@@ -497,7 +578,11 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
     let finished = false;
     // Defer the real SQL begin until commit so staging is local,
     // then enrol everything in one postgres transaction.
-    const stagedEmits: Array<{ signal: string; payload: unknown }> = [];
+    const stagedEmits: Array<{
+      signal: string;
+      payload: unknown;
+      options?: SignalEmitOptions;
+    }> = [];
     const stagedWrites = new Map<string, unknown>();
 
     return {
@@ -505,10 +590,12 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
         if (finished) throw new Error("transaction finished");
         stagedWrites.set(key, value);
       },
-      async emit(signal, payload) {
+      async emit(signal, payload, options) {
         if (finished) throw new Error("transaction finished");
-        requireDecl(signal);
-        stagedEmits.push({ signal, payload });
+        assertEmitAllowed(signal);
+        // Validate before staging so commit never sees an invalid payload.
+        const value = await validateSignalEmitPayload(signal, requireDecl(signal), payload);
+        stagedEmits.push({ signal, payload: value, options });
       },
       async commit() {
         if (finished) throw new Error("transaction finished");
@@ -521,7 +608,7 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
             ]);
           }
           for (const e of stagedEmits) {
-            await insertEmit(tx, e.signal, e.payload);
+            await insertEmit(tx, e.signal, e.payload, e.options);
           }
         });
         await sql.notify(CHANNEL, "commit");
@@ -541,18 +628,26 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
    * @param tx - Caller's postgres transaction
    * @param signal - Signal name
    * @param payload - Payload
+   * @param options - Optional emit options
    */
   async function emitInTransaction(
     tx: PostgresSignalSql,
     signal: string,
     payload?: unknown,
+    options?: SignalEmitOptions,
   ): Promise<void> {
-    await insertEmit(tx, signal, payload);
+    assertEmitAllowed(signal);
+    const value = await validateSignalEmitPayload(signal, requireDecl(signal), payload);
+    await insertEmit(tx, signal, value, options);
   }
 
-  async function emit(signal: string, payload?: unknown): Promise<void> {
+  async function emit(
+    signal: string,
+    payload?: unknown,
+    options?: SignalEmitOptions,
+  ): Promise<void> {
     const tx = await begin();
-    await tx.emit(signal, payload);
+    await tx.emit(signal, payload, options);
     await tx.commit();
   }
 
@@ -601,21 +696,21 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
     const msg = rowToMessage(row);
     try {
       await consumer.handler(msg);
-      await sql.exec(`UPDATE oke_signal_messages SET status = ?, locked_by = NULL WHERE id = ?`, [
-        "delivered",
-        msg.id,
-      ]);
+      await sql.exec(
+        `UPDATE oke_signal_messages SET status = ?, locked_by = NULL, lease_expires_at = NULL WHERE id = ?`,
+        ["delivered", msg.id],
+      );
       noteDelivered();
     } catch (err) {
       const failures = [...msg.failures, failureFromError(err, msg.attempts)];
       if (msg.attempts > decl.retries) {
         await sql.exec(
-          `UPDATE oke_signal_messages SET status = ?, locked_by = NULL, failures = ? WHERE id = ?`,
+          `UPDATE oke_signal_messages SET status = ?, locked_by = NULL, lease_expires_at = NULL, failures = ? WHERE id = ?`,
           [decl.deadLetter ? "dead" : "delivered", JSON.stringify(failures), msg.id],
         );
       } else {
         await sql.exec(
-          `UPDATE oke_signal_messages SET status = ?, locked_by = NULL, failures = ?, available_at = ? WHERE id = ?`,
+          `UPDATE oke_signal_messages SET status = ?, locked_by = NULL, lease_expires_at = NULL, failures = ?, available_at = ? WHERE id = ?`,
           ["pending", JSON.stringify(failures), now(), msg.id],
         );
       }
@@ -632,25 +727,24 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
 
   async function drainOncePass(): Promise<boolean> {
     let progress = false;
+    const t = now();
     for (const consumer of consumers) {
       const decl = signals.get(consumer.signal);
       if (decl?.delivery !== "once") continue;
-      const claimed = await sql.query(
-        `SELECT * FROM oke_signal_messages WHERE signal = ? AND delivery = 'once' AND status = 'pending' AND available_at <= ? AND locked_by IS NULL ORDER BY created_at ASC LIMIT 1 FOR UPDATE SKIP LOCKED`,
-        [consumer.signal, now(), consumer.subscriberId],
-      );
+      const claimed = await sql.query(CLAIM_ONCE_SQL, [consumer.signal, t, t, t]);
       if (claimed[0]) {
         progress = true;
         const row = claimed[0];
-        if (row.locked_by == null) {
-          await sql.exec(
-            `UPDATE oke_signal_messages SET status = 'inflight', locked_by = ?, attempts = ? WHERE id = ?`,
-            [consumer.subscriberId, Number(row.attempts) + 1, row.id],
-          );
-          row.locked_by = consumer.subscriberId;
-          row.attempts = Number(row.attempts) + 1;
-          row.status = "inflight";
-        }
+        const attempts = Number(row.attempts) + 1;
+        const leaseExpiresAt = t + leaseMs;
+        await sql.exec(
+          `UPDATE oke_signal_messages SET status = 'inflight', locked_by = ?, attempts = ?, lease_expires_at = ? WHERE id = ?`,
+          [consumer.subscriberId, attempts, leaseExpiresAt, row.id],
+        );
+        row.locked_by = consumer.subscriberId;
+        row.attempts = attempts;
+        row.status = "inflight";
+        row.lease_expires_at = leaseExpiresAt;
         await deliverOnce(row, consumer);
       }
     }
@@ -726,7 +820,7 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
       while (list.length > 50) list.shift();
       noteDelivered();
       await sql.exec(
-        `UPDATE oke_signal_messages SET status = 'delivered', locked_by = NULL WHERE id = ?`,
+        `UPDATE oke_signal_messages SET status = 'delivered', locked_by = NULL, lease_expires_at = NULL WHERE id = ?`,
         [row.id],
       );
     }
@@ -945,12 +1039,12 @@ export async function openPostgresSignal(options: SignalOpenOptions): Promise<Si
             const deliveredTo = new Set(JSON.parse(String(row?.delivered_to ?? "[]")) as string[]);
             deliveredTo.delete(options.subscriberId);
             await sql.exec(
-              `UPDATE oke_signal_messages SET status = 'pending', locked_by = NULL, attempts = 0, available_at = ?, delivered_to = ? WHERE id = ?`,
+              `UPDATE oke_signal_messages SET status = 'pending', locked_by = NULL, lease_expires_at = NULL, attempts = 0, available_at = ?, delivered_to = ? WHERE id = ?`,
               [now(), JSON.stringify([...deliveredTo]), m.id],
             );
           } else {
             await sql.exec(
-              `UPDATE oke_signal_messages SET status = 'pending', locked_by = NULL, attempts = 0, available_at = ?, delivered_to = '[]' WHERE id = ?`,
+              `UPDATE oke_signal_messages SET status = 'pending', locked_by = NULL, lease_expires_at = NULL, attempts = 0, available_at = ?, delivered_to = '[]' WHERE id = ?`,
               [now(), m.id],
             );
           }

package/src/drivers/signal-redis.ts

@@ -222,8 +222,8 @@ export async function openRedisSignal(options: SignalOpenOptions): Promise<Signa
 
   return {
     driverId: "redis",
-    async emit(signal, payload) {
-      await outbox.emit(signal, payload);
+    async emit(signal, payload, options) {
+      await outbox.emit(signal, payload, options);
       await relayToRedis(signal, payload);
     },
     async begin() {
@@ -231,9 +231,9 @@ export async function openRedisSignal(options: SignalOpenOptions): Promise<Signa
       const tx = await outbox.begin();
       return {
         write: (k, v) => tx.write(k, v),
-        async emit(signal, payload) {
+        async emit(signal, payload, options) {
           staged.push({ signal, payload });
-          await tx.emit(signal, payload);
+          await tx.emit(signal, payload, options);
         },
         async commit() {
           await tx.commit();

package/src/drivers/signal-types.ts

@@ -4,6 +4,12 @@
 
 import type { SignalDelivery } from "../manifest/types.ts";
 import type { SignalDecl } from "../elements/signal/declare.ts";
+import { OkeError, OKE_ERRORS } from "../kernel/errors.ts";
+import {
+  isStandardSchema,
+  normalizeIssuePath,
+  type SchemaInput,
+} from "../validation/standard-schema.ts";
 
 /** Protocol ids for signal drivers. */
 export type SignalDriverId = "memory" | "postgres" | "redis" | "nats";
@@ -24,11 +30,25 @@ export interface SignalFailureReason {
   readonly attempt: number;
 }
 
+/** Options for {@link SignalBus.emit} / {@link SignalTransaction.emit}. */
+export interface SignalEmitOptions {
+  /**
+   * Per-key serialization for `once` delivery.
+   *
+   * When set, no two messages sharing the same `(signal, key)` are claimed
+   * concurrently — the in-flight message's visibility lease is the lock.
+   * Omit for pure competing-consumer behavior (no ordering guarantee).
+   */
+  readonly key?: string;
+}
+
 /** A durable signal message. */
 export interface SignalMessage {
   readonly id: string;
   readonly signal: string;
   readonly payload: unknown;
+  /** Optional ordering key from {@link SignalEmitOptions.key}. */
+  readonly key?: string;
   readonly delivery: SignalDelivery;
   readonly attempts: number;
   readonly failures: readonly SignalFailureReason[];
@@ -180,20 +200,30 @@ export interface SignalTransaction {
    *
    * @param signal - Signal name
    * @param payload - Payload
+   * @param options - Optional emit options (`key` for per-key once ordering)
    */
-  emit(signal: string, payload?: unknown): Promise<void>;
+  emit(signal: string, payload?: unknown, options?: SignalEmitOptions): Promise<void>;
   /** Commit writes + emits together. */
   commit(): Promise<void>;
   /** Discard the transaction — nothing is visible. */
   rollback(): Promise<void>;
 }
 
+/** Default visibility lease for `once` claims (ms). */
+export const SIGNAL_DEFAULT_LEASE_MS = 30_000;
+
 /** Options when opening a signal bus. */
 export interface SignalOpenOptions {
   /** Registered signal declarations (name → decl). */
   readonly signals: ReadonlyMap<string, SignalDecl>;
   /** Clock. */
   readonly now?: () => number;
+  /**
+   * Visibility lease for `once` claims (ms).
+   * Expired `inflight` rows are reclaimed lazily at the next claim.
+   * Defaults to {@link SIGNAL_DEFAULT_LEASE_MS}.
+   */
+  readonly leaseMs?: number;
   /**
    * Durable path for chaos / crash recovery tests.
    * When set, committed state survives process death.
@@ -252,8 +282,9 @@ export interface SignalBus {
    *
    * @param signal - Signal name
    * @param payload - Payload
+   * @param options - Optional emit options (`key` for per-key once ordering)
    */
-  emit(signal: string, payload?: unknown): Promise<void>;
+  emit(signal: string, payload?: unknown, options?: SignalEmitOptions): Promise<void>;
   /** Begin a transaction that enrols writes + emits. */
   begin(): Promise<SignalTransaction>;
   /**
@@ -323,3 +354,31 @@ export interface SignalDriver {
    */
   open(options: SignalOpenOptions): Promise<SignalBus>;
 }
+
+/**
+ * Validate an emit payload against the signal declaration's Standard Schema.
+ *
+ * @param name - Signal name (for OKE1043)
+ * @param decl - Declared signal
+ * @param payload - Raw emit payload
+ */
+export async function validateSignalEmitPayload(
+  name: string,
+  decl: SignalDecl,
+  payload: unknown,
+): Promise<unknown> {
+  const schema = decl.schema as SchemaInput | undefined;
+  if (schema === undefined || schema === null || !isStandardSchema(schema)) {
+    return payload ?? null;
+  }
+  const result = await schema["~standard"].validate(payload ?? null);
+  if (!result.issues) return result.value;
+  const detail =
+    result.issues
+      .map((i) => {
+        const path = normalizeIssuePath(i.path);
+        return path.length > 0 ? `${path.join(".")}: ${i.message}` : i.message;
+      })
+      .join("; ") || "invalid payload";
+  throw new OkeError(OKE_ERRORS.SIGNAL_SCHEMA, { resource: name, detail });
+}

package/src/drivers/vault-driver-removal.test.ts

@@ -18,7 +18,11 @@ const FORBIDDEN_SECRETS_SAAS = ["infi", "sical"].join("");
 const FORBIDDEN_AGE = ["age", "-", "encryption"].join("");
 
 /** Lockfiles regenerated by `bun install` — not source residue. */
-const LOCKFILE_PREFIXES = ["bun.lock:", "packages/create-oke/template/bun.lock:"];
+const LOCKFILE_PREFIXES = [
+  "bun.lock:",
+  "packages/create-oke/templates/standard/bun.lock:",
+  "packages/create-oke/templates/advanced/bun.lock:",
+];
 
 /**
  * Run `git grep -F` and assert zero matches outside allow-listed prefixes.

package/src/elements/channel/costs.test.ts

@@ -18,7 +18,7 @@ describe("fallbackWeeklyCostDelta", () => {
         status: "fallback",
         attempts: [
           { driverId: "wa-cloud", ok: false, at: weekStart + 1 },
-          { driverId: "unifonic", ok: true, at: weekStart + 2 },
+          { driverId: "taqnyat", ok: true, at: weekStart + 2 },
         ],
         at: weekStart + 3,
       },
@@ -39,7 +39,7 @@ describe("fallbackWeeklyCostDelta", () => {
         status: "fallback",
         attempts: [
           { driverId: "wa-cloud", ok: false, at: weekStart + 6 },
-          { driverId: "unifonic", ok: true, at: weekStart + 7 },
+          { driverId: "msegat", ok: true, at: weekStart + 7 },
         ],
         at: weekStart + 8,
       },

package/src/elements/channel/costs.ts

@@ -106,13 +106,25 @@ export function fallbackWeeklyCostDelta(
 function mediumFromDriver(driverId: string, receiptMedium: string): string {
   const id = driverId.toLowerCase();
   if (id.includes("wa") || id.includes("whatsapp")) return "whatsapp";
-  if (id.includes("sms") || id.includes("unifonic") || id.includes("twilio")) {
+  if (
+    id.includes("sms") ||
+    id.includes("taqnyat") ||
+    id.includes("msegat") ||
+    id.includes("unifonic") ||
+    id.includes("twilio")
+  ) {
     return "sms";
   }
   if (id.includes("push") || id.includes("fcm") || id.includes("webpush")) {
     return "push";
   }
-  if (id.includes("smtp") || id.includes("resend") || id.includes("ses") || id.includes("email")) {
+  if (
+    id.includes("smtp") ||
+    id.includes("resend") ||
+    id.includes("sndr") ||
+    id.includes("ses") ||
+    id.includes("email")
+  ) {
     return "email";
   }
   return receiptMedium === "any" ? "email" : receiptMedium;

package/src/elements/channel/mime.ts

@@ -11,3 +11,14 @@ export type { Attachment, MailOptions, SendResult, Transport, RetryConfig } from
 export { SentlyError } from "sently/errors";
 export { RetryTransport } from "sently/transports/retry";
 export { FallbackTransport, FallbackError, type FallbackAttempt } from "sently/transports/fallback";
+export {
+  toChannelSendResult,
+  type AnySendResult,
+  type ChannelSendResult as SentlyChannelSendResult,
+} from "sently/channel-result";
+export {
+  parse as parseSndrWebhook,
+  verifySignature as verifySndrSignature,
+} from "sently/webhooks/sndr";
+export { parse as parseUnifonicWebhook } from "sently/webhooks/unifonic";
+export { toDeliveryEvent, type EmailEvent, type DeliveryEvent } from "sently/webhooks";