@agent-native/core 0.201.0-nightly-20261005153421 → 0.201.0

package/dist/mcp/oauth-token.js

@@ -11,6 +11,7 @@ export const MCP_OAUTH_SCOPES = [
     "offline_access",
 ];
 export const MCP_OAUTH_DEFAULT_SCOPE = MCP_OAUTH_SCOPES.join(" ");
+const MCP_OAUTH_CREDENTIAL_VERSION = 2;
 function signingSecret() {
     return new TextEncoder().encode(process.env.A2A_SECRET?.trim() || getAuthSecret());
 }
@@ -60,6 +61,7 @@ export function parseMcpOAuthOrgIdClaim(payload) {
 export async function signMcpOAuthAccessToken(params) {
     return new jose.SignJWT({
         typ: "agent-native-mcp-oauth",
+        credential_version: MCP_OAUTH_CREDENTIAL_VERSION,
         sub: params.ownerEmail,
         ...(params.orgId !== undefined ? { org_id: params.orgId } : {}),
         ...(params.orgDomain ? { org_domain: params.orgDomain } : {}),
@@ -122,6 +124,8 @@ export async function verifyMcpOAuthAccessToken(token, resource) {
     try {
         if (payload.typ !== "agent-native-mcp-oauth")
             return null;
+        if (payload.credential_version !== MCP_OAUTH_CREDENTIAL_VERSION)
+            return null;
         if (typeof payload.resource !== "string")
             return null;
         const embeddedResource = normaliseResource(payload.resource);
@@ -148,6 +152,7 @@ export async function verifyMcpOAuthAccessToken(token, resource) {
             clientId: payload.client_id,
             jti: typeof payload.jti === "string" ? payload.jti : undefined,
             ...(payload.catalog_scope === "full" ? { catalogScope: "full" } : {}),
+            ...(typeof payload.iat === "number" ? { issuedAt: payload.iat } : {}),
         };
     }
     catch {

package/dist/mcp/screen-memory-stdio.d.ts

@@ -140,13 +140,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
+            count?: undefined;
         };
         required?: undefined;
     };
@@ -171,13 +171,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
+            count?: undefined;
         };
         required?: undefined;
     };
@@ -196,13 +196,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
+            count?: undefined;
         };
         required?: undefined;
     };
@@ -231,13 +231,13 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             };
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
+            count?: undefined;
         };
     };
 } | {
@@ -260,12 +260,12 @@ export declare function screenMemoryMcpToolDefinitions(): ({
                 description: string;
             };
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             includeMicrophone?: undefined;
             includeSystemAudio?: undefined;
             requestId?: undefined;
+            count?: undefined;
         };
     };
 } | {
@@ -317,7 +317,6 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt: {
                 type: string;
                 description: string;
@@ -337,6 +336,7 @@ export declare function screenMemoryMcpToolDefinitions(): ({
                 type: string;
             };
             requestId?: undefined;
+            count?: undefined;
         };
     };
 } | {
@@ -352,7 +352,6 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             clientHint?: undefined;
             timestamp?: undefined;
             chapterId?: undefined;
-            count?: undefined;
             startAt?: undefined;
             endAt?: undefined;
             reason?: undefined;
@@ -361,6 +360,7 @@ export declare function screenMemoryMcpToolDefinitions(): ({
             requestId: {
                 type: string;
             };
+            count?: undefined;
         };
     };
 })[];

package/dist/mcp/server.js

