@shivaedev/test-sql 0.13.0 → 0.15.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.15.0 - 2026-10-30
+
+### Added
+
+- `observeUntil(read, settled, waitingFor, options?)` from `@shivaedev/test-sql/server/observeUntil.ts` waits for PostgreSQL state that sends no notification, such as sessions in `pg_stat_activity` or lock waiters. It repeats one read on live time, even under a paused test clock, and returns the value once `settled` holds for `stableReads` reads in a row (default 2), so a value that flips back is not accepted. When `within` (default 5 seconds) runs out it fails with a typed `NeverSettled` whose message names what it waited for, the read count and the last value.
+
+### Breaking
+
+- `raceWithLock` waits for its contenders to block through `observeUntil`, so that wait runs on live time. Its `timeout` now bounds each phase on its own: taking the lock and the contenders' finish after release still fail with `TimeoutError`, while contenders that never all block fail with `NeverSettled` naming how many blocked. Handle `NeverSettled` wherever you handled the `TimeoutError` of contenders that never queued on the lock.
+
+## 0.14.0 - 2026-10-30
+
+### Added
+
+- A scoped PostgreSQL disconnect proxy supports disconnecting, refusing and stalling traffic, holding disconnect acknowledgements, observing open clients and dropping LISTEN notifications. Test kits can share the environment reader and empty PostgreSQL template.
+- Shared story answer readouts translate Effect failures into words for package test kits.
+
 ## 0.13.0 - 2026-10-30
 
 ### Added

package/README.md

@@ -169,7 +169,21 @@ expect(results.filter(Result.isSuccess)).toHaveLength(1);
 expect(results.filter(Result.isFailure).map((result) => result.failure)).toEqual(["full", "full"]);
 ```
 
-`claimLastPlace` is the application's guarded write, failing with the typed `"full"` value when no place remains; `Result` is Effect's native `Result` module. Results stay in input order, including each call's typed failure. The holder rolls back by default, discarding any writes in `lock`; set `release: "commit"` when a contender must observe the holder's committed write. The default timeout is five seconds; `timeout` accepts an Effect duration. Defects and interruption retain their native failure kind, and the helper's scope owns the holder and competing fibers.
+`claimLastPlace` is the application's guarded write, failing with the typed `"full"` value when no place remains; `Result` is Effect's native `Result` module. Results stay in input order, including each call's typed failure. The holder rolls back by default, discarding any writes in `lock`; set `release: "commit"` when a contender must observe the holder's committed write. `timeout` accepts an Effect duration, five seconds by default, and bounds each phase on its own: taking the lock and the contenders' finish after release fail with `TimeoutError`, and contenders that never all block fail with `NeverSettled` from `observeUntil`, naming how many blocked at the last read. The wait for blocked contenders runs on live time. Defects and interruption retain their native failure kind, and the helper's scope owns the holder and competing fibers.
+
+### Wait for PostgreSQL state that sends no notification
+
+PostgreSQL announces no change to its catalog views: a session leaving `pg_stat_activity` or a backend starting to wait on a lock happens without a signal. `observeUntil` is the one poll for such state. It repeats one read, returns the value once `settled` holds for `stableReads` reads in a row, and sleeps on live time, so a story's paused test clock does not stall it:
+
+```ts
+import { observeUntil } from "@shivaedev/test-sql/server/observeUntil.ts";
+
+const sessions = sql<{ count: number }>`select count(*)::int as count from pg_stat_activity
+	where application_name = ${applicationName}`.pipe(Effect.map(([row]) => row?.count ?? 0));
+yield* observeUntil(sessions, (count) => count === 0, "the app's sessions to close");
+```
+
+Options are `every` (default 25 milliseconds between reads), `within` (default 5 seconds) and `stableReads` (default 2). A count that reaches zero and rises again restarts the run of agreeing reads instead of being accepted. When `within` runs out the Effect fails with a typed `NeverSettled`, whose `last` holds the last value as an `Option` and whose message reads like `Timed out after 1s waiting for the app's sessions to close: 40 reads, last value 1`. Use it only for state PostgreSQL does not announce; wait on the engine's own signals everywhere else.
 
 ### Choose an empty database per story or trait
 
@@ -249,6 +263,14 @@ With a PostgreSQL client in the current Context, the assertion compares names th
 
 The assertion uses the SQL `Model`'s selected database fields, including generated ids and excluding JSON-only fields. Supply an exact PostgreSQL type for every field: schemas such as `Schema.Number` do not determine whether storage is `integer`, `numeric` or `double precision`. It fails with a typed `ModelColumnMismatch` containing all detected missing, extra and wrongly typed column problems. The type map is checked against the model both by TypeScript and at runtime. This check covers names and types; it does not check defaults, nullability, constraints or application data transformations.
 
+### Database faults
+
+`disconnectProxy` from `@shivaedev/test-sql/server/disconnectProxy.ts` acquires a loopback TCP proxy in the current Effect scope. Give its `url` to the application database client. `disconnect()` cuts existing connections, `setReachable(false)` also refuses new connections, and `setResponsive(false)` stalls traffic until `setResponsive(true)` resumes it. Closing the scope destroys the sockets and closes the listener.
+
+For teardown stories, pass `{ holdDisconnects: true }`: `disconnecting` signals the first upstream disconnect, `allHeld` signals when every upstream has disconnected, and `release()` forwards the held acknowledgements. For LISTEN health stories, `{ dropNotifications: true }` filters PostgreSQL notifications while other SQL traffic continues; `dropped` signals a filtered notification.
+
+`@shivaedev/test-sql/server/emptyPostgres.ts` provides `databaseUrl` and `postgres`, an empty migration template selected by `PLATFORM_SQL_TEST_DATABASE_URL`. Use it with `withIsolatedDatabase` for kits that initialize their own schema. `environmentVariable(name)` from `@shivaedev/test-sql/server/adapters/environmentVariable.ts` reads an optional string through Effect Config when declaring a kit's `runIf`.
+
 ### API
 
 Import each name from the module that defines it. The package has no root entry. Every source module is available through its `.ts` subpath, including modules under `server/internal/`.
