@agent-native/core 0.79.21 → 0.79.22

package/corpus/README.md

@@ -27,5 +27,5 @@ rg -n "defineAction|useActionQuery" node_modules/@agent-native/core/corpus
 
 ## Generated Counts
 
-- core files: 2031
-- template files: 4423
+- core files: 2032
+- template files: 4434

package/corpus/core/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @agent-native/core
 
+## 0.79.22
+
+### Patch Changes
+
+- cdf41db: Require signed-in email identity for browser session replay by default across templates and send replay timing/event-count metadata with each upload. Apps that intentionally record anonymous replay sessions can opt out with `sessionReplay.requireSignedInUser: false` or `VITE_AGENT_NATIVE_SESSION_REPLAY_REQUIRE_AUTH=false`.
+- cdf41db: Keep diagram primitive borders visible in sketchy Plan diagrams and stop the shared feedback button from sending synthetic anonymous Agent Native emails.
+- cdf41db: Add an advanced OpenAI-compatible endpoint URL setting for custom gateways like LiteLLM.
+- cdf41db: Default shared expandable code surfaces to 30 visible lines before the reader
+  expands them.
+
 ## 0.79.21
 
 ### Patch Changes

package/corpus/core/docs/content/deployment.md

@@ -66,6 +66,85 @@ background processors. Local `--build-only` artifact checks still run without it
 
 Per-app independent deploy is still supported — just `cd apps/<name> && npx @agent-native/core@latest build` like a standalone scaffold.
 
+## How It Works {#how-it-works}
+
+When you run `npx @agent-native/core@latest build`, Nitro builds both the client SPA and the server API into `.output/`:
+
+```an-file-tree title="Build output"
+{
+  "entries": [
+    { "path": ".output/", "note": "self-contained — copy to any environment and run" },
+    { "path": ".output/public/", "note": "built SPA (static assets)" },
+    { "path": ".output/server/index.mjs", "note": "server entry point" },
+    { "path": ".output/server/chunks/", "note": "server code chunks" }
+  ]
+}
+```
+
+The output is self-contained — copy `.output/` to any environment and run it.
+
+```an-diagram title="Build to deploy" summary="One source tree builds to a Nitro preset; the same self-contained output runs on Node, Vercel, Netlify, Cloudflare, AWS, or Deno. Every instance points at the same persistent DATABASE_URL."
+{
+  "html": "<div class=\"diagram-deploy\"><div class=\"diagram-box\" data-rough>App source</div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-panel center\" data-rough><span class=\"diagram-pill accent\">build</span><small class=\"diagram-muted\">Nitro preset</small></div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-grid\"><span class=\"diagram-pill\">Node.js</span><span class=\"diagram-pill\">Vercel</span><span class=\"diagram-pill\">Netlify</span><span class=\"diagram-pill\">Cloudflare</span><span class=\"diagram-pill\">AWS Lambda</span><span class=\"diagram-pill\">Deno</span></div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-box\" data-rough>Persistent DATABASE_URL<br><small class=\"diagram-muted\">shared by every instance</small></div></div>",
+  "css": ".diagram-deploy{display:flex;align-items:center;gap:12px;flex-wrap:wrap}.diagram-deploy .center{display:flex;flex-direction:column;align-items:center;gap:4px;padding:14px 16px}.diagram-deploy .diagram-arrow{font-size:22px;line-height:1}.diagram-deploy .diagram-grid{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px}"
+}
+```
+
+## Setting the Preset {#setting-the-preset}
+
+By default, Nitro builds for Node.js. To target a different platform, set the preset in your `vite.config.ts`:
+
+```ts
+import { agentNative } from "@agent-native/core/vite";
+import { defineConfig } from "vite";
+
+export default defineConfig({
+  plugins: [agentNative({ nitro: { preset: "vercel" } })],
+});
+```
+
+Or use the `NITRO_PRESET` environment variable at build time:
+
+```bash
+NITRO_PRESET=netlify npx @agent-native/core@latest build
+```
+
+## Node.js (Default) {#nodejs}
+
+The default preset. Build and run:
+
+```bash
+npx @agent-native/core@latest build
+node .output/server/index.mjs
+```
+
+Set `PORT` to configure the listen port (default: `3000`).
+
+Use the current Node.js LTS line for production deploys. As of May 2026, that
+is Node.js 24; Node.js 20 reached end-of-life on April 30, 2026 and no longer
+receives upstream security updates.
+
+### Docker {#docker}
+
+```dockerfile
+FROM node:24-slim AS build
+WORKDIR /app
+COPY package.json pnpm-lock.yaml ./
+RUN corepack enable && pnpm install --frozen-lockfile
+COPY . .
+RUN pnpm build
+
+FROM node:24-slim
+WORKDIR /app
+COPY --from=build /app/.output .output
+# data/ is a runtime-created SQLite directory — do not copy a dev DB into prod.
+# For production, set DATABASE_URL to a hosted Postgres or Turso instance.
+RUN mkdir -p /app/data
+ENV PORT=3000
+EXPOSE 3000
+CMD ["node", ".output/server/index.mjs"]
+```
+
 ### Self-hosted workspace with Docker Compose {#workspace-docker-compose}
 
 The Dockerfile above is for one standalone app. A workspace is not one Nitro
