pipework 0.282.0 → 0.284.0

package/dist/test/plugin.js

@@ -6,7 +6,7 @@ import { createTestContext as createCtx } from '../request/context/create.js';
 import { runInContext } from '../request/context/store.js';
 import { randomUUID } from 'node:crypto';
 import { createDebugFn, isObserverOnly } from '../data/db/instrumentation.js';
-import { createStatementWatch } from '../data/db/query-watch.js';
+import { createStatementWatch, largeQueryBudgets } from '../data/db/query-watch.js';
 import { markObservedConnection } from '../data/query/postgres-js/driver-error-boundary.js';
 import { collapseTransactionsToSavepoints } from './savepoints.js';
 import { splitLargeInserts } from '../data/db/insert-split.js';
@@ -80,11 +80,11 @@ export async function endTestIsolation(instance, ctx) {
     instance.isolation.markEnd();
 }
 async function createIsolatedConnection(testDb, connections, name, observability, withSystem) {
-    const debug = createDebugFn(observability);
+    const watch = createStatementWatch({ database: name, url: testDb.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs, onSettled: observability.onStatementSettled, budgets: largeQueryBudgets(observability) });
+    const debug = createDebugFn(observability, watch.noteConnection);
     const client = postgres(testDb.url, { max: 1, onnotice: () => { }, ...(debug ? { debug } : {}) });
     if (isObserverOnly(observability))
         markObservedConnection(client);
-    const watch = createStatementWatch({ database: name, url: testDb.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs });
     const db = drizzle(client, { statementWatch: watch.watch });
     await db.execute(sql.raw('BEGIN'));
     const join = collapseTransactionsToSavepoints(db, client);
@@ -119,13 +119,13 @@ export async function propagateTestSessionVars(instance, testConnections, tenant
     }
 }
 export function createSetupConnection(testDb, observability) {
-    const debug = observability ? createDebugFn(observability) : undefined;
+    const watch = observability
+        ? createStatementWatch({ database: 'setup', url: testDb.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs, onSettled: observability.onStatementSettled, budgets: largeQueryBudgets(observability) })
+        : undefined;
+    const debug = observability ? createDebugFn(observability, watch?.noteConnection) : undefined;
     const client = postgres(testDb.url, { max: 1, onnotice: () => { }, ...(debug ? { debug } : {}) });
     if (observability && isObserverOnly(observability))
         markObservedConnection(client);
-    const watch = observability
-        ? createStatementWatch({ database: 'setup', url: testDb.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs })
-        : undefined;
     const db = splitLargeInserts(drizzle(client, watch ? { statementWatch: watch.watch } : {}));
     return { drizzle: db, close: async () => { await watch?.close(); await client.end(); } };
 }

package/dist/test/plugin.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pipework",
-  "version": "0.282.0",
+  "version": "0.284.0",
   "description": "TypeScript framework for multi-tenant SaaS applications. PostgreSQL-only.",
   "type": "module",
   "license": "MIT",
@@ -203,6 +203,10 @@
     "test:stress": "vitest run --config vitest.stress.config.ts",
     "test:packages": "pnpm -r --filter='./packages/*' test",
     "test:all": "pnpm test:packages && vitest run && vitest run --config vitest.isolation.config.ts && vitest run --config vitest.property.config.ts && vitest run --config vitest.stress.config.ts",
-    "mutate": "stryker run"
+    "mutate": "stryker run",
+    "rust:fmt": "cargo fmt --all --check",
+    "rust:clippy": "cargo clippy --workspace --all-targets -- -D warnings && cargo clippy -p pipework-query --all-targets --no-default-features --features all-types,audit,hashable-value,serde,thread-safe,postgres-driver -- -D warnings",
+    "rust:test": "cargo test --workspace && cargo test -p pipework-query --features all-types,hashable-value,serde",
+    "rust:check": "pnpm rust:fmt && pnpm rust:clippy && pnpm rust:test"
   }
 }

package/src/core/config/load.ts

