@agent-native/core 0.152.1 → 0.153.0

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

@@ -77,7 +77,7 @@ export declare function createCustomProviderRegistrationAction<TSchema extends Z
 }, z.core.$strip>>, {
     id?: undefined;
     deleted?: undefined;
-    message?: 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;
 } | {
-    count?: undefined;
     id?: undefined;
     deleted?: undefined;
-    message?: undefined;
     providers?: undefined;
+    count?: undefined;
     found: boolean;
     provider: import("../custom-registry.js").CustomProviderConfig;
     registered?: undefined;
     label?: undefined;
+    message?: undefined;
 } | {
-    count?: undefined;
     deleted?: undefined;
-    message?: 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

@@ -311,8 +311,8 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         notes?: string | undefined;
         scope?: "org" | "user" | undefined;
     }, {
+        message?: undefined;
         id?: undefined;
-        provider?: undefined;
         deleted?: undefined;
         providers: {
             id: string;
@@ -324,11 +324,12 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
             updatedAt: number;
         }[];
         count: number;
+        provider?: undefined;
         found?: undefined;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
+        message?: undefined;
         count?: undefined;
         id?: undefined;
         deleted?: undefined;
@@ -337,32 +338,31 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
         provider: import("../custom-registry.js").CustomProviderConfig;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
+        message?: undefined;
         count?: undefined;
-        provider?: undefined;
         deleted?: undefined;
         providers?: undefined;
+        provider?: undefined;
         found: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
+        message?: undefined;
         count?: undefined;
-        provider?: undefined;
         providers?: undefined;
+        provider?: undefined;
         found?: undefined;
         deleted: boolean;
         id: string;
         registered?: undefined;
         label?: undefined;
-        message?: undefined;
     } | {
         count?: undefined;
-        provider?: undefined;
         deleted?: undefined;
         providers?: undefined;
+        provider?: undefined;
         found?: undefined;
         registered: boolean;
         id: string;

package/dist/review/actions/create-review-comment.js

@@ -36,7 +36,7 @@ export default defineAction({
     schema,
     run: async (args, ctx) => {
         const actionCtx = ctx;
-        const access = await assertReviewableResourceAccess(args.resourceType, args.resourceId, actionCtx, "viewer");
+        const access = await assertReviewableResourceAccess(args.resourceType, args.resourceId, actionCtx, "commenter");
         const mentions = normalizeReviewMentions([
             ...normalizeReviewMentions(args.mentions),
             ...extractReviewMentions(args.body),

package/dist/review/actions/delete-review-comment.js

@@ -30,7 +30,10 @@ export default defineAction({
         const isAuthor = Boolean(actionCtx?.userEmail) &&
             normalizeEmail(comment.authorEmail) ===
                 normalizeEmail(actionCtx?.userEmail);
-        if (!isAuthor && (!access || !roleSatisfies(access.role, "editor"))) {
+        if (!access || !roleSatisfies(access.role, "commenter")) {
+            throw new ForbiddenError("Not allowed to delete this review comment");
+        }
+        if (!isAuthor && !roleSatisfies(access.role, "editor")) {
             throw new ForbiddenError("Not allowed to delete this review comment");
         }
         const updatedCount = await deleteReviewComment(comment.id, actionCtx?.userEmail ?? null);

package/dist/review/actions/list-review-comments.js

@@ -1,5 +1,6 @@
 import { z } from "zod";
 import { defineAction } from "../../action.js";
+import { roleSatisfies } from "../../sharing/schema.js";
 import { redactPublicReviewCommentIdentity, redactPublicReviewStatusIdentity, shouldRedactReviewIdentity, } from "../identity.js";
 import { assertReviewableResourceAccess } from "../registry.js";
 import { getReviewStatus, getReviewThreadSummary, queryReviewComments, } from "../store.js";
@@ -50,8 +51,9 @@ export default defineAction({
         const redactIdentity = shouldRedactReviewIdentity(actionCtx, access);
         const commentsWithCapabilities = comments.map((comment) => ({
             ...comment,
-            canDelete: access.role !== "viewer" ||
-                Boolean(actionCtx?.userEmail && comment.authorEmail === actionCtx.userEmail),
+            canDelete: roleSatisfies(access.role, "commenter") &&
+                (roleSatisfies(access.role, "editor") ||
+                    Boolean(actionCtx?.userEmail && comment.authorEmail === actionCtx.userEmail)),
         }));
         return redactIdentity
             ? {

package/dist/review/actions/reply-review-comment.js

@@ -29,7 +29,7 @@ export default defineAction({
             userEmail: actionCtx?.userEmail ?? null,
             orgId: actionCtx?.orgId ?? null,
         };
-        const access = await assertReviewableResourceAccess(args.resourceType, args.resourceId, actionCtx, "viewer");
+        const access = await assertReviewableResourceAccess(args.resourceType, args.resourceId, actionCtx, "commenter");
         const parent = await getReviewCommentById(args.commentId, scope, {
             bypassScope: true,
         });

package/dist/review/types.d.ts

@@ -1,5 +1,5 @@
 import type { Visibility } from "../sharing/schema.js";
-export type ReviewResourceRole = "viewer" | "editor" | "admin" | "owner";
+export type ReviewResourceRole = "viewer" | "commenter" | "editor" | "admin" | "owner";
 export type ReviewCommentKind = "comment" | "annotation" | "correction" | "question" | "decision" | "review";
 export type ReviewCommentStatus = "open" | "resolved" | "deleted";
 export type ReviewResolutionTarget = "agent" | "human";

package/dist/secrets/routes.d.ts

@@ -34,37 +34,37 @@ export declare function createListSecretsHandler(): import("h3").EventHandlerWit
 /** POST /_agent-native/secrets/:key — write a secret. */
 export declare function createWriteSecretHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     error: string;
-    ok?: undefined;
     status?: undefined;
+    ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     status: string;
+    error?: undefined;
 } | {
-    ok?: undefined;
     error: string;
     removed?: undefined;
+    ok?: undefined;
 } | {
-    error?: undefined;
     ok: boolean;
     removed: boolean;
+    error?: undefined;
 }>>;
 /**
  * POST /_agent-native/secrets/:key/test — validate an optional candidate value
  * or the current stored value without changing anything.
  */
 export declare function createTestSecretHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
     note?: undefined;
+    ok?: 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-discovery.js

@@ -513,6 +513,10 @@ export { CORE_ACTION_GROUPS };
  */
 export const ALWAYS_ON_CORE_ACTIONS = new Set([
     "upload-image",
+    "list-workspace-user-groups",
+    "upsert-workspace-user-group",
+    "bulk-update-workspace-user-groups",
+    "delete-workspace-user-group",
     "list-transactional-emails",
     "render-transactional-email-preview",
     "list-email-log",
@@ -544,6 +548,22 @@ export async function mergeCoreSharingActions(registry) {
             () => import("../sharing/actions/create-agent-resource-link.js"),
         ],
         ["upload-image", () => import("../file-upload/actions/upload-image.js")],
+        [
+            "list-workspace-user-groups",
+            () => import("../workspace-connections/actions/list-workspace-user-groups.js"),
+        ],
+        [
+            "upsert-workspace-user-group",
+            () => import("../workspace-connections/actions/upsert-workspace-user-group.js"),
+        ],
+        [
+            "bulk-update-workspace-user-groups",
+            () => import("../workspace-connections/actions/bulk-update-workspace-user-groups.js"),
+        ],
+        [
+            "delete-workspace-user-group",
+            () => import("../workspace-connections/actions/delete-workspace-user-group.js"),
+        ],
         // Transactional email catalog - mounted everywhere so Dispatch can ask any
         // app what it sends without that app opting in.
         [
@@ -605,6 +625,15 @@ export async function mergeCoreSharingActions(registry) {
             "manage-automation",
             () => import("../triggers/actions/manage-automation.js"),
         ],
+        ["get-usage-alerts", () => import("../usage/actions/get-usage-alerts.js")],
+        [
+            "manage-usage-alert",
+            () => import("../usage/actions/manage-usage-alert.js"),
+        ],
+        [
+            "get-usage-metrics",
+            () => import("../usage/actions/get-usage-metrics.js"),
+        ],
         [
             "context-manifest-get",
             () => import("../agent/context-xray/actions/context-manifest-get.js"),

package/dist/server/agent-chat/plugin-options.d.ts

@@ -52,6 +52,13 @@ export interface AgentChatPluginOptions {
     mentionProviders?: Record<string, MentionProvider> | (() => Record<string, MentionProvider> | Promise<Record<string, MentionProvider>>);
     /** App ID used to exclude self from agent discovery (e.g., "mail", "calendar") */
     appId?: string;
+    /**
+     * Controls connected MCP tools available to unattended recurring and trigger
+     * runs. "requested" only loads tools named by a job; "all" loads every
+     * tool visible to this app's current workspace context and still enforces
+     * the per-request scope gate when a tool is called.
+     */
+    backgroundMcpTools?: "requested" | "all";
     /**
      * Everything about this app's MCP mount — whether it is mounted, which tools
      * external callers see, and the branding sent during the `initialize`

package/dist/server/agent-chat-plugin.d.ts

@@ -1,4 +1,5 @@
 import type { Message as A2AMessage } from "../a2a/types.js";
+import { type ActionEntry } from "../agent/production-agent.js";
 import type { ResolvedKeyReference } from "../secrets/substitution.js";
 import { handleSharedThreadRequest, type SharedThreadRouteDependencies } from "./agent-chat/shared-thread.js";
 export { handleSharedThreadRequest };
@@ -62,6 +63,7 @@ export declare function resolveFetchToolKeyAllowlist(keyName: string, resolvedKe
     getKeyAllowlist: (name: string, scope: "user", scopeId: string) => Promise<string[] | null>;
     getResolvedKeyAllowlist: (ref: ResolvedKeyReference) => Promise<string[] | null>;
 }): Promise<string[] | null>;
+export declare function resolveHostedBuilderHandoff(browserTools: Record<string, ActionEntry>, canToggle: boolean): Record<string, ActionEntry>;
 export declare function createAgentChatPlugin(options?: AgentChatPluginOptions): NitroPluginDef;
 /**
  * Default agent chat plugin with no template-specific actions.

package/dist/server/agent-chat-plugin.js

@@ -240,6 +240,12 @@ export async function resolveFetchToolKeyAllowlist(keyName, resolvedKeys, owner,
         return deps.getResolvedKeyAllowlist(ref);
     return deps.getKeyAllowlist(keyName, "user", owner);
 }
+export function resolveHostedBuilderHandoff(browserTools, canToggle) {
+    if (canToggle)
+        return {};
+    const connectBuilder = browserTools["connect-builder"];
+    return connectBuilder ? { "connect-builder": connectBuilder } : {};
+}
 export function createAgentChatPlugin(options) {
     return (nitroApp) => {
         markDefaultPluginProvided(nitroApp, "agent-chat");
@@ -292,6 +298,7 @@ export function createAgentChatPlugin(options) {
             // `externalAgents` into `mcp`. A2A reads the same object, so the
             // connector policy cannot diverge between the two external surfaces.
             const mcpOptions = resolveAgentChatMcpOptions(options);
+            const backgroundMcpTools = options?.backgroundMcpTools ?? "requested";
             // Build the four assembled system prompt strings. These are static for the
             // lifetime of this plugin instance — examples come from options once at
             // startup, not per-request.
@@ -340,15 +347,13 @@ export function createAgentChatPlugin(options) {
             };
             const getJobMcpActionEntries = async (job) => {
                 const requested = job?.meta.mcpTools ?? [];
-                if (requested.length === 0)
+                if (requested.length === 0 && backgroundMcpTools !== "all")
                     return {};
                 // Background action suppliers may be async so event-triggered and
                 // scheduled runs can await lazy MCP hydration on serverless cold
                 // starts. Runs without requested MCP tools still skip this work.
                 await ensureMcpInitialized();
-                const entries = mcpToolsToActionEntries(mcpManager, {
-                    toolNames: requested,
-                });
+                const entries = mcpToolsToActionEntries(mcpManager, backgroundMcpTools === "all" ? {} : { toolNames: requested });
                 const missing = requested.filter((toolName) => !entries[toolName]);
                 if (missing.length > 0) {
                     throw new Error(`Configured MCP tools are unavailable in this run: ${missing.join(", ")}. Reconnect the MCP server or update the automation's capability list.`);
@@ -470,6 +475,7 @@ export function createAgentChatPlugin(options) {
                 getOwner: () => getRequestRunContext()?.owner ?? getRequestUserEmail(),
                 extensionTools: extensionToolsEnabled,
             });
+            const hostedBuilderHandoff = resolveHostedBuilderHandoff(browserTools, canToggle);
             // Auto-mount A2A protocol endpoints so every app is discoverable
             // and callable by other agents via the standard protocol.
             // In dev mode, include dev scripts (filesystem-discovered) so the A2A agent
@@ -961,6 +967,7 @@ export function createAgentChatPlugin(options) {
                     ...(browserTools["connect-file-storage"]
                         ? ["connect-file-storage"]
                         : []),
+                    ...Object.keys(hostedBuilderHandoff),
                 ]),
             ];
             const resolveExtraContext = async (event, owner) => {
@@ -2283,6 +2290,7 @@ export function createAgentChatPlugin(options) {
                 ...chatScripts,
                 ...(a2aAgentDelegationEnabled ? callAgentScript : {}),
                 ...toolActions,
+                ...hostedBuilderHandoff,
             };
             const anonymousReadOnlyActions = attachToolSearch(filterReadOnlyActions(templateScripts));
             // Full-database admin tools. Gated on NODE_ENV=development to match the

package/dist/server/builder-browser.js

@@ -1,13 +1,16 @@
 import { createHash, createHmac, randomBytes, timingSafeEqual, } from "node:crypto";
 import { getHeader } from "h3";
+import { getSetting } from "../settings/store.js";
 import { applyBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
 import { getAuthSecret, resolveSignupTrackingIdentity, } from "./better-auth-instance.js";
 import { getAppBasePath, getOrigin } from "./google-oauth.js";
+import { getRequestOrgId, getRequestUserEmail } from "./request-context.js";
 const DEFAULT_BUILDER_APP_HOST = "https://builder.io";
 const DEFAULT_BUILDER_API_HOST = "https://api.builder.io";
 const BUILDER_API_REQUEST_TIMEOUT_MS = 30_000;
 const BUILDER_BROWSER_HOST = "agent-native-browser";
 const BUILDER_BROWSER_CLIENT_ID = "Agent Native Browser";
+const DISPATCH_APP_CREATION_SETTINGS_KEY = "dispatch-app-creation-settings";
 export const BUILDER_CALLBACK_PATH = "/_agent-native/builder/callback";
 export const BUILDER_RELAY_PATH = "/_agent-native/builder/relay";
 export const BUILDER_RELAY_STATE_PARAM = "_an_relay";
@@ -565,7 +568,35 @@ export function getBuilderBranchProjectId() {
 export function isBuilderBranchingEnabled() {
     return !!getConfiguredBuilderBranchProjectId();
 }
+async function resolveDispatchBuilderProjectId() {
+    const orgId = getRequestOrgId()?.trim();
+    const userEmail = orgId ? undefined : getRequestUserEmail()?.trim();
+    const scopedKey = orgId
+        ? `${DISPATCH_APP_CREATION_SETTINGS_KEY}:org:${orgId}`
+        : userEmail
+            ? `${DISPATCH_APP_CREATION_SETTINGS_KEY}:user:${userEmail}`
+            : null;
+    if (!scopedKey)
+        return { status: "absent" };
+    try {
+        const setting = await getSetting(scopedKey);
+        if (setting === null)
+            return { status: "absent" };
+        const projectId = typeof setting.builderProjectId === "string"
+            ? setting.builderProjectId.trim()
+            : "";
+        return { status: "present", projectId: projectId || null };
+    }
+    catch {
+        return { status: "unreadable" };
+    }
+}
 export async function resolveBuilderBranchProjectId() {
+    const dispatchProject = await resolveDispatchBuilderProjectId();
+    if (dispatchProject.status === "unreadable")
+        return "";
+    if (dispatchProject.status === "present")
+        return dispatchProject.projectId ?? "";
     const envProjectId = getConfiguredBuilderBranchProjectId();
     if (envProjectId)
         return envProjectId;

package/dist/server/onboarding-html.js

@@ -4058,7 +4058,7 @@ ${runLocalCommand || signupLocalModeNote
   function __anCopySignupLocalModeCommand() {
     __anCopyCommandFromPanel('signup-local-mode-note', 'copy-signup-local-mode');
   }
-  }`
+  `
         : ""}
 </script>
 </body>

package/dist/server/transcribe-voice.d.ts

@@ -20,6 +20,6 @@ export declare function createTranscribeVoiceHandler(): import("h3").EventHandle
     error: string;
     text?: undefined;
 } | {
-    text: string;
     error?: undefined;
+    text: string;
 }>>;

package/dist/server/workspace-provider-oauth.js

@@ -2,6 +2,7 @@ import crypto from "node:crypto";
 import { deleteCookie, defineEventHandler, getCookie, getMethod, getQuery, setCookie, setResponseStatus, } from "h3";
 import { getWorkspaceConnectionProvider, } from "../connections/catalog.js";
 import { saveOAuthTokens, setOAuthDisplayName } from "../oauth-tokens/store.js";
+import { getRegisteredAppRoles, resolveAppRole } from "../org/app-roles.js";
 import { getOrgContext } from "../org/context.js";
 import { decryptSecretValue, encryptSecretValue } from "../secrets/crypto.js";
 import { listWorkspaceConnections, upsertWorkspaceConnection, upsertWorkspaceConnectionGrant, } from "../workspace-connections/store.js";
@@ -24,6 +25,7 @@ const PROVIDER_REQUEST_TIMEOUT_MS = 10_000;
 const PROVIDER_RESPONSE_MAX_BYTES = 256 * 1024;
 const SALESFORCE_PRODUCTION_LOGIN_URL = "https://login.salesforce.com";
 const SALESFORCE_SANDBOX_LOGIN_URL = "https://test.salesforce.com";
+const WORKSPACE_OAUTH_ADMIN_ERROR = "Only organization admins or the relevant app admin can connect shared OAuth accounts.";
 export function workspaceProviderOAuthPath(provider, phase) {
     return `/_agent-native/connections/oauth/${provider}/${phase}`;
 }
@@ -41,21 +43,21 @@ export async function handleWorkspaceProviderOAuthStart(event, providerId) {
     const session = await getSession(event).catch(() => null);
     if (!session?.email)
         return unauthorized(event);
-    const orgContext = await requireWorkspaceProviderOAuthAdmin(event);
+    const query = getQuery(event);
+    const appId = normalizeAppId(text(query.appId) ??
+        process.env.AGENT_NATIVE_WORKSPACE_APP_ID ??
+        process.env.VITE_AGENT_NATIVE_WORKSPACE_APP_ID ??
+        "creative-context");
+    const orgContext = await requireWorkspaceProviderOAuthAdmin(event, appId);
     if (!orgContext) {
-        return {
-            error: "Only organization owners and admins can connect shared OAuth accounts.",
-        };
+        return { error: WORKSPACE_OAUTH_ADMIN_ERROR };
     }
     const orgId = orgContext.orgId;
     if (!orgId) {
         setResponseStatus(event, 403);
-        return {
-            error: "Only organization owners and admins can connect shared OAuth accounts.",
-        };
+        return { error: WORKSPACE_OAUTH_ADMIN_ERROR };
     }
     const provider = requiredProvider(providerId);
-    const query = getQuery(event);
     const salesforceLoginUrl = providerId === "salesforce"
         ? resolveSalesforceOAuthLoginUrl(text(query.environment))
         : undefined;
@@ -63,10 +65,6 @@ export async function handleWorkspaceProviderOAuthStart(event, providerId) {
         setResponseStatus(event, 400);
         return { error: "Salesforce environment must be production or sandbox." };
     }
-    const appId = normalizeAppId(text(query.appId) ??
-        process.env.AGENT_NATIVE_WORKSPACE_APP_ID ??
-        process.env.VITE_AGENT_NATIVE_WORKSPACE_APP_ID ??
-        "creative-context");
     const redirectUri = resolveOAuthRedirectUri(event, workspaceProviderOAuthPath(providerId, "callback"));
     if (!redirectUri) {
         setResponseStatus(event, 400);
@@ -137,18 +135,15 @@ export async function handleWorkspaceProviderOAuthCallback(event, providerId) {
     const session = await getSession(event).catch(() => null);
     if (!session?.email)
         return unauthorized(event);
-    const orgContext = await requireWorkspaceProviderOAuthAdmin(event);
+    const flow = readStoredFlow(event, providerId);
+    const orgContext = await requireWorkspaceProviderOAuthAdmin(event, flow?.appId);
     if (!orgContext) {
-        return {
-            error: "Only organization owners and admins can connect shared OAuth accounts.",
-        };
+        return { error: WORKSPACE_OAUTH_ADMIN_ERROR };
     }
     const orgId = orgContext.orgId;
     if (!orgId) {
         setResponseStatus(event, 403);
-        return {
-            error: "Only organization owners and admins can connect shared OAuth accounts.",
-        };
+        return { error: WORKSPACE_OAUTH_ADMIN_ERROR };
     }
     const query = getQuery(event);
     const code = text(query.code);
@@ -162,7 +157,6 @@ export async function handleWorkspaceProviderOAuthCallback(event, providerId) {
         setResponseStatus(event, 400);
         return { error: "OAuth callback is missing code or state." };
     }
-    const flow = readStoredFlow(event, providerId);
     deleteCookie(event, flowCookieName(providerId), { path: "/" });
     const state = decodeOAuthState(stateParam, "");
     if (!flow ||
@@ -211,7 +205,9 @@ export async function handleWorkspaceProviderOAuthCallback(event, providerId) {
             const accountId = scopedOAuthAccountId(providerId, session.email, identity.accountId);
             await saveOAuthTokens(provider.oauth.provider, accountId, tokens, session.email);
             await setOAuthDisplayName(provider.oauth.provider, accountId, identity.label);
-            const existing = existingConnections.find((connection) => connection.accountId === accountId);
+            const existing = existingConnections.find((connection) => connection.accountId === accountId &&
+                (orgContext.oauthScope === "organization" ||
+                    connection.allowedApps.some((allowedApp) => allowedApp.toLowerCase() === flow.appId.toLowerCase())));
             const scopes = mergeWorkspaceOAuthValues(existing?.scopes ?? [], identity.scopes ?? tokenScopes(tokens, provider.oauth.scopes));
             const connectionConfig = {
                 credentialMode: "oauth",
@@ -235,7 +231,8 @@ export async function handleWorkspaceProviderOAuthCallback(event, providerId) {
                 accountLabel: identity.label,
                 status: "connected",
                 scopes,
-                allowedApps: existing?.allowedApps ?? [],
+                allowedApps: existing?.allowedApps ??
+                    (orgContext.oauthScope === "app" ? [flow.appId] : []),
                 config: connectionConfig,
                 lastCheckedAt: new Date(),
                 lastError: null,
@@ -822,12 +819,27 @@ function unauthorized(event) {
     setResponseStatus(event, 401);
     return { error: "Authentication required" };
 }
-async function requireWorkspaceProviderOAuthAdmin(event) {
+async function requireWorkspaceProviderOAuthAdmin(event, appId) {
     const context = await getOrgContext(event).catch(() => null);
-    if (!context ||
-        !canConnectWorkspaceProviderOAuth(context.orgId, context.role)) {
+    if (!context || !context.orgId) {
         setResponseStatus(event, 403);
         return null;
     }
-    return context;
+    if (canConnectWorkspaceProviderOAuth(context.orgId, context.role)) {
+        return { ...context, oauthScope: "organization" };
+    }
+    if (appId) {
+        const descriptor = getRegisteredAppRoles(appId);
+        if (descriptor?.roles.some((role) => role === "admin")) {
+            const role = await resolveAppRole(descriptor, {
+                userEmail: context.email,
+                orgId: context.orgId,
+            });
+            if (role.status === "assigned" && role.role === "admin") {
+                return { ...context, oauthScope: "app" };
+            }
+        }
+    }
+    setResponseStatus(event, 403);
+    return null;
 }

package/dist/setup-connections/index.d.ts

@@ -1,5 +1,5 @@
 export { registerOnboardingStep, listOnboardingSteps, createOnboardingPlugin, defaultOnboardingPlugin, registerDefaultOnboardingSteps, type OnboardingFormField, type OnboardingMethod, type OnboardingMethodBadge, type OnboardingPluginOptions, type OnboardingStep, type OnboardingStepStatus, } from "../onboarding/index.js";
 export { deleteAppSecret, getAppSecretMeta, getRequiredSecret, last4, listAppSecretsForScope, listRequiredSecrets, maybeRegisterSecretOnboardingStep, readAppSecret, readAppSecretMeta, registerRequiredSecret, resolveKeyReferences, validateUrlAllowlist, writeAppSecret, type ReadSecretResult, type RegisteredSecret, type SecretKind, type SecretMeta, type SecretRef, type SecretScope, type SecretValidator, type ValidatorResult, type WriteSecretArgs, } from "../secrets/index.js";
 export { WORKSPACE_CONNECTION_PROVIDERS, defineWorkspaceConnectionProvider, getWorkspaceConnectionProvider, isWorkspaceConnectionProviderId, listWorkspaceConnectionProviders, listWorkspaceConnectionProvidersForCapability, listWorkspaceConnectionProvidersForTemplate, mergeWorkspaceConnectionProviders, workspaceConnectionProviderSupports, type ListWorkspaceConnectionProvidersOptions, type WorkspaceConnectionCapability, type WorkspaceConnectionCredentialKey, type WorkspaceConnectionProvider, type WorkspaceConnectionProviderId, type WorkspaceConnectionTemplateUse, } from "../connections/index.js";
-export { deleteWorkspaceConnection, getWorkspaceConnection, listWorkspaceConnectionProviderCatalogForApp, listWorkspaceConnectionGrants, listWorkspaceConnections, listWorkspaceConnectionsForApp, markWorkspaceConnectionUsed, resolveWorkspaceConnectionCredentialForApp, resolveWorkspaceConnectionCredentialsForApp, resolveWorkspaceConnectionForApp, revokeWorkspaceConnectionGrant, summarizeWorkspaceConnectionProviderForApp, summarizeWorkspaceConnectionProviderReadiness, upsertWorkspaceConnection, upsertWorkspaceConnectionGrant, type ListWorkspaceConnectionProviderCatalogForAppOptions, type ResolvedWorkspaceConnectionForApp, type ResolveWorkspaceConnectionForAppOptions, type SerializedWorkspaceConnection, type SerializedWorkspaceConnectionGrant, type SummarizeWorkspaceConnectionProviderReadinessOptions, type UpsertWorkspaceConnectionGrantInput, type UpsertWorkspaceConnectionInput, type WorkspaceConnection, type WorkspaceConnectionForAppSummary, type WorkspaceConnectionGrant, type WorkspaceConnectionProviderCatalogForApp, type WorkspaceConnectionProviderCatalogForAppItem, type WorkspaceConnectionProviderReadiness, type WorkspaceConnectionProviderReadinessStatus, } from "../workspace-connections/index.js";
+export { deleteWorkspaceConnection, getWorkspaceConnection, listWorkspaceConnectionProviderCatalogForApp, listWorkspaceConnectionGrants, listWorkspaceConnections, listWorkspaceConnectionsForApp, markWorkspaceConnectionUsed, normalizeWorkspaceConnectionAllowedUsers, resolveWorkspaceConnectionCredentialForApp, resolveWorkspaceConnectionCredentialsForApp, resolveWorkspaceConnectionForApp, revokeWorkspaceConnectionGrant, summarizeWorkspaceConnectionProviderForApp, summarizeWorkspaceConnectionProviderReadiness, upsertWorkspaceConnection, upsertWorkspaceConnectionGrant, type ListWorkspaceConnectionProviderCatalogForAppOptions, type ResolvedWorkspaceConnectionForApp, type ResolveWorkspaceConnectionForAppOptions, type SerializedWorkspaceConnection, type SerializedWorkspaceConnectionGrant, type SummarizeWorkspaceConnectionProviderReadinessOptions, type UpsertWorkspaceConnectionGrantInput, type UpsertWorkspaceConnectionInput, type WorkspaceConnection, type WorkspaceConnectionForAppSummary, type WorkspaceConnectionGrant, type WorkspaceConnectionProviderCatalogForApp, type WorkspaceConnectionProviderCatalogForAppItem, type WorkspaceConnectionProviderReadiness, type WorkspaceConnectionProviderReadinessStatus, } from "../workspace-connections/index.js";
 export { registerWorkspaceConnectionOnboardingStep, type RegisterWorkspaceConnectionOnboardingStepOptions, } from "./onboarding.js";

package/dist/setup-connections/index.js

@@ -1,5 +1,5 @@
 export { registerOnboardingStep, listOnboardingSteps, createOnboardingPlugin, defaultOnboardingPlugin, registerDefaultOnboardingSteps, } from "../onboarding/index.js";
 export { deleteAppSecret, getAppSecretMeta, getRequiredSecret, last4, listAppSecretsForScope, listRequiredSecrets, maybeRegisterSecretOnboardingStep, readAppSecret, readAppSecretMeta, registerRequiredSecret, resolveKeyReferences, validateUrlAllowlist, writeAppSecret, } from "../secrets/index.js";
 export { WORKSPACE_CONNECTION_PROVIDERS, defineWorkspaceConnectionProvider, getWorkspaceConnectionProvider, isWorkspaceConnectionProviderId, listWorkspaceConnectionProviders, listWorkspaceConnectionProvidersForCapability, listWorkspaceConnectionProvidersForTemplate, mergeWorkspaceConnectionProviders, workspaceConnectionProviderSupports, } from "../connections/index.js";
-export { deleteWorkspaceConnection, getWorkspaceConnection, listWorkspaceConnectionProviderCatalogForApp, listWorkspaceConnectionGrants, listWorkspaceConnections, listWorkspaceConnectionsForApp, markWorkspaceConnectionUsed, resolveWorkspaceConnectionCredentialForApp, resolveWorkspaceConnectionCredentialsForApp, resolveWorkspaceConnectionForApp, revokeWorkspaceConnectionGrant, summarizeWorkspaceConnectionProviderForApp, summarizeWorkspaceConnectionProviderReadiness, upsertWorkspaceConnection, upsertWorkspaceConnectionGrant, } from "../workspace-connections/index.js";
+export { deleteWorkspaceConnection, getWorkspaceConnection, listWorkspaceConnectionProviderCatalogForApp, listWorkspaceConnectionGrants, listWorkspaceConnections, listWorkspaceConnectionsForApp, markWorkspaceConnectionUsed, normalizeWorkspaceConnectionAllowedUsers, resolveWorkspaceConnectionCredentialForApp, resolveWorkspaceConnectionCredentialsForApp, resolveWorkspaceConnectionForApp, revokeWorkspaceConnectionGrant, summarizeWorkspaceConnectionProviderForApp, summarizeWorkspaceConnectionProviderReadiness, upsertWorkspaceConnection, upsertWorkspaceConnectionGrant, } from "../workspace-connections/index.js";
 export { registerWorkspaceConnectionOnboardingStep, } from "./onboarding.js";

package/dist/shared/first-run-onboarding.d.ts

@@ -1,3 +1,9 @@
 export declare const FIRST_RUN_ONBOARDING_COOKIE = "agent-native-first-run";
 export declare const FIRST_RUN_ONBOARDING_MAX_AGE: number;
 export declare const FIRST_RUN_ONBOARDING_COMPLETED_KEY = "onboarding:first-run-completed";
+/**
+ * Set only when the framework provisions the user's first default
+ * organization. Membership in an existing organization must never qualify a
+ * user for the first-run flow, even if an old signup cookie is still present.
+ */
+export declare const FIRST_RUN_ONBOARDING_ELIGIBLE_KEY = "onboarding:first-run-eligible";

package/dist/shared/first-run-onboarding.js

@@ -1,3 +1,9 @@
 export const FIRST_RUN_ONBOARDING_COOKIE = "agent-native-first-run";
 export const FIRST_RUN_ONBOARDING_MAX_AGE = 24 * 60 * 60;
 export const FIRST_RUN_ONBOARDING_COMPLETED_KEY = "onboarding:first-run-completed";
+/**
+ * Set only when the framework provisions the user's first default
+ * organization. Membership in an existing organization must never qualify a
+ * user for the first-run flow, even if an old signup cookie is still present.
+ */
+export const FIRST_RUN_ONBOARDING_ELIGIBLE_KEY = "onboarding:first-run-eligible";