@@ -2,7 +2,9 @@ import { defineEventHandler, setResponseStatus, setResponseHeader, getMethod, ge
 import { getAppConfig } from "../app-config/store.js";
 import { getConfiguredAppBasePath } from "../server/app-base-path.js";
 import { isLoopbackRequest } from "../server/auth.js";
+import { CREDENTIAL_MEMBERSHIP_UNAVAILABLE_MESSAGE } from "../server/credential-membership-unavailable.js";
 import { getH3App } from "../server/framework-request-handler.js";
+import { getOrigin } from "../server/google-oauth.js";
 import { readBody } from "../server/h3-helpers.js";
 import { trackMcpInitialize } from "./analytics.js";
 import { createMCPServerForRequest, verifyAuth, getAccessTokens, resolveOrgIdFromDomain, buildLinkArtifacts, McpDirectoryProfileValidationError, validateMcpDirectoryProfile, validateMcpDirectoryWidgetDomain, selectMcpActionSurface, } from "./build-server.js";
@@ -186,7 +188,19 @@ export async function handleMcpRequest(event, config, routePath = MCP_PUBLIC_ROU
             isLoopbackOrigin(requestMeta.origin) &&
             (hasLocalOwnerHint || process.env.AGENT_NATIVE_MCP_DEV_OPEN === "1"),
         resourceUrl: getMcpOAuthAudiences(event, routePath),
+        requestOrigin: getOrigin(event),
     });
+    if (!authResult.authed && authResult.unavailable) {
+        // The token is valid but its org membership could not be checked. No auth
+        // challenge: re-authenticating would not help, and the client must keep
+        // its tokens and retry.
+        setResponseStatus(event, 503);
+        setResponseHeader(event, "Retry-After", "5");
+        return {
+            error: "Service Unavailable",
+            message: CREDENTIAL_MEMBERSHIP_UNAVAILABLE_MESSAGE,
+        };
+    }
     if (!authResult.authed) {
         setResponseStatus(event, 401);
         setResponseHeader(event, "WWW-Authenticate", buildMcpOAuthChallenge(event, routePath));

package/dist/onboarding/default-steps.js

@@ -230,7 +230,7 @@ const emailStep = {
             label: "Set email variables on your host",
             description: "See which variables each email provider needs and how to set them.",
             payload: {
-                url: "https://www.agent-native.com/docs/deployment#email-provider",
+                url: "https://www.agent-native.com/docs/deployment?utm_source=app&utm_medium=product&utm_content=onboarding-email-provider#email-provider",
                 external: true,
             },
         },

package/dist/org/handlers.d.ts

@@ -72,9 +72,9 @@ export declare const setWorkspaceAppDefaultVisibilityHandler: import("h3").Event
 }>>;
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     success: boolean;
-    id?: undefined;
     name?: undefined;
     role?: undefined;
+    id?: undefined;
 } | {
     success?: undefined;
     id: string;

package/dist/org/index.d.ts

@@ -179,13 +179,13 @@ export declare const getMyOrgHandler: import("h3").EventHandlerWithFetch<import(
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     name?: undefined;
     success: boolean;
-    id?: undefined;
     role?: undefined;
+    id?: undefined;
 } | {
+    success?: undefined;
     id: string;
     name: string;
     role: import("./types.js").OrgRole;
-    success?: undefined;
 }>>;
 export declare const updateOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     orgId: string;

package/dist/org/membership.d.ts

@@ -1,2 +1,4 @@
 export declare function isMissingOrganizationTableError(error: unknown): boolean;
-export declare function isOrgMember(orgId: string, email: string): Promise<boolean>;
+export declare function isOrgMember(orgId: string, email: string, options?: {
+    requireOrganizationMetadata?: boolean;
+}): Promise<boolean>;

package/dist/org/membership.js

@@ -17,7 +17,7 @@ export function isMissingOrganizationTableError(error) {
     }
     return false;
 }
-export async function isOrgMember(orgId, email) {
+export async function isOrgMember(orgId, email, options = {}) {
     const normalized = email.trim().toLowerCase();
     if (!orgId || !normalized)
         return false;
@@ -41,11 +41,14 @@ export async function isOrgMember(orgId, email) {
         })).rows;
     }
     catch (error) {
-        if (!isMissingOrganizationTableError(error))
+        if (options.requireOrganizationMetadata ||
+            !isMissingOrganizationTableError(error))
             throw error;
         return true;
     }
     const organization = organizationRows[0];
+    if (!organization && options.requireOrganizationMetadata)
+        return false;
     const linked = String(organization?.identity_authority ?? "").trim() ||
         String(organization?.identity_id ?? "").trim();
     if (!linked)