@@ -262,6 +284,7 @@ Import each name from the module that defines it. The package has no root entry.
 | `@shivaedev/test-sql/server/migrationSteps.ts`       | `migrationSteps(appMigrations)` returning `{ migrateTo(name), migrateToLatest }`                                                                                                           |
 | `@shivaedev/test-sql/server/migrationUpgrade.ts`     | `migrationUpgrade({ migrations, upTo, table })`, `MigrationUpgradeOptions`, `PostgresColumn`                                                                                               |
 | `@shivaedev/test-sql/server/assertModelColumns.ts`   | `assertModelColumns(columns, model, types)`, `ModelColumnMismatch`                                                                                                                         |
+| `@shivaedev/test-sql/server/observeUntil.ts`         | `observeUntil(read, settled, waitingFor, { every?, within?, stableReads? }?)`, `NeverSettled`, `ObserveOptions`                                                                            |
 
 `url` is a redacted PostgreSQL URL for an existing administrative database. `PostgresTestDatabase` supplies the current database's redacted `url`, an `awaitCleanup: Effect<void>` drain, a scoped `isolated` Effect that acquires a migrated clone's service Context, and `clone(template)` for an explicit `"empty"` or `"migrated"` choice. With `prepare: false`, both choices are empty. Prefer `withIsolatedDatabase` to acquire and release that Context around a test. Wrappers retain the body's result, failures and unmet service requirements, with native `SqlError` added for acquisition or transaction failures. Cleanup failures surface as SQL defects when the Layer closes. Drops that fail with connection exhaustion (SQLSTATE `53300`) retry every 100 ms of live time for up to 300 retries, even while a test clock is paused; if capacity does not return, the SQL defect remains visible. Startup sweeps databases left by dead processes on the same host and databases from the older unowned naming format. Databases owned by live processes or another host are retained, so local parallel workers keep their databases. Use the same host to reclaim its abandoned databases.
 

package/dist/server/adapters/environmentVariable.d.ts

@@ -0,0 +1,2 @@
+export declare function environmentVariable(name: string): string | undefined;
+//# sourceMappingURL=environmentVariable.d.ts.map

package/dist/server/adapters/environmentVariable.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/environmentVariable.ts"],"names":[],"mappings":"AAEA,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEpE"}

package/dist/server/adapters/environmentVariable.js

@@ -0,0 +1,5 @@
+import { Config, Effect, Option } from "effect";
+export function environmentVariable(name) {
+    return Option.getOrUndefined(Effect.runSync(Config.option(Config.String(name))));
+}
+//# sourceMappingURL=environmentVariable.js.map

package/dist/server/adapters/environmentVariable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../../src/server/adapters/environmentVariable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhD,MAAM,UAAU,mBAAmB,CAAC,IAAY;IAC/C,OAAO,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAClF,CAAC"}

package/dist/server/adapters/notificationFilter.d.ts

@@ -0,0 +1,3 @@
+import { Transform } from "node:stream";
+export declare function notificationFilter(dropped: () => void): Transform;
+//# sourceMappingURL=notificationFilter.d.ts.map

package/dist/server/adapters/notificationFilter.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notificationFilter.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/notificationFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,MAAM,IAAI,aAqBrD"}

package/dist/server/adapters/notificationFilter.js

@@ -0,0 +1,25 @@
+import { Transform } from "node:stream";
+export function notificationFilter(dropped) {
+    let pending = Buffer.alloc(0);
+    const filter = new Transform({
+        transform(chunk, _encoding, callback) {
+            pending = Buffer.concat([pending, chunk]);
+            while (pending.length >= 5) {
+                const length = pending.readInt32BE(1) + 1;
+                if (pending.length < length) {
+                    break;
+                }
+                if (pending[0] === 65) {
+                    dropped();
+                }
+                else {
+                    filter.push(pending.subarray(0, length));
+                }
+                pending = pending.subarray(length);
+            }
+            callback();
+        },
+    });
+    return filter;
+}
+//# sourceMappingURL=notificationFilter.js.map

package/dist/server/adapters/notificationFilter.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notificationFilter.js","sourceRoot":"","sources":["../../../src/server/adapters/notificationFilter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,UAAU,kBAAkB,CAAC,OAAmB;IACrD,IAAI,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAI,SAAS,CAAC;QAC5B,SAAS,CAAC,KAAa,EAAE,SAAS,EAAE,QAAQ;YAC3C,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;YAC1C,OAAO,OAAO,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;gBAC1C,IAAI,OAAO,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;oBAC7B,MAAM;gBACP,CAAC;gBACD,IAAI,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;oBACvB,OAAO,EAAE,CAAC;gBACX,CAAC;qBAAM,CAAC;oBACP,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBAC1C,CAAC;gBACD,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;YACpC,CAAC;YACD,QAAQ,EAAE,CAAC;QACZ,CAAC;KACD,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AACf,CAAC"}

package/dist/server/adapters/openDisconnectProxy.d.ts

