@agent-native/core 0.154.3 → 0.154.5

package/dist/oauth-tokens/store.d.ts

@@ -1,4 +1,26 @@
 export declare function getOAuthTokens(provider: string, accountId: string, owner?: string): Promise<Record<string, unknown> | null>;
+export interface OAuthTokenSnapshot {
+    tokens: Record<string, unknown>;
+    owner: string | null;
+    revision: number;
+    legacyRevision: number;
+    storageVersion: string;
+}
+/**
+ * Read one credential bundle together with the row revision used by
+ * refresh/revocation compare-and-swap writes.
+ */
+export declare function getOAuthTokenSnapshot(provider: string, accountId: string, owner: string): Promise<OAuthTokenSnapshot | null>;
+/** Read a legacy user-owned row without treating organization ids as case-insensitive. */
+export declare function getOAuthTokenSnapshotForUserOwner(provider: string, accountId: string, owner: string): Promise<OAuthTokenSnapshot | null>;
+/**
+ * Replace an existing credential bundle only when the caller still owns the
+ * revision it read. This prevents a slow refresh/revoke flow from overwriting
+ * a newer authorization completed in another process.
+ */
+export declare function replaceOAuthTokensIfRevision(provider: string, accountId: string, owner: string, expectedRevision: number, expectedLegacyRevision: number, expectedStorageVersion: string, tokens: Record<string, unknown>): Promise<boolean>;
+/** Delete only the exact credential revision the caller inspected. */
+export declare function deleteOAuthTokensIfRevision(provider: string, accountId: string, owner: string, expectedRevision: number, expectedLegacyRevision: number, expectedStorageVersion: string): Promise<boolean>;
 /**
  * Thrown when an OAuth save would re-bind an `(provider, account_id)` row
  * to a different owner than already holds it. Callers should catch this and

package/dist/oauth-tokens/store.js

@@ -42,6 +42,15 @@ function parseStoredTokens(stored) {
 function oauthTokensTable() {
     return isPostgres() ? "public.oauth_tokens" : "oauth_tokens";
 }
+function isDuplicateColumnError(err) {
+    const code = String(err?.code ?? "");
+    const message = String(err?.message ?? err)
+        .toLowerCase()
+        .trim();
+    return (code === "42701" ||
+        message.includes("duplicate column") ||
+        message.includes("already exists"));
+}
 async function ensureTable() {
     if (!_initPromise) {
         _initPromise = (async () => {
@@ -54,6 +63,7 @@ async function ensureTable() {
           owner TEXT,
           tokens TEXT NOT NULL,
           updated_at ${intType()} NOT NULL,
+          revision ${intType()} NOT NULL,
           PRIMARY KEY (provider, account_id)
         )
       `;
@@ -76,13 +86,11 @@ async function ensureTable() {
                 await ensureColumnExists("oauth_tokens", "owner", `ALTER TABLE ${table} ADD COLUMN IF NOT EXISTS owner TEXT`);
                 // Migration: add display_name column
                 await ensureColumnExists("oauth_tokens", "display_name", `ALTER TABLE ${table} ADD COLUMN IF NOT EXISTS display_name TEXT`);
+                await ensureColumnExists("oauth_tokens", "revision", `ALTER TABLE ${table} ADD COLUMN IF NOT EXISTS revision BIGINT`);
                 // Backfill: set owner = account_id for existing rows without an owner
                 await client.execute(`UPDATE ${table} SET owner = account_id WHERE owner IS NULL`);
-                // Older deployments have a 32-bit `updated_at`; on Postgres the
-                // `Date.now()` written on every token save overflows int4. Widen in place
-                // (no-op once done / on fresh DBs). Unqualified name — the helper scopes
-                // to the `public` schema.
-                await widenIntColumnsToBigInt("oauth_tokens", ["updated_at"]);
+                await client.execute(`UPDATE ${table} SET revision = updated_at WHERE revision IS NULL`);
+                await widenIntColumnsToBigInt("oauth_tokens", ["updated_at"], client);
                 return;
             }
             // SQLite (local dev): no lock problem — keep the original behaviour.
@@ -91,23 +99,28 @@ async function ensureTable() {
             try {
                 await client.execute(`ALTER TABLE ${table} ADD COLUMN owner TEXT`);
             }
-            catch {
-                // Column already exists
+            catch (err) {
+                if (!isDuplicateColumnError(err))
+                    throw err;
             }
             // Migration: add display_name column
             try {
                 await client.execute(`ALTER TABLE ${table} ADD COLUMN display_name TEXT`);
             }
-            catch {
-                // Column already exists
+            catch (err) {
+                if (!isDuplicateColumnError(err))
+                    throw err;
+            }
+            try {
+                await client.execute(`ALTER TABLE ${table} ADD COLUMN revision INTEGER`);
+            }
+            catch (err) {
+                if (!isDuplicateColumnError(err))
+                    throw err;
             }
             // Backfill: set owner = account_id for existing rows without an owner
             await client.execute(`UPDATE ${table} SET owner = account_id WHERE owner IS NULL`);
-            // Older deployments have a 32-bit `updated_at`; on Postgres the
-            // `Date.now()` written on every token save overflows int4. Widen in place
-            // (no-op once done / on fresh DBs). Unqualified name — the helper scopes
-            // to the `public` schema.
-            await widenIntColumnsToBigInt("oauth_tokens", ["updated_at"]);
+            await client.execute(`UPDATE ${table} SET revision = updated_at WHERE revision IS NULL`);
         })().catch((err) => {
             // Retry init on the next call after a failed startup.
             _initPromise = undefined;
@@ -130,6 +143,91 @@ export async function getOAuthTokens(provider, accountId, owner) {
         return null;
     return parseStoredTokens(rows[0].tokens);
 }
+/**
+ * Read one credential bundle together with the row revision used by
+ * refresh/revocation compare-and-swap writes.
+ */
+export async function getOAuthTokenSnapshot(provider, accountId, owner) {
+    await ensureTable();
+    const client = getDbExec();
+    const table = oauthTokensTable();
+    const { rows } = await client.execute({
+        sql: `SELECT owner, tokens, revision, updated_at FROM ${table} WHERE provider = ? AND account_id = ? AND owner = ?`,
+        args: [provider, accountId, owner],
+    });
+    if (rows.length === 0)
+        return null;
+    return {
+        tokens: parseStoredTokens(rows[0].tokens),
+        owner: rows[0].owner ?? null,
+        revision: Number(rows[0].revision ?? 0),
+        legacyRevision: Number(rows[0].updated_at),
+        storageVersion: rows[0].tokens,
+    };
+}
+/** Read a legacy user-owned row without treating organization ids as case-insensitive. */
+export async function getOAuthTokenSnapshotForUserOwner(provider, accountId, owner) {
+    await ensureTable();
+    const client = getDbExec();
+    const table = oauthTokensTable();
+    const { rows } = await client.execute({
+        sql: `SELECT owner, tokens, revision, updated_at FROM ${table} WHERE provider = ? AND account_id = ? AND LOWER(owner) = LOWER(?) AND LOWER(owner) LIKE 'user:%'`,
+        args: [provider, accountId, owner],
+    });
+    if (rows.length === 0)
+        return null;
+    return {
+        tokens: parseStoredTokens(rows[0].tokens),
+        owner: rows[0].owner ?? null,
+        revision: Number(rows[0].revision ?? 0),
+        legacyRevision: Number(rows[0].updated_at),
+        storageVersion: rows[0].tokens,
+    };
+}
+/**
+ * Replace an existing credential bundle only when the caller still owns the
+ * revision it read. This prevents a slow refresh/revoke flow from overwriting
+ * a newer authorization completed in another process.
+ */
+export async function replaceOAuthTokensIfRevision(provider, accountId, owner, expectedRevision, expectedLegacyRevision, expectedStorageVersion, tokens) {
+    await ensureTable();
+    const client = getDbExec();
+    const table = oauthTokensTable();
+    const nextRevision = Math.max(Date.now(), expectedRevision + 1);
+    const result = await client.execute({
+        sql: `UPDATE ${table} SET tokens = ?, revision = ?, updated_at = ? WHERE provider = ? AND account_id = ? AND owner = ? AND COALESCE(revision, 0) = ? AND updated_at = ? AND tokens = ?`,
+        args: [
+            serializeTokens(tokens),
+            nextRevision,
+            Math.floor(Date.now() / 1_000),
+            provider,
+            accountId,
+            owner,
+            expectedRevision,
+            expectedLegacyRevision,
+            expectedStorageVersion,
+        ],
+    });
+    return result.rowsAffected === 1;
+}
+/** Delete only the exact credential revision the caller inspected. */
+export async function deleteOAuthTokensIfRevision(provider, accountId, owner, expectedRevision, expectedLegacyRevision, expectedStorageVersion) {
+    await ensureTable();
+    const client = getDbExec();
+    const table = oauthTokensTable();
+    const result = await client.execute({
+        sql: `DELETE FROM ${table} WHERE provider = ? AND account_id = ? AND owner = ? AND COALESCE(revision, 0) = ? AND updated_at = ? AND tokens = ?`,
+        args: [
+            provider,
+            accountId,
+            owner,
+            expectedRevision,
+            expectedLegacyRevision,
+            expectedStorageVersion,
+        ],
+    });
+    return result.rowsAffected === 1;
+}
 /**
  * Thrown when an OAuth save would re-bind an `(provider, account_id)` row
  * to a different owner than already holds it. Callers should catch this and
@@ -154,6 +252,12 @@ export class OAuthAccountOwnedByOtherUserError extends Error {
         this.attemptedOwner = opts.attemptedOwner;
     }
 }
+function ownersRepresentSameUser(existingOwner, attemptedOwner) {
+    return (existingOwner === attemptedOwner ||
+        (existingOwner.startsWith("user:") &&
+            attemptedOwner.startsWith("user:") &&
+            existingOwner.toLowerCase() === attemptedOwner.toLowerCase()));
+}
 /**
  * Save OAuth tokens. The `owner` parameter specifies which user owns this
  * account — defaults to `accountId` (the account itself is the owner).
@@ -195,7 +299,9 @@ export async function saveOAuthTokens(provider, accountId, tokens, owner) {
         if (existingOwner)
             resolvedOwner = existingOwner;
     }
-    else if (existingOwner && owner && existingOwner !== owner) {
+    else if (existingOwner &&
+        owner &&
+        !ownersRepresentSameUser(existingOwner, owner)) {
         // Refuse to silently re-bind an account from one user to another.
         // This is the case the docstring promised but the previous
         // implementation didn't enforce — `ON CONFLICT DO UPDATE SET
@@ -212,19 +318,36 @@ export async function saveOAuthTokens(provider, accountId, tokens, owner) {
         ...(existingTokens ?? {}),
         ...cleanedIncomingTokens,
     };
-    await client.execute({
+    const result = await client.execute({
         sql: isPostgres()
-            ? `INSERT INTO ${table} (provider, account_id, owner, display_name, tokens, updated_at) VALUES (?, ?, ?, ?, ?, ?) ON CONFLICT (provider, account_id) DO UPDATE SET owner=EXCLUDED.owner, display_name=COALESCE(EXCLUDED.display_name, ${table}.display_name), tokens=EXCLUDED.tokens, updated_at=EXCLUDED.updated_at`
-            : `INSERT OR REPLACE INTO ${table} (provider, account_id, owner, display_name, tokens, updated_at) VALUES (?, ?, ?, ?, ?, ?)`,
+            ? `INSERT INTO ${table} (provider, account_id, owner, display_name, tokens, updated_at, revision) VALUES (?, ?, ?, ?, ?, ?, ?) ON CONFLICT (provider, account_id) DO UPDATE SET owner=EXCLUDED.owner, display_name=COALESCE(EXCLUDED.display_name, ${table}.display_name), tokens=EXCLUDED.tokens, updated_at=EXCLUDED.updated_at, revision=GREATEST(COALESCE(${table}.revision, 0) + 1, EXCLUDED.revision) WHERE ${table}.owner = EXCLUDED.owner OR (LOWER(${table}.owner) = LOWER(EXCLUDED.owner) AND LOWER(${table}.owner) LIKE 'user:%' AND LOWER(EXCLUDED.owner) LIKE 'user:%')`
+            : `INSERT INTO ${table} (provider, account_id, owner, display_name, tokens, updated_at, revision) VALUES (?, ?, ?, ?, ?, ?, ?) ON CONFLICT (provider, account_id) DO UPDATE SET owner=excluded.owner, display_name=COALESCE(excluded.display_name, ${table}.display_name), tokens=excluded.tokens, updated_at=excluded.updated_at, revision=MAX(COALESCE(${table}.revision, 0) + 1, excluded.revision) WHERE ${table}.owner = excluded.owner OR (LOWER(${table}.owner) = LOWER(excluded.owner) AND LOWER(${table}.owner) LIKE 'user:%' AND LOWER(excluded.owner) LIKE 'user:%')`,
         args: [
             provider,
             accountId,
             resolvedOwner,
             existingDisplayName,
             serializeTokens(tokensToStore),
+            Math.floor(Date.now() / 1_000),
             Date.now(),
         ],
     });
+    if (result.rowsAffected === 1)
+        return;
+    const { rows: conflict } = await client.execute({
+        sql: `SELECT owner FROM ${table} WHERE provider = ? AND account_id = ?`,
+        args: [provider, accountId],
+    });
+    const conflictOwner = conflict[0]?.owner ?? "";
+    if (conflictOwner && !ownersRepresentSameUser(conflictOwner, resolvedOwner)) {
+        throw new OAuthAccountOwnedByOtherUserError({
+            provider,
+            accountId,
+            existingOwner: conflictOwner,
+            attemptedOwner: resolvedOwner,
+        });
+    }
+    throw new Error(`OAuth account ${provider}:${accountId} was not saved.`);
 }
 export async function deleteOAuthTokens(provider, accountId, owner) {
     await ensureTable();

package/dist/observability/routes.d.ts

@@ -41,14 +41,14 @@ export declare function createObservabilityHandler(): import("h3").EventHandlerW
     thumbsUpRate: number;
     avgEvalScore: number;
 } | {
-    error?: undefined;
     ok?: undefined;
+    error?: undefined;
     summary: import("./types.js").TraceSummary;
     spans: import("./types.js").TraceSpan[];
     id?: undefined;
 } | {
-    error?: undefined;
     ok?: undefined;
+    error?: undefined;
     summary?: undefined;
     spans?: undefined;
     id: string;

package/dist/progress/routes.d.ts

@@ -15,6 +15,6 @@ export declare function createProgressHandler(): import("h3").EventHandlerWithFe
     error: string;
     ok?: undefined;
 } | {
-    ok: boolean;
     error?: undefined;
+    ok: boolean;
 }>>;

package/dist/secrets/routes.d.ts

@@ -37,17 +37,17 @@ export declare function createWriteSecretHandler(): import("h3").EventHandlerWit
     ok?: undefined;
     status?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     status: string;
+    error?: undefined;
 } | {
     ok?: undefined;
     error: string;
     removed?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     removed: boolean;
+    error?: undefined;
 }>>;
 /**
  * POST /_agent-native/secrets/:key/test — validate an optional candidate value
@@ -58,13 +58,13 @@ export declare function createTestSecretHandler(): import("h3").EventHandlerWith
     error: string;
     note?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     note?: undefined;
-} | {
     error?: undefined;
+} | {
     ok: boolean;
     note: string;
+    error?: undefined;
 } | {
     note?: undefined;
     ok: boolean;
@@ -95,11 +95,11 @@ export interface AdHocSecretPayload {
 export declare function createAdHocSecretHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<AdHocSecretPayload[] | {
     error: string;
 } | {
-    error?: undefined;
     ok: boolean;
     key: string;
-} | {
     error?: undefined;
+} | {
     ok: boolean;
     removed: boolean;
+    error?: undefined;
 }>>;

package/dist/server/action-routes.js

@@ -1,6 +1,6 @@
 import { createError, defineEventHandler, setResponseStatus, setResponseHeader, getMethod, getQuery, getHeader, getRequestURL, } from "h3";
 import { verifyA2ATokenWithClaims } from "../a2a-claims.js";
-import { isAgentActionStopError } from "../action.js";
+import { isActionContractError, isAgentActionStopError } from "../action.js";
 import { declaresFeatureFlagDelegation } from "../feature-flags/a2a-action-route.js";
 import { resolveOrgByDomain, resolveOrgIdForEmail } from "../org/context.js";
 import { readBody } from "../server/h3-helpers.js";
@@ -507,7 +507,15 @@ export function mountActionRoutes(nitroApp, actions, options) {
                         isAgentActionStopError(err) ||
                         (explicitStatus !== undefined && explicitStatus < 500);
                     if (isUserFacing) {
-                        return { error: msg };
+                        return isActionContractError(err)
+                            ? {
+                                error: msg,
+                                errorCode: err.errorCode,
+                                ...(err.details === undefined
+                                    ? {}
+                                    : { details: err.details }),
+                            }
+                            : { error: msg };
                     }
                     const requestId = getHttpRequestTelemetryId(event);
                     const captureId = captureError(err, {

package/dist/server/realtime-token.d.ts

@@ -26,8 +26,8 @@ export declare function createRealtimeTokenHandler(): import("h3").EventHandlerW
     expiresAt?: undefined;
     ttlSeconds?: undefined;
 } | {
+    error?: undefined;
     token: string;
     expiresAt: string;
     ttlSeconds: number;
-    error?: undefined;
 }>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.154.3",
+  "version": "0.154.5",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {
@@ -418,6 +418,7 @@
     "turndown": "7.2.4",
     "tw-animate-css": "1.4.0",
     "tweetnacl": "^1.0.3",
+    "undici": "^7.28.0",
     "y-protocols": "^1.0.7",
     "yjs": "^13.6.31",
     "zod": "^4.3.6",