@agent-native/core 0.119.1 → 0.119.2

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/db/client.d.ts

@@ -1,17 +1,23 @@
 export type Dialect = "sqlite" | "postgres" | "d1";
+export interface DbExecQuery {
+    sql: string;
+    args?: unknown[];
+    /**
+     * Client-side wall-clock budget for this statement. Use only for idempotent
+     * reads unless the caller can safely tolerate a late write completing.
+     */
+    timeoutMs?: number;
+    /** Maximum connection-level attempts for this statement, including the first. */
+    maxAttempts?: number;
+}
+export type DbExecStatement = string | DbExecQuery;
 export interface DbExec {
-    execute(sql: string | {
-        sql: string;
-        args?: unknown[];
-    }): Promise<{
+    execute(sql: DbExecStatement): Promise<{
         rows: any[];
         rowsAffected: number;
     }>;
     transaction?<T>(fn: (tx: DbExec) => Promise<T>): Promise<T>;
-    atomicBatch?(statements: readonly (string | {
-        sql: string;
-        args?: unknown[];
-    })[]): Promise<Array<{
+    atomicBatch?(statements: readonly DbExecStatement[]): Promise<Array<{
         rows: any[];
         rowsAffected: number;
     }>>;
@@ -124,6 +130,10 @@ export declare function isLocalDatabase(): boolean;
 /** Returns BIGINT for Postgres (64-bit), INTEGER for SQLite (already 64-bit). */
 export declare function intType(): string;
 export declare function sqliteToPostgresParams(sql: string): string;
+export declare function dbExecQueryBudget(statement: DbExecStatement): {
+    timeoutMs: number;
+    maxAttempts: number;
+};
 export declare function isConnectionError(err: any): boolean;
 /**
  * Classify database failures that should temporarily shed request load.

package/dist/db/client.d.ts.map

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

package/dist/db/client.js

@@ -515,6 +515,21 @@ function sqlAndArgs(sql) {
         ? { rawSql: sql, args: [] }
         : { rawSql: sql.sql, args: sql.args || [] };
 }
+export function dbExecQueryBudget(statement) {
+    if (typeof statement === "string") {
+        return { timeoutMs: dbOpTimeoutMs(), maxAttempts: 3 };
+    }
+    const timeoutMs = Number(statement.timeoutMs);
+    const maxAttempts = Number(statement.maxAttempts);
+    return {
+        timeoutMs: Number.isFinite(timeoutMs) && timeoutMs > 0
+            ? Math.floor(timeoutMs)
+            : dbOpTimeoutMs(),
+        maxAttempts: Number.isFinite(maxAttempts) && maxAttempts > 0
+            ? Math.floor(maxAttempts)
+            : 3,
+    };
+}
 function explicitTransaction(execute, begin = "BEGIN") {
     return async (fn) => {
         await execute(begin);
@@ -971,10 +986,11 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
             attachNeonPoolErrorLogger(pool);
             if (trackSingletonResources)
                 _neonPool = pool;
-            async function queryNeonClient(client, sql) {
+            async function queryNeonClient(client, sql, timeoutOverrideMs) {
                 const { rawSql, args } = sqlAndArgs(sql);
+                const { timeoutMs } = dbExecQueryBudget(sql);
                 const pgSql = sqliteToPostgresParams(rawSql);
-                const result = await withDbTimeout("query", () => client.query(pgSql, args), dbOpTimeoutMs());
+                const result = await withDbTimeout("query", () => client.query(pgSql, args), timeoutOverrideMs ?? timeoutMs);
                 return {
                     rows: result.rows,
                     rowsAffected: result.rowCount ?? 0,
@@ -982,13 +998,16 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
             }
             return {
                 async execute(sql) {
+                    const { timeoutMs, maxAttempts } = dbExecQueryBudget(sql);
                     if (bgHttp) {
                         // HTTP-per-query path (poolQueryViaFetch=true): no pool.connect(), no
                         // persistent socket to stall. queryNeonClient calls pool.query(),
                         // which the driver routes over HTTP when poolQueryViaFetch is set.
-                        return retryOnConnectionError(() => queryNeonClient(pool, sql));
+                        return retryOnConnectionError(() => queryNeonClient(pool, sql), maxAttempts);
                     }
                     const result = await retryOnConnectionError(async () => {
+                        const attemptStartedAt = Date.now();
+                        const remainingAttemptMs = () => Math.max(1, timeoutMs - (Date.now() - attemptStartedAt));
                         // Bound the pooled-connection ACQUIRE, not just the query below.
                         // Neon's pooler can stall on `connect()` when cold or exhausted,
                         // and that happens BEFORE `client.query`, so the query-level
@@ -1003,7 +1022,7 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                             if (acquireTimedOut)
                                 c.release();
                             return c;
-                        }), dbOpTimeoutMs(), () => {
+                        }), remainingAttemptMs(), () => {
                             acquireTimedOut = true;
                         });
                         let released = false;
@@ -1014,7 +1033,7 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                             client.release(err);
                         };
                         try {
-                            const result = await queryNeonClient(client, sql);
+                            const result = await queryNeonClient(client, sql, remainingAttemptMs());
                             releaseClient();
                             return result;
                         }
@@ -1022,7 +1041,7 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                             releaseClient(isConnectionError(err) ? true : undefined);
                             throw err;
                         }
-                    });
+                    }, maxAttempts);
                     return {
                         rows: result.rows,
                         rowsAffected: result.rowsAffected,
@@ -1084,8 +1103,9 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                     try {
                         const rawSql = typeof sql === "string" ? sql : sql.sql;
                         const args = typeof sql === "string" ? [] : sql.args || [];
+                        const { timeoutMs } = dbExecQueryBudget(sql);
                         const pgSql = sqliteToPostgresParams(rawSql);
-                        const result = await withDbTimeout("query", () => conn.unsafe(pgSql, args), dbOpTimeoutMs(), () => {
+                        const result = await withDbTimeout("query", () => conn.unsafe(pgSql, args), timeoutMs, () => {
                             timedOut = true;
                             disposePostgresPoolEventually(conn, "timed-out worker query");
                         });
@@ -1113,8 +1133,9 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                             const tx = {
                                 async execute(sql) {
                                     const { rawSql, args } = sqlAndArgs(sql);
+                                    const { timeoutMs } = dbExecQueryBudget(sql);
                                     const pgSql = sqliteToPostgresParams(rawSql);
-                                    const result = await withDbTimeout("query", () => txSql.unsafe(pgSql, args), dbOpTimeoutMs());
+                                    const result = await withDbTimeout("query", () => txSql.unsafe(pgSql, args), timeoutMs);
                                     return {
                                         rows: Array.from(result),
                                         rowsAffected: result.count ?? 0,
@@ -1154,12 +1175,13 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
             return {
                 async execute(sql) {
                     const { rawSql, args } = sqlAndArgs(sql);
+                    const { timeoutMs, maxAttempts } = dbExecQueryBudget(sql);
                     const pgSql = sqliteToPostgresParams(rawSql);
                     const result = await retryOnConnectionError(() => {
                         const queryPool = pool;
                         const query = queryPool.unsafe(pgSql, args);
-                        return withDbTimeout("query", () => query, dbOpTimeoutMs(), () => recyclePool(queryPool));
-                    });
+                        return withDbTimeout("query", () => query, timeoutMs, () => recyclePool(queryPool));
+                    }, maxAttempts);
                     return {
                         rows: Array.from(result),
                         rowsAffected: result.count ?? 0,
@@ -1170,8 +1192,9 @@ async function createDbExecInternal(config = {}, trackSingletonResources = false
                         const tx = {
                             async execute(sql) {
                                 const { rawSql, args } = sqlAndArgs(sql);
+                                const { timeoutMs } = dbExecQueryBudget(sql);
                                 const pgSql = sqliteToPostgresParams(rawSql);
-                                const result = await withDbTimeout("query", () => txSql.unsafe(pgSql, args), dbOpTimeoutMs());
+                                const result = await withDbTimeout("query", () => txSql.unsafe(pgSql, args), timeoutMs);
                                 return {
                                     rows: Array.from(result),
                                     rowsAffected: result.count ?? 0,