@agent-native/core 0.152.0 → 0.153.0

package/dist/observability/routes.d.ts

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

package/dist/onboarding/plugin.js

@@ -11,10 +11,11 @@
  */
 import { deleteCookie, defineEventHandler, getCookie, getMethod, getQuery, setResponseStatus, } from "h3";
 import { appStateGet, appStatePut } from "../application-state/store.js";
+import { getOrgContext } from "../org/context.js";
 import { getSession } from "../server/auth.js";
 import { awaitBootstrap, getH3App, markDefaultPluginProvided, } from "../server/framework-request-handler.js";
 import { runWithRequestContext } from "../server/request-context.js";
-import { FIRST_RUN_ONBOARDING_COMPLETED_KEY, FIRST_RUN_ONBOARDING_COOKIE, } from "../shared/first-run-onboarding.js";
+import { FIRST_RUN_ONBOARDING_COMPLETED_KEY, FIRST_RUN_ONBOARDING_COOKIE, FIRST_RUN_ONBOARDING_ELIGIBLE_KEY, } from "../shared/first-run-onboarding.js";
 import { getOnboardingAppProfile } from "./app-profile.js";
 import { registerDefaultOnboardingSteps } from "./default-steps.js";
 import { listOnboardingSteps } from "./registry.js";
@@ -205,8 +206,22 @@ export function createOnboardingPlugin(options = {}) {
                 return { firstRun: false };
             return withOnboardingRequestContext(context, async () => {
                 const completed = await appStateGet(context.sessionId, FIRST_RUN_ONBOARDING_COMPLETED_KEY);
+                if (completed?.completed === true) {
+                    deleteCookie(event, FIRST_RUN_ONBOARDING_COOKIE, { path: "/" });
+                    return { firstRun: false };
+                }
+                // Signup alone is not enough to qualify. Resolve the real org path
+                // first so invite/domain members cannot race this check before their
+                // existing membership is visible, while a true first user causes the
+                // default org to be created and marked eligible.
+                const orgContext = await getOrgContext(event);
+                const eligible = await appStateGet(context.sessionId, FIRST_RUN_ONBOARDING_ELIGIBLE_KEY);
+                const firstRun = orgContext.orgId !== null && eligible?.orgId === orgContext.orgId;
+                if (!firstRun) {
+                    deleteCookie(event, FIRST_RUN_ONBOARDING_COOKIE, { path: "/" });
+                }
                 return {
-                    firstRun: completed?.completed !== true,
+                    firstRun,
                 };
             });
         }));

package/dist/org/context.js

@@ -1,8 +1,10 @@
 import { warnAgent } from "../agent/action-warnings.js";
+import { appStatePut } from "../application-state/store.js";
 import { getDbExec, isTransientDatabaseError } from "../db/client.js";
 import { getSession } from "../server/auth.js";
 import { getSetting } from "../settings/store.js";
 import { getUserSetting } from "../settings/user-settings.js";
+import { FIRST_RUN_ONBOARDING_ELIGIBLE_KEY } from "../shared/first-run-onboarding.js";
 import { setActiveOrgId } from "./active-org.js";
 import { autoJoinDomainMatchingOrgs } from "./auto-join-domain.js";
 import { isFreeEmailProvider } from "./free-email-providers.js";
@@ -569,6 +571,20 @@ async function tryCreateDefaultOrg(exec, email, session) {
         });
         invalidateMemberOrgCaches();
         await setActiveOrgId(email, orgId, "auto-created default organization");
