@agent-native/core 0.146.8 → 0.148.0

package/dist/onboarding/app-profile.js

@@ -3,7 +3,7 @@ const LLM_CAPABILITY = {
     label: "AI model",
     required: true,
     builderIncluded: true,
-    keySummary: "One model key: Anthropic, OpenAI, Gemini, Groq, Mistral, or Cohere",
+    keySummary: "One model key or local connection: Anthropic, OpenAI, OpenRouter, Gemini, Groq, Mistral, Cohere, or Ollama",
     why: "The agent uses a language model to understand requests and produce answers.",
 };
 const DESIGN_SYSTEM_INTELLIGENCE_CAPABILITY = {

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

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

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

@@ -311,9 +311,7 @@ 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;
@@ -325,44 +323,46 @@ export declare function createProviderApiActions(runtime: Pick<ProviderApiRuntim
             updatedAt: number;
         }[];
         count: number;
+        provider?: undefined;
         found?: undefined;
         registered?: undefined;
         label?: undefined;
-    } | {
         message?: undefined;
-        count?: undefined;
+    } | {
         id?: undefined;
         deleted?: undefined;
+        count?: undefined;
         providers?: undefined;
         found: boolean;
         provider: import("../custom-registry.js").CustomProviderConfig;
         registered?: undefined;
         label?: undefined;
-    } | {
         message?: undefined;
-        count?: undefined;
-        provider?: undefined;
+    } | {
         deleted?: undefined;
+        count?: undefined;
         providers?: undefined;
+        provider?: undefined;
         found: boolean;
         id: string;
         registered?: undefined;
         label?: 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;
+        count?: undefined;
         providers?: undefined;
+        provider?: undefined;
         found?: undefined;
         registered: boolean;
         id: string;

package/dist/scripts/agent-engines/test-agent-engine.js

@@ -2,7 +2,8 @@
  * test-agent-engine — sends a trivial prompt to verify the engine is working.
  */
 import { getAgentEngineEntry, registerBuiltinEngines, } from "../../agent/engine/index.js";
-import { normalizeOpenAiBaseUrl, OPENAI_BASE_URL_ENV_VAR, } from "../../agent/engine/openai-compatible-endpoint.js";
+import { OLLAMA_BASE_URL_ENV_VAR, OPENAI_BASE_URL_ENV_VAR, } from "../../agent/engine/openai-compatible-endpoint.js";
+import { validateProviderBaseUrl } from "../../agent/engine/provider-endpoint-validation.js";
 import { canUseDeployCredentialFallbackForRequest, readDeployCredentialEnv, resolveSecret, } from "../../server/credential-provider.js";
 export const tool = {
     description: "Test an agent engine by sending a trivial prompt and measuring latency. Useful for verifying API keys and connectivity before switching engines.",
@@ -31,13 +32,30 @@ async function resolveAgentEngineSecret(key) {
         if (value)
             return value;
     }
-    catch {
-        // Fall through to deploy env when this request is allowed to use it.
+    catch (error) {
+        if (!canUseDeployCredentialFallbackForRequest(key))
+            throw error;
+        console.warn("[test-agent-engine] Saved provider secret unavailable; using deploy configuration.", { key, error });
     }
     return canUseDeployCredentialFallbackForRequest(key)
         ? readDeployCredentialEnv(key)
         : undefined;
 }
+async function resolveAgentEngineEndpoint(key) {
+    const value = await resolveSecret(key);
+    if (value) {
+        return validateProviderBaseUrl(value, {
+            allowLocalOllama: key === OLLAMA_BASE_URL_ENV_VAR &&
+                process.env.NODE_ENV === "development",
+        });
+    }
+    if (!canUseDeployCredentialFallbackForRequest(key))
+        return undefined;
+    const deployValue = readDeployCredentialEnv(key);
+    return deployValue
+        ? validateProviderBaseUrl(deployValue, { allowPrivate: true })
+        : undefined;
+}
 function canUseDeployEnvForEntry(entry) {
     if (entry.requiredEnvVars.length === 0)
         return true;
@@ -50,13 +68,19 @@ async function createEngineConfig(entry, args) {
             : undefined,
         allowEnvFallback: canUseDeployEnvForEntry(entry),
     };
-    if (entry.name === "ai-sdk:openai") {
-        const rawBaseUrl = args.baseUrl?.trim()
-            ? args.baseUrl
-            : await resolveAgentEngineSecret(OPENAI_BASE_URL_ENV_VAR);
-        if (rawBaseUrl) {
-            config.baseUrl = normalizeOpenAiBaseUrl(rawBaseUrl);
-        }
+    if (entry.name === "ai-sdk:openai" || entry.name === "ai-sdk:ollama") {
+        const endpointKey = entry.name === "ai-sdk:ollama"
+            ? OLLAMA_BASE_URL_ENV_VAR
+            : OPENAI_BASE_URL_ENV_VAR;
+        const explicitBaseUrl = args.baseUrl?.trim();
+        const baseUrl = explicitBaseUrl
+            ? await validateProviderBaseUrl(explicitBaseUrl, {
+                allowLocalOllama: entry.name === "ai-sdk:ollama" &&
+                    process.env.NODE_ENV === "development",
+            })
+            : await resolveAgentEngineEndpoint(endpointKey);
+        if (baseUrl)
+            config.baseUrl = baseUrl;
     }
     return config;
 }

package/dist/secrets/routes.d.ts

@@ -37,17 +37,17 @@ export declare function createWriteSecretHandler(): import("h3").EventHandlerWit
     ok?: undefined;
     status?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     status: string;
-    error?: undefined;
 } | {
     ok?: undefined;
     error: string;
     removed?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     removed: boolean;
-    error?: undefined;
 }>>;
 /**
  * POST /_agent-native/secrets/:key/test — validate an optional candidate value
@@ -58,13 +58,13 @@ export declare function createTestSecretHandler(): import("h3").EventHandlerWith
     error: string;
     note?: undefined;
 } | {
+    error?: undefined;
     ok: boolean;
     note?: undefined;
-    error?: 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;
 } | {
+    error?: undefined;
     ok: boolean;
     removed: boolean;
-    error?: undefined;
 }>>;

package/dist/server/agent-chat/run-code-tools.d.ts

@@ -1,7 +1,7 @@
 import type { ActionEntry } from "../../agent/production-agent.js";
 /**
  * Load the sandboxed code-execution tool entries for one action registry:
- * `run-code` plus its `get-code-execution` poll companion. The poll tool is
+ * `run-code`, bounded `tool-orchestration`, plus its `get-code-execution` poll companion. The poll tool is
  * registered ALONGSIDE run-code everywhere run-code appears, so the durable
  * background-execution guidance run-code emits ("check it with
  * get-code-execution") always points at a callable tool. Returns an empty

package/dist/server/agent-chat/run-code-tools.js

@@ -1,6 +1,6 @@
 /**
  * Load the sandboxed code-execution tool entries for one action registry:
- * `run-code` plus its `get-code-execution` poll companion. The poll tool is
+ * `run-code`, bounded `tool-orchestration`, plus its `get-code-execution` poll companion. The poll tool is
  * registered ALONGSIDE run-code everywhere run-code appears, so the durable
  * background-execution guidance run-code emits ("check it with
  * get-code-execution") always points at a callable tool. Returns an empty
@@ -13,8 +13,10 @@
 export async function loadRunCodeToolEntries(supplier, runCodeOptions) {
     try {
         const { createRunCodeEntry, createGetCodeExecutionEntry } = await import("../../coding-tools/run-code.js");
+        const { createToolOrchestrationEntry } = await import("../../coding-tools/tool-orchestration.js");
         const entries = {
             "run-code": createRunCodeEntry(supplier, runCodeOptions),
+            "tool-orchestration": createToolOrchestrationEntry(supplier),
             "get-code-execution": createGetCodeExecutionEntry(),
         };
         // Data programs: stored JS scripts executed through this same run-code

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

@@ -876,11 +876,11 @@ export function createAgentChatPlugin(options) {
                     : rawEnvCodeExec === "off"
                         ? "off"
                         : (options?.codeExecution?.production ?? "off");
-            // Forward-declaration for the production run-code bridge supplier.
-            // Must come before createRunCodeEntry so the closure can capture it.
+            // Forward-declaration for the production code-execution bridge supplier.
+            // Must come before the code entries are created so their closures can capture it.
             let prodRunCodeToolActions = {};
             let leanRunCodeToolActions = {};
-            // Sandboxed run-code tool (+ its get-code-execution poll companion):
+            // Sandboxed run-code, bounded tool-orchestration, and get-code-execution:
             // available in "sandboxed" or "trusted" prod modes and always in dev
             // mode. See loadRunCodeToolEntries for the registration contract.
             const runCodeTool = await loadRunCodeToolEntries(
@@ -914,7 +914,7 @@ export function createAgentChatPlugin(options) {
             // Forward-declaration: populated after devActions is assembled below.
             // Must be declared before devRunCodeTool so the closure can close over it.
             let devRunCodeToolActions = {};
-            // Always register run-code (+ get-code-execution) in dev mode (when the
+            // Always register code execution (+ get-code-execution) in dev mode (when the
             // coding module loads). devActions is not yet defined at this point; we
             // use a late-binding supplier so devRunCodeTool can reference the
             // devActions registry once it is built below (see devHandler block).
@@ -2551,8 +2551,8 @@ Non-code requests are still fine on this surface: read data, navigate the UI, su
             // System-prompt note appended when production code execution is enabled.
             const prodCodeExecPromptNote = !canToggle && resolvedProdCodeExec !== "off"
                 ? resolvedProdCodeExec === "trusted"
-                    ? "\n\n<code-execution-mode>Full shell access is enabled (trusted mode). You have bash, read, edit, write, and run-code tools available. Use bash for file discovery, running tests and builds, and project CLIs. Use run-code for sandboxed JavaScript data processing: provider/API pagination, joins, classification, aggregation, and large-response reduction. Use `pnpm action <name>` in bash to invoke registered app actions from the shell.</code-execution-mode>"
-                    : "\n\n<code-execution-mode>Sandboxed code execution is enabled. The run-code tool lets you execute isolated JavaScript (ESM, top-level await) to fetch, aggregate, and reduce data. Use providerFetch(), providerFetchAll(), providerRequest(), webRead(), and webFetch() inside run-code for authenticated provider calls and compact web/document reduction.</code-execution-mode>"
+                    ? "\n\n<code-execution-mode>Full shell access is enabled (trusted mode). You have bash, read, edit, write, and run-code tools available. Use bash for file discovery, running tests and builds, and project CLIs. Use run-code for sandboxed JavaScript data processing: provider/API pagination, joins, classification, aggregation, and large-response reduction. Use tool-orchestration for short bounded fan-out or reduction over read-only tools. Use `pnpm action <name>` in bash to invoke registered app actions from the shell.</code-execution-mode>"
+                    : "\n\n<code-execution-mode>Sandboxed code execution is enabled. Use tool-orchestration for short bounded fan-out, joins, and reduction over read-only tools. Use run-code when you need its broader provider/web helpers, workspace staging, or durable background execution. In either tool, authenticated calls go through the provided host globals and results should be reduced before printing.</code-execution-mode>"
                 : "";
             const prodHandler = createProductionAgentHandler({
                 actions: leanPrompt ? leanActions : prodActions,

package/dist/server/agent-engine-api-key-route.js

@@ -1,6 +1,7 @@
 import { defineEventHandler, getMethod, setResponseStatus, } from "h3";
 import { normalizeOpenAiBaseUrl } from "../agent/engine/openai-compatible-endpoint.js";
-import { OPENAI_BASE_URL_ENV_VAR, PROVIDER_ENV_META, } from "../agent/engine/provider-env-vars.js";
+import { validateProviderBaseUrl } from "../agent/engine/provider-endpoint-validation.js";
+import { OLLAMA_BASE_URL_ENV_VAR, OPENAI_BASE_URL_ENV_VAR, PROVIDER_ENV_META, } from "../agent/engine/provider-env-vars.js";
 import { getOrgContext } from "../org/context.js";
 import { deleteAppSecret, writeAppSecret } from "../secrets/storage.js";
 import { getSession } from "./auth.js";
@@ -11,15 +12,23 @@ const PROVIDER_TO_ENV_VAR = new Map(Object.entries(PROVIDER_ENV_META).map(([prov
     meta.envVar,
 ]));
 const PROVIDER_ENV_VAR_KEYS = new Set(PROVIDER_TO_ENV_VAR.values());
+const BASE_URL_KEYS = new Set([
+    OPENAI_BASE_URL_ENV_VAR,
+    OLLAMA_BASE_URL_ENV_VAR,
+]);
+const OPENAI_PROVIDER_KEY = PROVIDER_TO_ENV_VAR.get("openai") ?? "";
 export function normalizeAgentEngineApiKeyPayload(body) {
     const payload = body && typeof body === "object" ? body : {};
     const raw = payload;
+    const provider = typeof raw.provider === "string" ? raw.provider.trim() : "";
     const key = typeof raw.key === "string"
         ? raw.key.trim()
-        : typeof raw.provider === "string"
-            ? (PROVIDER_TO_ENV_VAR.get(raw.provider.trim()) ?? "")
-            : "";
-    if (!key || !PROVIDER_ENV_VAR_KEYS.has(key)) {
+        : provider === "ollama"
+            ? OLLAMA_BASE_URL_ENV_VAR
+            : provider
+                ? (PROVIDER_TO_ENV_VAR.get(provider) ?? "")
+                : "";
+    if (!key || (!PROVIDER_ENV_VAR_KEYS.has(key) && !BASE_URL_KEYS.has(key))) {
         return {
             ok: false,
             statusCode: 400,
@@ -38,11 +47,11 @@ export function normalizeAgentEngineApiKeyPayload(body) {
             : "";
     let baseUrl;
     if (rawBaseUrl.trim()) {
-        if (key !== PROVIDER_TO_ENV_VAR.get("openai")) {
+        if (key !== OPENAI_PROVIDER_KEY && !BASE_URL_KEYS.has(key)) {
             return {
                 ok: false,
                 statusCode: 400,
-                error: "Endpoint URL is only supported for OpenAI.",
+                error: "Endpoint URL is only supported for OpenAI or Ollama.",
             };
         }
         try {
@@ -57,11 +66,11 @@ export function normalizeAgentEngineApiKeyPayload(body) {
         }
     }
     const clearBaseUrl = raw.clearBaseUrl === true && baseUrl == null;
-    if (clearBaseUrl && key !== PROVIDER_TO_ENV_VAR.get("openai")) {
+    if (clearBaseUrl && key !== OPENAI_PROVIDER_KEY && !BASE_URL_KEYS.has(key)) {
         return {
             ok: false,
             statusCode: 400,
-            error: "Endpoint URL is only supported for OpenAI.",
+            error: "Endpoint URL is only supported for OpenAI or Ollama.",
         };
     }
     if (!value && !baseUrl && !clearBaseUrl) {
@@ -130,6 +139,20 @@ export function createAgentEngineApiKeyHandler() {
             setResponseStatus(event, resolved.statusCode);
             return { error: resolved.error };
         }
+        if (payload.baseUrl) {
+            try {
+                await validateProviderBaseUrl(payload.baseUrl, {
+                    allowLocalOllama: payload.key === OLLAMA_BASE_URL_ENV_VAR &&
+                        process.env.NODE_ENV === "development",
+                });
+            }
+            catch (err) {
+                setResponseStatus(event, 400);
+                return {
+                    error: err instanceof Error ? err.message : String(err),
+                };
+            }
+        }
         if (payload.value) {
             await writeAppSecret({
                 key: payload.key,
@@ -144,7 +167,9 @@ export function createAgentEngineApiKeyHandler() {
         }
         if (payload.baseUrl) {
             await writeAppSecret({
-                key: OPENAI_BASE_URL_ENV_VAR,
+                key: payload.key === OLLAMA_BASE_URL_ENV_VAR
+                    ? OLLAMA_BASE_URL_ENV_VAR
+                    : OPENAI_BASE_URL_ENV_VAR,
                 value: payload.baseUrl,
                 scope: resolved.target.scope,
                 scopeId: resolved.target.scopeId,
@@ -152,7 +177,9 @@ export function createAgentEngineApiKeyHandler() {
         }
         else if (payload.clearBaseUrl) {
             await deleteAppSecret({
-                key: OPENAI_BASE_URL_ENV_VAR,
+                key: payload.key === OLLAMA_BASE_URL_ENV_VAR
+                    ? OLLAMA_BASE_URL_ENV_VAR
+                    : OPENAI_BASE_URL_ENV_VAR,
                 scope: resolved.target.scope,
                 scopeId: resolved.target.scopeId,
             });
@@ -161,7 +188,11 @@ export function createAgentEngineApiKeyHandler() {
             ok: true,
             key: payload.key,
             ...(payload.baseUrl || payload.clearBaseUrl
-                ? { baseUrlKey: OPENAI_BASE_URL_ENV_VAR }
+                ? {
+                    baseUrlKey: payload.key === OLLAMA_BASE_URL_ENV_VAR
+                        ? OLLAMA_BASE_URL_ENV_VAR
+                        : OPENAI_BASE_URL_ENV_VAR,
+                }
                 : {}),
             scope: resolved.target.scope,
         };

package/dist/server/agents-bundle.d.ts

@@ -96,6 +96,8 @@ export interface AgentsBundle {
 }
 export interface AgentsBundleReadOptions {
     instructions?: AgentNativeInstructionsConfig;
+    /** Additional skill roots supplied by a local host, such as installed plugins. */
+    additionalSkillDirs?: string[];
 }
 export interface AgentInstructionPaths {
     runtime: string;

package/dist/server/agents-bundle.js

@@ -230,6 +230,27 @@ function readSkillsDir(skillsDir, rootForRelative, out, skipExistingNames) {
         }
     }
 }
