@voltro/sql-mysql 0.19.0 → 0.20.0

package/CHANGELOG.md

@@ -39,6 +39,93 @@ _Changes staged for the next release accumulate here (rolled up from
 
 ---
 
+## [0.20.0] — 2026-07-29
+
+### ⚠ BREAKING
+
+- **@voltro/plugin-versioning, @voltro/database, @voltro/voltro, @voltro/sql-postgres, @voltro/sql-mysql, @voltro/sql-sqlite, @voltro/sql-mssql** — `versioningPlugin({ timing: 'in-transaction' })` produced a WRONG trail, not merely a slow one. Reported and reproduced against MariaDB 11 by a team that wired both plugins and measured before migrating a single call site.
+
+  **It recorded every change twice.** The two timings are alternatives, but the post-commit change tap stayed wired when the in-transaction recorder was registered, so both ran. One `bookmarks.create` → two history rows.
+
+  **And the trail was mis-ordered, which is worse.** Each path numbered independently: one insert plus one update produced versions `0, 0, 1, 2` across four rows. `selectAsOf`, `sortHistory` and `diffVersionRows` all read `version`, so `rowAsOf` returned the wrong snapshot and `diffVersions` found nothing. A duplicate can be deduped; a wrong order cannot be detected from the data.
+
+  The recorder wrote a constant `version: 0` on purpose, with a design note arguing that ordering could come from `changedAt` and that a read per covered write was too expensive. Both halves were wrong: `changedAt` is millisecond-resolution, so two writes to one row inside one transaction tie routinely, and the number is what every reader consults.
+
+  **BREAKING —** a `WriteRecorder` now receives a PORT (`{ append, maxOf }`) rather than a bare `append`. `maxOf` is one aggregate with an equality filter on the connection the write already holds; it is what lets an append-only trail number its own entries. A recorder still cannot UPDATE, DELETE or open a nested transaction, and a throw from either operation still rolls the caller's write back. Apps that merely ENABLE the timing need no change — only a hand-written recorder does, and `tsc` names every site.
+
+  **Cost, stated rather than avoided:** `'in-transaction'` now takes TWO round-trips per recorded write, roughly doubling this timing's published per-write overhead. Both timings number from 1, so switching `timing` no longer shifts version numbers.
+
+### Fixed
+
+- **@voltro/database, @voltro/sql-postgres, @voltro/sql-mysql, @voltro/sql-sqlite, @voltro/sql-mssql** — The correlation bridge did not survive a transaction, and did not survive CDC. Both are fixed, and both were found by measuring against live databases after a consumer isolated the symptom in a scratch app.
+
+  **Every write a framework mutation makes was unattributed.** `transactional()` is entered from the request's async-local scope, but its callback runs from inside the Effect the store builds — and measured against live postgres AND live mariadb, the scope is active at the call site and EMPTY inside the callback. Framework mutations are auto-transactional, so this was every handler write. Same class as the `bindMutation` defect fixed alongside it: a scope covering the construction of an Effect and not its execution. The caller's attribution is now captured at `transactional()` entry and re-established around the callback, in all four dialect stores.
+
+  **And the CDC transports could not carry it at all.** Under `changeStrategy: 'cdc'` — the DEFAULT — the event a subscriber receives is rebuilt from a postgres NOTIFY payload or a mysql binlog row image, neither of which can hold a request context. `registerPendingAttribution` / `claimPendingAttribution` (`@voltro/database`) let the write path hand its identity to the echo, keyed by `(table, op, id)` and claimed once. A write made on ANOTHER replica has nothing pending and stays unattributed, which is the correct answer rather than a gap.
+
+  **Plus one nobody had reported, found on the way:** on postgres under CDC the write path skipped `routeEvent` entirely, and `runWriteRecorders` lives inside it — so `versioningPlugin({ timing: 'in-transaction' })` with the default `CDC=1` recorded NOTHING. The mode whose entire promise is "if the change committed, the entry is there" wrote an empty trail, silently. `routeEvent` now runs in both modes; only the DELIVERY decision is strategy-dependent.
+
+  New live-dialect suites (`cdcAttribution.integration.test.ts` in `sql-postgres` and `sql-mysql`) pin all of it, and were verified red against the previous code.
+- **@voltro/plugin-versioning, @voltro/runtime, @voltro/cli** — `_voltro_row_history.traceId` and `.subjectId` were NULL on every write. Three independent causes, all found from one consumer report whose evidence pinned the diagnosis before we looked: `subjectId` was NULL while `changedBy` on the SAME row carried the acting user — so the identity was known and was not travelling.
+
+  - **The adapter dropped them.** `dataStoreHistoryStore.append` hand-wrote its insert object and listed `changedBy` but not `traceId` / `subjectId`. This is the second time that shape has bitten in this file — the READ side (`rowToVersion`) had drifted identically. A row built by hand in one place and read by hand in another disagree exactly when a field is ADDED, because nothing fails. Both now spread the row. - **An Effect-returning handler was unattributed.** `bindMutation` established the scope around the CALL, which covers an async executor for its whole run — but an Effect-returning one is only CONSTRUCTED there and runs later. It is now forked inside the scope, with interruption and typed failures preserved (both pinned by tests). Verified by measurement, not assumption: an Effect forked inside an ALS scope keeps seeing it across `sleep`, `yieldNow` and a `setTimeout` promise, while the same effect merely constructed inside sees nothing. - **The devtools `/invoke` path never entered the scope at all.** It bypasses the rpc stack by design, and that also bypassed everything `bindMutation` sets up. The audit plugin recorded a traceId (it reads `requestContext.traceId`, which this path does build) while every write underneath carried none — three consumers of one call disagreeing about its trace. It also synthesised `inspect-<8 random chars>`, which no trace consumer can parse; the reporter's framing is the rule worth keeping — *a synthesised id produces a column that looks joinable and is not; NULL at least fails honestly.* It is a real 32-hex id now, and it reaches all three sinks.
+
+  `actingUserId` is imported at the new call site rather than re-derived — one answer to "who is writing", shared with what `audit()` stamps.
+- **@voltro/cli** — Three ways a check reported nothing while checking nothing, all found by a consumer verifying the silence instead of trusting it.
+
+  - **`unexercised-row-filter` never fired on a typed registration.** The match was `/\bsetRowFilter\s*\(/`, which demands the paren directly after the name, so `setRowFilter<Ctx>({…})` — the spelling our own generic signature invites — broke it. The rule was blind for exactly the teams that had wired `load`/`predicate` carefully. It counts CALLS now. - **…and its test-side condition was satisfiable by a COMMENT.** It matched `rowFilter:` in raw text. Comments and string literals are stripped, and the suite must both call `makeTestContext` and bind `rowFilter` in real code. - **The same paren-adjacent shape sat in two shipped codemod gates.** `0.7.0/01` (row filter) and `0.7.0/02` (`invoke`) both gate on a generic export, so a typed call made `voltro update` print nothing at all: the upgrade reads as clean and the behaviour change lands unread. Both now use the shared `callPattern`, which allows type arguments including nested ones.
+
+  Two false-positive fixes in the hand-roll detector, from the same report:
+
+  - **A file that WIRES a plugin is no longer told to adopt it.** The `presence` rule reported `app.config.ts` (which calls `presencePlugin()`) to an app that had just deleted its hand-rolled table. Rules that recommend a package now declare it, and a file referencing that package is skipped. - **Generated files and `.d.ts` are out of the scan.** A recommendation aimed at a file the next boot overwrites is never actionable.
+
+  And one more of the first kind, found while checking why a withdrawn report's probe had stayed silent: `raw-fetch` counted only a BARE `fetch(…)` callee, so `globalThis.fetch(url)` / `self.fetch(url)` in a server file read as clean.
+- **@voltro/cli** — `voltro doctor`'s `serverOnly: NOT CHECKED` line now names the failure, and the field exists in `--json`.
+
+  The refusal to claim a pass was right. What shipped with it was nothing to act on: the `catch` discarded the error entirely, so there was no reason, no failing module, and — because the field was absent from `--json` — no way for CI to assert "still unchecked" rather than reading silence as a pass.
+
+  A consumer's verdict, which is the useful part: *"The message is honest and that is the problem."* They had already verified that every descriptor, `app.config.ts` and the generated rpc group imported cleanly under `tsx` on their own, so the difference had to be in what `loadDiscovered` does BEYOND importing — and none of that was visible from outside. It matters more than its size because `.serverOnly()` is what guards their `sessions.tokenHash` and `apiKeys.keyHash`, markers they added after finding a query whose output schema shipped a hash over the wire.
+
+  `--json` now carries `serverOnly: { checked, reason?, leaks? }`. Gate CI on `checked === false`.
+- **@voltro/plugin-versioning** — A version snapshot no longer copies `.serverOnly()` columns into `_voltro_row_history`. `.encrypted()` columns are KEPT, and that distinction is the whole finding.
+
+  Reported by a team choosing which tables to version: `sessions` holds `.encrypted()` PATs and a `tokenHash`, `apiKeys` holds a `keyHash`, and they could not determine from outside what the snapshot would contain. They excluded both tables — then went and measured it, which corrected their own report:
+
+  ```
+  probeItems.secret     enc:v1:a56iziEV9THLhzmJ:Vk0ux+0bECleTLBJkCa0Rg==:3AtMwP…
+  _voltro_row_history   {"secret":"enc:v1:a56iziEV9THLhzmJ:Vk0ux+0bECleTLBJkCa0Rg==:…"}
+  ```
+
+  **`.encrypted()` lands as ciphertext, byte-identical to the source column**, so versioning such a table widens nothing — the history is exactly as readable as the row it came from. Withholding it would have cost real audit data to prevent an exposure that does not exist.
+
+  **`.serverOnly()` is withheld**, and the reason is not "a second copy under different retention" — that argument is weak on its own, since the hash already sits in the source table. The decisive one: `crud.*` STRIPS `.serverOnly()` columns from every row it returns, and a snapshot would smuggle the same value back past that stripping inside a `json()` blob, where no column-level rule applies.
+
+  Withheld names are listed under `data._omitted`, so a reader can tell "this column was withheld" from "this column did not exist then". Both timings apply the same policy. `.sensitive()` is not involved: it is an export-masking marker for values that are legitimately readable in the app.
+- **@voltro/cli** — A page that RE-EXPORTS its component (`export { default, renderMode } from '../page'`) no longer fails the codegen gate with "exports no default". The check required the literal words `as default`, so the one spelling that lets two routes share a screen without copying it was the one spelling it refused — and it refused in `voltro build`, while dev and tests stayed green because nothing prerenders there. `export { default as Screen }` is still correctly rejected: it renames the default away.
+
+  Two follow-ons from the same shape:
+
+  - The refusal message said the file "ends in `.page.tsx`" and offered "drop the `.page` suffix" as a fix. That is the 0.15.0 convention, replaced by directory routing in 0.17.0 — it named a convention that no longer exists and a fix that could not work. It now names `page.tsx` and both real fixes. - `scanRenderProfile` read a forwarded `renderMode` as absent and fell back to `'static'`, so `staticSafe` and the deploy-target classification could call an app CDN-deployable with an `ssr` route in it. The forward is now followed (relative specifiers, depth-capped); an unresolvable one still falls back rather than failing the scan.
+- **@voltro/database** — `VOLTRO_SOFT_DROP=1` could never converge. The applier renames the object to `<name>__dropped_<ts>` instead of dropping it, which leaves it undeclared — and the differ read that as one more forgotten table, planning the drop again. The re-plan inside `applyPlan` then found an operation still outstanding and aborted with "the DDL for these operations is a no-op — this is a framework bug", which was a wrong diagnosis of a real defect: the DDL had worked. No fingerprint was recorded, so the migration counted as unapplied and every later `db apply` / boot hit the same wall. The only exit was a hard drop of the snapshot — exactly the recoverability the flag is chosen for.
+
+  The planner now treats `<name>__dropped_<YYYYMMDDHHMMSS>` as framework-managed, alongside `_voltro_*` / `cluster_*`. Deliberately not retention-aware: a planner whose output depends on the clock would produce different plans before and after midnight, and `db gc-snapshots` already owns expiry.
+
+  Reported against tables; the same defect existed one level down for soft-dropped COLUMNS, where it was worse — a re-planned `drop-column` carries no `dropped()` marker and so refuses to plan at all. Both are fixed.
+
+  The convergence message itself no longer asserts a cause it cannot know. It said "the DDL for these operations is a no-op", which was flatly wrong here and sent the reporter looking for dead DDL. It now names both causes — no-op DDL, and a planner that cannot see what the DDL did — and says which one an operation naming a just-renamed object usually is.
+
+### Internal (no consumer-facing effect)
+
+- **The `0.20.0/01_write-recorder-port` codemod gains the gate test its two predecessors have.**
+
+  `codemodRegistry.test.ts` asserts that every `*.codemod.ts` on disk is registered and that ids are unique — registration, not behaviour. What it cannot see is the one way a `manual` codemod fails in practice: an `appliesTo` that is too broad, so the note prints for projects that have nothing to do. That is not a cosmetic problem. A note which fires on every app is how readers learn to skip notes, and the next one carries a boot refusal.
+
+  This codemod is the case where the silent direction matters most. The break is a TYPE error, so `tsc` already names every affected site; the note exists only to explain `maxOf`, which the compiler cannot. Apps that merely ENABLE `timing: 'in-transaction'` need to do nothing — `plugin-versioning` ships the recorder and it is already updated — and they are the large majority.
+
+  Four cases, covering both directions: a project registering its own recorder (note prints, and names `{ append }`, `maxOf`, and the `null`-is-not-zero distinction that a hand-written sequence gets wrong), an app that only enables the timing (silent), the identifier in a comment or a string (silent), and the generic call form `registerWriteRecorder<Row>(…)`, which `callPattern` admits and a naive match would miss.
+
+---
+
 ## [0.19.0] — 2026-07-29
 
 ### ⚠ BREAKING

package/dist/index.d.ts

@@ -282,6 +282,12 @@ export declare class MysqlStore implements DataStore {
      * re-enter `routeEvent` and emit a change event for the trail's own table.
      */
     private appendInTxn;
+    /**
+     * The other half of the recorder port: ONE aggregate on the caller's
+     * connection, so an append-only trail can number its own entries. Equality
+     * filter only — see `writeRecorder.ts` for why it is this narrow.
+     */
+    private maxInTxn;
     private routeEvent;
     private executeUpsert;
     /**

package/dist/index.js

@@ -3,16 +3,16 @@ import { Config as t, Effect as n, Layer as r, ManagedRuntime as i, Option as a,
 import { EventEmitter as c } from "node:events";
 import { createLogger as l } from "@voltro/logger";
 import { SqlClient as u, TransactionConnection as d } from "@effect/sql/SqlClient";
-import { CDC_OFFSETS_TABLE as f, EagerCardinalityError as p, _voltroCdcOffsetsTable as m, attachEagerLoads as h, attributionFields as g, compileEagerJson as _, compilePredicate as v, compileRawFragment as y, compileSelect as b, decodeRowsFromSchema as x, encodeRowForSchema as S, hasEagerLoads as C, isTableReactive as w, qualifyTable as T, raiseChangeListenerCeiling as E, recordsTable as D, requireTable as O, runWriteRecorders as k, stampGeneratedId as A, stampGeneratedIds as j } from "@voltro/database";
+import { CDC_OFFSETS_TABLE as f, EagerCardinalityError as p, _voltroCdcOffsetsTable as m, attachEagerLoads as h, attributionFields as g, attributionKey as _, claimPendingAttribution as v, compileEagerJson as y, compilePredicate as b, compileRawFragment as x, compileSelect as S, currentWriteAttribution as C, decodeRowsFromSchema as w, encodeRowForSchema as T, hasEagerLoads as E, isTableReactive as D, qualifyTable as O, raiseChangeListenerCeiling as k, recordsTable as ee, registerPendingAttribution as te, requireTable as A, runWithWriteAttribution as j, runWriteRecorders as M, stampGeneratedId as N, stampGeneratedIds as P } from "@voltro/database";
 //#region src/sqlLayer.ts
-var M = (n) => e.layerConfig({
+var F = (n) => e.layerConfig({
 	host: t.succeed(n.host),
 	port: t.succeed(n.port),
 	username: t.succeed(n.username),
 	password: t.succeed(o.make(n.password)),
 	database: t.succeed(n.database),
 	...n.maxConnections === void 0 ? {} : { maxConnections: t.succeed(n.maxConnections) }
-}), N = (e) => {
+}), I = (e) => {
 	if (e.url) {
 		let t = new URL(e.url);
 		return {
@@ -32,18 +32,18 @@ var M = (n) => e.layerConfig({
 		database: e.database ?? "app",
 		...e.maxConnections === void 0 ? {} : { maxConnections: e.maxConnections }
 	};
-}, P = (e) => M(N(e)), F = (e, t) => e === null ? !1 : t === null ? !0 : e.filename === t.filename ? e.position > t.position : e.filename > t.filename, I = (e) => e.msSinceProgress < e.stallThresholdMs ? "healthy" : e.primary !== null && !F(e.primary, e.reader) ? "idle-caught-up" : "reconnect", L = (e) => (e instanceof Error ? e.message : String(e ?? "")).includes("schema changed between binlog event and metadata fetch"), R = /* @__PURE__ */ new Set([
+}, L = (e) => F(I(e)), ne = (e, t) => e === null ? !1 : t === null ? !0 : e.filename === t.filename ? e.position > t.position : e.filename > t.filename, R = (e) => e.msSinceProgress < e.stallThresholdMs ? "healthy" : e.primary !== null && !ne(e.primary, e.reader) ? "idle-caught-up" : "reconnect", z = (e) => (e instanceof Error ? e.message : String(e ?? "")).includes("schema changed between binlog event and metadata fetch"), B = /* @__PURE__ */ new Set([
 	"writerows",
 	"updaterows",
 	"deleterows"
-]), z = /\b(alter|rename|drop|create)\s+(table|column)?/i, B = (e) => new Promise((t) => setTimeout(t, e)), V = async (e) => {
+]), V = /\b(alter|rename|drop|create)\s+(table|column)?/i, H = (e) => new Promise((t) => setTimeout(t, e)), U = async (e) => {
 	let t = l({ scope: `voltro:${e.variant}:cdc` }), n;
 	try {
 		n = (await import("@vlasky/zongji")).default;
 	} catch (t) {
 		throw Error(`changeStrategy='cdc' on ${e.variant} requires the '@vlasky/zongji' optional dependency. Install it (it ships as an optionalDependency of @voltro/sql-mysql) to enable binlog CDC.`, { cause: t });
 	}
-	let r = e.includeTables ? new Set(e.includeTables) : null, i = e.connection.database, a = e.startPosition?.filename ?? null, o = e.startPosition ?? null, s = (t, n) => x([n], t, e.variant)[0], c = null, u = !1, d = 0, f = Date.now(), p = !1, m = null, h = e.stallThresholdMs ?? 25e3, g = e.watchdogIntervalMs ?? 15e3, _ = () => {
+	let r = e.includeTables ? new Set(e.includeTables) : null, i = e.connection.database, a = e.startPosition?.filename ?? null, o = e.startPosition ?? null, s = (t, n) => w([n], t, e.variant)[0], c = null, u = !1, d = 0, f = Date.now(), p = !1, m = null, h = e.stallThresholdMs ?? 25e3, g = e.watchdogIntervalMs ?? 15e3, _ = () => {
 		f = Date.now();
 	}, v = (n) => {
 		_();
@@ -52,14 +52,14 @@ var M = (n) => e.layerConfig({
 			a = n.binlogName;
 			return;
 		}
-		if (l === "query" && n.query && z.test(n.query)) {
+		if (l === "query" && n.query && V.test(n.query)) {
 			c && (c.tableMap = {});
 			return;
 		}
 		if (n.nextPosition && a && (o = {
 			filename: a,
 			position: n.nextPosition
-		}, e.onPosition?.(o)), !R.has(l)) return;
+		}, e.onPosition?.(o)), !B.has(l)) return;
 		let u = n.tableMap[n.tableId];
 		if (!u || u.parentSchema !== i) return;
 		let d = u.tableName;
@@ -105,7 +105,7 @@ var M = (n) => e.layerConfig({
 	}, b = (e) => {
 		let t = e;
 		return t?.errno === 1236 || String(t?.code ?? "").includes("ER_MASTER_FATAL_ERROR_READING_BINLOG");
-	}, S = (r) => new Promise((i, a) => {
+	}, x = (r) => new Promise((i, a) => {
 		let o = new n({
 			host: e.connection.host,
 			port: e.connection.port,
@@ -126,9 +126,9 @@ var M = (n) => e.layerConfig({
 				s = !0, a(e instanceof Error ? e : Error(String(e)));
 				return;
 			}
-			C("binlog reader error", e);
+			S("binlog reader error", e);
 		}), o.start(y(r));
-	}), C = async (n, r) => {
+	}), S = async (n, r) => {
 		if (!(u || p)) {
 			p = !0, t.warn(`cdc: reconnecting — ${n}`, {}, r instanceof Error ? r : void 0), e.onError?.(r);
 			try {
@@ -137,11 +137,11 @@ var M = (n) => e.layerConfig({
 					try {
 						c?.stop();
 					} catch {}
-					if (d++, await B(Math.min(3e4, 500 * 2 ** Math.min(d, 6))), u) return;
-					let r = o, i = b(n), s = !i && L(n);
+					if (d++, await H(Math.min(3e4, 500 * 2 ** Math.min(d, 6))), u) return;
+					let r = o, i = b(n), s = !i && z(n);
 					(i || s) && (t.warn(s ? "cdc: un-replayable backlog event (schema moved past it) — jumping to current end + self-heal" : "cdc: binlog gap (purged/failover) — jumping to current end + self-heal"), r = e.resolveStartPosition ? await e.resolveStartPosition().catch(() => null) : null, a = r?.filename ?? null, e.onResync?.());
 					try {
-						await S(r), d = 0, _();
+						await x(r), d = 0, _();
 						return;
 					} catch (e) {
 						n = e;
@@ -153,7 +153,7 @@ var M = (n) => e.layerConfig({
 		}
 	};
 	try {
-		await S(e.startPosition ?? null);
+		await x(e.startPosition ?? null);
 	} catch (n) {
 		if (b(n) && e.startPosition) {
 			t.warn("cdc: persisted offset purged — starting at current end + self-heal");
@@ -161,14 +161,14 @@ var M = (n) => e.layerConfig({
 				c?.stop();
 			} catch {}
 			let n = e.resolveStartPosition ? await e.resolveStartPosition().catch(() => null) : null;
-			a = n?.filename ?? null, e.onResync?.(), await B(500), await S(n);
+			a = n?.filename ?? null, e.onResync?.(), await H(500), await x(n);
 		} else throw n;
 	}
-	let w = async () => {
+	let C = async () => {
 		if (u || p || Date.now() - f < h) return;
 		let n = null;
 		if (e.resolveStartPosition && (n = await e.resolveStartPosition().catch(() => null)), u || p) return;
-		let r = I({
+		let r = R({
 			msSinceProgress: Date.now() - f,
 			stallThresholdMs: h,
 			primary: n,
@@ -182,10 +182,10 @@ var M = (n) => e.layerConfig({
 			reader: o,
 			primary: n,
 			stalledForMs: Date.now() - f
-		}), C("watchdog: stream stalled (no events while primary advanced)", /* @__PURE__ */ Error("cdc watchdog stall"));
+		}), S("watchdog: stream stalled (no events while primary advanced)", /* @__PURE__ */ Error("cdc watchdog stall"));
 	};
 	return m = setInterval(() => {
-		w();
+		C();
 	}, g), m.unref && m.unref(), {
 		stop: async () => {
 			u = !0, m &&= (clearInterval(m), null);
@@ -197,7 +197,7 @@ var M = (n) => e.layerConfig({
 		},
 		currentPosition: () => o
 	};
-}, H = /* @__PURE__ */ new Set(["1213", "1205"]), U = (e) => {
+}, W = /* @__PURE__ */ new Set(["1213", "1205"]), G = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
 		let e = t.errno;
@@ -206,31 +206,31 @@ var M = (n) => e.layerConfig({
 		if (typeof n == "string") return n;
 		t = t.cause;
 	}
-}, W = (e) => {
-	let t = U(e);
-	return t !== void 0 && H.has(t);
-}, G = (e) => W(e) ? "retry" : "noRetry", K = (e) => {
+}, K = (e) => {
+	let t = G(e);
+	return t !== void 0 && W.has(t);
+}, q = (e) => K(e) ? "retry" : "noRetry", J = (e) => {
 	if (e == null) return "null";
 	let t = typeof e;
 	if (t === "bigint") return `${e}n`;
 	if (t !== "object") return JSON.stringify(e);
 	if (e instanceof Date) return `"${e.toISOString()}"`;
-	if (Array.isArray(e)) return `[${e.map(K).join(",")}]`;
+	if (Array.isArray(e)) return `[${e.map(J).join(",")}]`;
 	let n = e;
-	return `{${Object.keys(n).sort().map((e) => `${JSON.stringify(e)}:${K(n[e])}`).join(",")}}`;
-}, q = (e) => {
-	let t = K(e), n = 2166136261;
+	return `{${Object.keys(n).sort().map((e) => `${JSON.stringify(e)}:${J(n[e])}`).join(",")}}`;
+}, Y = (e) => {
+	let t = J(e), n = 2166136261;
 	for (let e = 0; e < t.length; e++) n ^= t.charCodeAt(e), n = Math.imul(n, 16777619);
 	return (n >>> 0).toString(36);
-}, J = (e, t) => {
+}, X = (e, t) => {
 	let n = setTimeout(e, t);
 	typeof n.unref == "function" && n.unref();
-}, Y = class {
+}, re = class {
 	variant;
 	ttlMs;
 	schedule;
 	seen = /* @__PURE__ */ new Map();
-	constructor(e, t = 6e4, n = J) {
+	constructor(e, t = 6e4, n = X) {
 		this.variant = e, this.ttlMs = t, this.schedule = n;
 	}
 	key(e) {
@@ -240,11 +240,11 @@ var M = (n) => e.layerConfig({
 		if (n == null) return null;
 		let r = t;
 		try {
-			r = x([t], e.table, this.variant)[0] ?? t;
+			r = w([t], e.table, this.variant)[0] ?? t;
 		} catch {
 			r = t;
 		}
-		return `${e.table} ${e.op} ${String(n)} ${q(r)}`;
+		return `${e.table} ${e.op} ${String(n)} ${Y(r)}`;
 	}
 	admit(e) {
 		let t = this.key(e);
@@ -259,12 +259,15 @@ var M = (n) => e.layerConfig({
 	get pending() {
 		return this.seen.size;
 	}
-}, X = async (e) => {
+}, Z = async (e) => {
 	let t = e.variant ?? "mysql", n = l({ scope: `voltro:${t}` }), a = e.changeStrategy ?? "inline", o = a;
 	a === "cdc" && !e.cdcConfig && (n.warn("changeStrategy='cdc' requires cdcConfig (serverId + connection); falling back to 'inline'."), o = "inline");
-	let s = e.tracerLayer ? r.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, c = i.make(s), d = new Z(await c.runPromise(u), c, t, o);
+	let s = e.tracerLayer ? r.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, c = i.make(s), d = new ie(await c.runPromise(u), c, t, o);
 	return o === "cdc" && e.cdcConfig && await d.startCdcConsumer(e.cdcConfig), d;
-}, Z = class e {
+}, Q = () => {
+	let e = C();
+	return e === void 0 ? (e) => e() : (t) => j(e, t);
+}, ie = class e {
 	sql;
 	runtime;
 	variant;
@@ -280,13 +283,13 @@ var M = (n) => e.layerConfig({
 	cdcStreamName = "default";
 	cdcGate;
 	constructor(e, t, n, r = "inline", i = null, a, o) {
-		this.sql = e, this.runtime = t, this.variant = n, this.changeStrategy = r, this.namespace = i, this.log = l({ scope: `voltro:${n}` }), this.emitter = a ?? new c(), E(this.emitter), this.cdcGate = o ?? new Y(n);
+		this.sql = e, this.runtime = t, this.variant = n, this.changeStrategy = r, this.namespace = i, this.log = l({ scope: `voltro:${n}` }), this.emitter = a ?? new c(), k(this.emitter), this.cdcGate = o ?? new re(n);
 	}
 	withNamespace(t) {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, this.variant, this.changeStrategy, t, this.emitter, this.cdcGate);
 	}
 	nsT(e) {
-		return T(this.namespace, e);
+		return O(this.namespace, e);
 	}
 	get dialectId() {
 		return this.variant;
@@ -298,8 +301,8 @@ var M = (n) => e.layerConfig({
 		};
 	}
 	async executeQuery(e, t) {
-		let r = b(e, this.sql, this.namespace), i = t ? n.provideService(r, d, t) : r;
-		return x(await this.runtime.runPromise(i), e.table, this.variant);
+		let r = S(e, this.sql, this.namespace), i = t ? n.provideService(r, d, t) : r;
+		return w(await this.runtime.runPromise(i), e.table, this.variant);
 	}
 	get supportsInsertReturning() {
 		return this.variant === "mariadb";
@@ -311,10 +314,10 @@ var M = (n) => e.layerConfig({
 		return !1;
 	}
 	async executeInsert(e, t, r, i) {
-		t = A(e, t);
+		t = N(e, t);
 		let a = this.sql;
 		if (this.supportsInsertReturning) {
-			let o = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(S(t, e))} RETURNING *`, s = r ? n.provideService(o, d, r) : o, c = (await this.runtime.runPromise(s))[0];
+			let o = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(T(t, e))} RETURNING *`, s = r ? n.provideService(o, d, r) : o, c = (await this.runtime.runPromise(s))[0];
 			if (!c) throw Error(`MysqlStore.insert: no row returned for table '${e}'`);
 			return await this.routeEvent({
 				table: e,
@@ -323,7 +326,7 @@ var M = (n) => e.layerConfig({
 				new: c
 			}, i, r), c;
 		}
-		let o = S(t, e), s = t.id;
+		let o = T(t, e), s = t.id;
 		if (s === void 0) {
 			let t = await this.insertRecoverAutoId(e, o, r);
 			return await this.routeEvent({
@@ -357,7 +360,7 @@ var M = (n) => e.layerConfig({
 		if (e) return this.runtime.runPromise(t(e));
 		this.inflightTxns++;
 		try {
-			let e = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (e) => a.isNone(e) ? n.fail(/* @__PURE__ */ Error("MysqlStore.insert: TransactionConnection missing.")) : t(e.value)))), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(W)), o = e.pipe(n.retry(i), n.withSpan("store.insert", { attributes: {
+			let e = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (e) => a.isNone(e) ? n.fail(/* @__PURE__ */ Error("MysqlStore.insert: TransactionConnection missing.")) : t(e.value)))), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(K)), o = e.pipe(n.retry(i), n.withSpan("store.insert", { attributes: {
 				"db.system": this.variant,
 				"db.operation": r
 			} }));
@@ -367,8 +370,8 @@ var M = (n) => e.layerConfig({
 		}
 	}
 	async executeInsertMany(e, t, r, i) {
-		if (t = j(e, t), t.length === 0) return [];
-		let a = this.sql, o = t.map((t) => S(t, e));
+		if (t = P(e, t), t.length === 0) return [];
+		let a = this.sql, o = t.map((t) => T(t, e));
 		if (this.supportsInsertReturning) {
 			let t = a`INSERT INTO ${a(this.nsT(e))} ${a.insert(o)} RETURNING *`, s = r ? n.provideService(t, d, r) : t, c = await this.runtime.runPromise(s);
 			for (let t of c) await this.routeEvent({
@@ -427,7 +430,7 @@ var M = (n) => e.layerConfig({
 	async executeUpdate(e, t, r, i, a) {
 		let o = this.sql;
 		if (this.supportsUpdateReturning) {
-			let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(S(r, e))} WHERE ${o("id")} = ${t} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
+			let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(T(r, e))} WHERE ${o("id")} = ${t} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
 			return l ? (await this.routeEvent({
 				table: e,
 				op: "update",
@@ -435,7 +438,7 @@ var M = (n) => e.layerConfig({
 				new: l
 			}, a, i), l) : null;
 		}
-		let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(S(r, e))} WHERE ${o("id")} = ${t}`, c = i ? n.provideService(s, d, i) : s, l = await this.runtime.runPromise(c);
+		let s = o`UPDATE ${o(this.nsT(e))} SET ${o.update(T(r, e))} WHERE ${o("id")} = ${t}`, c = i ? n.provideService(s, d, i) : s, l = await this.runtime.runPromise(c);
 		if (l && typeof l.affectedRows == "number" && l.affectedRows === 0) return null;
 		let u = o`SELECT * FROM ${o(this.nsT(e))} WHERE ${o("id")} = ${t}`, f = i ? n.provideService(u, d, i) : u, p = (await this.runtime.runPromise(f))[0];
 		return p ? (await this.routeEvent({
@@ -467,21 +470,35 @@ var M = (n) => e.layerConfig({
 		}, i, r), !0;
 	}
 	async appendInTxn(e, t, r) {
-		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(S(t, e))}`;
+		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(T(t, e))}`;
 		await this.runtime.runPromise(r ? n.provideService(a, d, r) : a);
 	}
+	async maxInTxn(e, t, r, i) {
+		let a = this.sql, o = Object.entries(r).map(([e, t]) => a`${a(e)} = ${t}`), s = a`SELECT MAX(${a(t)}) AS ${a("m")} FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = (await this.runtime.runPromise(i ? n.provideService(s, d, i) : s))[0]?.m;
+		return c == null ? null : Number(c);
+	}
 	async routeEvent(e, t, n = null) {
 		if (e = {
 			...g(),
 			...e
-		}, D(e.table) && await k((e, t) => this.appendInTxn(e, t, n), {
+		}, ee(e.table) && await M({
+			append: (e, t) => this.appendInTxn(e, t, n),
+			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
+		}, {
 			table: e.table,
 			op: e.op,
 			next: e.new,
 			prev: e.old,
 			traceId: e.traceId,
 			subjectId: e.subjectId
-		}), t !== null) {
+		}), this.changeStrategy === "cdc") {
+			let t = (e.op === "delete" ? e.old : e.new)?.id;
+			t != null && te(_(e.table, e.op, t), {
+				...e.traceId === void 0 ? {} : { traceId: e.traceId },
+				...e.subjectId === void 0 ? {} : { subjectId: e.subjectId }
+			});
+		}
+		if (t !== null) {
 			t.push(e);
 			return;
 		}
@@ -507,10 +524,10 @@ var M = (n) => e.layerConfig({
 			}
 			return await this.executeUpdate(e, a.id, o, r, i) ?? a;
 		}
-		return this.executeInsert(e, t, r, i);
+		return Q()(() => this.executeInsert(e, t, r, i));
 	}
 	async executeMariadbUpsert(e, t, r, i, a) {
-		let o = this.sql, s = S(t, e), c = Object.keys(s).filter((e) => s[e] !== void 0), l = r.update === void 0 ? c.filter((e) => e !== "id" && !r.conflictColumns.includes(e)) : r.update, u = l.length > 0 ? o.csv(l.map((e) => o`${o(e)} = VALUES(${o(e)})`)) : o`${o(r.conflictColumns[0])} = VALUES(${o(r.conflictColumns[0])})`, f = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(s)} ON DUPLICATE KEY UPDATE ${u} RETURNING *`, p = i ? n.provideService(f, d, i) : f, m = (await this.runtime.runPromise(p))[0];
+		let o = this.sql, s = T(t, e), c = Object.keys(s).filter((e) => s[e] !== void 0), l = r.update === void 0 ? c.filter((e) => e !== "id" && !r.conflictColumns.includes(e)) : r.update, u = l.length > 0 ? o.csv(l.map((e) => o`${o(e)} = VALUES(${o(e)})`)) : o`${o(r.conflictColumns[0])} = VALUES(${o(r.conflictColumns[0])})`, f = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(s)} ON DUPLICATE KEY UPDATE ${u} RETURNING *`, p = i ? n.provideService(f, d, i) : f, m = (await this.runtime.runPromise(p))[0];
 		if (!m) throw Error(`MysqlStore.upsert: no row returned for table '${e}'`);
 		let h = t.id !== void 0 && t.id === m.id ? "insert" : "update";
 		return await this.routeEvent({
@@ -521,8 +538,8 @@ var M = (n) => e.layerConfig({
 		}, a, i), m;
 	}
 	async executeInsertIgnore(e, t, r, i, a) {
-		if (t = A(e, t), this.variant === "mariadb") {
-			let o = this.sql, s = o`INSERT IGNORE INTO ${o(this.nsT(e))} ${o.insert(S(t, e))} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
+		if (t = N(e, t), this.variant === "mariadb") {
+			let o = this.sql, s = o`INSERT IGNORE INTO ${o(this.nsT(e))} ${o.insert(T(t, e))} RETURNING *`, c = i ? n.provideService(s, d, i) : s, l = (await this.runtime.runPromise(c))[0];
 			if (l) return await this.routeEvent({
 				table: e,
 				op: "insert",
@@ -533,7 +550,7 @@ var M = (n) => e.layerConfig({
 			if (!u) throw Error(`MysqlStore.insertIgnore: the insert was skipped as a conflict, but no existing row matches conflictColumns [${r.conflictColumns.join(", ")}] on '${e}'. A DIFFERENT unique constraint fired — a second unique index, or the primary key when you named something else. insertIgnore models ONE conflict target: name the columns of the constraint that actually collides, or handle the unique violation yourself.`);
 			return u;
 		}
-		return await this.findByConflict(e, t, r.conflictColumns, i) || this.executeInsert(e, t, i, a);
+		return await this.findByConflict(e, t, r.conflictColumns, i) || Q()(() => this.executeInsert(e, t, i, a));
 	}
 	async findByConflict(e, t, r, i) {
 		if (r.length === 0) return;
@@ -544,12 +561,12 @@ var M = (n) => e.layerConfig({
 		return this.runWithEager(e, null);
 	}
 	raw(e, t) {
-		let n = y(e, this.sql);
+		let n = x(e, this.sql);
 		return this.runtime.runPromise(n);
 	}
 	async runWithEager(e, t) {
-		if (!C(e)) return this.executeQuery(e, t);
-		let r = this.variant === "mariadb" ? "mariadb" : "mysql", i = this.namespace === null ? _(e, this.sql, r) : null;
+		if (!E(e)) return this.executeQuery(e, t);
+		let r = this.variant === "mariadb" ? "mariadb" : "mysql", i = this.namespace === null ? y(e, this.sql, r) : null;
 		if (i !== null) try {
 			let e = t ? n.provideService(i.fragment, d, t) : i.fragment, r = await this.runtime.runPromise(e);
 			return i.decode(r);
@@ -557,35 +574,35 @@ var M = (n) => e.layerConfig({
 			if (e instanceof p) throw e;
 			this.log.warn(`${this.variant} JSON-agg eager-load failed; falling back to walker`, { err: e });
 		}
-		return h(await this.executeQuery(e, t), e.eager, e.sourceTable ?? O(e.table), (e) => this.executeQuery(e, t));
+		return h(await this.executeQuery(e, t), e.eager, e.sourceTable ?? A(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return this.runWithEager.bind(this);
 	}
 	insert(e, t) {
-		return this.executeInsert(e, t, null, null);
+		return Q()(() => this.executeInsert(e, t, null, null));
 	}
 	insertMany(e, t) {
-		return this.executeInsertMany(e, t, null, null);
+		return Q()(() => this.executeInsertMany(e, t, null, null));
 	}
 	patchJson(e, t, n, r) {
-		return this.executePatchJson(e, t, n, r, null, null);
+		return Q()(() => this.executePatchJson(e, t, n, r, null, null));
 	}
 	upsert(e, t, n) {
-		return this.executeUpsert(e, t, n, null, null);
+		return Q()(() => this.executeUpsert(e, t, n, null, null));
 	}
 	insertIgnore(e, t, n) {
-		return this.executeInsertIgnore(e, t, n, null, null);
+		return Q()(() => this.executeInsertIgnore(e, t, n, null, null));
 	}
 	update(e, t, n) {
-		return this.executeUpdate(e, t, n, null, null);
+		return Q()(() => this.executeUpdate(e, t, n, null, null));
 	}
 	delete(e, t) {
-		return this.executeDelete(e, t, null, null);
+		return Q()(() => this.executeDelete(e, t, null, null));
 	}
 	async updateMany(e, t, r) {
 		if (this.supportsUpdateReturning) {
-			let n = this.sql, i = v(r.where, n, this.namespace), a = n`UPDATE ${n(this.nsT(e))} SET ${n.update(S(t, e))} WHERE ${i} RETURNING *`, o = await this.runtime.runPromise(a);
+			let n = this.sql, i = b(r.where, n, this.namespace), a = n`UPDATE ${n(this.nsT(e))} SET ${n.update(T(t, e))} WHERE ${i} RETURNING *`, o = await this.runtime.runPromise(a);
 			for (let t of o) await this.routeEvent({
 				table: e,
 				op: "update",
@@ -594,23 +611,23 @@ var M = (n) => e.layerConfig({
 			}, null, null);
 			return o.length;
 		}
-		let i = this.sql, o = v(r.where, i, this.namespace);
+		let i = this.sql, o = b(r.where, i, this.namespace);
 		this.inflightTxns++;
 		try {
 			let r = n.suspend(() => this.sql.withTransaction(n.flatMap(n.serviceOption(d), (r) => {
 				if (a.isNone(r)) return n.fail(/* @__PURE__ */ Error("MysqlStore.updateMany: TransactionConnection missing."));
-				let s = r.value, c = i`SELECT id FROM ${i(this.nsT(e))} WHERE ${o} FOR UPDATE`, l = i`UPDATE ${i(this.nsT(e))} SET ${i.update(S(t, e))} WHERE ${o}`;
+				let s = r.value, c = i`SELECT id FROM ${i(this.nsT(e))} WHERE ${o} FOR UPDATE`, l = i`UPDATE ${i(this.nsT(e))} SET ${i.update(T(t, e))} WHERE ${o}`;
 				return n.flatMap(n.provideService(c, d, s), (t) => {
 					if (t.length === 0) return n.succeed([]);
 					let r = t.map((e) => e.id), a = i`SELECT * FROM ${i(this.nsT(e))} WHERE ${i("id")} IN ${i.in(r)}`;
 					return n.flatMap(n.provideService(l, d, s), () => n.provideService(a, d, s));
 				});
-			}))), c = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(W)), l = r.pipe(n.retry(c), n.withSpan("store.updateMany", { attributes: {
+			}))), c = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(K)), l = r.pipe(n.retry(c), n.withSpan("store.updateMany", { attributes: {
 				"db.system": this.variant,
 				"db.operation": "update"
 			} })), u = await this.runtime.runPromise(l);
 			if (u.length === 0) return 0;
-			let f = x(u, e, this.variant);
+			let f = w(u, e, this.variant);
 			for (let t of f) await this.routeEvent({
 				table: e,
 				op: "update",
@@ -623,9 +640,9 @@ var M = (n) => e.layerConfig({
 		}
 	}
 	async deleteMany(e, t) {
-		let r = this.sql, i = v(t.where, r, this.namespace);
+		let r = this.sql, i = b(t.where, r, this.namespace);
 		if (this.supportsDeleteReturning) {
-			let t = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i} RETURNING *`, n = x(await this.runtime.runPromise(t), e, this.variant);
+			let t = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i} RETURNING *`, n = w(await this.runtime.runPromise(t), e, this.variant);
 			for (let t of n) await this.routeEvent({
 				table: e,
 				op: "delete",
@@ -640,12 +657,12 @@ var M = (n) => e.layerConfig({
 				if (a.isNone(t)) return n.fail(/* @__PURE__ */ Error("MysqlStore.deleteMany: TransactionConnection missing."));
 				let o = t.value, s = r`SELECT * FROM ${r(this.nsT(e))} WHERE ${i} FOR UPDATE`, c = r`DELETE FROM ${r(this.nsT(e))} WHERE ${i}`;
 				return n.flatMap(n.provideService(s, d, o), (e) => e.length === 0 ? n.succeed(e) : n.as(n.provideService(c, d, o), e));
-			}))), o = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(W)), c = t.pipe(n.retry(o), n.withSpan("store.deleteMany", { attributes: {
+			}))), o = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(K)), c = t.pipe(n.retry(o), n.withSpan("store.deleteMany", { attributes: {
 				"db.system": this.variant,
 				"db.operation": "delete"
 			} })), l = await this.runtime.runPromise(c);
 			if (l.length === 0) return 0;
-			let u = x(l, e, this.variant);
+			let u = w(l, e, this.variant);
 			for (let t of u) await this.routeEvent({
 				table: e,
 				op: "delete",
@@ -658,13 +675,13 @@ var M = (n) => e.layerConfig({
 		}
 	}
 	emitChange(e) {
-		w(e.table) && (this.changeStrategy === "cdc" && !this.cdcGate.admit(e) || this.emitter.emit("change", e));
+		D(e.table) && (this.changeStrategy === "cdc" && !this.cdcGate.admit(e) || this.emitter.emit("change", e));
 	}
 	async startCdcConsumer(e) {
 		if (this.cdcHandle) return;
 		await this.assertBinlogConfig(), this.cdcReplicaId = e.replicaId;
 		let t = await this.readCdcOffset(e.replicaId) ?? await this.resolveBinlogEnd();
-		this.cdcHandle = await V({
+		this.cdcHandle = await U({
 			connection: e.connection,
 			serverId: e.serverId,
 			variant: this.variant,
@@ -780,26 +797,26 @@ var M = (n) => e.layerConfig({
 	}
 	async transactional(e) {
 		this.inflightTxns++;
-		let t = 0, r = n.suspend(() => {
-			let r = ++t;
-			return this.sql.withTransaction(n.flatMap(n.serviceOption(d), (t) => {
-				if (a.isNone(t)) return n.fail(/* @__PURE__ */ Error("MysqlStore.transactional: TransactionConnection missing."));
-				let i = new Q(this, t.value);
+		let t = Q(), r = 0, i = n.suspend(() => {
+			let i = ++r;
+			return this.sql.withTransaction(n.flatMap(n.serviceOption(d), (r) => {
+				if (a.isNone(r)) return n.fail(/* @__PURE__ */ Error("MysqlStore.transactional: TransactionConnection missing."));
+				let o = new ae(this, r.value);
 				return n.tryPromise({
-					try: () => e(i).then((e) => ({
+					try: () => t(() => e(o)).then((e) => ({
 						result: e,
-						view: i,
-						attempt: r
+						view: o,
+						attempt: i
 					})),
 					catch: (e) => e
 				});
 			}));
-		}), i = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(W)), o = r.pipe(n.retry(i), n.withSpan("store.transactional", { attributes: {
+		}), o = s.exponential("10 millis").pipe(s.compose(s.recurs(3)), s.whileInput(K)), c = i.pipe(n.retry(o), n.withSpan("store.transactional", { attributes: {
 			"db.system": this.variant,
 			"db.operation": "transaction"
 		} }));
 		try {
-			let e = await this.runtime.runPromise(o);
+			let e = await this.runtime.runPromise(c);
 			return e.view.commitEvents(), e.result;
 		} finally {
 			this.inflightTxns--;
@@ -814,7 +831,10 @@ var M = (n) => e.layerConfig({
 		return this.changeStrategy === "cdc" ? "fleet" : "local";
 	}
 	injectExternalChange(e) {
-		this.changeStrategy === "cdc" && !this.cdcGate.admit(e) || w(e.table) && this.emitter.emit("change", {
+		if (this.changeStrategy === "cdc" && !this.cdcGate.admit(e) || !D(e.table)) return;
+		let t = (e.op === "delete" ? e.old : e.new)?.id, n = t == null ? void 0 : v(_(e.table, e.op, t));
+		this.emitter.emit("change", {
+			...n,
 			...e,
 			origin: "injected"
 		});
@@ -840,7 +860,7 @@ var M = (n) => e.layerConfig({
 	async ping() {
 		await this.runtime.runPromise(this.sql`SELECT 1`);
 	}
-}, Q = class {
+}, ae = class {
 	parent;
 	txn;
 	events = [];
@@ -912,7 +932,7 @@ var M = (n) => e.layerConfig({
 			this.events.length = 0;
 		}
 	}
-}, $ = (e) => e.__mysqlReplicationFriend ?? null, ee = () => ({
+}, $ = (e) => e.__mysqlReplicationFriend ?? null, oe = () => ({
 	async capturePrimaryPosition(e) {
 		let t = $(e);
 		if (t === null) throw Error("mysqlReplicationAdapter: primary is not a MysqlStore (missing __mysqlReplicationFriend).");
@@ -932,24 +952,24 @@ var M = (n) => e.layerConfig({
 	compare(e, t) {
 		return "behind";
 	}
-}), te = {
+}), se = {
 	id: "mysql",
-	makeSqlLayer: (e) => P(e),
-	makeStore: (e) => X({
+	makeSqlLayer: (e) => L(e),
+	makeStore: (e) => Z({
 		...e,
 		variant: "mysql"
 	}),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: G
-}, ne = {
+	retryFilter: q
+}, ce = {
 	id: "mariadb",
-	makeSqlLayer: (e) => P(e),
-	makeStore: (e) => X({
+	makeSqlLayer: (e) => L(e),
+	makeStore: (e) => Z({
 		...e,
 		variant: "mariadb"
 	}),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: G
+	retryFilter: q
 };
 //#endregion
-export { f as CDC_OFFSETS_TABLE, e as MysqlClient, m as _voltroCdcOffsetsTable, N as connectionFromConfig, M as makeMysqlSqlLayer, P as makeMysqlSqlLayerFromConfig, X as makeMysqlStore, ne as mariadbDialect, te as mysqlDialect, ee as mysqlReplicationAdapter, G as mysqlRetryFilter, V as startBinlogCdc };
+export { f as CDC_OFFSETS_TABLE, e as MysqlClient, m as _voltroCdcOffsetsTable, I as connectionFromConfig, F as makeMysqlSqlLayer, L as makeMysqlSqlLayerFromConfig, Z as makeMysqlStore, ce as mariadbDialect, se as mysqlDialect, oe as mysqlReplicationAdapter, q as mysqlRetryFilter, U as startBinlogCdc };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-mysql",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "MySQL/MariaDB dialect adapter for Voltro's cross-dialect DataStore (mariadb binlog CDC; mysql inline reactivity).",
   "keywords": [
     "voltro",
@@ -34,8 +34,8 @@
   "dependencies": {
     "@effect/sql": "^0.51.1",
     "@effect/sql-mysql2": "^0.52.0",
-    "@voltro/database": "0.19.0",
-    "@voltro/logger": "0.19.0"
+    "@voltro/database": "0.20.0",
+    "@voltro/logger": "0.20.0"
   },
   "optionalDependencies": {
     "@vlasky/zongji": "^0.9.0"