@@ -0,0 +1,14 @@
+import type { DisconnectProxyOptions } from "#disconnectProxy.ts";
+export declare function openDisconnectProxy(destination: string, options: DisconnectProxyOptions): Promise<{
+    allHeld: Promise<void>;
+    close: () => Promise<void>;
+    disconnect: () => void;
+    disconnecting: Promise<void>;
+    dropped: Promise<void>;
+    openClients: () => number;
+    release: () => void;
+    setReachable: (value: boolean) => void;
+    setResponsive: (value: boolean) => void;
+    url: string;
+}>;
+//# sourceMappingURL=openDisconnectProxy.d.ts.map

package/dist/server/adapters/openDisconnectProxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"openDisconnectProxy.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/openDisconnectProxy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,qBAAqB,CAAC;AAGlE,wBAAsB,mBAAmB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,sBAAsB;;;;;;;;0BAuFtE,OAAO;2BAMN,OAAO;;GAY/B"}

package/dist/server/adapters/openDisconnectProxy.js

@@ -0,0 +1,110 @@
+import { createConnection, createServer } from "node:net";
+import { notificationFilter } from "./notificationFilter.js";
+export async function openDisconnectProxy(destination, options) {
+    const target = new URL(destination);
+    const address = { host: target.hostname, port: Number(target.port || 5432) };
+    const sockets = new Set();
+    const clients = new Set();
+    const pending = new Set();
+    const disconnecting = Promise.withResolvers();
+    const allHeld = Promise.withResolvers();
+    const dropped = Promise.withResolvers();
+    let held = options.holdDisconnects === true;
+    let reachable = true;
+    let responsive = true;
+    let upstreams = 0;
+    function disconnect() {
+        for (const socket of sockets) {
+            socket.destroy();
+        }
+    }
+    function release() {
+        held = false;
+        for (const socket of pending) {
+            socket.end();
+        }
+    }
+    const server = createServer({ allowHalfOpen: true }, (client) => {
+        if (!reachable) {
+            client.destroy();
+            return;
+        }
+        const upstream = createConnection(address);
+        clients.add(client);
+        upstreams += 1;
+        for (const socket of [client, upstream]) {
+            sockets.add(socket);
+            socket.on("close", () => sockets.delete(socket));
+            socket.on("error", () => {
+                client.destroy();
+                upstream.destroy();
+            });
+        }
+        client.pipe(upstream, { end: false });
+        const incoming = options.dropNotifications === true ? upstream.pipe(notificationFilter(dropped.resolve)) : upstream;
+        incoming.pipe(client, { end: false });
+        client.on("end", () => {
+            clients.delete(client);
+            upstream.end();
+        });
+        client.on("close", () => clients.delete(client));
+        upstream.on("end", () => {
+            pending.add(client);
+            disconnecting.resolve();
+            if (pending.size === upstreams) {
+                allHeld.resolve();
+            }
+            if (!held) {
+                client.end();
+            }
+        });
+        if (!responsive) {
+            client.pause();
+            upstream.pause();
+        }
+    });
+    await new Promise((resolve, reject) => {
+        server.once("error", reject);
+        server.listen(0, "127.0.0.1", resolve);
+    });
+    const listening = server.address();
+    if (listening === null || typeof listening === "string") {
+        throw new Error("Expected a TCP listener");
+    }
+    target.hostname = "127.0.0.1";
+    target.port = String(listening.port);
+    if (options.dropNotifications === true) {
+        target.searchParams.set("sslmode", "disable");
+    }
+    return {
+        allHeld: allHeld.promise,
+        close: async () => {
+            disconnect();
+            await new Promise((resolve) => server.close(() => resolve()));
+        },
+        disconnect,
+        disconnecting: disconnecting.promise,
+        dropped: dropped.promise,
+        openClients: () => clients.size,
+        release,
+        setReachable: (value) => {
+            reachable = value;
+            if (!value) {
+                disconnect();
+            }
+        },
+        setResponsive: (value) => {
+            responsive = value;
+            for (const socket of sockets) {
+                if (value) {
+                    socket.resume();
+                }
+                else {
+                    socket.pause();
+                }
+            }
+        },
+        url: target.toString(),
+    };
+}
+//# sourceMappingURL=openDisconnectProxy.js.map

package/dist/server/adapters/openDisconnectProxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"openDisconnectProxy.js","sourceRoot":"","sources":["../../../src/server/adapters/openDisconnectProxy.ts"],"names":[],"mappings":"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"}

package/dist/server/disconnectProxy.d.ts

@@ -0,0 +1,18 @@
+import { Effect } from "effect";
+export interface DisconnectProxyOptions {
+    readonly dropNotifications?: boolean;
+    readonly holdDisconnects?: boolean;
+}
+export declare const disconnectProxy: (destination: string, options?: DisconnectProxyOptions | undefined) => Effect.Effect<{
+    allHeld: Promise<void>;
+    close: () => Promise<void>;
+    disconnect: () => void;
+    disconnecting: Promise<void>;
+    dropped: Promise<void>;
+    openClients: () => number;
+    release: () => void;
+    setReachable: (value: boolean) => void;
+    setResponsive: (value: boolean) => void;
+    url: string;
+}, never, import("effect/Scope").Scope>;
+//# sourceMappingURL=disconnectProxy.d.ts.map

package/dist/server/disconnectProxy.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"disconnectProxy.d.ts","sourceRoot":"","sources":["../../src/server/disconnectProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,MAAM,WAAW,sBAAsB;IACtC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,OAAO,CAAC;IACrC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;CACnC;AAED,eAAO,MAAM,eAAe;;;;;;;;;;;uCAK1B,CAAC"}

