@agentuity/drizzle 1.0.6 → 1.0.8

package/dist/index.d.ts

@@ -30,10 +30,11 @@
  *
  * @packageDocumentation
  */
-export { createPostgresDrizzle } from './postgres';
+export { createPostgresDrizzle, drizzle } from './postgres';
 export type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
 export { postgres, PostgresClient, type CallablePostgresClient, type PostgresConfig, type ReconnectConfig, type ConnectionStats, type TLSConfig, type TransactionOptions, type ReserveOptions, } from '@agentuity/postgres';
 export { sql, eq, and, or, not, desc, asc, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, between, like, ilike, relations, } from 'drizzle-orm';
+export { BunSQLDatabase, BunSQLPreparedQuery, BunSQLSession, BunSQLTransaction, } from 'drizzle-orm/bun-sql';
 export { pgTable, pgSchema, pgEnum, pgView, bigint, bigserial, boolean, vector, char, cidr, customType, date, doublePrecision, inet, integer, interval, json, jsonb, macaddr, macaddr8, numeric, real, serial, smallint, smallserial, text, time, timestamp, uuid, varchar, primaryKey, foreignKey, unique, uniqueIndex, index, check, } from 'drizzle-orm/pg-core';
 export { drizzleAdapter } from 'better-auth/adapters/drizzle';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAGnD,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAGtE,OAAO,EACN,QAAQ,EACR,cAAc,EACd,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,GACnB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACN,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,MAAM,EACN,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,IAAI,EACJ,KAAK,EACL,SAAS,GACT,MAAM,aAAa,CAAC;AAGrB,OAAO,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,MAAM,EAEN,MAAM,EACN,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,OAAO,EAEP,UAAU,EACV,UAAU,EACV,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACL,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAGH,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG5D,YAAY,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAGtE,OAAO,EACN,QAAQ,EACR,cAAc,EACd,KAAK,sBAAsB,EAC3B,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,eAAe,EACpB,KAAK,SAAS,EACd,KAAK,kBAAkB,EACvB,KAAK,cAAc,GACnB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACN,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,MAAM,EACN,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,IAAI,EACJ,KAAK,EACL,SAAS,GACT,MAAM,aAAa,CAAC;AAGrB,OAAO,EACN,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,MAAM,EAEN,MAAM,EACN,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,OAAO,EAEP,UAAU,EACV,UAAU,EACV,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACL,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/index.js

@@ -31,11 +31,13 @@
  * @packageDocumentation
  */
 // Main factory function
-export { createPostgresDrizzle } from './postgres';
+export { createPostgresDrizzle, drizzle } from './postgres';
 // Re-export from @agentuity/postgres for convenience
 export { postgres, PostgresClient, } from '@agentuity/postgres';
 // Re-export common Drizzle utilities for convenience
 export { sql, eq, and, or, not, desc, asc, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, between, like, ilike, relations, } from 'drizzle-orm';