+function readNestedSkillsDir(skillsDir, rootForRelative, out) {
+    if (!fs.existsSync(skillsDir))
+        return;
+    readSkillsDir(skillsDir, rootForRelative, out, true);
+    let entries;
+    try {
+        entries = fs.readdirSync(skillsDir, { withFileTypes: true });
+    }
+    catch {
+        return;
+    }
+    for (const entry of entries) {
+        if (!entry.isDirectory() || entry.name === "." || entry.name === "..") {
+            continue;
+        }
+        const nestedDir = path.join(skillsDir, entry.name);
+        if (fs.existsSync(path.join(nestedDir, "SKILL.md")))
+            continue;
+        readSkillsDir(nestedDir, rootForRelative, out, true);
+    }
+}
 /**
  * Read AGENTS.md + all skills directly from the filesystem rooted at `cwd`.
  * Optionally also reads a workspace-core's AGENTS.md and skills directory
@@ -256,9 +277,9 @@ export function readAgentsBundleFromFs(cwd, workspaceSource = null, options = {}
     // overwrite the template's. `.agents/skills` is canonical; `.agent/skills`
     // is accepted as a legacy alias and does not override canonical skills.
     const skills = {};
-    for (const [index, relSkillsDir] of TEMPLATE_SKILLS_DIRS.entries()) {
+    for (const relSkillsDir of TEMPLATE_SKILLS_DIRS) {
         try {
-            readSkillsDir(path.join(cwd, relSkillsDir), cwd, skills, index > 0);
+            readNestedSkillsDir(path.join(cwd, relSkillsDir), cwd, skills);
         }
         catch { }
     }
@@ -268,6 +289,15 @@ export function readAgentsBundleFromFs(cwd, workspaceSource = null, options = {}
         }
         catch { }
     }
+    for (const skillsDir of options.additionalSkillDirs ?? []) {
+        try {
+            readNestedSkillsDir(skillsDir, cwd, skills);
+        }
+        catch (error) {
+            // Optional host-provided skills must not make the coding session fail.
+            console.warn("[agents-bundle] Failed to load optional host-provided skills", { skillsDir, error });
+        }
+    }
     return {
         // Keep the old field useful for callers that only know about the runtime
         // bundle. Audience-aware consumers should use the explicit fields.

package/dist/server/auth.js

@@ -1678,11 +1678,27 @@ async function createAutoDevAccountForSession(auth, db) {
 function isHostedPreviewRequest(event) {
     const host = getRequestHost(event)?.split(",")[0]?.trim().toLowerCase() ?? "";
     return (host.endsWith(".agent-native.com") ||
-        host.endsWith(".builderio.xyz") ||
+        isBuilderPreviewHost(host) ||
+        host.includes("deploy-preview"));
+}
+const BUILDER_PREVIEW_LOCAL_DEV_ENV = "AGENT_NATIVE_ALLOW_BUILDER_PREVIEW_LOCAL_DEV";
+function isBuilderPreviewHost(host) {
+    return (host.endsWith(".builderio.xyz") ||
         host.endsWith(".builderio.dev") ||
         host.endsWith(".builder.codes") ||
-        host.endsWith(".builder.my") ||
-        host.includes("deploy-preview"));
+        host.endsWith(".builder.my"));
+}
+function isBuilderPreviewLocalDevEnabled() {
+    const value = process.env[BUILDER_PREVIEW_LOCAL_DEV_ENV]
+        ?.trim()
+        .toLowerCase();
+    return value === "1" || value === "true";
+}
+function isBuilderPreviewLocalDevRequest(event) {
+    if (!isBuilderPreviewLocalDevEnabled())
+        return false;
+    const host = getRequestHost(event)?.split(",")[0]?.trim().toLowerCase() ?? "";
+    return isBuilderPreviewHost(host);
 }
 export function isLocalDevAuthAllowed(event) {
     const deployPreview = typeof isDeployPreview === "function" && isDeployPreview();
@@ -1690,8 +1706,8 @@ export function isLocalDevAuthAllowed(event) {
         !deployPreview &&
         !isAuthDisabled() &&
         process.env.AGENT_NATIVE_DISABLE_AUTO_DEV_ACCOUNT !== "1" &&
-        !isHostedPreviewRequest(event) &&
-        isLoopbackRequest(event));
+        ((!isHostedPreviewRequest(event) && isLoopbackRequest(event)) ||
+            isBuilderPreviewLocalDevRequest(event)));
 }
 async function createOrReuseAutoDevSession(auth, config) {
     let session = await createBetterAuthSessionForEmail(AUTO_DEV_ACCOUNT_EMAIL, config);

package/dist/server/credential-provider.d.ts

@@ -85,6 +85,12 @@ export declare function isDeployCredentialFallbackAllowed(): boolean;
 export declare function canUseDeployCredentialFallbackForRequest(key?: string): boolean;
 type BuilderCredentialSource = "user" | "org" | "workspace" | "env";
 export declare function isBuilderPrivateKey(value: string | null | undefined): boolean;
+export interface BuilderCredentialLookupIdentity {
+    /** The verified owner of a background run, when it has no browser request. */
+    userEmail?: string | null;
+    /** The verified organization attached to that run, when one exists. */
+    orgId?: string | null;
+}
 /**
  * Resolve a Builder credential for the current request. User/org credentials
  * win; deployment env is only a fallback. This lets local/root .env keys keep
@@ -153,13 +159,13 @@ export interface BuilderCredentialsDetailed {
  * Callers that only need the plain credential bundle (the historical shape)
  * should use `resolveBuilderCredentials()` instead.
  */