package/dist/server/disconnectProxy.js

@@ -0,0 +1,6 @@
+import { Effect } from "effect";
+import { openDisconnectProxy } from "#adapters/openDisconnectProxy.ts";
+export const disconnectProxy = Effect.fnUntraced(function* (destination, options = {}) {
+    return yield* Effect.acquireRelease(Effect.promise(() => openDisconnectProxy(destination, options)), (proxy) => Effect.promise(proxy.close));
+});
+//# sourceMappingURL=disconnectProxy.js.map

package/dist/server/disconnectProxy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"disconnectProxy.js","sourceRoot":"","sources":["../../src/server/disconnectProxy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AAOvE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,WAAmB,EAAE,OAAO,GAA2B,EAAE;IACpH,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAClC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,EAC/D,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CACtC,CAAC;AACH,CAAC,CAAC,CAAC"}

package/dist/server/emptyPostgres.d.ts

@@ -0,0 +1,4 @@
+import { Migrator } from "effect/sql";
+export declare const databaseUrl: string | undefined;
+export declare const postgres: import("effect/Layer").Layer<import("@effect/sql-pg/PgClient").PgClient | import("./database.ts").PostgresTestDatabase | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient, Migrator.MigrationError | import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError, never>;
+//# sourceMappingURL=emptyPostgres.d.ts.map

package/dist/server/emptyPostgres.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"emptyPostgres.d.ts","sourceRoot":"","sources":["../../src/server/emptyPostgres.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAItC,eAAO,MAAM,WAAW,oBAAwD,CAAC;AACjF,eAAO,MAAM,QAAQ,uUAGnB,CAAC"}

package/dist/server/emptyPostgres.js

@@ -0,0 +1,10 @@
+import { Redacted } from "effect";
+import { Migrator } from "effect/sql";
+import { environmentVariable } from "#adapters/environmentVariable.ts";
+import { makePostgresTestLayer } from "#postgres.ts";
+export const databaseUrl = environmentVariable("PLATFORM_SQL_TEST_DATABASE_URL");
+export const postgres = makePostgresTestLayer({
+    migrations: { loader: Migrator.fromRecord({}), lockTimeout: "5 seconds" },
+    url: Redacted.make(databaseUrl ?? "postgresql://integration-tests-disabled"),
+});
+//# sourceMappingURL=emptyPostgres.js.map

package/dist/server/emptyPostgres.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"emptyPostgres.js","sourceRoot":"","sources":["../../src/server/emptyPostgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACvE,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,CAAC,MAAM,WAAW,GAAG,mBAAmB,CAAC,gCAAgC,CAAC,CAAC;AACjF,MAAM,CAAC,MAAM,QAAQ,GAAG,qBAAqB,CAAC;IAC7C,UAAU,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE;IACzE,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,WAAW,IAAI,yCAAyC,CAAC;CAC5E,CAAC,CAAC"}

package/dist/server/observeUntil.d.ts

@@ -0,0 +1,26 @@
+import { Duration, Effect, Option } from "effect";
+export interface ObserveOptions {
+    readonly every?: Duration.Input;
+    readonly stableReads?: number;
+    readonly within?: Duration.Input;
+}
+declare const NeverSettled_base: new <A_1 extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A_1 as P extends "_tag" ? never : P]: A_1[P]; }>) => import("effect/Cause").YieldableError & {
+    readonly _tag: "NeverSettled";
+} & Readonly<A_1>;
+export declare class NeverSettled<A> extends NeverSettled_base<{
+    readonly reads: number;
+    readonly waitingFor: string;
+    readonly within: Duration.Duration;
+}> {
+    readonly last: Option.Option<A>;
+    constructor({ last, ...fields }: {
+        readonly last: Option.Option<A>;
+        readonly reads: number;
+        readonly waitingFor: string;
+        readonly within: Duration.Duration;
+    });
+    get message(): string;
+}
+export declare const observeUntil: <A, E, R>(read: Effect.Effect<A, E, R>, settled: (value: A) => boolean, waitingFor: string, options?: ObserveOptions | undefined) => Effect.Effect<A, E | NeverSettled<A>, R>;
+export {};
+//# sourceMappingURL=observeUntil.d.ts.map

package/dist/server/observeUntil.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"observeUntil.d.ts","sourceRoot":"","sources":["../../src/server/observeUntil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,QAAQ,EAAE,MAAM,EAAa,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE1E,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IAChC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;CACjC;;;;AAED,qBAAa,YAAY,CAAC,CAAC,CAAE,SAAQ,kBAAiC;IACrE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC;CACnC,CAAC;IACD,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAEhC,YAAY,EACX,IAAI,EACJ,GAAG,MAAM,EACT,EAAE;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAA;KAAE,EAG9H;IAED,IAAa,OAAO,WAMnB;CACD;AAGD,eAAO,MAAM,YAAY,GAAqD,CAAC,EAAE,CAAC,EAAE,CAAC,iDAEnE,CAAC,KAAK,OAAO,uGAuB7B,CAAC"}

package/dist/server/observeUntil.js