+        try {
+            await appStatePut(email, FIRST_RUN_ONBOARDING_ELIGIBLE_KEY, { orgId, at: new Date(now).toISOString() }, { requestSource: "org-auto-create" });
+        }
+        catch (error) {
+            // The safe failure mode is to omit first-run onboarding. The org itself
+            // already exists, so do not turn a marker-write failure into a false
+            // zero-membership result or retry that creates another org.
+            warnAgent({
+                severity: "advisory",
+                code: "first-run-onboarding-eligibility-unreadable",
+                message: `Auto-created organization ${orgId} for ${email}, but could not persist ` +
+                    `the first-run onboarding eligibility marker: ${error instanceof Error ? error.message : String(error)}`,
+            });
+        }
         return { email, orgId, orgName, role: "owner" };
     }
     catch {

package/dist/progress/routes.d.ts

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

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/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/context-tools.js

@@ -376,8 +376,12 @@ export function createUrlTools() {
             },
         },
         "ask-question": {
+            // The turn is over once the question is on screen. Without this the loop
+            // asks the model for another step, and it keeps working (and re-asking)
+            // over an unanswered question no matter what the tool result says.
+            endsTurn: true,
             tool: {
-                description: "Ask the user a multiple-choice clarifying question and render it inline in the chat. Use this ONLY when you are genuinely blocked on a decision you cannot resolve from context and a wrong guess would be costly — an ambiguous metric, date range, or grain; a real fork in approach. Present 2-5 concrete options and mark the most likely one recommended. Do NOT use it for confirmations, for things the user already specified, or to dodge easy work you could just do. Ask at most once per turn. Calling this yields the turn: stop and wait for the user's answer.",
+                description: "Ask the user a multiple-choice clarifying question and render it inline in the chat. Use this ONLY when you are genuinely blocked on a decision you cannot resolve from context and a wrong guess would be costly — an ambiguous metric, date range, or grain; a real fork in approach. Present 2-5 concrete options and mark the most likely one recommended. Do NOT use it for confirmations, for things the user already specified, or to dodge easy work you could just do. Calling this ends the turn: one question per turn, and any other tool call you emit alongside it will not run.",
                 parameters: {
                     type: "object",
                     properties: {
@@ -408,9 +412,12 @@ export function createUrlTools() {
                 },
             },
             run: async (args) => {
+                // These must throw, not return an error string: `endsTurn` yields the
+                // turn on any non-error result, so a returned string would leave the
+                // run waiting on a question card that was never written.
                 const question = String(args?.question ?? "").trim();
                 if (!question)
-                    return "Error: 'question' is required.";
+                    throw new Error("'question' is required.");
                 const header = String(args?.header ?? "").trim();
                 const allowMultiple = String(args?.allowMultiple ?? "") === "true";
                 const allowFreeText = String(args?.allowFreeText ?? "true") !== "false";
@@ -419,10 +426,10 @@ export function createUrlTools() {
                     parsedOptions = JSON.parse(String(args?.options ?? "[]"));
                 }
                 catch {
-                    return "Error: 'options' must be a JSON array of { label, value?, description?, recommended? }.";
+                    throw new Error("'options' must be a JSON array of { label, value?, description?, recommended? }.");
                 }
                 if (!Array.isArray(parsedOptions) || parsedOptions.length === 0) {
-                    return "Error: 'options' must be a non-empty JSON array of { label, value?, description?, recommended? }.";
+                    throw new Error("'options' must be a non-empty JSON array of { label, value?, description?, recommended? }.");
                 }
                 const options = parsedOptions
                     .map((raw) => {
@@ -450,14 +457,26 @@ export function createUrlTools() {
                 })
                     .filter((opt) => opt !== null);
                 if (options.length === 0) {
-                    return "Error: 'options' must contain at least one option with a label.";
+                    throw new Error("'options' must contain at least one option with a label.");
                 }
                 // Shape must match the GuidedQuestionFlow renderer in
                 // client/guided-questions.tsx: a `text-options` question whose options
                 // carry `value`, with `multiSelect` for multi-pick and `allowOther` for
                 // free text. The renderer otherwise injects "Explore"/"Decide" options,
                 // which would be noise for a focused clarifying question, so disable them.
+                // The application-state key is scoped per browser tab, not per chat, so
+                // the payload has to name the thread that asked. The client hides a
+                // pending question in every other conversation instead of following the
+                // user from chat to chat.
+                // A request that carried no thread id falls back to the run id (see
+                // `onRunStart`), and a per-run value would never match the chat the user
+                // is looking at. Leave those surfaces unbound — they have one chat.
+                const askingRunCtx = getRequestRunContext();
+                const askingThreadId = askingRunCtx?.threadId && askingRunCtx.threadId !== askingRunCtx.runId
+                    ? askingRunCtx.threadId
+                    : undefined;
                 const payload = {
+                    ...(askingThreadId ? { threadId: askingThreadId } : {}),
                     questions: [
                         {
                             id: "q1",
@@ -475,7 +494,9 @@ export function createUrlTools() {
                 };
                 const { writeAppState } = await import("../../application-state/script-helpers.js");
                 await writeAppState(appStateKeyForBrowserTab("guided-questions", getRequestRunContext()?.browserTabId), payload);
-                return "Asked the user a clarifying question and rendered it in the chat. Stop here and wait for their answer — do not proceed or assume an answer.";
+                // The `startsWith` of this text is how integration surfaces recognize a
+                // delivered question (see `extractSlackInputRequest`). Keep the prefix.
+                return "Asked the user a clarifying question and rendered it in the chat. This turn is over — their answer arrives as a new message.";
             },
         },
     };

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/agent-engine-api-key-route.d.ts

@@ -27,10 +27,10 @@ export declare function resolveAgentEngineApiKeyWriteTarget(event: H3Event, scop
 export declare function createAgentEngineApiKeyHandler(): import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     error: any;
 } | {
+    error?: undefined;
     ok: boolean;
     key: string;
     baseUrlKey?: string;
     scope: AgentEngineApiKeyScope;
-    error?: undefined;
 }>>;
 export {};

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/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;
 }>>;