package/dist/provider-api/actions/custom-provider-registration.d.ts

@@ -76,8 +76,8 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
     }>>;
 }, z.core.$strip>>, {
     id?: undefined;
-    message?: undefined;
     deleted?: undefined;
+    provider?: undefined;
     providers: {
         id: string;
         label: string;
@@ -88,45 +88,45 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
         updatedAt: number;
     }[];
     count: number;
-    provider?: undefined;
     found?: undefined;
     registered?: undefined;
     label?: undefined;
+    message?: undefined;
 } | {
     id?: undefined;
-    count?: undefined;
-    message?: undefined;
     deleted?: undefined;
     providers?: undefined;
+    count?: undefined;
     found: boolean;
     provider: import("../custom-registry.js").CustomProviderConfig;
     registered?: undefined;
     label?: undefined;
-} | {
-    count?: undefined;
     message?: undefined;
+} | {
     deleted?: undefined;
-    providers?: undefined;
     provider?: undefined;
+    providers?: undefined;
+    count?: undefined;
     found: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
-} | {
-    count?: undefined;
     message?: undefined;
-    providers?: undefined;
+} | {
     provider?: undefined;
+    providers?: undefined;
+    count?: undefined;
     found?: undefined;
     deleted: boolean;
     id: string;
     registered?: undefined;
     label?: undefined;
+    message?: undefined;
 } | {
-    count?: undefined;
     deleted?: undefined;
-    providers?: undefined;
     provider?: undefined;
+    providers?: undefined;
+    count?: undefined;
     found?: undefined;
     registered: boolean;
     id: string;

package/dist/provider-api/actions/provider-api.d.ts

@@ -312,8 +312,9 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         scope?: "org" | "user" | undefined;
     }, {
         provider?: undefined;
-        id?: undefined;
         deleted?: undefined;
+        message?: undefined;
+        id?: undefined;
         providers: {
             id: string;
             label: string;
@@ -327,42 +328,41 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         found?: undefined;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
-        id?: undefined;
+        count?: undefined;
         deleted?: undefined;
+        message?: undefined;
+        id?: undefined;
         providers?: undefined;
-        count?: undefined;
         found: boolean;
         provider: import("../custom-registry.js").CustomProviderConfig;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
         provider?: undefined;
+        count?: undefined;
         deleted?: undefined;
+        message?: undefined;
         providers?: undefined;
-        count?: undefined;
         found: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
         provider?: undefined;
-        providers?: undefined;
         count?: undefined;
+        message?: undefined;
+        providers?: undefined;
         found?: undefined;
         deleted: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
         provider?: undefined;
+        count?: undefined;
         deleted?: undefined;
         providers?: undefined;
-        count?: undefined;
         found?: undefined;
         registered: boolean;
         id: string;

package/dist/provider-api/corpus-jobs.d.ts

@@ -73,6 +73,7 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     offset?: unknown;
     limit?: unknown;
 }, {
+    deleted?: undefined;
     jobs: {
         id: string;
         name: string;
@@ -83,7 +84,6 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
         updatedAt: string;
     }[];
     total: number;
-    deleted?: undefined;
     jobId?: undefined;
 } | {
     jobs?: undefined;
@@ -91,9 +91,9 @@ export declare function createProviderCorpusJobAction(options: CreateProviderCor
     deleted: boolean;
     jobId: string;
 } | {
+    deleted?: undefined;
     jobs?: undefined;
     total?: undefined;
-    deleted?: undefined;
     jobId?: undefined;
     hits: Record<string, unknown>[];
     offset: number;

package/dist/resource-changes/store.d.ts

@@ -73,6 +73,8 @@ export declare function resourceChangeTriggerNames(source: ResourceChangeSource)
  * committed between a drop and a create would never be recorded.
  */
 export declare function resourceChangeTriggerSql(source: ResourceChangeSource): string[];
+/** A hash of the capture SQL for a source, which changes whenever it does. */
+export declare function resourceChangeCaptureFingerprint(source: ResourceChangeSource): string;
 /**
  * Installs change capture for a source and subscribes a consumer to it.
  * Apps call this from a named migration, so the triggers ship with the app's

package/dist/resource-changes/store.js

@@ -230,6 +230,10 @@ $an_rc$`,
         `CREATE OR REPLACE TRIGGER "${names.truncateTrigger}" BEFORE TRUNCATE ON "${table}" FOR EACH STATEMENT EXECUTE FUNCTION "${names.function}"()`,
     ];
 }
+/** A hash of the capture SQL for a source, which changes whenever it does. */
+export function resourceChangeCaptureFingerprint(source) {
+    return shortHash(resourceChangeTriggerSql(source).join("\n"));
+}
 /**
  * Installs change capture for a source and subscribes a consumer to it.
  * Apps call this from a named migration, so the triggers ship with the app's

package/dist/resources/handlers.d.ts

@@ -39,8 +39,8 @@ export declare function handleUpdateResource(event: any): Promise<import("./stor
     error: string;
 }>;
 export declare function handleDeleteResource(event: any): Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/scripts/db/exec.js

@@ -1,8 +1,8 @@
 import path from "node:path";
-import { getDatabaseUrl, toPostgresParams } from "../../db/client.js";
+import { getDatabaseUrl } from "../../db/client.js";
 import { parseArgs, fail } from "../utils.js";
 import { createPostgresScriptClient } from "./postgres-client.js";
-import { assertNoRawDbAccessControlWrite, assertNoSchemaQualifiedTables, assertNoSensitiveFrameworkTables, } from "./safety.js";
+import { finalRawDbSql, rawDbInsertTarget, readRawDbWriteStatement, verifyRawDbStatement, } from "./safety.js";
 import { buildScopingPostgres } from "./scoping.js";
 function parseSqlArgs(raw, label = "--args") {
     if (!raw)
@@ -50,106 +50,20 @@ function parseStatements(parsed) {
     }
     return [{ sql: parsed.sql, args: parseSqlArgs(parsed.args) }];
 }
-function stripLeadingSqlComments(sql) {
-    return sql
-        .replace(/^\s*--[^\n]*\n/gm, "")
-        .replace(/\/\*[\s\S]*?\*\//g, "")
-        .trim();
-}
-function hasAdditionalStatement(sql) {
-    let state = "normal";
-    for (let i = 0; i < sql.length; i++) {
-        const ch = sql[i];
-        const next = sql[i + 1];
-        if (state === "line") {
-            if (ch === "\n")
-                state = "normal";
-            continue;
-        }
-        if (state === "block") {
-            if (ch === "*" && next === "/") {
-                i++;
-                state = "normal";
-            }
-            continue;
-        }
-        if (state === "single") {
-            if (ch === "'" && next === "'")
-                i++;
-            else if (ch === "'")
-                state = "normal";
-            continue;
-        }
-        if (state === "double") {
-            if (ch === '"' && next === '"')
-                i++;
-            else if (ch === '"')
-                state = "normal";
-            continue;
-        }
-        if (ch === "-" && next === "-") {
-            i++;
-            state = "line";
-        }
-        else if (ch === "/" && next === "*") {
-            i++;
-            state = "block";
-        }
-        else if (ch === "'") {
-            state = "single";
-        }
-        else if (ch === '"') {
-            state = "double";
-        }
-        else if (ch === ";") {
-            return sql.slice(i + 1).trim().length > 0;
-        }
-    }
-    return false;
-}
-function normalizeUserSql(sql, index) {
-    const normalized = stripLeadingSqlComments(sql);
-    if (!normalized)
-        fail(`Statement ${index} is empty`);
-    if (hasAdditionalStatement(normalized)) {
-        fail(`Statement ${index} contains multiple SQL statements. Use --statements for batches so each write can be validated and run transactionally.`);
-    }
-    return normalized.replace(/;\s*$/, "");
-}
-function validateWriteSql(sql, index) {
-    const normalized = normalizeUserSql(sql, index);
-    const upper = normalized.toUpperCase();
-    const allowed = ["INSERT", "UPDATE", "DELETE"];
-    const blocked = ["SELECT", "WITH", "EXPLAIN"];
-    if (blocked.some((keyword) => upper.startsWith(keyword))) {
-        fail(`Statement ${index}: use db-query for read statements. db-exec is for writes only.`);
-    }
-    if (upper.startsWith("CREATE") || upper.startsWith("ALTER")) {
-        fail(`Statement ${index}: schema changes are not allowed through db-exec. Additive schema changes must go through reviewed migrations or startup code.`);
-    }
-    if (!allowed.some((keyword) => upper.startsWith(keyword))) {
-        fail(`Statement ${index}: only ${allowed.join(", ")} statements are allowed. Dangerous operations such as DROP, TRUNCATE, GRANT, and REVOKE are blocked.`);
-    }
-    assertNoSensitiveFrameworkTables(normalized, "write");
-    assertNoRawDbAccessControlWrite(normalized);
-    assertNoSchemaQualifiedTables(normalized, "write");
-    return normalized;
-}
 const INSERT_INTO = "INSERT\\s+INTO";
-function injectOwnership(sql, scoping) {
-    if (!scoping.active)
+function injectOwnership(statement, scoping) {
+    const sql = statement.sql;
+    if (!scoping.active || statement.keyword !== "insert")
         return sql;
-    if (!stripLeadingSqlComments(sql).toUpperCase().startsWith("INSERT")) {
+    const target = rawDbInsertTarget(statement);
+    if (!target)
         return sql;
-    }
-    const match = sql.match(new RegExp(`${INSERT_INTO}\\s+["']?(\\w+)["']?`, "i"));
-    if (!match)
-        return sql;
-    const tableName = match[1];
+    const tableName = target.table;
+    const listed = new Set(target.columns ?? []);
     const injections = [];
     if (scoping.userEmail &&
         scoping.ownerEmailTables.has(tableName) &&
-        !/owner_email/i.test(sql)) {
+        !listed.has("owner_email")) {
         injections.push({
             column: "owner_email",
             value: `'${scoping.userEmail.replace(/'/g, "''")}'`,
@@ -157,7 +71,7 @@ function injectOwnership(sql, scoping) {
     }
     if (scoping.orgId &&
         scoping.orgIdTables.has(tableName) &&
-        !/org_id/i.test(sql)) {
+        !listed.has("org_id")) {
         injections.push({
             column: "org_id",
             value: `'${scoping.orgId.replace(/'/g, "''")}'`,
@@ -227,7 +141,7 @@ Options:
         return;
     }
     const statements = parseStatements(parsed).map((statement, index) => ({
-        sql: validateWriteSql(statement.sql, index + 1),
+        statement: readRawDbWriteStatement(statement.sql, `Statement ${index + 1}`),
         args: statement.args,
     }));
     const url = parsed.db
@@ -243,14 +157,27 @@ Options:
             try {
                 for (let index = 0; index < statements.length; index++) {
                     const statement = statements[index];
-                    const sql = toPostgresParams(injectOwnership(statement.sql, scoping));
+                    const label = `Statement ${index + 1}`;
+                    // Ownership injection rewrites the text, so the guards re-read the
+                    // final SQL and check it against this transaction's state right
+                    // before it runs, after any earlier statement in the batch.
+                    const executed = finalRawDbSql(injectOwnership(statement.statement, scoping), "write", label);
+                    await verifyRawDbStatement(tx, executed.statement, {
+                        columnsByTable: scoping.columnsByTable,
+                        label,
+                    });
+                    const sql = executed.sql;
                     try {
-                        const result = await tx.unsafe(sql, statement.args);
+                        const result = await tx.unsafe(sql, statement.args, {
+                            singleStatement: true,
+                        });
                         results.push({
                             index: index + 1,
                             sql,
                             changes: result.count ?? 0,
-                            rows: /\bRETURNING\b/i.test(sql) ? Array.from(result) : [],
+                            rows: executed.statement.tokens.some((token) => token.kind === "word" && token.value === "returning")
+                                ? Array.from(result)
+                                : [],
                         });
                     }
                     catch (error) {