@@ -0,0 +1,35 @@
+import { Clock, Data, Duration, Effect, Formatter, Option } from "effect";
+export class NeverSettled extends Data.TaggedError("NeverSettled") {
+    last;
+    constructor({ last, ...fields }) {
+        super(fields);
+        this.last = last;
+    }
+    get message() {
+        const seen = Option.match(this.last, {
+            onNone: () => "no read finished",
+            onSome: (value) => `${this.reads} ${this.reads === 1 ? "read" : "reads"}, last value ${Formatter.format(value)}`,
+        });
+        return `Timed out after ${Duration.format(this.within)} waiting for ${this.waitingFor}: ${seen}`;
+    }
+}
+// PostgreSQL announces no change to its catalog views, so this poll is the sanctioned wait for them. It sleeps on live time because a story's test clock cannot move PostgreSQL.
+export const observeUntil = Effect.fn("PostgresTest.observeUntil")(function* (read, settled, waitingFor, options) {
+    const within = Duration.fromInputUnsafe(options?.within ?? "5 seconds");
+    const stableReads = options?.stableReads ?? 2;
+    const live = Clock.Clock.defaultValue();
+    const pause = Effect.sleep(options?.every ?? "25 millis").pipe(Effect.provideService(Clock.Clock, live));
+    let last = Option.none();
+    let reads = 0;
+    function observe(streak) {
+        return Effect.flatMap(read, (value) => {
+            last = Option.some(value);
+            reads += 1;
+            const agreeing = settled(value) ? streak + 1 : 0;
+            return agreeing >= stableReads ? Effect.succeed(value) : Effect.andThen(pause, observe(agreeing));
+        });
+    }
+    const deadline = Effect.sleep(within).pipe(Effect.provideService(Clock.Clock, live), Effect.andThen(Effect.suspend(() => Effect.fail(new NeverSettled({ last, reads, waitingFor, within })))));
+    return yield* Effect.raceFirst(observe(0), deadline);
+});
+//# sourceMappingURL=observeUntil.js.map

package/dist/server/observeUntil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"observeUntil.js","sourceRoot":"","sources":["../../src/server/observeUntil.ts"],"names":[],"mappings":"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"}

package/dist/server/raceWithLock.d.ts

@@ -6,5 +6,5 @@ export declare function raceWithLock<A, E, R, TLockError, TLockServices>(options
     readonly timeout?: Duration.Input;
     readonly release?: "commit" | "rollback";
     readonly count?: "contenders" | "every blocked session";
-}): Effect.Effect<import("effect/Result").Result<A, E>[], TLockError | import("effect/sql/SqlError").SqlError | import("effect/Cause").TimeoutError, import("effect/reactivity/Reactivity").Reactivity | SqlClient.SqlClient | Exclude<R, import("effect/Scope").Scope> | Exclude<Exclude<TLockServices, import("effect/Scope").Scope>, import("effect/Scope").Scope>>;
+}): Effect.Effect<import("effect/Result").Result<A, E>[], TLockError | import("#observeUntil.ts").NeverSettled<number> | import("effect/sql/SqlError").SqlError | import("effect/Cause").TimeoutError, import("effect/reactivity/Reactivity").Reactivity | SqlClient.SqlClient | Exclude<R, import("effect/Scope").Scope> | Exclude<Exclude<TLockServices, import("effect/Scope").Scope>, import("effect/Scope").Scope>>;
 //# sourceMappingURL=raceWithLock.d.ts.map

