@voltro/sql-mssql 0.65.0 → 0.66.1

package/CHANGELOG.md

@@ -39,6 +39,108 @@ _Changes staged for the next release accumulate here (rolled up from
 
 ---
 
+## [0.66.1] — 2026-09-06
+
+### Fixed
+
+- **@voltro/cli** — API serve and web start bundles preserve esbuild's caught-import handling: a missing `require()` inside `try/catch` or a caught dynamic import can use its source fallback without a package.json optional-dependency declaration. This fixes the 0.66.0 minified MySQL/MariaDB serve-build regression at mysql2's optional `cardinal` debug highlighter; no direct `cardinal` dependency is needed after upgrading and rebuilding the API. Unhandled missing dependencies and broken installed exports still fail the build. Regression tests execute minified fallback code and build/import production serve bundles for every registered SQL-driver package, plus MariaDB, without requiring database services.
+
+---
+
+## [0.66.0] — 2026-09-06
+
+### ⚠ BREAKING
+
+- **@voltro/client, @voltro/cli** — Socket reconnects retry immediately, then after 500 ms with factor 1.5 and a 5 s cap; configure `web.api.recovery.retry: { initialMs, thenMs, factor, maxMs }` beside `graceMs` and rebuild the web app. Web and React Native share the policy, reset it on protocol readiness, preserve subscription bases/revisions and report every scheduled retry in client diagnostics. One transport loop owns retries, preventing competing supervisor rebuilds. Migration for custom `startApiSupervisor`/`BuildClient` adapters: own socket retries inside the transport (or use `buildApiRuntime`); `onSocketIssue` now reports health/backstop signals only, and `retryDelayMs` overrides construction failures only. Header resolvers are evaluated per runtime build, so do not rely on socket cuts to refresh a rotated token: the web host retains bounded auth-error refresh, and custom hosts can call `SupervisorHandle.refreshAuth()`. Explicit `refreshAuth()`/`reconnect()` still rebuild. Ordinary web/RN mounts require no adapter changes.
+
+  **`voltro update` carries you across this** — codemod `0.66.0/02_socket-retry-owner`. If you pin versions by hand and never run it, print the notes without changing anything: `voltro update --codemods-only --from <your current version> --dry-run` (this one ships in 0.66.0).
+- **@voltro/database, @voltro/runtime, @voltro/voltro** — `id({ scheme: 'numeric' })` declares the numeric row key it always emitted. The builder was typed `ColumnBuilder<string, 'id'>` for every scheme and the row decoder used `Schema.String` for every id, so a BIGSERIAL / AUTO_INCREMENT / IDENTITY column arrived in application code as a decimal string. It is now `number`, decoded as `Schema.Number`, and `InMemoryDataStore` allocates numbers so the in-memory store and a SQL store agree.
+
+  Migration — the codemod prints these, and they are ordered by how the failures surface. String operations on such an id stop compiling and the compiler names every one; wrap with `String(id)` at whatever boundary wants text. Equality against a quoted literal (`row.id === '4'`) is the half that keeps compiling and is now permanently false — drop the quotes. Seeds and fixtures spelling the id as a string fail to decode; write them as numbers. Template interpolation needs no change.
+
+  `reference(target, { storage: 'numeric' })` carries the same numeric type.
+
+  **`voltro update` carries you across this** — codemod `0.66.0/01_numeric-id-is-a-number`. If you pin versions by hand and never run it, print the notes without changing anything: `voltro update --codemods-only --from <your current version> --dry-run` (this one ships in 0.66.0).
+
+### Added
+
+- **@voltro/client, @voltro/protocol** — Add typed `useConnectionSetup(tag)` and `useMutation(tag).withConnectionSetup(handle)` for acknowledged connection-local setup before initial writes and replay. The Effect-scoped barrier follows physical sockets, restores acknowledged intent, shares concurrent setup attempts and clears on leave, unmount or subject/tenant change. Setup descriptors must explicitly declare connection-scoped idempotency; normal writes keep their keys and replay limits. This is not a durable outbox or an authorization grant. Existing mutation identity helpers retain their signatures.
+- **@voltro/cli** — Generated production Compose stacks run declared boot-lifecycle seeds in the migration job, after the reviewed schema plan has applied. Seeding is therefore one pre-deploy operation rather than something every serving replica repeats on boot.
+- **@voltro/protocol, @voltro/runtime, @voltro/cli, @voltro/voltro** — Mutations can declare `idempotencyScope: 'connection'` for native WebSocket side effects: repeat keys deduplicate within that server-owned connection but execute again on a replacement connection. HTTP RPCs fail with typed `MutationConnectionRequired`, including when dedup is disabled; internal, public REST and agent-tool projections are refused. The default subject-scoped replay behavior of ordinary business mutations is unchanged. This does not replace application authorization, reconnect ordering, durable pending writes or disconnect cleanup.
+- **@voltro/runtime, @voltro/cli, @voltro/testing** — `ctx.connectionState` keeps server-owned, structured-cloneable values for one native RPC connection: mutations defer writes/deletes to the existing commit queue, rollback/retry discards them, and transport close clears the state without allowing late commits to resurrect it. Dev, serve and `makeTestContext({ connection })` share the implementation; `withRpcConnection` selects another connection against the same test store and services. This is neither authentication nor durable membership storage.
+- **@voltro/database, @voltro/runtime, @voltro/sql-postgres, @voltro/sql-mysql, @voltro/sql-sqlite, @voltro/sql-mssql, @voltro/testing, @voltro/voltro** — `store.update(table, key, patch)`, `delete`, `patchJson` and `hardDelete` take EITHER an id string or the columns that identify the row:
+
+  await store.update('memberships', { userId: u, orgId: o }, { role: 'member' }) await store.delete('memberships', { userId: u, orgId: o })
+
+  A table declared `.primaryKey(['userId','orgId'])` — or with one explicit key column, which is how a one-to-one shares its parent's key — has no `id`, so it could not be reached by the keyed forms at all. Measured before this, against the in-memory store: `update('memberships', 'u1', …)` returned `null`, `delete('memberships', 'u1')` returned `false`, and the row was untouched. Those are the SAME values a missing row returns.
+
+  The five store implementations did not agree about it either. The SQL stores emitted `WHERE id = ?` literally — 3 sites in postgres, 8 in mysql, 3 in sqlite, 3 in mssql — so a dialect answered `column "id" does not exist`, while the in-memory store keys rows internally and simply missed. A suite on `makeTestApp` runs the quiet one, so it went green over a call that fails in production.
+
+  A key is resolved ONCE, by `rowKeyColumns` in `@voltro/database`, so the five implementations cannot drift about what a key is. A bare string still means the `id` column, unchanged; on a table that has none it is refused with the key columns named, rather than answering `null`.
+
+  Two further defects surfaced when a composite-key table joined the dialect parity harness, both of them older than this change and invisible while the feature had no users:
+
+  - **MySQL could not INSERT such a row.** A row arriving without an `id` was assumed to be an AUTO_INCREMENT table, so the store recovered the key via `LAST_INSERT_ID()` and failed with "is the primary key AUTO_INCREMENT?" — a question about a column the table never declared. It now reads the post-image back by the values just written when nothing was generated. - **MSSQL could not CREATE one over `text()` columns.** `text()` renders as `NVARCHAR(MAX)` there, which SQL Server refuses as a key column. The emitter already bounds indexed text to `NVARCHAR(450)` for exactly this reason; the primary key's own columns were missing from the set that drives it.
+
+  `runDialectParity` gained three composite-key scenarios, so all five dialects assert it — the harness that found both of the above.
+
+  `apiSurface: compatible` — the golden lines that are REPLACED rather than added are the three keyed signatures widening `primaryKey: string` to `primaryKey: RowKey`. A widened parameter accepts everything it did before, so no call site can fail; `@voltro/voltro` is named because the two aggregate goldens carry the same surface and a source package's own report does not pull them along.
+- **@voltro/cli** — `voltro create-project` can add multiple independently cloud-bound projects to one workspace. `add-app --to` and `cloud project link --project` select a target explicitly when needed, and default project port ranges never overlap. API apps now receive manifest/config ports alongside web apps. While the `compose` baseline is active, project/app changes and `voltro baseline sync` regenerate every service plus per-project PostgreSQL databases from those manifests. The generated stack pins PostgreSQL 18.6 and lets containerized web dev resolve its API proxy through `VOLTRO_API_ORIGIN` service DNS.
+- **@voltro/database** — `.primaryKey(['memberId'])` accepts a single explicit natural or reference column as well as a composite set. It previously refused one field and pointed the caller at `id()`, which made a one-to-one shared primary-key/foreign-key impossible to declare without inventing a second key column.
+- **@voltro/database** — `reference(target, { storage: 'numeric' })` declares a foreign key to a table whose primary key is numeric, without disguising it as a plain integer column: row schemas decode it as a number, every SQL renderer emits the dialect's 64-bit integer form, snapshots and introspection round-trip the storage kind, and the migration planner no longer churns it back to text.
+
+  `reference(target, { column: 'key' })` targets a unique alternate key instead of assuming `id`. Deferred cyclic constraints, subject graphs and test factories carry that target column through. The default remains text-and-`id`.
+- **@voltro/protocol, @voltro/cli, @voltro/testing** — Custom REST handlers receive the per-request application context as `ctx.app`. Development, production `serve` and `makeTestApp` bind the same surface, so a REST webhook can publish a typed event or reach cache, KV, workflows and webhooks exactly as an RPC handler does — without a protocol-to-runtime dependency and without stepping outside the framework to do it.
+- **@voltro/protocol** — Typed REST handlers can shape their own response. `response(body, { status, headers })` selects a status and headers, including repeated values such as the several `Set-Cookie` lines a login emits; `restError(status, body, headers)` preserves an application-defined JSON error contract instead of flattening it to the framework's shape; binary responses can pick status and headers the same way. `RestRouteContext` exposes the byte-exact request body alongside method, path and query, so a signed webhook or a multipart protocol no longer has to drop down to a raw plugin route to see the bytes it must verify.
+
+  `requireAuthenticated()` gives a protected REST route one consistent 401 path, distinct from the 403 a scope check produces.
+
+  `apiSurface: compatible` — the golden's one replaced line is the handler's return type widening from `Promise<O> | O` to `Promise<O | RestResponse<O>> | O | RestResponse<O>`. A handler that returns `O` is still assignable, so no declaration site breaks. The one place it is observable is a consumer who reads the descriptor's `handler` type and calls it directly, whose result is now the wider union; the supported way to exercise a route is `makeTestApp`, which is unaffected.
+- **@voltro/database, @voltro/runtime, @voltro/sql-postgres, @voltro/sql-mysql, @voltro/sql-mssql, @voltro/sql-sqlite, @voltro/sql-turso, @voltro/testing, @voltro/voltro** — Upserts accept `updateValues` for additional conflict-only assignments without modifying the INSERT row or changing native column-list upserts into read/compute callbacks. Defined values override the selected update projection; undefined is omitted and identity rewrites are refused. The typed, Effect, replication, transaction and codec surfaces preserve the option, including row-bound encryption. Covered by the shared live-dialect parity suite, including both Turso backends. Existing option fields and calls remain compatible; this is the persistence foundation, not activation of column `.onUpdate()` callbacks.
+
+### Fixed
+
+- **@voltro/client** — Keep a transport-interrupted mutation pending through repeated native `MutationInFlight` replies while its original replay window still permits it. Preserve one key, pending slot and optimistic patch; recheck identity, capability, transport and connection setup before each attempt. Do not renew the window, silently accept a failed write, retry other handler failures or busy-loop on malformed non-positive server delays.
+- **@voltro/client** — `useOutbox` drains online enqueues and restored writes, joins concurrent replay calls, includes writes appended during an acknowledgement, and stops at every failed predecessor without a render-driven retry loop. A subsequent explicit retry or reconnection can retry transient failures; conflicts still require resolution. This scheduling fix does not add a durable-save acknowledgement or cross-tab ownership.
+- **@voltro/client** — Keep late failures from ended physical mutation attempts from marking a healed replacement socket disconnected. Native mutation error events record `affectsTransport: false` when their lifetime evidence proves this distinction; the original failure, commit uncertainty and raw error reporting remain intact. Emitters without native lifetime evidence retain the conservative fallback.
+- **@voltro/database, @voltro/runtime, @voltro/sql-postgres, @voltro/sql-mysql, @voltro/sql-mssql, @voltro/sql-sqlite, @voltro/testing, voltro** — Request-scoped stores evaluate column `.onUpdate()` before validation and encryption for keyed/bulk updates, soft deletes, upsert conflicts and JSON patches. `patchJson` accepts optional companion assignments in the same database UPDATE; object merges are shallow and retain JSON nulls. SQLite-family escaped object keys are compared and preserved after exactly one decoding step, based on a constant in-statement engine probe. Raw stores do not run application callbacks. Scalar JSON roots on SQL Server remain a separate schema-validation limitation.
+- **@voltro/cli** — A generated multi-project Compose stack probes each API's declared port. The generator added one but probed the neighbouring web app's port instead, so an API could be marked healthy without ever being tested — and a web service that correctly waited for API readiness deadlocked behind a check that was never going to describe it.
+- **@voltro/cli** — Production serve/start and SSR bundles now resolve dependencies with the bundler's actual import/require conditions. Installed ESM-only transitive packages no longer become bare external imports that fail after strict-pnpm deployment or pruning. Missing required dependencies and broken installed exports fail the build instead of being reported as optional peers; only actually absent packages declared optional by their importer use that fallback. Native runtime shims remain intact. If this exposes a previously hidden missing dependency, install/fix it in its importing package rather than labelling a required import optional. Real esbuild and Vite tests cover conditional exports, strict transitive resolution, optional and required failures, and execution after relocation without node_modules.
+- **@voltro/cli** — `voltro doctor`'s `cron/bucket-on-wall-clock` follows value references into relative app helpers, including renamed imports, namespace members and re-exports. A `new Date()` in a called `midnightUtcForToday()` is now attributed to its cron in text and `--json` output. Unused helper exports, comments, strings and types do not supply either the wall clock or a clearing `scheduledAt` read. This remains a static advisory, not bucket-key data-flow proof; package imports, tsconfig aliases and dynamic imports are not followed.
+- **@voltro/i18n** — `placeholdersOf` is now exported from `@voltro/i18n`'s public entry, including the built JavaScript and declarations. The 0.64.0 changelog promised that export, but it existed only in the internal catalog module; its tests imported that module and missed the absent package export. Those tests now exercise the public entry. No application change is needed unless you want to use the helper.
+- **@voltro/runtime** — `InMemoryDataStore` keeps seeded rows from tables that deliberately have no `id` column — natural and composite primary keys — and inserts into those tables no longer fabricate one. The store assigns an internal map identity instead, which is what a SQL store does, rather than leaking an undeclared field into application rows.
+
+  Its numeric sequence now starts above the highest seeded id, so the first generated insert can no longer land on top of a seed row.
+- **@voltro/sql-turso** — File-backed libsql connections enable WAL at startup so readers from completed interactive transactions do not block subsequent writers' commits. Remote transports retain server-owned journal configuration. Local-file concurrent-transaction tests require no Turso Cloud account; network and replica synchronization still need separate live validation.
+- **@voltro/runtime** — The in-memory store now applies registered schema literal defaults (including timestamp `now`, JSON and arrays) and implicit nullable values on insert, including transactional, bulk, upsert-insert and insert-ignore-insert paths. Returned rows and change events contain the populated values; explicit values, seeded rows and conflict-update fields are preserved. Mutable defaults are copied per row. App-side factories/computed values remain owned by the shared mutation wrapper; this does not emulate generated SQL expressions or certify database-dialect parity.
+- **@voltro/sql-mssql** — Bind Date parameters as `DateTime2` and strings as `NVarChar`, matching the schema before values reach SQL Server. This preserves milliseconds, dates before 1753, Unicode text and JSON keys/values across row writes, predicates and raw SQL. Explicit NULL remains `NVarChar`. The direct `tedious` dependency uses the version already locked for the SQL client.
+- **@voltro/runtime, @voltro/cli, @voltro/protocol, @voltro/plugin-audit** — Every trace id now comes from one function, `newTraceId()` in `@voltro/runtime` — 128 random bits as 32 hex, the shape a `traceparent` parser, a collector and `voltro traces` all accept.
+
+  Seventeen call sites minted their own, and three of the shapes were not ids. `incoming:<webhookId>`, `reaction:<workflow>`, `schedule:<name>-<ms>` and the literal `'webhooks:trigger'` were CONSTANTS — five of them wrote the identical string into `traceId` and `source`, so the trace id was the caller's label wearing a second hat and every delivery a process handled shared one trace, with the waterfall merging unrelated work. Six more carried `public-`/`grpc-`/`rest-` plus eight base36 characters, about 41 bits, which collides well inside a busy day. One passed `randomUUID()` unstripped, 36 characters with dashes, which no `traceparent` parser accepts — including this framework's own.
+
+  The entry-point kind is not lost: it lives in the `source` field beside the id, which is where it was already being written.
+
+  Plugin HTTP routes now carry a real one too. `PluginHttpRouteEvent` gains `traceId` — the caller's `traceparent` where one arrived, freshly minted otherwise — and the audit trail records it instead of the empty string it wrote before, so an incident review can join a login to what it caused. `apiSurface: compatible`: an observer that ignores the new field is unaffected, and the framework is the only producer of the event.
+
+  A guard in `@voltro/runtime` now asks the question over the whole tree rather than per call site, because the previous test pinned exactly one of them and the same defect went on living at sixteen others.
+- **@voltro/database, @voltro/runtime** — Declarative migrations now retain partial-index predicates and partial uniqueness on new and existing tables, introspect native filters on PostgreSQL/SQLite/SQL Server, detect same-name predicate changes and invalid PostgreSQL online indexes, and include predicates in drift fingerprints. A partial unique index is never emitted as a full UNIQUE constraint. Existing qualifying duplicates refuse the apply without automatic data repair; a pre-DDL conflict check protects replacements when the current column shape supports it. MySQL/MariaDB uniqueActive lowering remains; unlowered partial indexes are refused by the declarative path. SQL normalization is conservative, not a general expression-equivalence prover.
+
+  Memory upsert now addresses matched rows through their actual conflict-column key instead of assuming an id column, both directly and transactionally. Natural/composite primary-key rows preserve independent fields, rollback and post-commit events. The schema/API spelling is unchanged and needs no source codemod; projects upgrading must review and apply the newly visible missing constraints, resolving conflicting historical data explicitly rather than deleting it automatically.
+- **@voltro/cli** — Production workspace WebSocket proxies preserve the browser's Host header, so the native same-origin guard accepts legitimate requests behind internal Docker or cluster hostnames while continuing to reject foreign and opaque origins.
+- **@voltro/protocol** — REST descriptors reject undeclared descendant paths before decoding, resolving identity or executing their handler, instead of accidentally serving parent data or performing parent writes. Named parameters, trailing slashes, explicit splats and raw plugin HTTP prefix routes keep their declared behavior.
+- **@voltro/runtime** — Isolate connection credentials across HTTP/WebSocket protocols and listeners, and deliver every disconnect to both runtime cleanup and the RPC core. Executors receive the server-owned `ctx.request.connection` identity, transport and close signal; numeric client IDs remain opaque process-local handles. Connection state is shared across bundled and external module copies.
+- **@voltro/cli** — `voltro prune-runtime` now preserves package-resolution metadata for rooted native dependencies, so packages such as `argon2` remain importable in pruned production images.
+- **@voltro/sql-sqlite, @voltro/sql-turso, @voltro/testing** — SQLite-family raw stores now encode registered JSON and array columns on every row-write path, including insertMany, updateMany, callback upserts and conflict-only updateValues. Previously objects could fail binding or reach Turso as invalid JSON when a request codec had not already serialized them. Shared live-dialect tests cover direct and transactional writes over SQLite and both Turso clients as well as the other SQL stores.
+- **@voltro/testing** — Declared events published by a mutation under `invoke` now use the transaction's commit queue, including subject/tenant re-scopes; rollback and deadlock replay discard failed-attempt notifications, while untransacted actions still publish immediately.
+- **@voltro/cli** — Apply the shared page-safe security-header policy to both web listeners, including streaming, assets and errors, with `security.headers` configuration and route-owned overrides. Do not derive HSTS from untrusted forwarded headers. Proxy native runtime capability discovery in production as well as dev: one public GET per configured workspace API, not the development inspect surface. Named and custom socket paths reach the actual server's replay capability; ambiguous custom socket parents fail explicitly instead of advertising the wrong API. No replay support or successful writes are synthesized by the proxy.
+
+### Internal (no consumer-facing effect)
+
+- **@voltro/cli** — Building the CLI package now gives its declaration-rollup process a bounded 6144 MiB heap, and packing delegates to the same build script. The seven-entry rollup exhausted the default roughly 4 GiB heap even in an isolated Node 24 build; the measured build succeeds with the scoped allowance. This does not change the memory settings of application builds or serving processes, and does not disable declaration validation or increase build concurrency.
+- The local release gate now executes the CI test planner with all packages and both CLI projects, rather than skipping its GitHub-specific preparation and reading missing shard files. Missing filters or project selectors fail before tests start; the coverage verifier also refuses a missing expected-package plan. Selftests execute the workflow's actual producer/consumer handoff. MySQL test fixtures check authenticated TCP readiness and distinguish cold initialization from failed steady-state healthchecks. The Postgres partial-index contract creates and cleans up its own database on the regular fixture server, so all seven assertions run without an additional opt-in flag in both local and CI gates. Row-history test files run serially because their live fixtures install and write the same fixed-name Postgres table; parallel setup could deadlock before the history assertions ran when the schema was cold.
+
+---
+
 ## [0.65.0] — 2026-09-04
 
 ### ⚠ BREAKING

package/dist/index.d.ts

@@ -18,11 +18,13 @@ import { QueryNamespace } from '@voltro/database';
 import { RawSqlFragment } from '@voltro/database/sql';
 import { RetryDecision } from '@voltro/database';
 import { Row } from '@voltro/database';
+import { RowKey } from '@voltro/database';
 import { SqlClient } from '@effect/sql';
 import { SqlClient as SqlClient_2 } from '@effect/sql/SqlClient';
 import { SqlDialect } from '@voltro/database';
 import { SqlError } from '@effect/sql';
 import { TransactionConnection } from '@effect/sql/SqlClient';
+import { UpsertOptions } from '@voltro/database';
 import { _voltroMssqlCdcOffsetsTable } from '@voltro/database';
 import { WriteAttribution } from '@voltro/database';
 
@@ -246,7 +248,7 @@ export declare class MssqlStore implements DataStore {
     private writeWithRecorders;
     insert(t: string, r: Row): Promise<Readonly<Record<string, unknown>>>;
     insertMany(t: string, rows: ReadonlyArray<Row>): Promise<readonly Readonly<Record<string, unknown>>[]>;
-    patchJson(t: string, pk: string, path: string, value: unknown): Promise<Readonly<Record<string, unknown>> | null>;
+    patchJson(t: string, pk: string, path: string, value: unknown, additionalPatch?: Readonly<Record<string, unknown>>): Promise<Readonly<Record<string, unknown>> | null>;
     update(t: string, pk: string, p: Readonly<Record<string, unknown>>): Promise<Readonly<Record<string, unknown>> | null>;
     delete(t: string, pk: string): Promise<boolean>;
     updateMany(table: string, patch: Readonly<Record<string, unknown>>, options: {
@@ -257,14 +259,10 @@ export declare class MssqlStore implements DataStore {
     }): Promise<number>;
     /* Excluded from this release type: executeUpdateMany */
     /* Excluded from this release type: executeDeleteMany */
-    upsert(t: string, r: Row, options: {
-        conflictColumns: ReadonlyArray<string>;
-        update?: ReadonlyArray<string> | ((existing: Row) => Readonly<Record<string, unknown>>);
-    }): Promise<Readonly<Record<string, unknown>>>;
+    upsert(t: string, r: Row, options: UpsertOptions): Promise<Readonly<Record<string, unknown>>>;
     insertIgnore(t: string, r: Row, options: {
         conflictColumns: ReadonlyArray<string>;
     }): Promise<Readonly<Record<string, unknown>>>;
-    private upsertPatch;
     private executeUpsert;
     /**
      * Single-statement native MERGE upsert. Builds a parameterised

package/dist/index.js

@@ -1,31 +1,34 @@
 import { MssqlClient as e } from "@effect/sql-mssql";
-import { Config as t, Duration as n, Effect as r, Layer as i, ManagedRuntime as a, Option as o, Redacted as s } from "effect";
-import { CDC_OFFSETS_TABLE as c, DEFAULT_ACQUIRE_TIMEOUT_MS as l, EagerCardinalityError as u, MSSQL_TRANSIENT_NUMBERS as d, _voltroMssqlCdcOffsetsTable as f, attachEagerLoads as p, attributionFields as m, bulkInsertLimitsFor as h, causeBranches as g, chunkRowsForInsert as _, compileEagerJson as v, compilePredicate as y, compileRawFragment as ee, compileSelect as b, decodeRowsFromSchema as x, encodeRowForSchema as S, externalChangeEvent as te, hasEagerLoads as ne, isTableReactive as C, makeEagerFallbackReporter as re, observeDbOp as w, qualifyTable as T, quoteIdent as E, raiseChangeListenerCeiling as ie, recordsTable as D, requireTable as O, runStoreTransaction as k, runWriteRecorders as A, stampGeneratedId as j, stampGeneratedIds as M, withCapturedAttribution as ae } from "@voltro/database";
-import { EventEmitter as oe } from "node:events";
-import { createLogger as N } from "@voltro/logger";
-import { SqlClient as P, TransactionConnection as F } from "@effect/sql/SqlClient";
+import { TYPES as t } from "tedious";
+import { Config as n, Duration as r, Effect as i, Layer as a, ManagedRuntime as o, Option as s, Redacted as c } from "effect";
+import { CDC_OFFSETS_TABLE as l, DEFAULT_ACQUIRE_TIMEOUT_MS as u, EagerCardinalityError as d, MSSQL_TRANSIENT_NUMBERS as f, _voltroMssqlCdcOffsetsTable as p, attachEagerLoads as m, attributionFields as h, bulkInsertLimitsFor as g, causeBranches as _, chunkRowsForInsert as v, compileEagerJson as y, compileJsonPatch as b, compilePredicate as x, compileRawFragment as ee, compileSelect as S, decodeRowsFromSchema as C, encodeRowForSchema as w, externalChangeEvent as te, hasEagerLoads as ne, isTableReactive as T, jsonPatchAssignments as re, makeEagerFallbackReporter as E, observeDbOp as D, qualifyTable as ie, quoteIdent as ae, raiseChangeListenerCeiling as oe, recordsTable as O, requireTable as se, rowKeyColumns as k, runStoreTransaction as A, runWriteRecorders as j, stampGeneratedId as M, stampGeneratedIds as ce, upsertUpdatePatch as N, upsertUpdateValues as P, withCapturedAttribution as le } from "@voltro/database";
+import { EventEmitter as ue } from "node:events";
+import { createLogger as F } from "@voltro/logger";
+import { SqlClient as I, TransactionConnection as L } from "@effect/sql/SqlClient";
 //#region src/sqlLayer.ts
-var se = {
+var R = {
 	...e.defaultParameterTypes,
-	null: e.defaultParameterTypes.object
-}, ce = (e) => {
-	let t = e.acquireTimeoutMs ?? l;
+	null: t.NVarChar,
+	Date: t.DateTime2,
+	string: t.NVarChar
+}, de = (e) => {
+	let t = e.acquireTimeoutMs ?? u;
 	return t > 0 ? t : void 0;
-}, I = (r) => {
-	let i = ce(r);
+}, z = (t) => {
+	let i = de(t);
 	return e.layerConfig({
-		server: t.succeed(r.server),
-		parameterTypes: t.succeed(se),
-		...i === void 0 ? {} : { connectTimeout: t.succeed(n.millis(i)) },
-		...r.port === void 0 ? {} : { port: t.succeed(r.port) },
-		...r.database === void 0 ? {} : { database: t.succeed(r.database) },
-		...r.username === void 0 ? {} : { username: t.succeed(r.username) },
-		...r.password === void 0 ? {} : { password: t.succeed(s.make(r.password)) },
-		...r.encrypt === void 0 ? {} : { encrypt: t.succeed(r.encrypt) },
-		...r.trustServer === void 0 ? {} : { trustServer: t.succeed(r.trustServer) },
-		...r.maxConnections === void 0 ? {} : { maxConnections: t.succeed(r.maxConnections) }
+		server: n.succeed(t.server),
+		parameterTypes: n.succeed(R),
+		...i === void 0 ? {} : { connectTimeout: n.succeed(r.millis(i)) },
+		...t.port === void 0 ? {} : { port: n.succeed(t.port) },
+		...t.database === void 0 ? {} : { database: n.succeed(t.database) },
+		...t.username === void 0 ? {} : { username: n.succeed(t.username) },
+		...t.password === void 0 ? {} : { password: n.succeed(c.make(t.password)) },
+		...t.encrypt === void 0 ? {} : { encrypt: n.succeed(t.encrypt) },
+		...t.trustServer === void 0 ? {} : { trustServer: n.succeed(t.trustServer) },
+		...t.maxConnections === void 0 ? {} : { maxConnections: n.succeed(t.maxConnections) }
 	});
-}, L = (e) => {
+}, B = (e) => {
 	let t = e.get("sslmode");
 	if (t !== null) {
 		if (t === "require") return !0;
@@ -40,7 +43,7 @@ var se = {
 			throw Error(`DB_URL '?${t}=${n}' is not supported by the mssql dialect — use 'true'/'1' or 'false'/'0'.`);
 		}
 	}
-}, R = (e) => {
+}, V = (e) => {
 	let t = e.acquireTimeoutMs === void 0 ? {} : { acquireTimeoutMs: e.acquireTimeoutMs }, n = (e) => e === void 0 ? {} : {
 		encrypt: e,
 		...e ? { trustServer: !0 } : {}
@@ -53,7 +56,7 @@ var se = {
 			username: decodeURIComponent(r.username || "sa"),
 			password: decodeURIComponent(r.password || ""),
 			database: r.pathname.replace(/^\//, "") || "master",
-			...n(e.ssl ?? L(r.searchParams)),
+			...n(e.ssl ?? B(r.searchParams)),
 			...e.maxConnections === void 0 ? {} : { maxConnections: e.maxConnections },
 			...t
 		};
@@ -68,7 +71,7 @@ var se = {
 		...e.maxConnections === void 0 ? {} : { maxConnections: e.maxConnections },
 		...t
 	};
-}, z = (e) => I(R(e)), B = d, V = (e) => {
+}, H = (e) => z(V(e)), fe = f, U = (e) => {
 	let t = e;
 	for (let e = 0; e < 5 && typeof t == "object" && t; e++) {
 		let e = t.number;
@@ -77,36 +80,36 @@ var se = {
 		if (typeof n == "string") return n;
 		t = t.cause;
 	}
-}, H = (e) => g(e).some((e) => {
-	let t = V(e);
-	return t !== void 0 && B.has(t);
-}), U = /* @__PURE__ */ new Set(["2601", "2627"]), W = (e) => {
-	let t = V(e);
-	return t !== void 0 && U.has(t);
-}, G = (e) => H(e) ? "retry" : "noRetry", le = {
+}, W = (e) => _(e).some((e) => {
+	let t = U(e);
+	return t !== void 0 && fe.has(t);
+}), pe = /* @__PURE__ */ new Set(["2601", "2627"]), G = (e) => {
+	let t = U(e);
+	return t !== void 0 && pe.has(t);
+}, K = (e) => W(e) ? "retry" : "noRetry", me = {
 	I: "insert",
 	U: "update",
 	D: "delete"
-}, K = (e, t) => e(r.gen(function* () {
-	let e = yield* P;
+}, q = (e, t) => e(i.gen(function* () {
+	let e = yield* I;
 	if (((yield* e`
         SELECT COUNT(*) AS ${e("on")}
         FROM sys.change_tracking_databases
-        WHERE database_id = DB_ID()`)[0]?.on ?? 0) === 0) return yield* r.fail(/* @__PURE__ */ Error("mssql Change Tracking CDC requires CT enabled on the database. Run `ALTER DATABASE <db> SET CHANGE_TRACKING = ON (CHANGE_RETENTION = 2 DAYS, AUTO_CLEANUP = ON)`, or set CDC=0 for inline emit."));
+        WHERE database_id = DB_ID()`)[0]?.on ?? 0) === 0) return yield* i.fail(/* @__PURE__ */ Error("mssql Change Tracking CDC requires CT enabled on the database. Run `ALTER DATABASE <db> SET CHANGE_TRACKING = ON (CHANGE_RETENTION = 2 DAYS, AUTO_CLEANUP = ON)`, or set CDC=0 for inline emit."));
 	for (let n of t) yield* e.unsafe(`IF NOT EXISTS (
              SELECT 1 FROM sys.change_tracking_tables
-             WHERE object_id = OBJECT_ID(${q(n)})
+             WHERE object_id = OBJECT_ID(${J(n)})
            )
-           ALTER TABLE ${J(n)} ENABLE CHANGE_TRACKING WITH (TRACK_COLUMNS_UPDATED = OFF)`);
-})).then(() => void 0), q = (e) => `'${e.replace(/'/g, "''")}'`, J = (e) => `[${e.replace(/\]/g, "]]")}]`, Y = async (e) => {
-	let t = N({ scope: "voltro:mssql:cdc" }), n = e.pollIntervalMs ?? 500;
-	await K(e.run, e.tables);
-	let i = async () => (await e.run(r.gen(function* () {
-		return yield* (yield* P)`SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_CURRENT_VERSION()) AS v`;
-	})))[0]?.v ?? "0", a = e.startVersion ?? await i(), o = !1, s = null, c = !1, l = (e, t) => BigInt(e) > BigInt(t), u = async (n, o) => {
-		let s = await e.run(r.gen(function* () {
-			let e = yield* P, t = e.unsafe(J(n)), r = (yield* e`
-          SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_MIN_VALID_VERSION(OBJECT_ID(${e.unsafe(q(n))}))) AS floor`)[0]?.floor;
+           ALTER TABLE ${Y(n)} ENABLE CHANGE_TRACKING WITH (TRACK_COLUMNS_UPDATED = OFF)`);
+})).then(() => void 0), J = (e) => `'${e.replace(/'/g, "''")}'`, Y = (e) => `[${e.replace(/\]/g, "]]")}]`, X = async (e) => {
+	let t = F({ scope: "voltro:mssql:cdc" }), n = e.pollIntervalMs ?? 500;
+	await q(e.run, e.tables);
+	let r = async () => (await e.run(i.gen(function* () {
+		return yield* (yield* I)`SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_CURRENT_VERSION()) AS v`;
+	})))[0]?.v ?? "0", a = e.startVersion ?? await r(), o = !1, s = null, c = !1, l = (e, t) => BigInt(e) > BigInt(t), u = async (n, o) => {
+		let s = await e.run(i.gen(function* () {
+			let e = yield* I, t = e.unsafe(Y(n)), r = (yield* e`
+          SELECT CONVERT(VARCHAR(40), CHANGE_TRACKING_MIN_VALID_VERSION(OBJECT_ID(${e.unsafe(J(n))}))) AS floor`)[0]?.floor;
 			return r != null && BigInt(o) < BigInt(r) ? {
 				resync: !0,
 				rows: []
@@ -120,11 +123,11 @@ var se = {
 			};
 		}));
 		if (s.resync) {
-			t.warn("cdc: CT retention floor passed our cursor — resyncing to current version", { table: n }), a = await i(), e.onResync?.(), e.onVersion?.(a);
+			t.warn("cdc: CT retention floor passed our cursor — resyncing to current version", { table: n }), a = await r(), e.onResync?.(), e.onVersion?.(a);
 			return;
 		}
 		for (let t of s.rows) {
-			let r = le[t.__ct_op];
+			let r = me[t.__ct_op];
 			if (!r) continue;
 			let { __ct_op: i, __ct_id: a, ...o } = t;
 			if (r === "delete") e.onChange({
@@ -134,7 +137,7 @@ var se = {
 				new: null
 			});
 			else {
-				let t = x([o], n, "mssql")[0];
+				let t = C([o], n, "mssql")[0];
 				e.onChange({
 					table: n,
 					op: r,
@@ -147,7 +150,7 @@ var se = {
 		if (!(o || c)) {
 			c = !0;
 			try {
-				let t = await i();
+				let t = await r();
 				if (l(t, a)) {
 					for (let t of e.tables) {
 						if (o) break;
@@ -175,26 +178,26 @@ var se = {
 		},
 		currentVersion: () => a
 	};
-}, X = N({ scope: "voltro:mssql" }), Z = async (e) => {
+}, Z = F({ scope: "voltro:mssql" }), Q = async (e) => {
 	let t = e.changeStrategy ?? "inline", n = t;
-	t === "cdc" && !e.cdcConfig && (X.warn("changeStrategy='cdc' requires cdcConfig (replicaId + includeTables); falling back to 'inline'."), n = "inline");
-	let r = e.tracerLayer ? i.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, o = a.make(r), s = new Q(await o.runPromise(P), o, n);
+	t === "cdc" && !e.cdcConfig && (Z.warn("changeStrategy='cdc' requires cdcConfig (replicaId + includeTables); falling back to 'inline'."), n = "inline");
+	let r = e.tracerLayer ? a.mergeAll(e.sqlLayer, e.tracerLayer) : e.sqlLayer, i = o.make(r), s = new he(await i.runPromise(I), i, n);
 	return n === "cdc" && e.cdcConfig && await s.startCdcConsumer(e.cdcConfig), s;
-}, Q = class e {
+}, he = class e {
 	sql;
 	runtime;
 	changeStrategy;
 	namespace;
 	emitter;
 	inflightTxns = 0;
-	reportEagerFallback = re(X);
+	reportEagerFallback = E(Z);
 	cdcHandle = null;
 	cdcCheckpointTimer = null;
 	cdcPendingVersion = null;
 	cdcReplicaId = "";
 	cdcStreamName = "default";
 	constructor(e, t, n = "inline", r = null, i) {
-		this.sql = e, this.runtime = t, this.changeStrategy = n, this.namespace = r, this.emitter = i ?? new oe(), ie(this.emitter);
+		this.sql = e, this.runtime = t, this.changeStrategy = n, this.namespace = r, this.emitter = i ?? new ue(), oe(this.emitter);
 	}
 	get inlineEmit() {
 		return this.changeStrategy === "inline";
@@ -203,19 +206,19 @@ var se = {
 		return t === this.namespace ? this : new e(this.sql, this.runtime, this.changeStrategy, t, this.emitter);
 	}
 	nsT(e) {
-		return T(this.namespace, e);
+		return ie(this.namespace, e);
 	}
 	__mssqlReplicationFriend = { runEffect: (e) => this.runtime.runPromise(e) };
 	async executeQuery(e, t) {
-		let n = b(e, this.sql, this.namespace), i = t ? r.provideService(n, F, t) : n, a = await w("mssql", "select", () => this.runtime.runPromise(i));
-		return x(a, e.table, "mssql");
+		let n = S(e, this.sql, this.namespace), r = t ? i.provideService(n, L, t) : n, a = await D("mssql", "select", () => this.runtime.runPromise(r));
+		return C(a, e.table, "mssql");
 	}
 	decodeWritten(e, t) {
-		return x([t], e, "mssql")[0] ?? t;
+		return C([t], e, "mssql")[0] ?? t;
 	}
-	async executeInsert(e, t, n, i, a) {
-		t = j(e, t);
-		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(S(t, e)).returning("*")}`, c = n ? r.provideService(s, F, n) : s, l = (await this.runtime.runPromise(c))[0];
+	async executeInsert(e, t, n, r, a) {
+		t = M(e, t);
+		let o = this.sql, s = o`INSERT INTO ${o(this.nsT(e))} ${o.insert(w(t, e)).returning("*")}`, c = n ? i.provideService(s, L, n) : s, l = (await this.runtime.runPromise(c))[0];
 		if (!l) throw Error(`MssqlStore.insert: row not returned post-insert in '${e}'`);
 		let u = this.decodeWritten(e, l);
 		return await this.routeEvent({
@@ -223,10 +226,10 @@ var se = {
 			op: "insert",
 			old: null,
 			new: u
-		}, i, n, a), u;
+		}, r, n, a), u;
 	}
-	async executeUpdate(e, t, n, i, a, o) {
-		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(S(n, e)).returning("*")} WHERE ${s("id")} = ${t}`, l = i ? r.provideService(c, F, i) : c, u = (await this.runtime.runPromise(l))[0];
+	async executeUpdate(e, t, n, r, a, o) {
+		let s = this.sql, c = s`UPDATE ${s(this.nsT(e))} SET ${s.update(w(n, e)).returning("*")} WHERE ${s.and(k(t).map(([e, t]) => s`${s(e)} = ${t}`))}`, l = r ? i.provideService(c, L, r) : c, u = (await this.runtime.runPromise(l))[0];
 		if (!u) return null;
 		let d = this.decodeWritten(e, u);
 		return await this.routeEvent({
@@ -234,39 +237,39 @@ var se = {
 			op: "update",
 			old: null,
 			new: d
-		}, a, i, o), d;
+		}, a, r, o), d;
 	}
-	async executeInsertMany(e, t, n, i, a) {
-		if (t = M(e, t), t.length === 0) return [];
-		let o = this.sql, s = _(t, h("mssql")), c = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t.map((t) => S(t, e))).returning("*")}`, l;
+	async executeInsertMany(e, t, n, r, a) {
+		if (t = ce(e, t), t.length === 0) return [];
+		let o = this.sql, s = v(t, g("mssql")), c = (t) => o`INSERT INTO ${o(this.nsT(e))} ${o.insert(t.map((t) => w(t, e))).returning("*")}`, l;
 		if (s.length === 1) {
-			let e = c(s[0]), t = n ? r.provideService(e, F, n) : e;
+			let e = c(s[0]), t = n ? i.provideService(e, L, n) : e;
 			l = await this.runtime.runPromise(t);
 		} else if (n) {
 			let e = [];
-			for (let t of s) e.push(...await this.runtime.runPromise(r.provideService(c(t), F, n)));
+			for (let t of s) e.push(...await this.runtime.runPromise(i.provideService(c(t), L, n)));
 			l = e;
-		} else l = await this.runtime.runPromise(o.withTransaction(r.map(r.forEach(s, c, { concurrency: 1 }), (e) => e.flat())));
-		let u = t.map((e) => e.id), d = new Map(x(l, e, "mssql").map((e) => [e.id, e])), f = u.map((e) => d.get(e)).filter((e) => e !== void 0), p = f.length === l.length ? f : [...l];
+		} else l = await this.runtime.runPromise(o.withTransaction(i.map(i.forEach(s, c, { concurrency: 1 }), (e) => e.flat())));
+		let u = t.map((e) => e.id), d = new Map(C(l, e, "mssql").map((e) => [e.id, e])), f = u.map((e) => d.get(e)).filter((e) => e !== void 0), p = f.length === l.length ? f : [...l];
 		for (let t of p) await this.routeEvent({
 			table: e,
 			op: "insert",
 			old: null,
 			new: t
-		}, i, n, a);
+		}, r, n, a);
 		return p;
 	}
-	async executePatchJson(e, t, n, i, a, o, s) {
-		let c = this.sql, l = n.split("."), u = l[0], d = l.slice(1), f = d.length === 0 ? "$" : `$.${d.join(".")}`, p = JSON.stringify(i ?? null), m = c`UPDATE ${c(this.nsT(e))} SET ${c(u)} = JSON_MODIFY(${c(u)}, ${f}, JSON_QUERY(${p})) OUTPUT INSERTED.* WHERE ${c("id")} = ${t}`, h = a ? r.provideService(m, F, a) : m, g = (await this.runtime.runPromise(h))[0];
-		return g ? (await this.routeEvent({
+	async executePatchJson(e, t, n, r, a, o, s, c) {
+		let l = this.sql, u = w(re(t, n, c), e), d = l.csv([b(l, "mssql", n, r), ...Object.entries(u).map(([e, t]) => l`${l(e)} = ${t}`)]), f = l`UPDATE ${l(this.nsT(e))} SET ${d} OUTPUT INSERTED.* WHERE ${l.and(k(t).map(([e, t]) => l`${l(e)} = ${t}`))}`, p = a ? i.provideService(f, L, a) : f, m = (await this.runtime.runPromise(p))[0];
+		return m ? (await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
-			new: g
-		}, o, a, s), g) : null;
+			new: m
+		}, o, a, s), m) : null;
 	}
-	async executeDelete(e, t, n, i, a) {
-		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${o("id")} = ${t}`, c = n ? r.provideService(s, F, n) : s, l = (await this.runtime.runPromise(c))[0];
+	async executeDelete(e, t, n, r, a) {
+		let o = this.sql, s = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${o.and(k(t).map(([e, t]) => o`${o(e)} = ${t}`))}`, c = n ? i.provideService(s, L, n) : s, l = (await this.runtime.runPromise(c))[0];
 		if (!l) return !1;
 		let u = this.decodeWritten(e, l);
 		return await this.routeEvent({
@@ -274,21 +277,21 @@ var se = {
 			op: "delete",
 			old: u,
 			new: null
-		}, i, n, a), !0;
+		}, r, n, a), !0;
 	}
 	async appendInTxn(e, t, n) {
-		let i = this.sql, a = i`INSERT INTO ${i(this.nsT(e))} ${i.insert(S(t, e))}`;
-		await this.runtime.runPromise(n ? r.provideService(a, F, n) : a);
+		let r = this.sql, a = r`INSERT INTO ${r(this.nsT(e))} ${r.insert(w(t, e))}`;
+		await this.runtime.runPromise(n ? i.provideService(a, L, n) : a);
 	}
-	async maxInTxn(e, t, n, i) {
-		let a = this.sql, o = Object.entries(n).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 ? r.provideService(s, F, i) : s))[0]?.m;
+	async maxInTxn(e, t, n, r) {
+		let a = this.sql, o = Object.entries(n).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(r ? i.provideService(s, L, r) : s))[0]?.m;
 		return c == null ? null : Number(c);
 	}
 	async routeEvent(e, t, n = null, r) {
 		e = {
-			...m(r),
+			...h(r),
 			...e
-		}, D(e.table) && await A({
+		}, O(e.table) && await j({
 			append: (e, t) => this.appendInTxn(e, t, n),
 			maxOf: (e, t, r) => this.maxInTxn(e, t, r, n)
 		}, {
@@ -298,7 +301,7 @@ var se = {
 			prev: e.old,
 			traceId: e.traceId,
 			subjectId: e.subjectId
-		}), C(e.table) && (t === null ? this.inlineEmit && this.emitter.emit("change", e) : t.push(e));
+		}), T(e.table) && (t === null ? this.inlineEmit && this.emitter.emit("change", e) : t.push(e));
 	}
 	query(e) {
 		return this.runWithEager(e, null);
@@ -307,17 +310,17 @@ var se = {
 		return this.rawOn(e, null);
 	}
 	rawOn(e, t) {
-		let n = ee(e, this.sql), i = t ? r.provideService(n, F, t) : n;
-		return w("mssql", "raw", () => this.runtime.runPromise(i));
+		let n = ee(e, this.sql), r = t ? i.provideService(n, L, t) : n;
+		return D("mssql", "raw", () => this.runtime.runPromise(r));
 	}
 	async runWithEager(e, t) {
 		if (!ne(e)) return this.executeQuery(e, t);
-		let n = this.namespace === null ? v(e, this.sql, "mssql") : null;
+		let n = this.namespace === null ? y(e, this.sql, "mssql") : null;
 		if (n !== null) try {
-			let e = t ? r.provideService(n.fragment, F, t) : n.fragment, i = await w("mssql", "select", () => this.runtime.runPromise(e));
-			return n.decode(i);
+			let e = t ? i.provideService(n.fragment, L, t) : n.fragment, r = await D("mssql", "select", () => this.runtime.runPromise(e));
+			return n.decode(r);
 		} catch (t) {
-			if (t instanceof u) throw t;
+			if (t instanceof d) throw t;
 			this.reportEagerFallback({
 				dialect: "mssql",
 				table: e.table,
@@ -330,19 +333,19 @@ var se = {
 			table: e.table,
 			reason: "not-compilable"
 		});
-		let i = await this.executeQuery(e, t);
-		return p(i, e.eager, e.sourceTable ?? O(e.table), (e) => this.executeQuery(e, t));
+		let r = await this.executeQuery(e, t);
+		return m(r, e.eager, e.sourceTable ?? se(e.table), (e) => this.executeQuery(e, t));
 	}
 	getInternalRunWithEager() {
 		return this.runWithEager.bind(this);
 	}
 	localWrite(e, t, n) {
-		let r = (e) => D(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
-		return w("mssql", e, () => ae(r));
+		let r = (e) => O(t) ? this.writeWithRecorders(n, e) : n(e, null, null);
+		return D("mssql", e, () => le(r));
 	}
 	async writeWithRecorders(e, t) {
-		let n = [], i = this.sql, a = await this.runtime.runPromise(i.withTransaction(r.flatMap(r.serviceOption(F), (i) => o.isNone(i) ? r.fail(/* @__PURE__ */ Error("MssqlStore.write: TransactionConnection missing.")) : r.tryPromise({
-			try: () => e(t, i.value, n),
+		let n = [], r = this.sql, a = await this.runtime.runPromise(r.withTransaction(i.flatMap(i.serviceOption(L), (r) => s.isNone(r) ? i.fail(/* @__PURE__ */ Error("MssqlStore.write: TransactionConnection missing.")) : i.tryPromise({
+			try: () => e(t, r.value, n),
 			catch: (e) => e
 		}))));
 		for (let e of n) this.emitChange(e);
@@ -354,8 +357,8 @@ var se = {
 	insertMany(e, t) {
 		return this.localWrite("insert", e, (n, r, i) => this.executeInsertMany(e, t, r, i, n));
 	}
-	patchJson(e, t, n, r) {
-		return this.localWrite("update", e, (i, a, o) => this.executePatchJson(e, t, n, r, a, o, i));
+	patchJson(e, t, n, r, i) {
+		return this.localWrite("update", e, (a, o, s) => this.executePatchJson(e, t, n, r, o, s, a, i));
 	}
 	update(e, t, n) {
 		return this.localWrite("update", e, (r, i, a) => this.executeUpdate(e, t, n, i, a, r));
@@ -369,24 +372,24 @@ var se = {
 	deleteMany(e, t) {
 		return this.executeDeleteMany(e, t, null, null);
 	}
-	async executeUpdateMany(e, t, n, i, a, o) {
-		let s = this.sql, c = y(n.where, s, this.namespace), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update(S(t, e))} OUTPUT INSERTED.* WHERE ${c}`, u = i ? r.provideService(l, F, i) : l, d = await w("mssql", "update", () => this.runtime.runPromise(u));
+	async executeUpdateMany(e, t, n, r, a, o) {
+		let s = this.sql, c = x(n.where, s, this.namespace), l = s`UPDATE ${s(this.nsT(e))} SET ${s.update(w(t, e))} OUTPUT INSERTED.* WHERE ${c}`, u = r ? i.provideService(l, L, r) : l, d = await D("mssql", "update", () => this.runtime.runPromise(u));
 		for (let t of d) await this.routeEvent({
 			table: e,
 			op: "update",
 			old: null,
 			new: t
-		}, a, i, o);
+		}, a, r, o);
 		return d.length;
 	}
-	async executeDeleteMany(e, t, n, i, a) {
-		let o = this.sql, s = y(t.where, o, this.namespace), c = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${s}`, l = n ? r.provideService(c, F, n) : c, u = await w("mssql", "delete", () => this.runtime.runPromise(l));
+	async executeDeleteMany(e, t, n, r, a) {
+		let o = this.sql, s = x(t.where, o, this.namespace), c = o`DELETE FROM ${o(this.nsT(e))} OUTPUT DELETED.* WHERE ${s}`, l = n ? i.provideService(c, L, n) : c, u = await D("mssql", "delete", () => this.runtime.runPromise(l));
 		for (let t of u) await this.routeEvent({
 			table: e,
 			op: "delete",
 			old: t,
 			new: null
-		}, i, n, a);
+		}, r, n, a);
 		return u.length;
 	}
 	upsert(e, t, n) {
@@ -395,66 +398,58 @@ var se = {
 	insertIgnore(e, t, n) {
 		return this.localWrite("upsert", e, (r, i, a) => this.executeInsertIgnore(e, t, n, i, a, r));
 	}
-	upsertPatch(e, t, n) {
-		if (typeof n.update == "function") return n.update(t);
-		if (Array.isArray(n.update)) {
-			let t = {};
-			for (let r of n.update) r in e && (t[r] = e[r]);
-			return t;
-		}
-		let r = {};
-		for (let [t, i] of Object.entries(e)) t !== "id" && (n.conflictColumns.includes(t) || (r[t] = i));
-		return r;
-	}
 	async executeUpsert(e, t, n, r, i, a) {
-		if (t = j(e, t), typeof n.update != "function" && n.conflictColumns.length > 0) return this.mergeUpsert(e, t, {
+		if (P(n), t = M(e, t), typeof n.update != "function" && n.conflictColumns.length > 0) return this.mergeUpsert(e, t, {
 			conflictColumns: n.conflictColumns,
-			...n.update ? { update: n.update } : {}
+			...n.update === void 0 ? {} : { update: n.update },
+			...n.updateValues === void 0 ? {} : { updateValues: n.updateValues }
 		}, r, i);
 		let o = await this.findByConflict(e, t, n.conflictColumns, r);
-		if (o) return await this.executeUpdate(e, o.id, this.upsertPatch(t, o, n), r, i) ?? o;
+		if (o) return await this.executeUpdate(e, o.id, N(t, o, n), r, i) ?? o;
 		try {
 			return await this.executeInsert(e, t, r, i);
 		} catch (a) {
-			if (!W(a)) throw a;
+			if (!G(a)) throw a;
 			let o = await this.findByConflict(e, t, n.conflictColumns, r);
 			if (!o) throw a;
-			return await this.executeUpdate(e, o.id, this.upsertPatch(t, o, n), r, i) ?? o;
+			return await this.executeUpdate(e, o.id, N(t, o, n), r, i) ?? o;
 		}
 	}
-	async mergeUpsert(e, t, n, i, a) {
-		let o = this.sql, s = Object.keys(t), c = Array.isArray(n.update) ? n.update.filter((e) => s.includes(e)) : s.filter((e) => e !== "id" && !n.conflictColumns.includes(e)), l = S(t, e), u = s.map((e) => o`${l[e]}`), d = s.map((e) => o`${o(e)}`), f = n.conflictColumns.map((e) => o`tgt.${o(e)} = src.${o(e)}`), p = s.map((e) => o`${o(e)}`), m = s.map((e) => o`src.${o(e)}`), h = (c.length > 0 ? c : [n.conflictColumns[0]]).map((e) => o`tgt.${o(e)} = src.${o(e)}`), g = o`
+	async mergeUpsert(e, t, n, r, a) {
+		let o = this.sql, s = Object.keys(t), c = Array.isArray(n.update) ? n.update.filter((e) => s.includes(e)) : s.filter((e) => e !== "id" && !n.conflictColumns.includes(e)), l = w(t, e), u = s.map((e) => o`${l[e]}`), d = s.map((e) => o`${o(e)}`), f = n.conflictColumns.map((e) => o`tgt.${o(e)} = src.${o(e)}`), p = s.map((e) => o`${o(e)}`), m = s.map((e) => o`src.${o(e)}`), h = P(n), g = w(h, e), _ = [...c.filter((e) => !Object.hasOwn(h, e)).map((e) => o`tgt.${o(e)} = src.${o(e)}`), ...Object.entries(g).map(([e, t]) => o`tgt.${o(e)} = ${t}`)];
+		_.length === 0 && _.push(o`tgt.${o(n.conflictColumns[0])} = src.${o(n.conflictColumns[0])}`);
+		let v = o`
       MERGE ${o(this.nsT(e))} WITH (HOLDLOCK) AS tgt
       USING (VALUES (${o.csv(u)})) AS src (${o.csv(d)})
       ON ${o.and(f)}
-      WHEN MATCHED THEN UPDATE SET ${o.csv(h)}
+      WHEN MATCHED THEN UPDATE SET ${o.csv(_)}
       WHEN NOT MATCHED THEN INSERT (${o.csv(p)}) VALUES (${o.csv(m)})
-      OUTPUT $action AS ${o("__action")}, INSERTED.*;`, _ = i ? r.provideService(g, F, i) : g, v = (await this.runtime.runPromise(_))[0];
-		if (!v) throw Error(`MssqlStore.upsert: MERGE returned no row for '${e}'`);
-		let y = v.__action, { __action: ee, ...b } = v, x = this.decodeWritten(e, b);
+      OUTPUT $action AS ${o("__action")}, INSERTED.*;`, y = r ? i.provideService(v, L, r) : v, b = (await this.runtime.runPromise(y))[0];
+		if (!b) throw Error(`MssqlStore.upsert: MERGE returned no row for '${e}'`);
+		let x = b.__action, { __action: ee, ...S } = b, C = this.decodeWritten(e, S);
 		return this.routeEvent({
 			table: e,
-			op: y === "INSERT" ? "insert" : "update",
+			op: x === "INSERT" ? "insert" : "update",
 			old: null,
-			new: x
-		}, a), x;
+			new: C
+		}, a), C;
 	}
 	async executeInsertIgnore(e, t, n, r, i, a) {
-		t = j(e, t);
+		t = M(e, t);
 		let o = await this.findByConflict(e, t, n.conflictColumns, r);
 		if (o) return o;
 		try {
 			return await this.executeInsert(e, t, r, i);
 		} catch (i) {
-			if (!W(i)) throw i;
+			if (!G(i)) throw i;
 			let a = await this.findByConflict(e, t, n.conflictColumns, r);
 			if (!a) throw i;
 			return a;
 		}
 	}
-	async findByConflict(e, t, n, i) {
+	async findByConflict(e, t, n, r) {
 		if (n.length === 0) return;
-		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT TOP 1 * FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = i ? r.provideService(s, F, i) : s;
+		let a = this.sql, o = n.map((e) => a`${a(e)} = ${t[e]}`), s = a`SELECT TOP 1 * FROM ${a(this.nsT(e))} WHERE ${a.and(o)}`, c = r ? i.provideService(s, L, r) : s;
 		return (await this.runtime.runPromise(c))[0];
 	}
 	emitChange(e) {
@@ -464,9 +459,9 @@ var se = {
 		if (this.cdcHandle) return;
 		this.cdcReplicaId = e.replicaId;
 		let t = e.includeTables ?? [];
-		t.length === 0 && X.warn("cdc: no reactive tables to tail; Change Tracking reader idle. Set includeTables to enable.");
+		t.length === 0 && Z.warn("cdc: no reactive tables to tail; Change Tracking reader idle. Set includeTables to enable.");
 		let n = await this.readCdcOffset(e.replicaId);
-		this.cdcHandle = await Y({
+		this.cdcHandle = await X({
 			run: this.__mssqlReplicationFriend.runEffect,
 			tables: t,
 			startVersion: n,
@@ -474,9 +469,9 @@ var se = {
 			onVersion: (e) => {
 				this.cdcPendingVersion = e;
 			},
-			onError: (e) => X.warn("cdc: consumer error", {}, e),
+			onError: (e) => Z.warn("cdc: consumer error", {}, e),
 			onResync: () => {
-				X.warn("cdc: resynced to current CT version after retention gap — subscriptions self-heal on the next change");
+				Z.warn("cdc: resynced to current CT version after retention gap — subscriptions self-heal on the next change");
 			}
 		}), this.cdcCheckpointTimer = setInterval(() => {
 			this.flushCdcOffset();
@@ -485,14 +480,14 @@ var se = {
 	async readCdcOffset(e) {
 		try {
 			let t = this.sql, n = (await this.runtime.runPromise(t`
-          SELECT TOP 1 ${t("ctVersion")} FROM ${t(c)}
+          SELECT TOP 1 ${t("ctVersion")} FROM ${t(l)}
           WHERE ${t("id")} = ${e}`))[0]?.ctVersion;
-			return n ? (X.info("cdc: resuming from persisted CT version", {
+			return n ? (Z.info("cdc: resuming from persisted CT version", {
 				replicaId: e,
 				version: n
 			}), n) : null;
 		} catch (t) {
-			return X.warn("cdc: no readable offset; starting at current CT version", { replicaId: e }, t), null;
+			return Z.warn("cdc: no readable offset; starting at current CT version", { replicaId: e }, t), null;
 		}
 	}
 	async flushCdcOffset() {
@@ -501,7 +496,7 @@ var se = {
 			this.cdcPendingVersion = null;
 			try {
 				let t = this.cdcReplicaId;
-				await this.executeUpsert(c, {
+				await this.executeUpsert(l, {
 					id: t,
 					replicaId: t,
 					streamName: this.cdcStreamName,
@@ -512,7 +507,7 @@ var se = {
 					update: ["ctVersion", "updatedAt"]
 				}, null, null);
 			} catch (t) {
-				this.cdcPendingVersion = e, X.warn("cdc: checkpoint write failed", {}, t);
+				this.cdcPendingVersion = e, Z.warn("cdc: checkpoint write failed", {}, t);
 			}
 		}
 	}
@@ -567,16 +562,16 @@ var se = {
 	}
 	async emptyTablesOn(e, t) {
 		if (e.length === 0) return;
-		let n = this.sql, i = (e) => this.nsT(e), a = (e, t) => n.unsafe(`ALTER TABLE ${E(i(e), "mssql")} ${t ? "WITH CHECK CHECK" : "NOCHECK"} CONSTRAINT ALL`), o = r.acquireUseRelease(r.forEach(e, (e) => a(e, !1), { discard: !0 }), () => r.forEach(e, (e) => n`DELETE FROM ${n(i(e))}`, { discard: !0 }), () => r.orDie(r.ignore(r.forEach(e, (e) => a(e, !0), { discard: !0 })))), s = t === null ? n.withTransaction(o) : r.provideService(o, F, t);
+		let n = this.sql, r = (e) => this.nsT(e), a = (e, t) => n.unsafe(`ALTER TABLE ${ae(r(e), "mssql")} ${t ? "WITH CHECK CHECK" : "NOCHECK"} CONSTRAINT ALL`), o = i.acquireUseRelease(i.forEach(e, (e) => a(e, !1), { discard: !0 }), () => i.forEach(e, (e) => n`DELETE FROM ${n(r(e))}`, { discard: !0 }), () => i.orDie(i.ignore(i.forEach(e, (e) => a(e, !0), { discard: !0 })))), s = t === null ? n.withTransaction(o) : i.provideService(o, L, t);
 		await this.runtime.runPromise(s);
 	}
 	async transactional(e) {
 		this.inflightTxns++;
 		try {
-			return await k({
+			return await A({
 				...this.txnSpec("MssqlStore.transactional"),
 				work: e,
-				makeView: (e, t) => new ue(this, e, t)
+				makeView: (e, t) => new ge(this, e, t)
 			});
 		} finally {
 			this.inflightTxns--;
@@ -588,7 +583,7 @@ var se = {
 			dialect: "mssql",
 			withTransaction: (e) => this.sql.withTransaction(e),
 			runPromiseExit: (e) => this.runtime.runPromiseExit(e),
-			isRetryable: H,
+			isRetryable: W,
 			span: {
 				name: "store.transactional",
 				attributes: {
@@ -607,7 +602,7 @@ var se = {
 		return this.changeStrategy === "cdc" ? "fleet" : "local";
 	}
 	injectExternalChange(e) {
-		C(e.table) && this.emitter.emit("change", te(e));
+		T(e.table) && this.emitter.emit("change", te(e));
 	}
 	run(e) {
 		return this.runtime.runPromise(e);
@@ -620,7 +615,7 @@ var se = {
 		if (this.inflightTxns > 0) {
 			let t = Date.now() + e;
 			for (; this.inflightTxns > 0 && Date.now() < t;) await new Promise((e) => setTimeout(e, 25));
-			this.inflightTxns > 0 && X.warn("close: grace period expired with in-flight transactions", {
+			this.inflightTxns > 0 && Z.warn("close: grace period expired with in-flight transactions", {
 				gracePeriodMs: e,
 				inflight: this.inflightTxns
 			});
@@ -630,7 +625,7 @@ var se = {
 	async ping() {
 		await this.runtime.runPromise(this.sql`SELECT 1`);
 	}
-}, ue = class {
+}, ge = class {
 	parent;
 	txn;
 	attr;
@@ -654,8 +649,8 @@ var se = {
 	insertMany(e, t) {
 		return this.parent.getInternalExecuteInsertMany()(e, t, this.txn, this.events, this.attr);
 	}
-	patchJson(e, t, n, r) {
-		return this.parent.getInternalExecutePatchJson()(e, t, n, r, this.txn, this.events, this.attr);
+	patchJson(e, t, n, r, i) {
+		return this.parent.getInternalExecutePatchJson()(e, t, n, r, this.txn, this.events, this.attr, i);
 	}
 	update(e, t, n) {
 		return this.parent.getInternalExecuteUpdate()(e, t, n, this.txn, this.events, this.attr);
@@ -691,12 +686,12 @@ var se = {
 			this.events.length = 0;
 		}
 	}
-}, $ = (e) => e.__mssqlReplicationFriend ?? null, de = (e, t) => e === t ? 0 : e < t ? -1 : 1, fe = () => ({
+}, $ = (e) => e.__mssqlReplicationFriend ?? null, _e = (e, t) => e === t ? 0 : e < t ? -1 : 1, ve = () => ({
 	async capturePrimaryPosition(e) {
 		let t = $(e);
 		if (t === null) throw Error("mssqlReplicationAdapter: primary is not an MssqlStore (missing __mssqlReplicationFriend).");
-		return t.runEffect(r.gen(function* () {
-			return (yield* (yield* P)`
+		return t.runEffect(i.gen(function* () {
+			return (yield* (yield* I)`
           SELECT CONVERT(VARCHAR(40), end_of_log_lsn) AS lsn
           FROM sys.dm_hadr_database_replica_states
           WHERE database_id = DB_ID()
@@ -708,8 +703,8 @@ var se = {
 	async probeReplicaPosition(e) {
 		let t = $(e);
 		if (t === null) throw Error("mssqlReplicationAdapter: replica is not an MssqlStore.");
-		return t.runEffect(r.gen(function* () {
-			return (yield* (yield* P)`
+		return t.runEffect(i.gen(function* () {
+			return (yield* (yield* I)`
           SELECT CONVERT(VARCHAR(40), last_hardened_lsn) AS lsn
           FROM sys.dm_hadr_database_replica_states
           WHERE database_id = DB_ID()
@@ -718,14 +713,14 @@ var se = {
 		}));
 	},
 	compare(e, t) {
-		return de(t, e) >= 0 ? "caught-up" : "behind";
+		return _e(t, e) >= 0 ? "caught-up" : "behind";
 	}
-}), pe = {
+}), ye = {
 	id: "mssql",
-	makeSqlLayer: (e) => z(e),
-	makeStore: (e) => Z(e),
+	makeSqlLayer: (e) => H(e),
+	makeStore: (e) => Q(e),
 	compileContains: (e, t, n) => n`${e} LIKE ${`%${t.replace(/[\\%_[\]]/g, (e) => `\\${e}`)}%`} ESCAPE '\\'`,
-	retryFilter: G
+	retryFilter: K
 };
 //#endregion
-export { c as CDC_OFFSETS_TABLE, e as MssqlClient, f as _voltroMssqlCdcOffsetsTable, R as connectionFromConfig, K as ensureChangeTracking, I as makeMssqlSqlLayer, z as makeMssqlSqlLayerFromConfig, Z as makeMssqlStore, pe as mssqlDialect, fe as mssqlReplicationAdapter, G as mssqlRetryFilter, Y as startChangeTrackingCdc };
+export { l as CDC_OFFSETS_TABLE, e as MssqlClient, p as _voltroMssqlCdcOffsetsTable, V as connectionFromConfig, q as ensureChangeTracking, z as makeMssqlSqlLayer, H as makeMssqlSqlLayerFromConfig, Q as makeMssqlStore, ye as mssqlDialect, ve as mssqlReplicationAdapter, K as mssqlRetryFilter, X as startChangeTrackingCdc };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@voltro/sql-mssql",
-  "version": "0.65.0",
+  "version": "0.66.1",
   "description": "SQL Server (mssql) dialect adapter for Voltro's cross-dialect DataStore (OUTPUT-clause returning, OFFSET/FETCH paging, inline reactivity).",
   "keywords": [
     "voltro",
@@ -35,8 +35,9 @@
   "dependencies": {
     "@effect/sql": "^0.52.0",
     "@effect/sql-mssql": "^0.53.0",
-    "@voltro/database": "0.65.0",
-    "@voltro/logger": "0.65.0"
+    "@voltro/database": "0.66.1",
+    "@voltro/logger": "0.66.1",
+    "tedious": "18.6.2"
   },
   "peerDependencies": {
     "effect": "^3.22.0"