@@ -4,16 +4,26 @@ import { resolveEnvironment, resolveEnvironmentStrict, resolveDbUrl, resolveTest
 import { ConfigError } from './errors.js'
 import { resolveEnvVars } from './env-resolve.js'
 import { consumeConfigBaseDir } from './base-dir.js'
-import type { StatementObserver } from './statement-observer.js'
+import type { StatementObserver, StatementSettledObserver } from './statement-observer.js'
 
 export interface ResolvedObservability {
   readonly slowQueryMs: number
   /** Interval at which a still-running statement is reported; undefined = off. */
   readonly inFlightQueryMs?: number | undefined
+  /** Estimated bind-parameter bytes above which a statement logs `query:large`; 0 = off. */
+  readonly largeQueryParamBytes: number
+  /** SQL text length (characters) above which a statement logs `query:large`; 0 = off. */
+  readonly largeQuerySqlChars: number
+  /** UNION/INTERSECT/EXCEPT arms (a text count) above which a statement logs `query:large`; 0 = off. */
+  readonly largeQueryArms: number
+  /** Rows returned (or affected) above which a statement logs `query:large`; 0 = off. */
+  readonly largeQueryRows: number
   readonly logAllQueries: boolean
   readonly poolMetricsInterval: number
   /** Caller-supplied per-statement observer; undefined when not configured. */
   readonly onStatement: StatementObserver | undefined
+  /** Caller-supplied per-statement completion hook; undefined when not configured. */
+  readonly onStatementSettled?: StatementSettledObserver | undefined
 }
 
 export interface ResolvedTrace {
@@ -244,9 +254,14 @@ function buildResolved(config: Blueprint, environment: Environment, baseDir: str
     observability: {
       slowQueryMs: config.observability?.slowQueryMs ?? 500,
       inFlightQueryMs: config.observability?.inFlightQueryMs,
+      largeQueryParamBytes: config.observability?.largeQueryParamBytes ?? 8_388_608,
+      largeQuerySqlChars: config.observability?.largeQuerySqlChars ?? 131_072,
+      largeQueryArms: config.observability?.largeQueryArms ?? 50,
+      largeQueryRows: config.observability?.largeQueryRows ?? 100_000,
       logAllQueries: config.observability?.logAllQueries ?? false,
       poolMetricsInterval: config.observability?.poolMetricsInterval ?? 0,
       onStatement: config.observability?.onStatement,
+      onStatementSettled: config.observability?.onStatementSettled,
     },
     trace: {
       hotRetentionDays: config.trace?.hotRetentionDays ?? 7,

package/src/core/config/schema.ts

@@ -1,5 +1,5 @@
 import { z } from 'zod/v4'
-import type { StatementObserver } from './statement-observer.js'
+import type { StatementObserver, StatementSettledObserver } from './statement-observer.js'
 
 const SETTING_NAME = /^[A-Za-z_][A-Za-z0-9_]*(\.[A-Za-z_][A-Za-z0-9_]*)?$/
 
@@ -171,6 +171,10 @@ const fastPathSchema = z.object({
 
 const observabilitySchema = z.object({
   slowQueryMs: z.number().int().positive().optional().describe('Warn when a query exceeds this duration in ms'),
+  largeQueryParamBytes: z.number().int().nonnegative().optional().describe('Log `query:large` when a statement\'s bind parameters total more than this many bytes, estimated (default 8388608; 0 = off)'),
+  largeQuerySqlChars: z.number().int().nonnegative().optional().describe('Log `query:large` when a statement\'s SQL text is longer than this many characters (default 131072; 0 = off)'),
+  largeQueryArms: z.number().int().nonnegative().optional().describe('Log `query:large` when a statement\'s SQL has more than this many UNION/INTERSECT/EXCEPT arms, counted in the text (default 50; 0 = off)'),
+  largeQueryRows: z.number().int().nonnegative().optional().describe('Log `query:large` when a statement returns (or affects) more than this many rows (default 100000; 0 = off)'),
   inFlightQueryMs: z.number().int().positive().optional().describe('While a statement is still running, log what it is waiting on every this many ms (unset = off)'),
   logAllQueries: z.boolean().optional().describe('Log every query at debug level'),
   poolMetricsInterval: z.number().int().nonnegative().optional().describe('Seconds between pool metric summaries (0 = disabled)'),
@@ -181,6 +185,9 @@ const observabilitySchema = z.object({
   onStatement: z.custom<StatementObserver>(v => typeof v === 'function', { message: 'Expected a function' })
     .optional()
     .describe('Per-statement observer — fires once per statement written to the wire, including driver-issued BEGIN/SAVEPOINT/COMMIT/ROLLBACK'),
+  onStatementSettled: z.custom<StatementSettledObserver>(v => typeof v === 'function', { message: 'Expected a function' })
+    .optional()
+    .describe('Per-statement completion hook — fires once per statement when it settles, with label, durationMs, rows, connectionId and (on failure) a sanitized error'),
 })
 
 const envVarDefSchema = z.discriminatedUnion('type', [

package/src/core/config/statement-observer.ts

@@ -46,3 +46,64 @@ export interface StatementEvent {
  * database.
  */
 export type StatementObserver = (event: StatementEvent) => void
+
+/**
+ * A failed statement's error, reduced to what is safe to hand to a hook:
+ * the driver's own error objects carry the statement text and bind parameters
+ * (and, on an observed connection, make them enumerable), so the hook never
+ * sees the error object itself.
+ */
+export interface StatementSettledError {
+  readonly name: string
+  readonly message: string
+  /** The PostgreSQL SQLSTATE (or the driver's error code) when the error carries one. */
+  readonly code?: string
+}
+
+/**
+ * One statement as it settles — the completion counterpart to `StatementEvent`.
+ * Fields are only ever added to this payload, never reshaped.
+ */
+export interface StatementSettledEvent {
+  /**
+   * The `pipe.labelled` label in effect when the statement settled; null when
+   * none. This is the label alone: unlike `query:slow`, it never falls back to
+   * the statement text.
+   */
+  readonly label: string | null
+  /**
+   * Wall-clock milliseconds the statement took, measured by the same timer as
+   * `query:slow` (so for one statement the two agree exactly).
+   */
+  readonly durationMs: number
+  /**
+   * Rows the statement returned, or, for a write with no `RETURNING`, rows it
+   * affected: the command tag's count. 0 for a statement with no count
+   * (DDL, `SET`, ...) and for a failed statement.
+   */
+  readonly rows: number
+  /**
+   * The same ordinal `StatementEvent.connectionId` carries for this statement;
+   * null when the statement never reached a connection (it failed before being
+   * written).
+   */
+  readonly connectionId: number | null
+  /** Present exactly when the statement failed. Never carries parameters. */
+  readonly error?: StatementSettledError
+}
+
+/**
+ * Caller-supplied completion hook. Fires once per statement that settles, on
+ * every statement pipework runs through its own query path: `pipe()`, every
+ * `pipe.*` write, `connection.drizzle`, transactions and savepoints, and the
+ * test harness's connections. It does not fire for the driver's own
+ * transaction control (`BEGIN`/`SAVEPOINT`/`COMMIT`/`ROLLBACK`), nor for the
+ * raw `ManagedConnection.client` door, nor for the migration runner's own
+ * connection; `onStatement` is the hook that sees wire truth.
+ *
+ * Pure observation, fired after the statement has settled and its result is on
+ * its way back: a hook that throws, or returns a promise that rejects, is
+ * logged (`statement:settled-hook-failed`) and never affects the statement.
+ * A returned promise is not awaited.
+ */
+export type StatementSettledObserver = (event: StatementSettledEvent) => void | Promise<void>

package/src/core/surface/types.ts

@@ -70,9 +70,14 @@ export interface SurfaceContext {
     readonly observability: {
       readonly slowQueryMs: number
       readonly inFlightQueryMs?: number | undefined
+      readonly largeQueryParamBytes: number
+      readonly largeQuerySqlChars: number
+      readonly largeQueryArms: number
+      readonly largeQueryRows: number
       readonly logAllQueries: boolean
       readonly poolMetricsInterval: number
       readonly onStatement: import('../config/statement-observer.js').StatementObserver | undefined
+      readonly onStatementSettled?: import('../config/statement-observer.js').StatementSettledObserver | undefined
     }
     readonly raw: unknown
   }

package/src/data/db/instrumentation.ts

@@ -5,6 +5,9 @@ import type { ResolvedObservability } from '../../core/config/load.js'
 const DEADLOCK_CODE = '40P01'
 const QUERY_TRUNCATE_LENGTH = 500
 
+/** Records which connection a statement's parameter array was written on; see `createStatementWatch`. */
+export type ConnectionNote = (connectionId: number, parameters: readonly unknown[]) => void
+
 /** postgres.js's `debug` hook signature. */
 type DebugFn = (connection: number, query: string, parameters: unknown[]) => void
 
@@ -15,30 +18,28 @@ type DebugFn = (connection: number, query: string, parameters: unknown[]) => voi
  * are today, that mode having already opted into verbose errors.
  */
 export function isObserverOnly(config: ResolvedObservability): boolean {
-  return config.onStatement !== undefined && !config.logAllQueries
+  return (config.onStatement !== undefined || config.onStatementSettled !== undefined) && !config.logAllQueries
 }
 
 /**
  * The driver's `debug` hook for a connection, or undefined when nothing is
- * observing. Query logging and the caller-supplied `onStatement` observer are
- * independent: either alone installs the hook, and with both configured both
- * fire for every statement.
+ * observing. Query logging, the caller-supplied `onStatement` observer and the
+ * connection note behind `onStatementSettled` are independent: any one alone
+ * installs the hook, and with several configured all fire for every statement.
  */
-export function createDebugFn(config: ResolvedObservability): DebugFn | undefined {
+export function createDebugFn(config: ResolvedObservability, noteConnection?: ConnectionNote): DebugFn | undefined {
   const logQuery = config.logAllQueries ? createQueryLogFn() : undefined
   const observer = config.onStatement
+  // The completion hook needs the connection a statement ran on, which only this hook is told.
+  const note = config.onStatementSettled !== undefined ? noteConnection : undefined
 
-  if (!logQuery && !observer) return undefined
-  if (!observer) return logQuery
-  if (!logQuery) {
-    return (connection, query, parameters) => {
-      observer({ connectionId: connection, query, parameters })
-    }
-  }
+  if (!logQuery && !observer && !note) return undefined
+  if (!observer && !note) return logQuery
 
   return (connection, query, parameters) => {
-    logQuery(connection, query, parameters)
-    observer({ connectionId: connection, query, parameters })
+    logQuery?.(connection, query, parameters)
+    note?.(connection, parameters)
+    observer?.({ connectionId: connection, query, parameters })
   }
 }
 

package/src/data/db/namespace.ts

@@ -38,7 +38,7 @@ export const pipe = Object.assign(getDb, {
   /** Query operators and aggregates — eq, gt, lt, and, or, count, sum, etc. */
   filter,
 
-  /** Names every statement `fn` starts, in `query:slow` and `query:in-flight` log lines: `pipe.labelled('servable-footprints', async () => await ...)`. A query builder is lazy: `fn` must await it, not return it, or it runs outside the scope. */
+  /** Names every statement `fn` starts, in `query:slow`, `query:large` and `query:in-flight` log lines: `pipe.labelled('servable-footprints', async () => await ...)`. A query builder is lazy: `fn` must await it, not return it, or it runs outside the scope. */
   labelled,
 
   /** Raw statement tag — for a statement pipework does not model. Interpolated values are parameters; `sql.raw` is not. Runs on the caller's connection, so inside a request it is the request transaction. Writes still go through pipe.update / insert / delete, which is what audit hooks. */

package/src/data/db/pool.ts

@@ -6,7 +6,7 @@ import { createDebugFn, isObserverOnly } from './instrumentation.js'
 import { markObservedConnection } from '../query/postgres-js/driver-error-boundary.js'
 import { warnRawClientIsUnsanitized } from './raw-client-warning.js'
 import { splitLargeInserts } from './insert-split.js'
-import { createStatementWatch } from './query-watch.js'
+import { createStatementWatch, largeQueryBudgets } from './query-watch.js'
 
 /** Which database role a pooled connection authenticates as. `owner` runs migrations/bootstrap and owns tables (bypasses RLS); `app` is the non-owner, non-BYPASSRLS runtime role that RLS policies enforce against; `system` is the platform role (`rls.platformRole`, via `systemUrl`), which reaches a tenant table only through a declared door. */
 export type ConnectionRole = 'owner' | 'app' | 'system'
@@ -166,7 +166,10 @@ export function createManagedConnection(
   observability?: ResolvedObservability,
   applicationName?: string,
 ): ManagedConnection {
-  const baseDebug = observability ? createDebugFn(observability) : undefined
+  const statementWatch = observability
+    ? createStatementWatch({ database: config.name, url: config.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs, onSettled: observability.onStatementSettled, budgets: largeQueryBudgets(observability) })
+    : undefined
+  const baseDebug = observability ? createDebugFn(observability, statementWatch?.noteConnection) : undefined
   const slot: ProbeSlot | undefined = baseDebug ? { current: null } : undefined
   const debug = baseDebug && slot
     ? ((connection, query, parameters) => {
@@ -187,9 +190,6 @@ export function createManagedConnection(
   const observerOnly = observability !== undefined && isObserverOnly(observability)
   if (observerOnly) markObservedConnection(client)
 
-  const statementWatch = observability
-    ? createStatementWatch({ database: config.name, url: config.url, slowQueryMs: observability.slowQueryMs, inFlightQueryMs: observability.inFlightQueryMs })
-    : undefined
   const db = splitLargeInserts(drizzle(client, statementWatch ? { statementWatch: statementWatch.watch } : {}))
   const canceller = createCanceller(config.url)
 

package/src/data/db/query-size.ts

@@ -0,0 +1,63 @@
+// Size measurements behind `query:large`. Each runs only when its budget is enabled (> 0), after the
+// statement has settled, so a pool with every budget at 0 never calls into this file.
+
+/** Bytes assumed for a number, bigint, boolean, Date or other fixed-width scalar parameter. */
+const SCALAR_BYTES = 8
+
+/**
+ * Estimated bytes of the bind parameters of one statement. Strings count their UTF-8 length
+ * (no copy is made), Buffers/typed arrays their byte length, arrays the sum of their elements,
+ * numbers/booleans/dates a fixed 8, null/undefined 0. A plain object is a JSON value the driver
+ * will serialise: it is measured by `JSON.stringify` length, which serialises it once more than
+ * the driver does; ORM json columns arrive already stringified (counted as strings, free), so
+ * only a raw object parameter pays that. An unserialisable object counts as one scalar.
+ */
+export function parameterBytes(parameters: unknown): number {
+  if (!Array.isArray(parameters)) return 0
+  let total = 0
+  for (const value of parameters) total += valueBytes(value)
+  return total
+}
+
+function valueBytes(value: unknown): number {
+  if (value === null || value === undefined) return 0
+  switch (typeof value) {
+    case 'string': return Buffer.byteLength(value)
+    case 'object': break
+    default: return SCALAR_BYTES
+  }
+  if (value instanceof Date) return SCALAR_BYTES
+  if (ArrayBuffer.isView(value)) return value.byteLength
+  if (value instanceof ArrayBuffer) return value.byteLength
+  if (Array.isArray(value)) {
+    let total = 0
+    for (const item of value) total += valueBytes(item)
+    return total
+  }
+  try {
+    const json = JSON.stringify(value) as string | undefined
+    return json === undefined ? 0 : json.length
+  } catch {
+    return SCALAR_BYTES
+  }
+}
+
+// Single left-to-right scan: a quoted literal or quoted identifier is consumed whole, so a keyword
+// inside one is never counted; what is left are bare UNION / INTERSECT / EXCEPT words.
+const SET_OPERATION = /'[^']*(?:''[^']*)*'|"[^"]*(?:""[^"]*)*"|\b(?:union|intersect|except)\b/gi
+
+/**
+ * Arms of the set operations in a statement's SQL text: set-operator keywords + 1, 0 when there
+ * are none. This is a text count at every nesting depth (a union inside a subquery or CTE costs the
+ * planner the same as one at the top), not a parse. Pipework sends values as bind parameters, so
+ * no keyword can appear inside a string value; a literal written with `sql.raw` is skipped by
+ * the scan. Comments and dollar-quoted bodies are not understood and can over-count.
+ */
+export function setOperationArms(sqlText: string): number {
+  let operators = 0
+  for (const match of sqlText.matchAll(SET_OPERATION)) {
+    const first = match[0][0]
+    if (first !== "'" && first !== '"') operators++
+  }
+  return operators === 0 ? 0 : operators + 1
+}

package/src/data/db/query-watch.ts

@@ -1,7 +1,10 @@
 import postgres from 'postgres'
 import { getLogger } from '../../core/logging/logger.js'
 import { currentQueryLabel } from './query-label.js'
+import { DrizzleQueryError } from '../query/errors.js'
+import { parameterBytes, setOperationArms } from './query-size.js'
 import type { StatementWatch } from '../query/postgres-js/session.js'
+import type { StatementSettledError, StatementSettledObserver } from '../../core/config/statement-observer.js'
 
 const LABEL_SQL_CHARS = 120
 const SAMPLE_TIMEOUT_MS = 2_000
@@ -16,6 +19,24 @@ interface BackendSample {
 
 const UNKNOWN_BACKEND: BackendSample = { pid: null, state: null, waitEventType: null, waitEvent: null }
 
+/** `observability.largeQuery*` budgets; 0 disables a budget and nothing is measured for it. */
+export interface LargeQueryBudgets {
+  readonly parameterBytes: number
+  readonly sqlChars: number
+  readonly arms: number
+  readonly rows: number
+}
+
+/** The budgets of a resolved `observability` section. */
+export function largeQueryBudgets(o: {
+  readonly largeQueryParamBytes: number
+  readonly largeQuerySqlChars: number
+  readonly largeQueryArms: number
+  readonly largeQueryRows: number
+}): LargeQueryBudgets {
+  return { parameterBytes: o.largeQueryParamBytes, sqlChars: o.largeQuerySqlChars, arms: o.largeQueryArms, rows: o.largeQueryRows }
+}
+
 /** What a pool's watch needs: where it logs, how slow is slow, and how to reach the server for a wait-event sample. */
 export interface StatementWatchOptions {
   readonly database: string
@@ -23,13 +44,44 @@ export interface StatementWatchOptions {
   readonly slowQueryMs: number
   /** Undefined: no timer is ever created. */
   readonly inFlightQueryMs: number | undefined
+  /** `observability.onStatementSettled`; undefined: nothing extra is tracked or fired. */
+  readonly onSettled?: StatementSettledObserver | undefined
+  /** Undefined: no `query:large` check. */
+  readonly budgets?: LargeQueryBudgets | undefined
 }
 
 export interface StatementWatchHandle {
   readonly watch: StatementWatch
+  /**
+   * Pass to `createDebugFn` for the same pool: the driver's debug hook is the only place that
+   * learns a statement's connection. Undefined when no `onSettled` hook is configured.
+   */
+  readonly noteConnection: ((connectionId: number, parameters: readonly unknown[]) => void) | undefined
   close(): Promise<void>
 }
 
+/** Rows a settled statement returned, or affected for a write: the driver's command-tag count, else the row count. */
+function rowsOf(result: unknown): number {
+  if (typeof result !== 'object' || result === null) return 0
+  const count = (result as { count?: unknown }).count
+  if (typeof count === 'number') return count
+  return Array.isArray(result) ? result.length : 0
+}
+
+/** Name, message and code only: the driver's error object carries the statement text and bind parameters. */
+function settledError(raw: unknown): StatementSettledError {
+  // Drizzle wraps a driver failure in an error whose message is `Failed query: <sql>\nparams: <values>`: report the cause.
+  let err = raw
+  while (err instanceof DrizzleQueryError && err.cause !== undefined) err = err.cause
+  if (typeof err !== 'object' || err === null) return { name: 'Error', message: String(err) }
+  const { name, message, code } = err as { name?: unknown; message?: unknown; code?: unknown }
+  return {
+    name: typeof name === 'string' ? name : 'Error',
+    message: typeof message === 'string' ? message : '',
+    ...(typeof code === 'string' ? { code } : {}),
+  }
+}
+
 function labelFor(sqlText: string): string {
   return currentQueryLabel() ?? sqlText.replace(/\s+/g, ' ').trim().slice(0, LABEL_SQL_CHARS)
 }
@@ -41,7 +93,12 @@ function labelFor(sqlText: string): string {
  * dedicated connection, never the statement's own and never the app pool.
  */
 export function createStatementWatch(options: StatementWatchOptions): StatementWatchHandle {
-  const { database, url, slowQueryMs, inFlightQueryMs } = options
+  const { database, url, slowQueryMs, inFlightQueryMs, onSettled, budgets } = options
+  const watchesSize = budgets !== undefined && (budgets.parameterBytes > 0 || budgets.sqlChars > 0 || budgets.arms > 0 || budgets.rows > 0)
+  const needsOutcome = onSettled !== undefined || (budgets?.rows ?? 0) > 0
+  // Keyed on the parameter array the driver builds for a statement: the same array reaches the
+  // debug hook (with the connection ordinal) and sits on the pending query the session hands us.
+  const connections = onSettled ? new WeakMap<object, number>() : undefined
   let sampler: postgres.Sql | undefined
   let sampling = false
   let closed = false
@@ -72,8 +129,43 @@ export function createStatementWatch(options: StatementWatchOptions): StatementW
     return Promise.race([run, timeout]).catch(() => UNKNOWN_BACKEND).finally(() => { clearTimeout(timer) })
   }
 
-  const watch: StatementWatch = async <T>(sqlText: string, run: () => Promise<T>): Promise<T> => {
+  function fireSettled(event: Parameters<StatementSettledObserver>[0]): void {
+    if (!onSettled) return
+    const failed = (err: unknown): void => {
+      getLogger().warn({ err, database }, 'statement:settled-hook-failed')
+    }
+    try {
+      const out = onSettled(event)
+      if (out !== undefined && typeof (out as Promise<void>).then === 'function') void Promise.resolve(out).catch(failed)
+    } catch (err) {
+      failed(err)
+    }
+  }
+
+  /** One `query:large` per statement over any enabled budget, carrying every enabled measurement. Never throws. */
+  function warnIfLarge(sqlText: string, parameters: unknown, outcome: { result: unknown } | { error: unknown } | undefined, b: LargeQueryBudgets): void {
+    try {
+      const measured: Record<string, number> = {}
+      const over: string[] = []
+      const check = (name: string, budget: number, measure: () => number): void => {
+        if (budget <= 0) return
+        const value = measure()
+        measured[name] = value
+        if (value > budget) over.push(name)
+      }
+      check('parameterBytes', b.parameterBytes, () => parameterBytes(parameters))
+      check('sqlChars', b.sqlChars, () => sqlText.length)
+      check('arms', b.arms, () => setOperationArms(sqlText))
+      check('rows', b.rows, () => (outcome !== undefined && 'result' in outcome ? rowsOf(outcome.result) : 0))
+      if (over.length > 0) getLogger().warn({ label: labelFor(sqlText), database, over, ...measured }, 'query:large')
+    } catch { /* a measurement must never affect the statement */ }
+  }
+
+  const watch: StatementWatch = async <T>(sqlText: string, run: (seen: (pending: object) => void) => Promise<T>): Promise<T> => {
     const startedMs = Date.now()
+    let pendingQuery: object | undefined
+    let outcome: { result: unknown } | { error: unknown } | undefined
+    const seen = (pending: object): void => { pendingQuery = pending }
     let interval: NodeJS.Timeout | undefined
     let settled = false
     if (inFlightQueryMs !== undefined) {
@@ -93,7 +185,12 @@ export function createStatementWatch(options: StatementWatchOptions): StatementW
       interval.unref()
     }
     try {
-      return await run()
+      const result = await run(seen)
+      if (needsOutcome) outcome = { result }
+      return result
+    } catch (err) {
+      if (needsOutcome) outcome = { error: err }
+      throw err
     } finally {
       settled = true
       if (interval !== undefined) clearInterval(interval)
@@ -101,11 +198,26 @@ export function createStatementWatch(options: StatementWatchOptions): StatementW
       if (slowQueryMs > 0 && durationMs > slowQueryMs) {
         getLogger().warn({ label: labelFor(sqlText), durationMs, database }, 'query:slow')
       }
+      const parameters = pendingQuery === undefined ? undefined : (pendingQuery as { parameters?: unknown }).parameters
+      if (watchesSize) warnIfLarge(sqlText, parameters, outcome, budgets)
+      if (onSettled && outcome !== undefined) {
+        const connectionId = typeof parameters === 'object' && parameters !== null ? connections?.get(parameters) ?? null : null
+        fireSettled({
+          label: currentQueryLabel() ?? null,
+          durationMs,
+          rows: 'result' in outcome ? rowsOf(outcome.result) : 0,
+          connectionId,
+          ...('error' in outcome ? { error: settledError(outcome.error) } : {}),
+        })
+      }
     }
   }
 
   return {
     watch,
+    noteConnection: connections
+      ? (connectionId, parameters) => { connections.set(parameters, connectionId) }
+      : undefined,
     async close() {
       closed = true
       const client = sampler

package/src/data/db/raw-client-warning.ts

@@ -23,7 +23,7 @@ export function warnRawClientIsUnsanitized(database: string): void {
 
   getBaseLogger().warn(
     { database },
-    '[pipework] raw .client read on a connection with observability.onStatement configured. ' +
+    '[pipework] raw .client read on a connection with observability.onStatement or onStatementSettled configured. ' +
     'Queries issued through .client bypass pipework\'s driver error boundary, so their errors ' +
     'serialize bind parameters (postgres.js marks query/parameters/args enumerable whenever its ' +
     'debug hook is installed). Use connection.drizzle — or pipe() inside a managed context — to ' +