package/dist/server/raceWithLock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"raceWithLock.d.ts","sourceRoot":"","sources":["../../src/server/raceWithLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,EAAmB,MAAM,QAAQ,CAAC;AAC1E,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAUlD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IACzE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IACjE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CACxD,sWAyCA"}
+{"version":3,"file":"raceWithLock.d.ts","sourceRoot":"","sources":["../../src/server/raceWithLock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,QAAQ,EAAE,MAAM,EAAS,MAAM,QAAQ,CAAC;AAChE,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAWlD,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,OAAO,EAAE;IACzE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC;IACjE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;IACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,YAAY,GAAG,uBAAuB,CAAC;CACxD,wZAyCA"}

package/dist/server/raceWithLock.js

@@ -1,39 +1,40 @@
-import { Deferred, Effect, Fiber, Schedule } from "effect";
+import { Deferred, Effect, Fiber } from "effect";
 import { SqlClient, Statement } from "effect/sql";
 import { transact } from "@shivaedev/sql/transact.ts";
+import { observeUntil } from "#observeUntil.ts";
 import { withTestTransaction } from "#withTestTransaction.ts";
 function tagged(effect, tag) {
     return Effect.provideService(effect, Statement.CurrentTransformer, (statement, sql) => Effect.succeed(sql `${sql.literal(`/* ${tag} */`)} ${statement}`));
 }
 export function raceWithLock(options) {
     const everyBlockedSession = options.count === "every blocked session";
+    const timeout = options.timeout ?? "5 seconds";
+    const contenders = `${options.effects.length} ${everyBlockedSession ? "sessions" : "contenders"} to block on the lock`;
     return Effect.scoped(Effect.gen(function* () {
         const sql = yield* SqlClient.SqlClient;
         const ready = yield* Deferred.make();
         const started = yield* Deferred.make();
         const hold = Effect.gen(function* () {
-            yield* options.lock;
+            yield* Effect.timeout(options.lock, timeout);
             const [holder] = yield* sql `select pg_backend_pid() as pid`;
             const race = `raceWithLock ${holder?.pid}.`;
             yield* Deferred.succeed(ready, race);
             yield* Deferred.await(started);
-            // PostgreSQL signals nothing when a session starts waiting on a lock, so the holder polls its blocker graph.
-            yield* sql `select pg_stat_clear_snapshot()`.pipe(Effect.andThen(sql `with recursive blocked(pid) as (
+            const waiting = sql `select pg_stat_clear_snapshot()`.pipe(Effect.andThen(sql `with recursive blocked(pid) as (
 						select pid from pg_stat_activity where pg_backend_pid() = any(pg_blocking_pids(pid))
 						union
 						select activity.pid from pg_stat_activity activity join blocked on blocked.pid = any(pg_blocking_pids(activity.pid))
 					) select ${everyBlockedSession ? sql `count(*)` : sql `count(distinct split_part(activity.query, ' */', 1))`}::integer as waiting
 					from pg_stat_activity activity join blocked using (pid)
-					where ${everyBlockedSession ? sql `true` : sql `starts_with(activity.query, ${`/* ${race}`})`}`), Effect.repeat({ schedule: Schedule.spaced("10 millis"), while: ([row]) => (row?.waiting ?? 0) < options.effects.length }));
+					where ${everyBlockedSession ? sql `true` : sql `starts_with(activity.query, ${`/* ${race}`})`}`), Effect.map(([row]) => row?.waiting ?? 0));
+            yield* observeUntil(waiting, (count) => count >= options.effects.length, contenders, { within: timeout });
         });
         const holder = yield* (options.release === "commit" ? transact(Effect.scoped(hold), { onSqlError: (error) => error }) : withTestTransaction(hold)).pipe(Effect.forkScoped);
         const race = yield* Effect.raceFirst(Deferred.await(ready), Fiber.join(holder).pipe(Effect.andThen(Effect.never)));
-        const contenders = yield* Effect.forEach(options.effects, (effect, index) => Effect.result(everyBlockedSession ? effect : tagged(effect, `${race}${index}`)), {
-            concurrency: "unbounded",
-        }).pipe(Effect.forkScoped);
+        const racing = yield* Effect.forEach(options.effects, (effect, index) => Effect.result(everyBlockedSession ? effect : tagged(effect, `${race}${index}`)), { concurrency: "unbounded" }).pipe(Effect.forkScoped);
         yield* Deferred.succeed(started, undefined);
-        yield* Effect.raceFirst(Fiber.join(holder), Fiber.join(contenders).pipe(Effect.andThen(Effect.never)));
-        return yield* Fiber.join(contenders);
-    })).pipe(Effect.timeout(options.timeout ?? "5 seconds"));
+        yield* Effect.raceFirst(Fiber.join(holder), Fiber.join(racing).pipe(Effect.andThen(Effect.never)));
+        return yield* Effect.timeout(Fiber.join(racing), timeout);
+    }));
 }
 //# sourceMappingURL=raceWithLock.js.map

package/dist/server/raceWithLock.js.map

@@ -1 +1 @@
-{"version":3,"file":"raceWithLock.js","sourceRoot":"","sources":["../../src/server/raceWithLock.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"raceWithLock.js","sourceRoot":"","sources":["../../src/server/raceWithLock.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shivaedev/test-sql",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "description": "PostgreSQL rollback and real-commit test isolation for Effect",
   "keywords": [
     "effect"
@@ -43,16 +43,16 @@
     "README.md"
   ],
   "dependencies": {
-    "@shivaedev/sql": "0.26.1"
+    "@shivaedev/sql": "0.27.0"
   },
   "devDependencies": {
     "@effect/sql-pg": "4.0.6",
     "@effect/vitest": "4.0.6",
-    "@shivaedev/jobs": "0.23.1",
-    "@shivaedev/quality": "0.47.0",
+    "@shivaedev/jobs": "0.23.2",
+    "@shivaedev/quality": "0.48.0",
     "@shivaedev/service": "0.6.0",
-    "@shivaedev/test": "0.11.0",
-    "@shivaedev/test-story": "0.25.1",
+    "@shivaedev/test": "0.12.0",
+    "@shivaedev/test-story": "0.26.2",
     "@types/node": "24.19.2",
     "effect": "4.0.6",
     "pg-boss": "12.38.0",

package/src/server/adapters/environmentVariable.ts

@@ -0,0 +1,5 @@
+import { Config, Effect, Option } from "effect";
+
+export function environmentVariable(name: string): string | undefined {
+	return Option.getOrUndefined(Effect.runSync(Config.option(Config.String(name))));
+}

package/src/server/adapters/notificationFilter.ts

@@ -0,0 +1,24 @@
+import { Transform } from "node:stream";
+
+export function notificationFilter(dropped: () => void) {
+	let pending = Buffer.alloc(0);
+	const filter = new Transform({
+		transform(chunk: Buffer, _encoding, callback) {
+			pending = Buffer.concat([pending, chunk]);
+			while (pending.length >= 5) {
+				const length = pending.readInt32BE(1) + 1;
+				if (pending.length < length) {
+					break;
+				}
+				if (pending[0] === 65) {
+					dropped();
+				} else {
+					filter.push(pending.subarray(0, length));
+				}
+				pending = pending.subarray(length);
+			}
+			callback();
+		},
+	});
+	return filter;
+}

package/src/server/adapters/openDisconnectProxy.ts

@@ -0,0 +1,110 @@
+import { createConnection, createServer, type Socket } from "node:net";
+import type { DisconnectProxyOptions } from "#disconnectProxy.ts";
+import { notificationFilter } from "./notificationFilter.ts";
+
+export async function openDisconnectProxy(destination: string, options: DisconnectProxyOptions) {
+	const target = new URL(destination);
+	const address = { host: target.hostname, port: Number(target.port || 5432) };
+	const sockets = new Set<Socket>();
+	const clients = new Set<Socket>();
+	const pending = new Set<Socket>();
+	const disconnecting = Promise.withResolvers<void>();
+	const allHeld = Promise.withResolvers<void>();
+	const dropped = Promise.withResolvers<void>();
+	let held = options.holdDisconnects === true;
+	let reachable = true;
+	let responsive = true;
+	let upstreams = 0;
+	function disconnect() {
+		for (const socket of sockets) {
+			socket.destroy();
+		}
+	}
+	function release() {
+		held = false;
+		for (const socket of pending) {
+			socket.end();
+		}
+	}
+	const server = createServer({ allowHalfOpen: true }, (client) => {
+		if (!reachable) {
+			client.destroy();
+			return;
+		}
+		const upstream = createConnection(address);
+		clients.add(client);
+		upstreams += 1;
+		for (const socket of [client, upstream]) {
+			sockets.add(socket);
+			socket.on("close", () => sockets.delete(socket));
+			socket.on("error", () => {
+				client.destroy();
+				upstream.destroy();
+			});
+		}
+		client.pipe(upstream, { end: false });
+		const incoming = options.dropNotifications === true ? upstream.pipe(notificationFilter(dropped.resolve)) : upstream;
+		incoming.pipe(client, { end: false });
+		client.on("end", () => {
+			clients.delete(client);
+			upstream.end();
+		});
+		client.on("close", () => clients.delete(client));
+		upstream.on("end", () => {
+			pending.add(client);
+			disconnecting.resolve();
+			if (pending.size === upstreams) {
+				allHeld.resolve();
+			}
+			if (!held) {
+				client.end();
+			}
+		});
+		if (!responsive) {
+			client.pause();
+			upstream.pause();
+		}
+	});
+	await new Promise<void>((resolve, reject) => {
+		server.once("error", reject);
+		server.listen(0, "127.0.0.1", resolve);
+	});
+	const listening = server.address();
+	if (listening === null || typeof listening === "string") {
+		throw new Error("Expected a TCP listener");
+	}
+	target.hostname = "127.0.0.1";
+	target.port = String(listening.port);
+	if (options.dropNotifications === true) {
+		target.searchParams.set("sslmode", "disable");
+	}
+	return {
+		allHeld: allHeld.promise,
+		close: async () => {
+			disconnect();
+			await new Promise<void>((resolve) => server.close(() => resolve()));
+		},
+		disconnect,
+		disconnecting: disconnecting.promise,
+		dropped: dropped.promise,
+		openClients: () => clients.size,
+		release,
+		setReachable: (value: boolean) => {
+			reachable = value;
+			if (!value) {
+				disconnect();
+			}
+		},
+		setResponsive: (value: boolean) => {
+			responsive = value;
+			for (const socket of sockets) {
+				if (value) {
+					socket.resume();
+				} else {
+					socket.pause();
+				}
+			}
+		},
+		url: target.toString(),
+	};
+}

package/src/server/disconnectProxy.ts

@@ -0,0 +1,14 @@
+import { Effect } from "effect";
+import { openDisconnectProxy } from "#adapters/openDisconnectProxy.ts";
+
+export interface DisconnectProxyOptions {
+	readonly dropNotifications?: boolean;
+	readonly holdDisconnects?: boolean;
+}
+
+export const disconnectProxy = Effect.fnUntraced(function* (destination: string, options: DisconnectProxyOptions = {}) {
+	return yield* Effect.acquireRelease(
+		Effect.promise(() => openDisconnectProxy(destination, options)),
+		(proxy) => Effect.promise(proxy.close),
+	);
+});

package/src/server/emptyPostgres.ts

@@ -0,0 +1,10 @@
+import { Redacted } from "effect";
+import { Migrator } from "effect/sql";
+import { environmentVariable } from "#adapters/environmentVariable.ts";
+import { makePostgresTestLayer } from "#postgres.ts";
+
+export const databaseUrl = environmentVariable("PLATFORM_SQL_TEST_DATABASE_URL");
+export const postgres = makePostgresTestLayer({
+	migrations: { loader: Migrator.fromRecord({}), lockTimeout: "5 seconds" },
+	url: Redacted.make(databaseUrl ?? "postgresql://integration-tests-disabled"),
+});

package/src/server/observeUntil.ts

@@ -0,0 +1,59 @@
+import { Clock, Data, Duration, Effect, Formatter, Option } from "effect";
+
+export interface ObserveOptions {
+	readonly every?: Duration.Input;
+	readonly stableReads?: number;
+	readonly within?: Duration.Input;
+}
+
+export class NeverSettled<A> extends Data.TaggedError("NeverSettled")<{
+	readonly reads: number;
+	readonly waitingFor: string;
+	readonly within: Duration.Duration;
+}> {
+	readonly last: Option.Option<A>;
+
+	constructor({
+		last,
+		...fields
+	}: { readonly last: Option.Option<A>; readonly reads: number; readonly waitingFor: string; readonly within: Duration.Duration }) {
+		super(fields);
+		this.last = last;
+	}
+
+	override get message() {
+		const seen = Option.match(this.last, {
+			onNone: () => "no read finished",
+			onSome: (value) => `${this.reads} ${this.reads === 1 ? "read" : "reads"}, last value ${Formatter.format(value)}`,
+		});
+		return `Timed out after ${Duration.format(this.within)} waiting for ${this.waitingFor}: ${seen}`;
+	}
+}
+
+// PostgreSQL announces no change to its catalog views, so this poll is the sanctioned wait for them. It sleeps on live time because a story's test clock cannot move PostgreSQL.
+export const observeUntil = Effect.fn("PostgresTest.observeUntil")(function* <A, E, R>(
+	read: Effect.Effect<A, E, R>,
+	settled: (value: A) => boolean,
+	waitingFor: string,
+	options?: ObserveOptions,
+) {
+	const within = Duration.fromInputUnsafe(options?.within ?? "5 seconds");
+	const stableReads = options?.stableReads ?? 2;
+	const live = Clock.Clock.defaultValue();
+	const pause = Effect.sleep(options?.every ?? "25 millis").pipe(Effect.provideService(Clock.Clock, live));
+	let last = Option.none<A>();
+	let reads = 0;
+	function observe(streak: number): Effect.Effect<A, E, R> {
+		return Effect.flatMap(read, (value) => {
+			last = Option.some(value);
+			reads += 1;
+			const agreeing = settled(value) ? streak + 1 : 0;
+			return agreeing >= stableReads ? Effect.succeed(value) : Effect.andThen(pause, observe(agreeing));
+		});
+	}
+	const deadline = Effect.sleep(within).pipe(
+		Effect.provideService(Clock.Clock, live),
+		Effect.andThen(Effect.suspend(() => Effect.fail(new NeverSettled({ last, reads, waitingFor, within })))),
+	);
+	return yield* Effect.raceFirst(observe(0), deadline);
+});

package/src/server/raceWithLock.ts

@@ -1,6 +1,7 @@
-import { Deferred, type Duration, Effect, Fiber, Schedule } from "effect";
+import { Deferred, type Duration, Effect, Fiber } from "effect";
 import { SqlClient, Statement } from "effect/sql";
 import { transact } from "@shivaedev/sql/transact.ts";
+import { observeUntil } from "#observeUntil.ts";
 import { withTestTransaction } from "#withTestTransaction.ts";
 
 function tagged<A, E, R>(effect: Effect.Effect<A, E, R>, tag: string) {
@@ -17,19 +18,20 @@ export function raceWithLock<A, E, R, TLockError, TLockServices>(options: {
 	readonly count?: "contenders" | "every blocked session";
 }) {
 	const everyBlockedSession = options.count === "every blocked session";
+	const timeout = options.timeout ?? "5 seconds";
+	const contenders = `${options.effects.length} ${everyBlockedSession ? "sessions" : "contenders"} to block on the lock`;
 	return Effect.scoped(
 		Effect.gen(function* () {
 			const sql = yield* SqlClient.SqlClient;
 			const ready = yield* Deferred.make<string>();
 			const started = yield* Deferred.make<void>();
 			const hold = Effect.gen(function* () {
-				yield* options.lock;
+				yield* Effect.timeout(options.lock, timeout);
 				const [holder] = yield* sql<{ pid: number }>`select pg_backend_pid() as pid`;
 				const race = `raceWithLock ${holder?.pid}.`;
 				yield* Deferred.succeed(ready, race);
 				yield* Deferred.await(started);
-				// PostgreSQL signals nothing when a session starts waiting on a lock, so the holder polls its blocker graph.
-				yield* sql`select pg_stat_clear_snapshot()`.pipe(
+				const waiting = sql`select pg_stat_clear_snapshot()`.pipe(
 					Effect.andThen(sql<{ waiting: number }>`with recursive blocked(pid) as (
 						select pid from pg_stat_activity where pg_backend_pid() = any(pg_blocking_pids(pid))
 						union
@@ -37,23 +39,22 @@ export function raceWithLock<A, E, R, TLockError, TLockServices>(options: {
 					) select ${everyBlockedSession ? sql`count(*)` : sql`count(distinct split_part(activity.query, ' */', 1))`}::integer as waiting
 					from pg_stat_activity activity join blocked using (pid)
 					where ${everyBlockedSession ? sql`true` : sql`starts_with(activity.query, ${`/* ${race}`})`}`),
-					Effect.repeat({ schedule: Schedule.spaced("10 millis"), while: ([row]) => (row?.waiting ?? 0) < options.effects.length }),
+					Effect.map(([row]) => row?.waiting ?? 0),
 				);
+				yield* observeUntil(waiting, (count) => count >= options.effects.length, contenders, { within: timeout });
 			});
 			const holder = yield* (
 				options.release === "commit" ? transact(Effect.scoped(hold), { onSqlError: (error) => error }) : withTestTransaction(hold)
 			).pipe(Effect.forkScoped);
 			const race = yield* Effect.raceFirst(Deferred.await(ready), Fiber.join(holder).pipe(Effect.andThen(Effect.never)));
-			const contenders = yield* Effect.forEach(
+			const racing = yield* Effect.forEach(
 				options.effects,
 				(effect, index) => Effect.result(everyBlockedSession ? effect : tagged(effect, `${race}${index}`)),
-				{
-					concurrency: "unbounded",
-				},
+				{ concurrency: "unbounded" },
 			).pipe(Effect.forkScoped);
 			yield* Deferred.succeed(started, undefined);
-			yield* Effect.raceFirst(Fiber.join(holder), Fiber.join(contenders).pipe(Effect.andThen(Effect.never)));
-			return yield* Fiber.join(contenders);
+			yield* Effect.raceFirst(Fiber.join(holder), Fiber.join(racing).pipe(Effect.andThen(Effect.never)));
+			return yield* Effect.timeout(Fiber.join(racing), timeout);
 		}),
-	).pipe(Effect.timeout(options.timeout ?? "5 seconds"));
+	);
 }