@agent-native/core 0.114.12 → 0.114.15

package/src/client/error-format.ts

@@ -11,7 +11,8 @@
  * regex stays narrow; the gateway may emit URLs containing `(`
  * (e.g. `?ref=Acme%20(staging)`) and we don't want to reject them.
  */
-export const BUILDER_SPACE_SETTINGS_URL = "https://builder.io/account/space";
+export const BUILDER_SPACE_SETTINGS_URL =
+  "https://builder.io/account/space?utm_source=agent-native&utm_medium=product&utm_campaign=onboarding&utm_content=space_settings";
 
 // Pseudo-href used to mark an in-app "Start new chat" CTA inside the markdown
 // error message. The chat renderer intercepts this href and renders a button

package/src/client/index.ts

@@ -49,6 +49,7 @@ export {
   type FeatureFlagRules,
   type SetFeatureFlagInput,
 } from "./feature-flags/index.js";
+export { withBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
 export {
   SettingsPanel,
   SettingsTabsPage,

package/src/client/integrations/IntegrationsPanel.tsx

@@ -14,7 +14,6 @@ import {
 } from "@tabler/icons-react";
 import React, { useState, useCallback, useEffect } from "react";
 
-import { AgentAskPopover } from "../AgentAskPopover.js";
 import { agentNativePath } from "../api-path.js";
 import {
   Tooltip,
@@ -135,7 +134,8 @@ const PLATFORMS: PlatformInfo[] = [
       "Builder.io discovers each agent's skills via A2A",
       "Chat with one agent that can trigger actions across all your apps",
     ],
-    docsUrl: "https://www.builder.io",
+    docsUrl:
+      "https://www.builder.io?utm_source=agent-native&utm_medium=product&utm_campaign=integrations&utm_content=integrations_panel",
   },
 ];
 
@@ -512,14 +512,6 @@ export function IntegrationsPanel() {
         <div className="text-[10px] font-medium text-muted-foreground mb-1.5">
           {t("integrations.addChatIntegration")}
         </div>
-        <AgentAskPopover
-          label={t("integrations.addSomething")}
-          title={t("integrations.addSomethingTitle")}
-          placeholder={t("integrations.addSomethingPlaceholder")}
-          prompt=""
-          context="The user wants to add a chat or workspace integration that is not in the current directory. Research the provider's official OAuth or MCP setup, explain any app registration or allowlist requirements, and add a reusable integration preset when it is supported. Never ask the user to paste credentials into a prompt."
-          className="mb-2 h-7 w-full justify-center border-dashed px-2 text-[10px]"
-        />
         <AddIntegrationPicker
           connectedIds={connectedIds}
           onSelect={(p) => {
@@ -554,14 +546,6 @@ export function IntegrationsPanel() {
             </TooltipTrigger>
             <TooltipContent>{t("integrations.addIntegration")}</TooltipContent>
           </Tooltip>
-          <AgentAskPopover
-            label={t("integrations.addSomething")}
-            title={t("integrations.addSomethingTitle")}
-            placeholder={t("integrations.addSomethingPlaceholder")}
-            prompt=""
-            context="The user wants to add a chat or workspace integration that is not in the current directory. Research the provider's official OAuth or MCP setup, explain any app registration or allowlist requirements, and add a reusable integration preset when it is supported. Never ask the user to paste credentials into a prompt."
-            className="h-7 px-2 text-[10px]"
-          />
         </div>
       </div>
 

package/src/client/resources/McpIntegrationDialog.tsx

@@ -7,7 +7,6 @@ import {
 } from "@tabler/icons-react";
 import { useEffect, useMemo, useRef, useState } from "react";
 
-import { AgentAskPopover } from "../AgentAskPopover.js";
 import { agentNativePath } from "../api-path.js";
 import { openAgentSettings } from "../CommandMenu.js";
 import {
@@ -62,6 +61,40 @@ interface TestResult {
   message: string;
 }
 
+function IntegrationLogo({ name, logoUrl }: { name: string; logoUrl: string }) {
+  const [loaded, setLoaded] = useState(false);
+  const [loadFailed, setLoadFailed] = useState(false);
+
+  useEffect(() => {
+    setLoaded(false);
+    setLoadFailed(false);
+  }, [logoUrl]);
+
+  return (
+    <div className="relative flex h-8 w-8 shrink-0 items-center justify-center overflow-hidden rounded-md border border-border bg-background text-[11px] font-semibold text-muted-foreground">
+      <span aria-hidden="true" hidden={loaded}>
+        {name.slice(0, 1)}
+      </span>
+      <img
+        src={logoUrl}
+        alt=""
+        loading="lazy"
+        decoding="async"
+        className="absolute inset-1 h-6 w-6 object-contain"
+        hidden={loadFailed}
+        onLoad={() => {
+          setLoadFailed(false);
+          setLoaded(true);
+        }}
+        onError={() => {
+          setLoadFailed(true);
+          setLoaded(false);
+        }}
+      />
+    </div>
+  );
+}
+
 function parseHeaderLines(text: string): Record<string, string> | undefined {
   const out: Record<string, string> = {};
   for (const line of text.split(/\r?\n/)) {
@@ -412,7 +445,9 @@ export function McpIntegrationDialog({
             <DialogHeader className="shrink-0 px-7 pb-5 pe-14 pt-6">
               <DialogTitle>{t("mcpIntegrations.title")}</DialogTitle>
               <DialogDescription>
-                {t("mcpIntegrations.description")}
+                {t("mcpIntegrations.description", {
+                  count: defaultIntegrations.length,
+                })}
               </DialogDescription>
             </DialogHeader>
             <div className="flex shrink-0 flex-col gap-3 px-7 pb-5 sm:flex-row">
@@ -435,14 +470,6 @@ export function McpIntegrationDialog({
               >
                 {t("mcpIntegrations.addYourOwn")}
               </button>
-              <AgentAskPopover
-                label={t("mcpIntegrations.addSomething")}
-                title={t("mcpIntegrations.addSomethingTitle")}
-                placeholder={t("mcpIntegrations.addSomethingPlaceholder")}
-                prompt=""
-                context="The user wants to add an MCP or provider integration that is not in the current directory. Research the provider's official remote MCP endpoint and OAuth, client-registration, or allowlist requirements. Prefer Streamable HTTP endpoints over legacy SSE, reuse an existing provider OAuth connector when appropriate, and never ask the user to paste credentials into a prompt. If this should become a reusable preset, update the integration catalog, official docs link, bundled logo, localization, and tests."
-                className="h-9 whitespace-nowrap border-dashed px-3 text-[12px] font-medium"
-              />
             </div>
             <div className="min-h-0 flex-1 overflow-y-auto px-7 pb-7">
               {error && (
@@ -467,27 +494,16 @@ export function McpIntegrationDialog({
                       className="flex min-h-[128px] flex-col rounded-md border border-border bg-card p-4 transition-colors hover:border-border/80 hover:bg-accent/20"
                     >
                       <div className="flex items-center gap-3">
-                        <div className="relative flex h-8 w-8 shrink-0 items-center justify-center overflow-hidden rounded-md border border-border bg-background text-[11px] font-semibold text-muted-foreground">
-                          <span aria-hidden="true">
-                            {integration.name.slice(0, 1)}
-                          </span>
-                          <img
-                            src={integration.logoUrl}
-                            alt=""
-                            loading="lazy"
-                            decoding="async"
-                            className="absolute inset-1 h-6 w-6 object-contain"
-                            onError={(event) => {
-                              event.currentTarget.hidden = true;
-                            }}
-                          />
-                        </div>
+                        <IntegrationLogo
+                          name={integration.name}
+                          logoUrl={integration.logoUrl}
+                        />
                         <div className="min-w-0">
                           <h3 className="truncate text-[13px] font-semibold text-foreground">
                             {integration.name}
                           </h3>
                           {integration.availability !== "ready" && (
-                            <span className="mt-0.5 inline-flex rounded-full border border-amber-500/20 bg-amber-500/5 px-1.5 py-0.5 text-[9px] font-medium text-amber-700 dark:text-amber-300">
+                            <span className="mt-0.5 inline-flex rounded-full border border-border/70 bg-muted/40 px-1.5 py-0.5 text-[9px] font-medium text-muted-foreground">
                               {integration.availability === "beta"
                                 ? t("mcpIntegrations.status.beta")
                                 : integration.availability ===
@@ -508,11 +524,6 @@ export function McpIntegrationDialog({
                       <p className="mt-1 line-clamp-2 flex-1 text-[12px] leading-relaxed text-muted-foreground">
                         {t(integration.descriptionKey)}
                       </p>
-                      {integration.setupNoteKey && (
-                        <p className="mt-2 line-clamp-3 text-[10px] leading-relaxed text-amber-700 dark:text-amber-300">
-                          {t(integration.setupNoteKey)}
-                        </p>
-                      )}
                       <div className="mt-3 flex items-center gap-2">
                         {connected ? (
                           <button
@@ -637,7 +648,7 @@ export function McpIntegrationDialog({
               <div className="space-y-3">
                 {renderScopeSelector()}
                 {selected?.setupNoteKey && (
-                  <div className="rounded-md border border-amber-500/20 bg-amber-500/5 px-3 py-2 text-[11px] leading-relaxed text-amber-700 dark:text-amber-300">
+                  <div className="rounded-md border border-border bg-muted/40 px-3 py-2 text-[11px] leading-relaxed text-muted-foreground">
                     {t(selected.setupNoteKey)}
                   </div>
                 )}

package/src/client/resources/mcp-integration-catalog.ts

@@ -189,7 +189,8 @@ export const DEFAULT_MCP_INTEGRATIONS: DefaultMcpIntegration[] = [
     availability: "ready",
     verification: "preflight-only",
     logoUrl: mcpIntegrationLogo("supabase"),
-    docsUrl: "https://www.builder.io/c/docs/fusion-connect-to-supabase",
+    docsUrl:
+      "https://www.builder.io/c/docs/fusion-connect-to-supabase?utm_source=agent-native&utm_medium=product&utm_campaign=integrations&utm_content=fusion_connect_supabase",
     keywords: ["database", "auth", "postgres", "storage"],
   },
   {
@@ -206,7 +207,8 @@ export const DEFAULT_MCP_INTEGRATIONS: DefaultMcpIntegration[] = [
     availability: "ready",
     verification: "preflight-only",
     logoUrl: mcpIntegrationLogo("neon"),
-    docsUrl: "https://www.builder.io/c/docs/fusion-connect-to-neon",
+    docsUrl:
+      "https://www.builder.io/c/docs/fusion-connect-to-neon?utm_source=agent-native&utm_medium=product&utm_campaign=integrations&utm_content=fusion_connect_neon",
     keywords: ["database", "postgres", "serverless", "backend"],
   },
   {

package/src/client/settings/BackgroundAgentSection.tsx

@@ -6,6 +6,7 @@ import {
 } from "@tabler/icons-react";
 import { useState } from "react";
 
+import { withBuilderUtmTrackingParams } from "../../shared/builder-link-tracking.js";
 import { trackEvent } from "../analytics.js";
 import { agentNativePath } from "../api-path.js";
 import { SettingsSection } from "./SettingsSection.js";
@@ -170,7 +171,10 @@ export function BackgroundAgentSection() {
                 Branch created
               </div>
               <a
-                href={result.url}
+                href={withBuilderUtmTrackingParams(result.url, {
+                  campaign: "product",
+                  content: "background_agent_branch",
+                })}
                 target="_blank"
                 rel="noopener noreferrer"
                 className="flex items-center gap-1 text-[10px] text-foreground hover:underline"

package/src/client/settings/SettingsPanel.tsx

@@ -2857,7 +2857,7 @@ function SettingsPanelContent({
               />
               <ManualSetupCard
                 hint="Deploy manually to Netlify, Vercel, Cloudflare, or any Nitro-supported target."
-                docsUrl="https://www.builder.io/c/docs/agent-native-deployment"
+                docsUrl="https://www.builder.io/c/docs/agent-native-deployment?utm_source=agent-native&utm_medium=product&utm_campaign=onboarding&utm_content=deployment_settings"
                 dim={connected}
               />
             </div>
@@ -2888,7 +2888,7 @@ function SettingsPanelContent({
               />
               <ManualSetupCard
                 hint="Set DATABASE_URL in your .env to connect Neon, Supabase, Turso, any Postgres/SQLite database, or local PGlite with pglite:./data/pglite."
-                docsUrl="https://www.builder.io/c/docs/agent-native-database"
+                docsUrl="https://www.builder.io/c/docs/agent-native-database?utm_source=agent-native&utm_medium=product&utm_campaign=onboarding&utm_content=database_settings"
                 dim={connected}
               />
             </div>
@@ -2919,7 +2919,7 @@ function SettingsPanelContent({
               />
               <ManualSetupCard
                 hint="Without a provider, files are stored as base64 in your database. Fine for dev, not recommended for production."
-                docsUrl="https://www.builder.io/c/docs/agent-native-file-uploads"
+                docsUrl="https://www.builder.io/c/docs/agent-native-file-uploads?utm_source=agent-native&utm_medium=product&utm_campaign=onboarding&utm_content=file_upload_settings"
                 dim={connected}
               />
             </div>
@@ -2950,7 +2950,7 @@ function SettingsPanelContent({
               />
               <ManualSetupCard
                 hint="Configure Better Auth with BETTER_AUTH_SECRET and optional Google/GitHub OAuth providers."
-                docsUrl="https://www.builder.io/c/docs/agent-native-authentication"
+                docsUrl="https://www.builder.io/c/docs/agent-native-authentication?utm_source=agent-native&utm_medium=product&utm_campaign=onboarding&utm_content=authentication_settings"
                 dim={connected}
               />
             </div>

package/src/client/settings/useBuilderStatus.ts

@@ -1,5 +1,6 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 
+import { applyBuilderUtmTrackingParams } from "../../shared/builder-link-tracking.js";
 import { trackEvent } from "../analytics.js";
 import { agentNativePath } from "../api-path.js";
 import { getCallbackOrigin } from "../frame.js";
@@ -343,6 +344,8 @@ export function withBuilderConnectTrackingParams(
       parsed.searchParams.set("redirect_url", parsedRedirect.toString());
     }
 
+    applyBuilderUtmTrackingParams(parsed.searchParams, { content: source });
+
     return parsed.toString();
   } catch {
     return url;

package/src/db/client.ts

@@ -29,6 +29,9 @@ export interface DbExec {
     sql: string | { sql: string; args?: unknown[] },
   ): Promise<{ rows: any[]; rowsAffected: number }>;
   transaction?<T>(fn: (tx: DbExec) => Promise<T>): Promise<T>;
+  atomicBatch?(
+    statements: readonly (string | { sql: string; args?: unknown[] })[],
+  ): Promise<Array<{ rows: any[]; rowsAffected: number }>>;
   /**
    * Release the underlying connection/pool held by this exec.
    * Only non-singleton execs created via `createDbExec()` (e.g. the migration
@@ -1100,7 +1103,17 @@ async function createDbExecInternal(
     };
     return {
       execute,
-      transaction: explicitTransaction(execute),
+      async atomicBatch(statements) {
+        const prepared = statements.map((statement) => {
+          if (typeof statement === "string") return d1.prepare(statement);
+          return d1.prepare(statement.sql).bind(...(statement.args ?? []));
+        });
+        const results = await d1.batch(prepared);
+        return results.map((result: any) => ({
+          rows: result.results || [],
+          rowsAffected: result.meta?.changes ?? 0,
+        }));
+      },
     };
   }
 
@@ -1558,6 +1571,10 @@ export function getDbExec(): DbExec {
       // After init, swap to a sanitizing wrapper around the real client
       const wrapper: DbExec = {
         execute: (s) => _exec!.execute(sanitize(s)),
+        atomicBatch: _exec!.atomicBatch
+          ? (statements) =>
+              _exec!.atomicBatch!(statements.map((s) => sanitize(s)))
+          : undefined,
         transaction: _exec!.transaction
           ? (fn) =>
               _exec!.transaction!((tx) =>
@@ -1582,6 +1599,10 @@ export function getDbExec(): DbExec {
       }
       const wrapper: DbExec = {
         execute: (s) => _exec!.execute(sanitize(s)),
+        atomicBatch: _exec!.atomicBatch
+          ? (statements) =>
+              _exec!.atomicBatch!(statements.map((s) => sanitize(s)))
+          : undefined,
         transaction: _exec!.transaction
           ? (innerFn) =>
               _exec!.transaction!((tx) =>
@@ -1601,8 +1622,30 @@ export function getDbExec(): DbExec {
           }),
         );
       }
+      if (_exec!.atomicBatch) {
+        throw new Error(
+          "This database supports atomic batches, not interactive transactions.",
+        );
+      }
       return explicitTransaction(wrapper.execute)(fn);
     },
+    async atomicBatch(statements) {
+      if (!_initPromise) _initPromise = initClient();
+      try {
+        await _initPromise;
+      } catch (err) {
+        _initPromise = undefined;
+        _exec = undefined;
+        throw err;
+      }
+      if (!_exec!.atomicBatch) {
+        throw new Error("This database does not support atomic batches.");
+      }
+      const batch = (items: typeof statements) =>
+        _exec!.atomicBatch!(items.map((item) => sanitize(item)));
+      Object.assign(proxy, { atomicBatch: batch });
+      return batch(statements);
+    },
   };
   return proxy;
 }

package/src/localization/default-messages.ts

@@ -725,9 +725,6 @@ const messages = {
     chatIntegrations: "Chat Integrations",
     chatIntegrationsDescription: "Talk to this agent from other platforms",
     addIntegration: "Add integration",
-    addSomething: "Add something not listed",
-    addSomethingTitle: "Add another integration",
-    addSomethingPlaceholder: "Which integration should we add?",
     dispatchEntrypoint:
       "For a central Slack or Telegram entrypoint that can route work across multiple apps, use the",
     sharedMessaging:
@@ -737,12 +734,9 @@ const messages = {
     menuLabel: "Integrations",
     menuDescription: "Connect MCP tools to the agent",
     title: "Connect integrations",
-    description: "Choose a default MCP integration or add a custom server.",
+    description: "Browse {{count}} MCP integrations or add a custom server.",
     searchPlaceholder: "Search integrations",
     addYourOwn: "Add your own",
-    addSomething: "Add something not listed",
-    addSomethingTitle: "Add another integration",
-    addSomethingPlaceholder: "Which MCP or provider should we add?",
     noMatches: "No integrations match that search.",
     connected: "Connected",
     configure: "Configure",

package/src/server/builder-browser.ts

@@ -8,6 +8,7 @@ import {
 import type { H3Event } from "h3";
 import { getHeader } from "h3";
 
+import { applyBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
 import {
   getAuthSecret,
   resolveSignupTrackingIdentity,
@@ -920,6 +921,9 @@ export function buildBuilderCliAuthUrl(
   );
   url.searchParams.set("framework", "agent-native");
   applyBuilderConnectTrackingParams(url.searchParams, tracking);
+  applyBuilderUtmTrackingParams(url.searchParams, {
+    content: cleanTrackingParam(tracking.agentNativeConnectSource) ?? null,
+  });
   return url.toString();
 }
 

package/src/server/builder-design-systems.ts

@@ -1,3 +1,4 @@
+import { withBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
 import { FeatureNotConfiguredError } from "./credential-provider.js";
 import {
   getBuilderProxyOrigin,
@@ -356,11 +357,15 @@ function nonEmptyFiles(
 
 export function builderDesignSystemUrl(designSystemId?: string | null): string {
   const host = trimTrailingSlash(getBuilderAppHost());
-  return designSystemId
+  const url = designSystemId
     ? `${host}/app/design-system-intelligence/${encodeURIComponent(
         designSystemId,
       )}`
     : `${host}/app/design-system-intelligence`;
+  return withBuilderUtmTrackingParams(url, {
+    campaign: "product",
+    content: "design_system_intelligence",
+  });
 }
 
 export function localBuilderDesignSystemId(

package/src/server/fusion-app.ts

@@ -24,6 +24,7 @@
  * respond with newline-delimited JSON over chunked HTTP.
  */
 
+import { withBuilderUtmTrackingParams } from "../shared/builder-link-tracking.js";
 import { getBuilderApiHost, getBuilderAppHost } from "./builder-browser.js";
 
 export interface FusionBranchRef {
@@ -86,7 +87,10 @@ function fusionUrl(
 /** The Builder visual-editor URL for a fusion branch. */
 export function getFusionBranchEditorUrl(ref: FusionBranchRef): string {
   const host = getBuilderAppHost().replace(/\/+$/, "");
-  return `${host}/app/projects/${encodeURIComponent(ref.projectId)}/${encodeURIComponent(ref.branchName)}`;
+  return withBuilderUtmTrackingParams(
+    `${host}/app/projects/${encodeURIComponent(ref.projectId)}/${encodeURIComponent(ref.branchName)}`,
+    { campaign: "product", content: "fusion_editor" },
+  );
 }
 
 /** Public URL for a reserved fusion hosting slug. */

package/src/shared/builder-link-tracking.ts

@@ -0,0 +1,41 @@
+export const BUILDER_UTM_SOURCE = "agent-native";
+export const BUILDER_UTM_MEDIUM = "product";
+export const BUILDER_UTM_CAMPAIGN = "onboarding";
+
+export function applyBuilderUtmTrackingParams(
+  params: URLSearchParams,
+  options: {
+    medium?: string;
+    campaign?: string;
+    content?: string | null;
+  } = {},
+): void {
+  params.set("utm_source", BUILDER_UTM_SOURCE);
+  params.set("utm_medium", options.medium ?? BUILDER_UTM_MEDIUM);
+  params.set("utm_campaign", options.campaign ?? BUILDER_UTM_CAMPAIGN);
+  if (options.content) params.set("utm_content", options.content);
+}
+
+export function withBuilderUtmTrackingParams(
+  url: string,
+  options: {
+    medium?: string;
+    campaign?: string;
+    content?: string | null;
+  } = {},
+): string {
+  let parsed: URL;
+  try {
+    parsed = new URL(url);
+  } catch {
+    return url;
+  }
+  if (
+    parsed.hostname !== "builder.io" &&
+    parsed.hostname !== "www.builder.io"
+  ) {
+    return url;
+  }
+  applyBuilderUtmTrackingParams(parsed.searchParams, options);
+  return parsed.toString();
+}

package/src/shared/index.ts

@@ -7,6 +7,7 @@ export {
 export { agentEnv, type EnvVar } from "./agent-env.js";
 export { extractOAuthStateAppId } from "./oauth-state.js";
 export { truncate } from "./truncate.js";
+export { withBuilderUtmTrackingParams } from "./builder-link-tracking.js";
 export {
   llmConnectionTrackingProperties,
   normalizeLlmConnection,