@@ -79,7 +158,7 @@ Build each app with the same base path that the proxy will use at runtime. The
 base path is a build-time input for the client bundle and a runtime input for
 the server:
 
-```bash
+```bash maxLines=8
 APP_BASE_PATH=/mail VITE_APP_BASE_PATH=/mail npx @agent-native/core@latest build
 node .output/server/index.mjs
 ```
@@ -87,7 +166,7 @@ node .output/server/index.mjs
 A reusable workspace Dockerfile can take the app name and path prefix as build
 arguments:
 
-```dockerfile
+```dockerfile maxLines=12
 FROM node:24-slim AS build
 WORKDIR /workspace
 RUN corepack enable
@@ -117,7 +196,7 @@ Then compose Postgres, the app containers, and your proxy. This example uses
 Caddy because it can terminate HTTP locally or sit behind Cloudflare's SSL
 proxy, but the important part is the path-prefix routing:
 
-```yaml
+```yaml maxLines=30
 services:
   postgres:
     image: postgres:17
@@ -199,85 +278,6 @@ Notes for this shape:
   normal `X-Forwarded-Proto` / `X-Forwarded-Host` headers and route the public
   host to the proxy container.
 
-## How It Works {#how-it-works}
-
-When you run `npx @agent-native/core@latest build`, Nitro builds both the client SPA and the server API into `.output/`:
-
-```an-file-tree title="Build output"
-{
-  "entries": [
-    { "path": ".output/", "note": "self-contained — copy to any environment and run" },
-    { "path": ".output/public/", "note": "built SPA (static assets)" },
-    { "path": ".output/server/index.mjs", "note": "server entry point" },
-    { "path": ".output/server/chunks/", "note": "server code chunks" }
-  ]
-}
-```
-
-The output is self-contained — copy `.output/` to any environment and run it.
-
-```an-diagram title="Build to deploy" summary="One source tree builds to a Nitro preset; the same self-contained output runs on Node, Vercel, Netlify, Cloudflare, AWS, or Deno. Every instance points at the same persistent DATABASE_URL."
-{
-  "html": "<div class=\"diagram-deploy\"><div class=\"diagram-box\" data-rough>App source</div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-panel center\" data-rough><span class=\"diagram-pill accent\">build</span><small class=\"diagram-muted\">Nitro preset</small></div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-grid\"><span class=\"diagram-pill\">Node.js</span><span class=\"diagram-pill\">Vercel</span><span class=\"diagram-pill\">Netlify</span><span class=\"diagram-pill\">Cloudflare</span><span class=\"diagram-pill\">AWS Lambda</span><span class=\"diagram-pill\">Deno</span></div><div class=\"diagram-arrow diagram-muted\" aria-hidden=\"true\">&rarr;</div><div class=\"diagram-box\" data-rough>Persistent DATABASE_URL<br><small class=\"diagram-muted\">shared by every instance</small></div></div>",
-  "css": ".diagram-deploy{display:flex;align-items:center;gap:12px;flex-wrap:wrap}.diagram-deploy .center{display:flex;flex-direction:column;align-items:center;gap:4px;padding:14px 16px}.diagram-deploy .diagram-arrow{font-size:22px;line-height:1}.diagram-deploy .diagram-grid{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:8px}"
-}
-```
-
-## Setting the Preset {#setting-the-preset}
-
-By default, Nitro builds for Node.js. To target a different platform, set the preset in your `vite.config.ts`:
-
-```ts
-import { agentNative } from "@agent-native/core/vite";
-import { defineConfig } from "vite";
-
-export default defineConfig({
-  plugins: [agentNative({ nitro: { preset: "vercel" } })],
-});
-```
-
-Or use the `NITRO_PRESET` environment variable at build time:
-
-```bash
-NITRO_PRESET=netlify npx @agent-native/core@latest build
-```
-
-## Node.js (Default) {#nodejs}
-
-The default preset. Build and run:
-
-```bash
-npx @agent-native/core@latest build
-node .output/server/index.mjs
-```
-
-Set `PORT` to configure the listen port (default: `3000`).
-
-Use the current Node.js LTS line for production deploys. As of May 2026, that
-is Node.js 24; Node.js 20 reached end-of-life on April 30, 2026 and no longer
-receives upstream security updates.
-
-### Docker {#docker}
-
-```dockerfile
-FROM node:24-slim AS build
-WORKDIR /app
-COPY package.json pnpm-lock.yaml ./
-RUN corepack enable && pnpm install --frozen-lockfile
-COPY . .
-RUN pnpm build
-
-FROM node:24-slim
-WORKDIR /app
-COPY --from=build /app/.output .output
-# data/ is a runtime-created SQLite directory — do not copy a dev DB into prod.
-# For production, set DATABASE_URL to a hosted Postgres or Turso instance.
-RUN mkdir -p /app/data
-ENV PORT=3000
-EXPOSE 3000
-CMD ["node", ".output/server/index.mjs"]
-```
-
 ## Vercel {#vercel}
 
 ```ts