-export declare function resolveBuilderCredentialsDetailed(): Promise<BuilderCredentialsDetailed>;
+export declare function resolveBuilderCredentialsDetailed(identity?: BuilderCredentialLookupIdentity): Promise<BuilderCredentialsDetailed>;
 /**
  * Resolve the Builder assistant credential bundle from one complete scope.
  * Kept to its original return shape (no `source`/`lookupFailed`) for existing
  * callers; use `resolveBuilderCredentialsDetailed()` for those fields.
  */
-export declare function resolveBuilderCredentials(): Promise<{
+export declare function resolveBuilderCredentials(identity?: BuilderCredentialLookupIdentity): Promise<{
     privateKey: string | null;
     publicKey: string | null;
     userId: string | null;

package/dist/server/credential-provider.js

@@ -134,6 +134,7 @@ const APP_PROVIDED_DEPLOY_CREDENTIAL_KEYS = new Set([
     "EMAIL_AGENT_ADDRESS",
     "OPENAI_API_KEY",
     "OPENAI_BASE_URL",
+    "OLLAMA_BASE_URL",
     "OPENROUTER_API_KEY",
     "GOOGLE_CLIENT_ID",
     "GOOGLE_CLIENT_SECRET",
@@ -444,8 +445,8 @@ async function resolveScopedBuilderCredential(key) {
         cause: orgLookupCause,
     };
 }
-async function resolveScopedBuilderCredentials() {
-    const email = getRequestUserEmail();
+async function resolveScopedBuilderCredentials(identity) {
+    const email = identity?.userEmail?.trim() || getRequestUserEmail();
     if (!email)
         return { creds: null, lookupFailed: false };
     const traceLookup = shouldTraceCredentialResolve();
@@ -463,7 +464,7 @@ async function resolveScopedBuilderCredentials() {
         if (await isCompleteBuilderConnection(userCreds)) {
             return { creds: userCreds, lookupFailed: false };
         }
-        let orgId = getRequestOrgId();
+        let orgId = identity?.orgId?.trim() || getRequestOrgId();
         let orgSource = orgId
             ? "request"
             : "none";
@@ -527,8 +528,12 @@ export async function resolveBuilderCredential(key) {
     const envValue = canUseBuilderDeployCredentialFallbackForRequest()
         ? (readDeployCredentialEnv(key) ?? null)
         : null;
-    if (envValue)
+    if (envValue) {
+        // A deploy fallback is still useful, but it must not turn a transient
+        // credential-store failure into a clean connected result for Builder.
+        assertCredentialStoreReadable(scoped);
         return envValue;
+    }
     // Nothing answered AND the store never gave a real answer: that is not
     // "not connected", it is "we could not look".
     assertCredentialStoreReadable(scoped);
@@ -589,8 +594,8 @@ export async function resolveBuilderCredentialSource() {
  * Callers that only need the plain credential bundle (the historical shape)
  * should use `resolveBuilderCredentials()` instead.
  */
-export async function resolveBuilderCredentialsDetailed() {
-    const { creds: scoped, lookupFailed, cause, } = await resolveScopedBuilderCredentials();
+export async function resolveBuilderCredentialsDetailed(identity) {
+    const { creds: scoped, lookupFailed, cause, } = await resolveScopedBuilderCredentials(identity);
     if (scoped) {
         const { privateKey, publicKey, userId, orgName, orgKind, subscription, subscriptionLevel, subscriptionName, isEnterprise, isFreeAccount, source, } = scoped;
         return {
@@ -683,8 +688,8 @@ export async function resolveBuilderCredentialsDetailed() {
  * Kept to its original return shape (no `source`/`lookupFailed`) for existing
  * callers; use `resolveBuilderCredentialsDetailed()` for those fields.
  */
-export async function resolveBuilderCredentials() {
-    const { privateKey, publicKey, userId, orgName, orgKind, subscription, subscriptionLevel, subscriptionName, isEnterprise, isFreeAccount, } = await resolveBuilderCredentialsDetailed();
+export async function resolveBuilderCredentials(identity) {
+    const { privateKey, publicKey, userId, orgName, orgKind, subscription, subscriptionLevel, subscriptionName, isEnterprise, isFreeAccount, } = await resolveBuilderCredentialsDetailed(identity);
     return {
         privateKey,
         publicKey,
@@ -1210,7 +1215,7 @@ export async function resolveSecretDetailed(key) {
         }
         return {
             value: envFallback,
-            lookupFailed: lookupFailed && !envFallback,
+            lookupFailed,
             cause,
         };
     }