+// Re-export Bun SQL driver types for compatibility
+export { BunSQLDatabase, BunSQLPreparedQuery, BunSQLSession, BunSQLTransaction, } from 'drizzle-orm/bun-sql';
 // Re-export pg-core table and column definitions
 export { pgTable, pgSchema, pgEnum, pgView, 
 // Column types

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,wBAAwB;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,YAAY,CAAC;AAKnD,qDAAqD;AACrD,OAAO,EACN,QAAQ,EACR,cAAc,GAQd,MAAM,qBAAqB,CAAC;AAE7B,qDAAqD;AACrD,OAAO,EACN,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,MAAM,EACN,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,IAAI,EACJ,KAAK,EACL,SAAS,GACT,MAAM,aAAa,CAAC;AAErB,iDAAiD;AACjD,OAAO,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,MAAM;AACN,eAAe;AACf,MAAM,EACN,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,OAAO;AACP,0BAA0B;AAC1B,UAAU,EACV,UAAU,EACV,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACL,MAAM,qBAAqB,CAAC;AAE7B,qEAAqE;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AAEH,wBAAwB;AACxB,OAAO,EAAE,qBAAqB,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAK5D,qDAAqD;AACrD,OAAO,EACN,QAAQ,EACR,cAAc,GAQd,MAAM,qBAAqB,CAAC;AAE7B,qDAAqD;AACrD,OAAO,EACN,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,IAAI,EACJ,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,GAAG,EACH,EAAE,EACF,MAAM,EACN,SAAS,EACT,OAAO,EACP,UAAU,EACV,OAAO,EACP,IAAI,EACJ,KAAK,EACL,SAAS,GACT,MAAM,aAAa,CAAC;AAErB,mDAAmD;AACnD,OAAO,EACN,cAAc,EACd,mBAAmB,EACnB,aAAa,EACb,iBAAiB,GACjB,MAAM,qBAAqB,CAAC;AAE7B,iDAAiD;AACjD,OAAO,EACN,OAAO,EACP,QAAQ,EACR,MAAM,EACN,MAAM;AACN,eAAe;AACf,MAAM,EACN,SAAS,EACT,OAAO,EACP,MAAM,EACN,IAAI,EACJ,IAAI,EACJ,UAAU,EACV,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,OAAO,EACP,QAAQ,EACR,IAAI,EACJ,KAAK,EACL,OAAO,EACP,QAAQ,EACR,OAAO,EACP,IAAI,EACJ,MAAM,EACN,QAAQ,EACR,WAAW,EACX,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,IAAI,EACJ,OAAO;AACP,0BAA0B;AAC1B,UAAU,EACV,UAAU,EACV,MAAM,EACN,WAAW,EACX,KAAK,EACL,KAAK,GACL,MAAM,qBAAqB,CAAC;AAE7B,qEAAqE;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC"}

package/dist/postgres.d.ts

@@ -1,4 +1,6 @@
-import { SQL as BunSQL } from 'bun';
+import { SQL as BunSQL, type SQL as BunSQLClient, type SQLOptions } from 'bun';
+import { type BunSQLDatabase } from 'drizzle-orm/bun-sql';
+import type { DrizzleConfig } from 'drizzle-orm';
 import { type CallablePostgresClient, type PostgresConfig } from '@agentuity/postgres';
 import type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
 /**
@@ -20,6 +22,24 @@ export declare function resolvePostgresClientConfig<TSchema extends Record<strin
  * @internal Exported for testing — not part of the public package API.
  */
 export declare function createResilientSQLProxy(client: CallablePostgresClient): InstanceType<typeof BunSQL>;
+type DrizzleConnectionConfig = string | ({
+    url?: string;
+} & SQLOptions);
+declare function _drizzle<TSchema extends Record<string, unknown> = Record<string, never>, TClient extends BunSQLClient = BunSQLClient>(...params: [TClient | string] | [TClient | string, DrizzleConfig<TSchema>] | [DrizzleConfig<TSchema> & ({
+    connection: DrizzleConnectionConfig;
+} | {
+    client: TClient;
+})]): BunSQLDatabase<TSchema> & {
+    $client: TClient;
+};
+declare namespace _drizzle {
+    var mock: <TSchema extends Record<string, unknown> = Record<string, never>>(config?: DrizzleConfig<TSchema>) => BunSQLDatabase<TSchema> & {
+        $client: "$client is not available on drizzle.mock()";
+    };
+}
+export declare const drizzle: typeof _drizzle & {
+    mock: typeof _drizzle.mock;
+};
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *
@@ -65,4 +85,5 @@ export declare function createResilientSQLProxy(client: CallablePostgresClient):
  * ```
  */
 export declare function createPostgresDrizzle<TSchema extends Record<string, unknown> = Record<string, never>>(config?: PostgresDrizzleConfig<TSchema>): PostgresDrizzle<TSchema>;
+export {};
 //# sourceMappingURL=postgres.d.ts.map

package/dist/postgres.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,MAAM,EAAE,MAAM,KAAK,CAAC;AAEpC,OAAO,EAAY,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,cAAc,CA0BzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,sBAAsB,GAC5B,YAAY,CAAC,OAAO,MAAM,CAAC,CAqC7B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoCnE"}
+{"version":3,"file":"postgres.d.ts","sourceRoot":"","sources":["../src/postgres.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,MAAM,EAAE,KAAK,GAAG,IAAI,YAAY,EAAE,KAAK,UAAU,EAAE,MAAM,KAAK,CAAC;AAC/E,OAAO,EAA8B,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEjD,OAAO,EAAY,KAAK,sBAAsB,EAAE,KAAK,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjG,OAAO,KAAK,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAEtE;;;;;;GAMG;AACH,wBAAgB,2BAA2B,CAC1C,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,cAAc,CA0BzD;AA8FD;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CACtC,MAAM,EAAE,sBAAsB,GAC5B,YAAY,CAAC,OAAO,MAAM,CAAC,CA4D7B;AAED,KAAK,uBAAuB,GAAG,MAAM,GAAG,CAAC;IAAE,GAAG,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,UAAU,CAAC,CAAC;AAoHxE,iBAAS,QAAQ,CAChB,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC/D,OAAO,SAAS,YAAY,GAAG,YAAY,EAE3C,GAAG,MAAM,EACN,CAAC,OAAO,GAAG,MAAM,CAAC,GAClB,CAAC,OAAO,GAAG,MAAM,EAAE,aAAa,CAAC,OAAO,CAAC,CAAC,GAC1C,CAAC,aAAa,CAAC,OAAO,CAAC,GAAG,CAAC;IAAE,UAAU,EAAE,uBAAuB,CAAA;CAAE,GAAG;IAAE,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC,CAAC,GAC3F,cAAc,CAAC,OAAO,CAAC,GAAG;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAwBhD;kBAhCQ,QAAQ;eAkCA,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,mCAC9C,aAAa,CAAC,OAAO,CAAC,KAC7B,cAAc,CAAC,OAAO,CAAC,GAAG;QAAE,OAAO,EAAE,4CAA4C,CAAA;KAAE;;AAStF,eAAO,MAAM,OAAO,EAAe,OAAO,QAAQ,GAAG;IACpD,IAAI,EAAE,OAAO,QAAQ,CAAC,IAAI,CAAC;CAC3B,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,wBAAgB,qBAAqB,CACpC,OAAO,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,EAC9D,MAAM,CAAC,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,eAAe,CAAC,OAAO,CAAC,CAoCnE"}

package/dist/postgres.js

@@ -1,4 +1,5 @@
-import { drizzle } from 'drizzle-orm/bun-sql';
+import { drizzle as upstreamDrizzle } from 'drizzle-orm/bun-sql';
+import { isConfig } from 'drizzle-orm/utils';
 import { postgres } from '@agentuity/postgres';
 /**
  * Resolves the PostgreSQL client configuration from Drizzle config options.
@@ -32,6 +33,85 @@ export function resolvePostgresClientConfig(config) {
     }
     return clientConfig;
 }
+/**
+ * Strips leading whitespace and SQL comments (block and line) from a query string.
+ * Returns the remaining query text starting at the first non-comment token.
+ */
+const LEADING_COMMENTS_RE = /^(?:\s+|\/\*[\s\S]*?\*\/|--[^\n]*\n)*/;
+/**
+ * Determines whether a SQL query is a non-retryable INSERT statement.
+ *
+ * Handles two patterns:
+ * 1. Direct INSERT: `INSERT INTO ...` (with optional leading comments/whitespace)
+ * 2. CTE INSERT: `WITH cte AS (...) INSERT INTO ...` — scans past the WITH clause
+ *    by tracking parenthesis depth to skip CTE subexpressions, then checks
+ *    if the first top-level DML keyword is INSERT.
+ *
+ * @see https://github.com/agentuity/sdk/issues/911
+ */
+function isNonRetryableInsert(query) {
+    // Strip leading whitespace and SQL comments
+    const stripped = query.replace(LEADING_COMMENTS_RE, '');
+    // Fast path: direct INSERT statement
+    if (/^INSERT\s/i.test(stripped)) {
+        return true;
+    }
+    // Check for WITH (CTE) prefix
+    if (!/^WITH\s/i.test(stripped)) {
+        return false;
+    }
+    // Scan past the CTE clause to find the first top-level DML keyword.
+    // We track parenthesis depth so we skip CTE subexpressions like
+    // "WITH cte AS (SELECT ... INSERT ...)" without false-matching the
+    // INSERT inside the parens.
+    let depth = 0;
+    let i = 4; // skip past "WITH"
+    const len = stripped.length;
+    while (i < len) {
+        const ch = stripped[i];
+        if (ch === '(') {
+            depth++;
+            i++;
+            continue;
+        }
+        if (ch === ')') {
+            depth--;
+            i++;
+            continue;
+        }
+        // Only inspect keywords at top level (depth === 0)
+        if (depth === 0) {
+            // Skip whitespace at top level
+            if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') {
+                i++;
+                continue;
+            }
+            // Skip commas between CTEs: WITH a AS (...), b AS (...)
+            if (ch === ',') {
+                i++;
+                continue;
+            }
+            // Check for DML keywords at this position.
+            // We look for INSERT, UPDATE, DELETE, or SELECT — the first one
+            // we find at top level determines whether this is retryable.
+            const rest = stripped.substring(i);
+            const dmlMatch = /^(INSERT|UPDATE|DELETE|SELECT)\s/i.exec(rest);
+            if (dmlMatch) {
+                return dmlMatch[1].toUpperCase() === 'INSERT';
+            }
+            // Skip over any other word (e.g., CTE names, AS keyword, RECURSIVE)
+            // by advancing past alphanumeric/underscore characters
+            if (/\w/.test(ch)) {
+                while (i < len && /\w/.test(stripped[i])) {
+                    i++;
+                }
+                continue;
+            }
+        }
+        i++;
+    }
+    return false;
+}
 /**
  * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
  * current raw connection. This ensures that after automatic reconnection,
@@ -47,6 +127,9 @@ export function createResilientSQLProxy(client) {
         get(_target, prop, _receiver) {
             // Always resolve from the CURRENT raw connection (changes after reconnect)
             const raw = client.raw;
+            if (prop === 'close') {
+                return () => client.close();
+            }
             if (prop === 'unsafe') {
                 // Wrap unsafe() with retry logic for resilient queries.
                 // Returns a thenable that also supports .values() chaining,
@@ -54,6 +137,23 @@ export function createResilientSQLProxy(client) {
                 //   client.unsafe(query, params)           → Promise<rows>
                 //   client.unsafe(query, params).values()   → Promise<rows>
                 return (query, params) => {
+                    // INSERT statements (including CTE-based) are NOT retried to prevent
+                    // duplicate rows. If an INSERT succeeds on the server but the connection
+                    // drops before the response, retrying would re-execute it — creating a
+                    // duplicate row when the primary key is server-generated.
+                    // See: https://github.com/agentuity/sdk/issues/911
+                    const isInsert = isNonRetryableInsert(query);
+                    if (isInsert) {
+                        const makeDirectExecutor = (useValues) => {
+                            const currentRaw = client.raw;
+                            const q = currentRaw.unsafe(query, params);
+                            return useValues ? q.values() : q;
+                        };
+                        const result = makeDirectExecutor(false);
+                        return Object.assign(result, {
+                            values: () => makeDirectExecutor(true),
+                        });
+                    }
                     const makeExecutor = (useValues) => client.executeWithRetry(async () => {
                         // Re-resolve raw inside retry to get post-reconnect instance
                         const currentRaw = client.raw;
@@ -76,6 +176,114 @@ export function createResilientSQLProxy(client) {
         },
     });
 }
+function isCallablePostgresClient(value) {
+    return (typeof value === 'function' &&
+        value !== null &&
+        'raw' in value &&
+        typeof value.executeWithRetry === 'function');
+}
+function createProxyClientFromSql(client) {
+    // Bun SQL instances are callable as tagged template literals.
+    // Create a function that forwards calls to the client.
+    const proxy = (async (strings, ...values) => {
+        // Forward tagged template to the Bun SQL client directly
+        return client(strings, ...values);
+    });
+    Object.defineProperties(proxy, {
+        raw: {
+            get: () => client,
+            enumerable: true,
+        },
+    });
+    proxy.executeWithRetry = async (operation) => operation();
+    proxy.close = async () => {
+        const close = client.close;
+        if (typeof close === 'function') {
+            await close.call(client);
+        }
+    };
+    return proxy;
+}
+function extractPostgresConfigFromSql(client) {
+    const options = client.options;
+    if (!options || typeof options !== 'object') {
+        return undefined;
+    }
+    const config = {};
+    const keys = [
+        'url',
+        'hostname',
+        'port',
+        'username',
+        'password',
+        'database',
+        'tls',
+        'max',
+        'idleTimeout',
+        'connectionTimeout',
+    ];
+    for (const key of keys) {
+        if (key in options) {
+            config[key] = options[key];
+        }
+    }
+    return Object.keys(config).length > 0 ? config : undefined;
+}
+function resolvePostgresClient(client) {
+    if (isCallablePostgresClient(client)) {
+        return client;
+    }
+    const config = extractPostgresConfigFromSql(client);
+    if (config) {
+        return postgres(config);
+    }
+    return createProxyClientFromSql(client);
+}
+function resolvePostgresClientFromConnection(connection) {
+    if (!connection) {
+        return postgres();
+    }
+    if (typeof connection === 'string') {
+        return postgres(connection);
+    }
+    if (typeof connection === 'object' && connection.url !== undefined) {
+        const { url, ...config } = connection;
+        return postgres({ url, ...config });
+    }
+    return postgres(connection);
+}
+function createDrizzleDatabase(client, config) {
+    const resilientSQL = createResilientSQLProxy(client);
+    return upstreamDrizzle({
+        client: resilientSQL,
+        ...(config ?? {}),
+    });
+}
+function _drizzle(...params) {
+    if (typeof params[0] === 'string') {
+        const client = resolvePostgresClientFromConnection(params[0]);
+        return createDrizzleDatabase(client, params[1]);
+    }
+    if (isConfig(params[0])) {
+        const config = params[0];
+        const { connection, client, ...drizzleConfig } = config;
+        if (client) {
+            const resolvedClient = resolvePostgresClient(client);
+            return createDrizzleDatabase(resolvedClient, drizzleConfig);
+        }
+        const resolvedClient = resolvePostgresClientFromConnection(connection);
+        return createDrizzleDatabase(resolvedClient, drizzleConfig);
+    }
+    const client = resolvePostgresClient(params[0]);
+    return createDrizzleDatabase(client, params[1]);
+}
+_drizzle.mock = (config) => {
+    const db = upstreamDrizzle.mock(config);
+    db.$client =
+        '$client is not available on drizzle.mock()';
+    return db;
+};
+export const drizzle = _drizzle;
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *
@@ -138,7 +346,7 @@ export function createPostgresDrizzle(config) {
     const resilientSQL = createResilientSQLProxy(client);
     // Create Drizzle instance using the resilient proxy instead of a static
     // reference to client.raw, which would become stale after reconnection.
-    const db = drizzle({
+    const db = upstreamDrizzle({
         client: resilientSQL,
         schema: config?.schema,
         logger: config?.logger,

package/dist/postgres.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@agentuity/drizzle",
-	"version": "1.0.6",
+	"version": "1.0.8",
 	"license": "Apache-2.0",
 	"author": "Agentuity employees and contributors",
 	"type": "module",
@@ -41,12 +41,12 @@
 		"prepublishOnly": "bun run clean && bun run build"
 	},
 	"dependencies": {
-		"@agentuity/postgres": "1.0.6",
+		"@agentuity/postgres": "1.0.8",
 		"drizzle-orm": "^0.45.0",
 		"better-auth": "^1.4.9"
 	},
 	"devDependencies": {
-		"@agentuity/test-utils": "1.0.6",
+		"@agentuity/test-utils": "1.0.8",
 		"@types/bun": "latest",
 		"bun-types": "latest",
 		"typescript": "^5.9.0"

package/src/index.ts

@@ -32,7 +32,7 @@
  */
 
 // Main factory function
-export { createPostgresDrizzle } from './postgres';
+export { createPostgresDrizzle, drizzle } from './postgres';
 
 // Types
 export type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
@@ -74,6 +74,14 @@ export {
 	relations,
 } from 'drizzle-orm';
 
+// Re-export Bun SQL driver types for compatibility
+export {
+	BunSQLDatabase,
+	BunSQLPreparedQuery,
+	BunSQLSession,
+	BunSQLTransaction,
+} from 'drizzle-orm/bun-sql';
+
 // Re-export pg-core table and column definitions
 export {
 	pgTable,

package/src/postgres.ts

@@ -1,5 +1,7 @@
-import { SQL as BunSQL } from 'bun';
-import { drizzle } from 'drizzle-orm/bun-sql';
+import { SQL as BunSQL, type SQL as BunSQLClient, type SQLOptions } from 'bun';
+import { drizzle as upstreamDrizzle, type BunSQLDatabase } from 'drizzle-orm/bun-sql';
+import type { DrizzleConfig } from 'drizzle-orm';
+import { isConfig } from 'drizzle-orm/utils';
 import { postgres, type CallablePostgresClient, type PostgresConfig } from '@agentuity/postgres';
 import type { PostgresDrizzleConfig, PostgresDrizzle } from './types';
 
@@ -40,6 +42,98 @@ export function resolvePostgresClientConfig<
 	return clientConfig;
 }
 
+/**
+ * Strips leading whitespace and SQL comments (block and line) from a query string.
+ * Returns the remaining query text starting at the first non-comment token.
+ */
+const LEADING_COMMENTS_RE = /^(?:\s+|\/\*[\s\S]*?\*\/|--[^\n]*\n)*/;
+
+/**
+ * Determines whether a SQL query is a non-retryable INSERT statement.
+ *
+ * Handles two patterns:
+ * 1. Direct INSERT: `INSERT INTO ...` (with optional leading comments/whitespace)
+ * 2. CTE INSERT: `WITH cte AS (...) INSERT INTO ...` — scans past the WITH clause
+ *    by tracking parenthesis depth to skip CTE subexpressions, then checks
+ *    if the first top-level DML keyword is INSERT.
+ *
+ * @see https://github.com/agentuity/sdk/issues/911
+ */
+function isNonRetryableInsert(query: string): boolean {
+	// Strip leading whitespace and SQL comments
+	const stripped = query.replace(LEADING_COMMENTS_RE, '');
+
+	// Fast path: direct INSERT statement
+	if (/^INSERT\s/i.test(stripped)) {
+		return true;
+	}
+
+	// Check for WITH (CTE) prefix
+	if (!/^WITH\s/i.test(stripped)) {
+		return false;
+	}
+
+	// Scan past the CTE clause to find the first top-level DML keyword.
+	// We track parenthesis depth so we skip CTE subexpressions like
+	// "WITH cte AS (SELECT ... INSERT ...)" without false-matching the
+	// INSERT inside the parens.
+	let depth = 0;
+	let i = 4; // skip past "WITH"
+	const len = stripped.length;
+
+	while (i < len) {
+		const ch = stripped[i]!;
+
+		if (ch === '(') {
+			depth++;
+			i++;
+			continue;
+		}
+		if (ch === ')') {
+			depth--;
+			i++;
+			continue;
+		}
+
+		// Only inspect keywords at top level (depth === 0)
+		if (depth === 0) {
+			// Skip whitespace at top level
+			if (ch === ' ' || ch === '\t' || ch === '\n' || ch === '\r') {
+				i++;
+				continue;
+			}
+
+			// Skip commas between CTEs: WITH a AS (...), b AS (...)
+			if (ch === ',') {
+				i++;
+				continue;
+			}
+
+			// Check for DML keywords at this position.
+			// We look for INSERT, UPDATE, DELETE, or SELECT — the first one
+			// we find at top level determines whether this is retryable.
+			const rest = stripped.substring(i);
+			const dmlMatch = /^(INSERT|UPDATE|DELETE|SELECT)\s/i.exec(rest);
+			if (dmlMatch) {
+				return dmlMatch[1]!.toUpperCase() === 'INSERT';
+			}
+
+			// Skip over any other word (e.g., CTE names, AS keyword, RECURSIVE)
+			// by advancing past alphanumeric/underscore characters
+			if (/\w/.test(ch)) {
+				while (i < len && /\w/.test(stripped[i]!)) {
+					i++;
+				}
+				continue;
+			}
+		}
+
+		i++;
+	}
+
+	return false;
+}
+
 /**
  * Creates a dynamic SQL proxy that always delegates to the PostgresClient's
  * current raw connection. This ensures that after automatic reconnection,
@@ -58,6 +152,10 @@ export function createResilientSQLProxy(
 			// Always resolve from the CURRENT raw connection (changes after reconnect)
 			const raw = client.raw;
 
+			if (prop === 'close') {
+				return () => client.close();
+			}
+
 			if (prop === 'unsafe') {
 				// Wrap unsafe() with retry logic for resilient queries.
 				// Returns a thenable that also supports .values() chaining,
@@ -65,6 +163,25 @@ export function createResilientSQLProxy(
 				//   client.unsafe(query, params)           → Promise<rows>
 				//   client.unsafe(query, params).values()   → Promise<rows>
 				return (query: string, params?: unknown[]) => {
+					// INSERT statements (including CTE-based) are NOT retried to prevent
+					// duplicate rows. If an INSERT succeeds on the server but the connection
+					// drops before the response, retrying would re-execute it — creating a
+					// duplicate row when the primary key is server-generated.
+					// See: https://github.com/agentuity/sdk/issues/911
+					const isInsert = isNonRetryableInsert(query);
+
+					if (isInsert) {
+						const makeDirectExecutor = (useValues: boolean) => {
+							const currentRaw = client.raw;
+							const q = currentRaw.unsafe(query, params);
+							return useValues ? q.values() : q;
+						};
+						const result = makeDirectExecutor(false);
+						return Object.assign(result, {
+							values: () => makeDirectExecutor(true),
+						});
+					}
+
 					const makeExecutor = (useValues: boolean) =>
 						client.executeWithRetry(async () => {
 							// Re-resolve raw inside retry to get post-reconnect instance
@@ -91,6 +208,171 @@ export function createResilientSQLProxy(
 	});
 }
 
+type DrizzleConnectionConfig = string | ({ url?: string } & SQLOptions);
+
+function isCallablePostgresClient(value: unknown): value is CallablePostgresClient {
+	return (
+		typeof value === 'function' &&
+		value !== null &&
+		'raw' in (value as CallablePostgresClient) &&
+		typeof (value as CallablePostgresClient).executeWithRetry === 'function'
+	);
+}
+
+function createProxyClientFromSql(client: BunSQLClient): CallablePostgresClient {
+	// Bun SQL instances are callable as tagged template literals.
+	// Create a function that forwards calls to the client.
+	const proxy = (async (strings: TemplateStringsArray, ...values: unknown[]) => {
+		// Forward tagged template to the Bun SQL client directly
+		return (client as unknown as CallablePostgresClient)(strings, ...values);
+	}) as unknown as CallablePostgresClient;
+
+	Object.defineProperties(proxy, {
+		raw: {
+			get: () => client as InstanceType<typeof BunSQL>,
+			enumerable: true,
+		},
+	});
+
+	proxy.executeWithRetry = async <T>(operation: () => T | Promise<T>) => operation();
+	proxy.close = async () => {
+		const close = (client as { close?: () => Promise<void> | void }).close;
+		if (typeof close === 'function') {
+			await close.call(client);
+		}
+	};
+
+	return proxy;
+}
+
+function extractPostgresConfigFromSql(client: BunSQLClient): PostgresConfig | undefined {
+	const options = (client as { options?: Record<string, unknown> }).options;
+	if (!options || typeof options !== 'object') {
+		return undefined;
+	}
+
+	const config: PostgresConfig = {};
+	const keys = [
+		'url',
+		'hostname',
+		'port',
+		'username',
+		'password',
+		'database',
+		'tls',
+		'max',
+		'idleTimeout',
+		'connectionTimeout',
+	] as const;
+
+	for (const key of keys) {
+		if (key in options) {
+			(config as Record<string, unknown>)[key] = options[key];
+		}
+	}
+
+	return Object.keys(config).length > 0 ? config : undefined;
+}
+
+function resolvePostgresClient<TClient extends BunSQLClient>(
+	client: TClient
+): CallablePostgresClient {
+	if (isCallablePostgresClient(client)) {
+		return client;
+	}
+
+	const config = extractPostgresConfigFromSql(client);
+	if (config) {
+		return postgres(config);
+	}
+
+	return createProxyClientFromSql(client);
+}
+
+function resolvePostgresClientFromConnection(
+	connection?: DrizzleConnectionConfig
+): CallablePostgresClient {
+	if (!connection) {
+		return postgres();
+	}
+
+	if (typeof connection === 'string') {
+		return postgres(connection);
+	}
+
+	if (typeof connection === 'object' && connection.url !== undefined) {
+		const { url, ...config } = connection;
+		return postgres({ url, ...(config as PostgresConfig) });
+	}
+
+	return postgres(connection as PostgresConfig);
+}
+
+function createDrizzleDatabase<
+	TSchema extends Record<string, unknown> = Record<string, never>,
+	TClient extends BunSQLClient = BunSQLClient,
+>(
+	client: CallablePostgresClient,
+	config?: DrizzleConfig<TSchema>
+): BunSQLDatabase<TSchema> & {
+	$client: TClient;
+} {
+	const resilientSQL = createResilientSQLProxy(client);
+	return upstreamDrizzle({
+		client: resilientSQL,
+		...(config ?? {}),
+	}) as BunSQLDatabase<TSchema> & { $client: TClient };
+}
+
+function _drizzle<
+	TSchema extends Record<string, unknown> = Record<string, never>,
+	TClient extends BunSQLClient = BunSQLClient,
+>(
+	...params:
+		| [TClient | string]
+		| [TClient | string, DrizzleConfig<TSchema>]
+		| [DrizzleConfig<TSchema> & ({ connection: DrizzleConnectionConfig } | { client: TClient })]
+): BunSQLDatabase<TSchema> & { $client: TClient } {
+	if (typeof params[0] === 'string') {
+		const client = resolvePostgresClientFromConnection(params[0]);
+		return createDrizzleDatabase(client, params[1]);
+	}
+
+	if (isConfig(params[0])) {
+		const config = params[0] as DrizzleConfig<TSchema> & {
+			connection?: DrizzleConnectionConfig;
+			client?: TClient;
+		};
+		const { connection, client, ...drizzleConfig } = config;
+
+		if (client) {
+			const resolvedClient = resolvePostgresClient(client);
+			return createDrizzleDatabase(resolvedClient, drizzleConfig);
+		}
+
+		const resolvedClient = resolvePostgresClientFromConnection(connection);
+		return createDrizzleDatabase(resolvedClient, drizzleConfig);
+	}
+
+	const client = resolvePostgresClient(params[0] as TClient);
+	return createDrizzleDatabase(client, params[1]);
+}
+
+_drizzle.mock = <TSchema extends Record<string, unknown> = Record<string, never>>(
+	config?: DrizzleConfig<TSchema>
+): BunSQLDatabase<TSchema> & { $client: '$client is not available on drizzle.mock()' } => {
+	const db = upstreamDrizzle.mock(config);
+	(db as unknown as Record<string, unknown>).$client =
+		'$client is not available on drizzle.mock()';
+	return db as BunSQLDatabase<TSchema> & {
+		$client: '$client is not available on drizzle.mock()';
+	};
+};
+
+export const drizzle = _drizzle as typeof _drizzle & {
+	mock: typeof _drizzle.mock;
+};
+
 /**
  * Creates a Drizzle ORM instance with a resilient PostgreSQL connection.
  *
@@ -159,7 +441,7 @@ export function createPostgresDrizzle<
 
 	// Create Drizzle instance using the resilient proxy instead of a static
 	// reference to client.raw, which would become stale after reconnection.
-	const db = drizzle({
+	const db = upstreamDrizzle({
 		client: resilientSQL,
 		schema: config?.schema,
 		logger: config?.logger,