package/corpus/core/docs/content/faq.md

@@ -54,7 +54,7 @@ Yes. Pick any host that runs Node — Netlify, Vercel, Cloudflare, AWS, Deno Dep
 
 ### What AI models does it support? {#what-models}
 
-Anthropic Claude, OpenAI (GPT-5 family), Google Gemini, and any provider that speaks the OpenAI API shape (including local models via Ollama). You configure the model in settings; switching is a config change, not a code rewrite. The framework's heaviest tested path is Claude, so that's the default recommendation.
+Anthropic Claude, OpenAI (GPT-5 family), Google Gemini, and any provider that speaks the OpenAI API shape. For OpenAI-compatible gateways like LiteLLM, choose OpenAI in Settings and add the gateway URL under Advanced. You configure the model in settings; switching is a config change, not a code rewrite. The framework's heaviest tested path is Claude, so that's the default recommendation.
 
 ### Do I need to know AI/ML? {#do-i-need-to-know-ai}
 

package/corpus/core/docs/content/tracking.md

@@ -144,7 +144,6 @@ configureTracking({
   endpoint: "https://analytics.example.com/api/analytics/track",
   sessionReplay: {
     enabled: true,
-    requireSignedInUser: true,
     sampleRate: 0.1,
   },
   getDefaultProps: (_event, props) => ({
@@ -163,11 +162,12 @@ Agent Native template roots already call `configureTracking()`. Hosted template
 VITE_AGENT_NATIVE_ANALYTICS_PUBLIC_KEY=anpk_...
 VITE_AGENT_NATIVE_ANALYTICS_ENDPOINT=https://analytics.example.com/api/analytics/track
 VITE_AGENT_NATIVE_SESSION_REPLAY_ENABLED=true
-VITE_AGENT_NATIVE_SESSION_REPLAY_REQUIRE_AUTH=true
 VITE_AGENT_NATIVE_SESSION_REPLAY_SAMPLE_RATE=0.1
 ```
 
-The browser helper also performs a best-effort, non-blocking read of the current Agent Native auth session. When `requireSignedInUser` or `VITE_AGENT_NATIVE_SESSION_REPLAY_REQUIRE_AUTH` is enabled, replay does not start unless the session resolves to a signed-in user. Signed-in replays include `userId`/`userEmail` plus `orgId`; if auth gating is disabled, anonymous recordings remain queryable by anonymous visitor, session, app/template, hostname, and path.
+The browser helper also performs a best-effort, non-blocking read of the current Agent Native auth session. Replay is signed-in-only by default: when `sessionReplay` is enabled, recording does not start unless the session resolves to a user email address. Signed-in replays include email-backed `userId`/`userEmail` plus `orgId`.
+
+Set `sessionReplay.requireSignedInUser: false` or `VITE_AGENT_NATIVE_SESSION_REPLAY_REQUIRE_AUTH=false` only for an intentional anonymous replay deployment. When auth gating is disabled, anonymous recordings remain queryable by anonymous visitor, session, app/template, hostname, and path.
 
 Session replay is sampled deterministically per browser session. A `sampleRate` of `0.1` records about 10% of eligible sessions; use `1` when the eligible population is intentionally small, such as logged-in-only dogfooding.
 

package/corpus/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-native/core",
-  "version": "0.79.21",
+  "version": "0.79.22",
   "description": "Framework for agent-native application development — where AI agents and UI share SQL state, actions, and context",
   "homepage": "https://github.com/BuilderIO/agent-native#readme",
   "bugs": {

package/corpus/core/src/agent/engine/openai-compatible-endpoint.ts

@@ -0,0 +1,25 @@
+export const OPENAI_BASE_URL_ENV_VAR = "OPENAI_BASE_URL";
+
+export function normalizeOpenAiBaseUrl(value: string): string {
+  const trimmed = value.trim();
+  if (!trimmed) {
+    throw new Error("Endpoint URL is required.");
+  }
+
+  let url: URL;
+  try {
+    url = new URL(trimmed);
+  } catch {
+    throw new Error("Endpoint URL must be a valid URL.");
+  }
+
+  if (url.protocol !== "https:" && url.protocol !== "http:") {
+    throw new Error("Endpoint URL must start with http:// or https://.");
+  }
+  if (url.username || url.password) {
+    throw new Error("Endpoint URL must not include credentials.");
+  }
+
+  url.hash = "";
+  return url.toString().replace(/\/+$/, "");
+}

package/corpus/core/src/agent/engine/provider-env-vars.ts

@@ -16,6 +16,8 @@ export interface ProviderEnvMeta {
   placeholder: string;
 }
 
+export { OPENAI_BASE_URL_ENV_VAR } from "./openai-compatible-endpoint.js";
+
 export const PROVIDER_ENV_META: Record<string, ProviderEnvMeta> = {
   anthropic: {
     envVar: "ANTHROPIC_API_KEY",

package/corpus/core/src/agent/engine/registry.ts

@@ -18,6 +18,10 @@ import {
 } from "../../server/credential-provider.js";
 import { getSetting } from "../../settings/store.js";
 import { getAgentAppModelDefaultForCurrentRequest } from "../app-model-defaults.js";
+import {
+  normalizeOpenAiBaseUrl,
+  OPENAI_BASE_URL_ENV_VAR,
+} from "./openai-compatible-endpoint.js";
 import type { AgentEngine, EngineCapabilities } from "./types.js";
 
 const require = createRequire(import.meta.url);
@@ -324,6 +328,39 @@ function engineCreateConfig(
   };
 }
 
+async function resolveOpenAiBaseUrl(): Promise<string | undefined> {
+  let raw: string | null | undefined = null;
+  try {
+    raw = await resolveSecret(OPENAI_BASE_URL_ENV_VAR);
+  } catch {
+    raw = null;
+  }
+
+  if (!raw && canUseDeployCredentialFallbackForRequest()) {
+    raw = readDeployCredentialEnv(OPENAI_BASE_URL_ENV_VAR);
+  }
+
+  return raw ? normalizeOpenAiBaseUrl(raw) : undefined;
+}
+
+async function engineCreateConfigForEntry(
+  entry: AgentEngineEntry,
+  apiKey: string | undefined,
+  extra?: Record<string, unknown>,
+): Promise<Record<string, unknown>> {
+  const safeExtra = { ...(extra ?? {}) };
+  if (entry.name === "ai-sdk:openai") {
+    if (typeof safeExtra.baseURL === "string" && safeExtra.baseUrl == null) {
+      safeExtra.baseUrl = normalizeOpenAiBaseUrl(safeExtra.baseURL);
+    }
+    if (safeExtra.baseUrl == null) {
+      const baseUrl = await resolveOpenAiBaseUrl();
+      if (baseUrl) safeExtra.baseUrl = baseUrl;
+    }
+  }
+  return engineCreateConfig(apiKey, safeExtra);
+}
+
 /**
  * True when the stored `agent-engine` row points at a registered engine
  * AND an API key for it is reachable via the engine's required env vars.
@@ -432,7 +469,9 @@ export async function resolveEngine(
         `[agent-engine] Unknown engine: "${name}". Registered: ${[..._registry.keys()].join(", ")}`,
       );
     assertAgentEnginePackageInstalled(entry);
-    return entry.create(engineCreateConfig(apiKey, engineConfig));
+    return entry.create(
+      await engineCreateConfigForEntry(entry, apiKey, engineConfig),
+    );
   }
 
   // 3. Explicit string name from options
@@ -443,7 +482,7 @@ export async function resolveEngine(
         `[agent-engine] Unknown engine: "${engineOption}". Registered: ${[..._registry.keys()].join(", ")}`,
       );
     assertAgentEnginePackageInstalled(entry);
-    return entry.create(engineCreateConfig(apiKey));
+    return entry.create(await engineCreateConfigForEntry(entry, apiKey));
   }
 
   // 4. Env var — explicit engine name override
@@ -452,7 +491,7 @@ export async function resolveEngine(
     const entry = _registry.get(envEngine);
     if (entry) {
       assertAgentEnginePackageInstalled(entry);
-      return entry.create(engineCreateConfig(apiKey));
+      return entry.create(await engineCreateConfigForEntry(entry, apiKey));
     }
   }
 
@@ -460,7 +499,7 @@ export async function resolveEngine(
   if (appDefault?.engine) {
     const entry = _registry.get(appDefault.engine);
     if (entry && (await isStoredEngineUsableForRequest(appDefault, entry))) {
-      return entry.create(engineCreateConfig(apiKey));
+      return entry.create(await engineCreateConfigForEntry(entry, apiKey));
     }
   }
 
@@ -477,7 +516,9 @@ export async function resolveEngine(
   // Builder connection wins over a stale deploy-level/provider key.
   const detectedFromUser = await detectEngineFromUserSecrets();
   if (detectedFromUser?.name === "builder") {
-    return detectedFromUser.create(engineCreateConfig(apiKey));
+    return detectedFromUser.create(
+      await engineCreateConfigForEntry(detectedFromUser, apiKey),
+    );
   }
 
   // 6. Settings store — only when the stored row's API key is reachable.
@@ -490,19 +531,22 @@ export async function resolveEngine(
   if (storedRaw && typeof storedEngine === "string") {
     const entry = _registry.get(storedEngine);
     if (entry && (await isStoredEngineUsableForRequest(storedRaw, entry))) {
-      return entry.create({
-        ...engineCreateConfig(
+      return entry.create(
+        await engineCreateConfigForEntry(
+          entry,
           apiKey,
           stripInlineApiKeyConfig(
             storedConfig as Record<string, unknown> | undefined,
           ),
         ),
-      });
+      );
     }
   }
 
   if (detectedFromUser) {
-    return detectedFromUser.create(engineCreateConfig(apiKey));
+    return detectedFromUser.create(
+      await engineCreateConfigForEntry(detectedFromUser, apiKey),
+    );
   }
 
   // 8. Auto-detect from any provider env var — so just dropping a key in
@@ -510,7 +554,9 @@ export async function resolveEngine(
   const detected = canUseDeployCredentialFallbackForRequest()
     ? detectEngineFromEnv()
     : null;
-  if (detected) return detected.create(engineCreateConfig(apiKey));
+  if (detected) {
+    return detected.create(await engineCreateConfigForEntry(detected, apiKey));
+  }
 
   // 9. Default: anthropic
   const anthropicEntry = _registry.get("anthropic");
@@ -519,7 +565,9 @@ export async function resolveEngine(
       "[agent-engine] Default Anthropic engine is not registered. Did builtin.ts fail to load?",
     );
   }
-  return anthropicEntry.create(engineCreateConfig(apiKey));
+  return anthropicEntry.create(
+    await engineCreateConfigForEntry(anthropicEntry, apiKey),
+  );
 }
 
 /**

package/corpus/core/src/client/FeedbackButton.tsx

@@ -20,6 +20,12 @@ import { cn } from "./utils.js";
 const DEFAULT_FEEDBACK_URL =
   "https://forms.agent-native.com/f/agent-native-feedback/_16ewV";
 
+function isSyntheticAgentNativeAnonymousEmail(
+  value: string | null | undefined,
+): boolean {
+  return /^anon-[^\s@]+@agent-native\.com$/i.test(value ?? "");
+}
+
 interface ParsedTarget {
   endpoint: string;
   slug: string;
@@ -342,7 +348,11 @@ export function FeedbackButton({
       try {
         const resolvedSchema = schema ?? (await loadSchema(target));
         if (!schema) setSchema(resolvedSchema);
-        const submitterEmail = session?.email;
+        const submitterEmail = isSyntheticAgentNativeAnonymousEmail(
+          session?.email,
+        )
+          ? null
+          : session?.email;
         const feedbackContext = getFeedbackClientContext({
           chatSessionId,
           storageKey: chatStorageKey,

package/corpus/core/src/client/agent-engine-key.ts

@@ -29,6 +29,32 @@ export interface SaveAgentEngineApiKeyOptions {
   scope?: "user" | "org";
 }
 
+export interface SaveAgentEngineProviderSettingsOptions {
+  provider?: AgentEngineProvider;
+  key?: string;
+  apiKey?: string;
+  baseUrl?: string;
+  clearBaseUrl?: boolean;
+  scope?: "user" | "org";
+}
+
+function resolveProviderEnvVar(
+  provider: AgentEngineProvider | undefined,
+  key: string | undefined,
+): string {
+  const envVar = key?.trim() || (provider ? PROVIDER_ENV_VAR[provider] : "");
+  if (!envVar) {
+    throw new Error("Choose an API key provider first.");
+  }
+  return envVar;
+}
+
+function dispatchConfiguredChanged(): void {
+  if (typeof window !== "undefined") {
+    window.dispatchEvent(new CustomEvent(CONFIGURED_CHANGED_EVENT));
+  }
+}
+
 /**
  * Persist a provider API key for the current owner. Resolves on success.
  * Throws an Error with a readable message on failure. On success it also
@@ -41,20 +67,43 @@ export async function saveAgentEngineApiKey({
   apiKey,
   scope,
 }: SaveAgentEngineApiKeyOptions): Promise<void> {
-  const trimmed = apiKey.trim();
-  if (!trimmed) {
+  if (!apiKey.trim()) {
     throw new Error("Enter an API key first.");
   }
-  const envVar = key?.trim() || (provider ? PROVIDER_ENV_VAR[provider] : "");
-  if (!envVar) {
-    throw new Error("Choose an API key provider first.");
+  await saveAgentEngineProviderSettings({ provider, key, apiKey, scope });
+}
+
+/**
+ * Persist provider-specific settings for the current owner. This intentionally
+ * stays narrow: API keys for built-in BYOK providers, plus OpenAI's optional
+ * compatible endpoint URL. Values are stored server-side in scoped secrets.
+ */
+export async function saveAgentEngineProviderSettings({
+  provider,
+  key,
+  apiKey,
+  baseUrl,
+  clearBaseUrl,
+  scope,
+}: SaveAgentEngineProviderSettingsOptions): Promise<void> {
+  const trimmed = apiKey?.trim() ?? "";
+  const endpoint = baseUrl?.trim() ?? "";
+  if (!trimmed && !endpoint && !clearBaseUrl) {
+    throw new Error("Enter an API key or endpoint URL first.");
   }
+  const envVar = resolveProviderEnvVar(provider, key);
   const res = await fetch(
     agentNativePath("/_agent-native/agent-engine/api-key"),
     {
       method: "POST",
       headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ key: envVar, value: trimmed, scope }),
+      body: JSON.stringify({
+        key: envVar,
+        ...(trimmed ? { value: trimmed } : {}),
+        ...(endpoint ? { baseUrl: endpoint } : {}),
+        ...(clearBaseUrl ? { clearBaseUrl: true } : {}),
+        scope,
+      }),
     },
   );
   if (!res.ok) {
@@ -66,10 +115,8 @@ export async function saveAgentEngineApiKey({
       message ??
         (res.status === 401
           ? "Sign in to save a key, or connect Builder instead."
-          : `Could not save the key (HTTP ${res.status}).`),
+          : `Could not save provider settings (HTTP ${res.status}).`),
     );
   }
-  if (typeof window !== "undefined") {
-    window.dispatchEvent(new CustomEvent(CONFIGURED_CHANGED_EVENT));
-  }
+  dispatchConfiguredChanged();
 }