@agent-native/core 0.147.0 → 0.148.0

package/dist/client/settings/SettingsPanel.js

@@ -6,8 +6,9 @@ import { IconChevronDown, IconChevronRight, IconCheck, IconExternalLink, IconBra
 import React, { Suspense, lazy, useState, useEffect, useCallback, useMemo, useRef, } from "react";
 import { PROVIDER_ENV_PLACEHOLDERS } from "../../agent/engine/provider-env-vars.js";
 import { buildSettingsRoute } from "../../navigation/index.js";
-import { saveAgentEngineProviderSettings } from "../agent-engine-key.js";
+import { saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
 import { AgentWorkspaceContent } from "../agent-page/AgentWorkspaceContent.js";
+import { getAgentProviderOption, providerIdForEngine, } from "../agent-provider-catalog.js";
 import { agentNativePath } from "../api-path.js";
 import { BuilderBMark } from "../builder-mark.js";
 import { Popover, PopoverContent, PopoverTrigger, } from "../components/ui/popover.js";
@@ -24,6 +25,7 @@ import { AgentsSection } from "./AgentsSection.js";
 import { AutomationsSection } from "./AutomationsSection.js";
 import { DemoModeSection } from "./DemoModeSection.js";
 import { ExtensionsSettingsContent } from "./ExtensionsSettingsContent.js";
+import { AgentProviderPicker } from "./ProviderSetupForm.js";
 import { SecretsSection } from "./SecretsSection.js";
 import { SettingsGroup, SettingsRow } from "./SettingsRow.js";
 import { SettingsSection, SettingsSurfaceProvider, useSettingsSurface, } from "./SettingsSection.js";
@@ -343,8 +345,8 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
     const [baseUrlConfigured, setBaseUrlConfigured] = useState(false);
     const [clearBaseUrl, setClearBaseUrl] = useState(false);
     const [advancedOpen, setAdvancedOpen] = useState(false);
-    const [manualSetupOpen, setManualSetupOpen] = useState(false);
     const [applyNote, setApplyNote] = useState(false);
+    const [applyError, setApplyError] = useState(null);
     const [testing, setTesting] = useState(false);
     const [testResult, setTestResult] = useState(null);
     const [settingsStatus, setSettingsStatus] = useState(null);
@@ -420,32 +422,26 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
         envVar,
         builderConnected,
     });
-    const manualSetupHint = selectedEngine === "ai-sdk:openrouter"
-        ? "Provide an OpenRouter key to use OpenRouter models like GLM 5.2."
-        : "Choose your AI provider and model.";
+    const manualSetupHint = "Select a provider.";
     const engineChanged = selectedEngine !== currentEngine || selectedModel !== currentModel;
-    const isOpenAiEngine = selectedEngine === "ai-sdk:openai";
-    const endpointChanged = isOpenAiEngine && (!!baseUrl.trim() || clearBaseUrl);
+    const selectedProvider = providerIdForEngine(selectedEngine) ?? "anthropic";
+    const selectedProviderOption = getAgentProviderOption(selectedProvider);
+    const isEndpointProvider = selectedProviderOption.supportsEndpoint === true;
+    const endpointChanged = isEndpointProvider && (!!baseUrl.trim() || clearBaseUrl);
     const providerSettingsChanged = !!apiKey.trim() || endpointChanged;
-    // Hide the Anthropic-via-AI-SDK alias (redundant with the native entry)
-    // and Ollama (no API key to set here). The currently-selected engine is
-    // always kept so a stale setting doesn't vanish from the picker.
-    const providerOptions = engines
-        .filter((e) => e.name === selectedEngine ||
-        (e.name !== "ai-sdk:anthropic" && e.name !== "ai-sdk:ollama"))
-        .map((e) => ({ value: e.name, label: e.label }));
     const modelOptions = latestModelsOnly(selectedEngineInfo?.supportedModels ?? []).map((m) => ({ value: m, label: friendlyModelName(m) }));
     const handleSave = async () => {
-        if (!providerSettingsChanged || !envVar)
+        if (!providerSettingsChanged || (!envVar && !isEndpointProvider))
             return;
         setSaving(true);
         try {
-            const nextBaseUrl = isOpenAiEngine ? baseUrl.trim() : "";
+            const nextBaseUrl = isEndpointProvider ? baseUrl.trim() : "";
             await saveAgentEngineProviderSettings({
-                key: envVar,
+                provider: selectedProvider,
+                ...(envVar ? { key: envVar } : {}),
                 ...(apiKey.trim() ? { apiKey } : {}),
                 ...(nextBaseUrl ? { baseUrl: nextBaseUrl } : {}),
-                ...(isOpenAiEngine && clearBaseUrl ? { clearBaseUrl: true } : {}),
+                ...(isEndpointProvider && clearBaseUrl ? { clearBaseUrl: true } : {}),
             });
             setSaved(true);
             setApiKey("");
@@ -527,40 +523,46 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
         }
     };
     const handleApply = async () => {
+        setApplyError(null);
         try {
-            const res = await fetch(agentNativePath("/_agent-native/actions/manage-agent-engine"), {
-                method: "POST",
-                headers: { "Content-Type": "application/json" },
-                body: JSON.stringify({
-                    action: "set",
-                    engine: selectedEngine,
-                    model: selectedModel,
-                }),
+            await setAgentEngineProvider({
+                provider: selectedProvider,
+                model: selectedModel,
             });
-            if (res.ok) {
-                setCurrentEngine(selectedEngine);
-                setCurrentModel(selectedModel);
-                setApplyNote(true);
-                refreshSettingsStatus();
-                notifyConfigChanged();
-                setTimeout(() => setApplyNote(false), 4000);
-            }
+            setCurrentEngine(selectedEngine);
+            setCurrentModel(selectedModel);
+            setApplyNote(true);
+            refreshSettingsStatus();
+            notifyConfigChanged();
+            setTimeout(() => setApplyNote(false), 4000);
+        }
+        catch (err) {
+            setApplyError(err instanceof Error ? err.message : String(err));
         }
-        catch { }
     };
-    return (_jsx(SettingsSection, { id: settingsSectionDomId("llm"), icon: _jsx(IconBrain, { size: 14 }), title: "LLM", subtitle: "Use Builder.io free credits or your own LLM provider.", required: true, connected: initialLoading ? undefined : anyKeyConfigured, grouped: isPage && grouped, open: open, onToggle: onToggle, children: initialLoading ? (_jsx(SettingsLoadingRow, { controlCount: 2 })) : (_jsxs("div", { className: cn(isPage
+    return (_jsx(SettingsSection, { id: settingsSectionDomId("llm"), icon: _jsx(IconBrain, { size: 14 }), title: "LLM", required: true, connected: initialLoading ? undefined : anyKeyConfigured, subtitle: isPage
+            ? undefined
+            : t("agentPanel.builderOrOwnKeys", {
+                defaultValue: "Choose Builder.io or custom keys.",
+            }), grouped: isPage && grouped, open: open, onToggle: onToggle, children: initialLoading ? (_jsx(SettingsLoadingRow, { controlCount: 2 })) : (_jsxs("div", { className: cn(isPage
                 ? "flex items-center justify-between gap-4 px-5 py-4 sm:px-6"
-                : "space-y-2"), children: [isPage && (_jsxs("div", { className: "min-w-0", children: [_jsx("p", { className: "text-sm font-medium text-foreground", children: "Connect an LLM" }), _jsx("p", { className: "mt-1 text-sm leading-6 text-muted-foreground", children: "Use Builder.io free credits or your own provider." })] })), _jsxs("div", { className: cn(isPage && "flex flex-wrap items-center justify-end gap-2"), children: [_jsx(UseBuilderCard, { builderFlow: builderFlow, connectUrl: connectUrl, connected: connected, orgName: orgName, envManaged: envManaged, credentialSource: credentialSource, trackingSource: "llm_settings", trackingFlow: "connect_llm", label: "Connect Builder.io", compact: isPage }), builderConnected && !isPage && (_jsxs(Button, { type: "button", intent: "neutral", emphasis: "ghost", "aria-expanded": manualSetupOpen, "aria-controls": "llm-manual-setup", onClick: () => setManualSetupOpen((open) => !open), className: cn("inline-flex items-center gap-1 px-0.5 text-muted-foreground hover:text-foreground", isPage ? "text-xs" : "text-[10px]"), children: [t("agentPanel.addOwnKeys", {
-                                    defaultValue: "Add your own keys",
-                                }), _jsx(IconChevronDown, { size: isPage ? 14 : 11, className: cn("transition-transform", manualSetupOpen && "rotate-180") })] })), (!builderConnected || manualSetupOpen || isPage) && (_jsx(ManualSetupCard, { id: "llm-manual-setup", title: "Custom keys", hint: manualSetupHint, sourceBadge: builderConnected ? undefined : sourceBadge, bare: isPage, popover: isPage, popoverLabel: "Custom keys", children: _jsxs("div", { className: "space-y-2 mb-1", children: [_jsx(SettingsSelect, { label: "Provider", value: selectedEngine, options: providerOptions, onValueChange: (val) => {
-                                            setSelectedEngine(val);
-                                            const info = engines.find((e) => e.name === val);
-                                            setSelectedModel(info?.defaultModel ?? "");
+                : "flex items-center justify-between gap-2"), children: [isPage && (_jsxs("div", { className: "min-w-0", children: [_jsx("p", { className: "text-sm font-medium text-foreground", children: "AI provider" }), _jsx("p", { className: "mt-1 text-sm leading-6 text-muted-foreground", children: t("agentPanel.builderOrOwnKeys", {
+                                defaultValue: "Choose Builder.io or custom keys.",
+                            }) })] })), _jsxs("div", { className: cn("flex flex-wrap items-center justify-end gap-2"), children: [_jsx(UseBuilderCard, { builderFlow: builderFlow, connectUrl: connectUrl, connected: connected, orgName: orgName, envManaged: envManaged, credentialSource: credentialSource, trackingSource: "llm_settings", trackingFlow: "connect_llm", label: "Connect Builder.io", compact: true }), _jsx(ManualSetupCard, { id: "llm-manual-setup", title: "Custom keys", hint: manualSetupHint, sourceBadge: builderConnected ? undefined : sourceBadge, bare: isPage, popover: true, popoverLabel: settingsConfigured
+                                ? "Manage"
+                                : t("agentPanel.addOwnKeys", {
+                                    defaultValue: "Custom keys",
+                                }), children: _jsxs("div", { className: "space-y-2 mb-1", children: [_jsx(AgentProviderPicker, { value: selectedProvider, layout: isPage ? "page" : "compact", onChange: (provider) => {
+                                            const option = getAgentProviderOption(provider);
+                                            setSelectedEngine(option.engine);
+                                            setSelectedModel(option.defaultModel);
                                             setApiKey("");
                                             setBaseUrl("");
                                             setClearBaseUrl(false);
                                             setAdvancedOpen(false);
-                                        } }), _jsxs("div", { className: "space-y-1.5", children: [_jsx("p", { className: fieldLabelClass(isPage), children: "Model" }), _jsx("input", { type: "text", list: `model-suggestions-${selectedEngine}`, value: selectedModel, onChange: (e) => setSelectedModel(e.target.value), placeholder: selectedEngineInfo?.defaultModel ?? "e.g. model-id", spellCheck: false, autoComplete: "off", className: textInputClass(isPage), style: isPage ? CONTROL_STYLE_PAGE : CONTROL_STYLE }), modelOptions.length > 0 && (_jsx("datalist", { id: `model-suggestions-${selectedEngine}`, children: modelOptions.map((opt) => (_jsx("option", { value: opt.value, label: opt.label }, opt.value))) }))] }), isOpenAiEngine && (_jsxs("div", { className: "border-t border-border/70 pt-2", children: [_jsxs(Button, { type: "button", onClick: () => setAdvancedOpen((v) => !v), className: "flex w-full cursor-pointer items-center justify-between gap-2 rounded px-0.5 py-1 text-left hover:text-foreground", children: [_jsxs("span", { className: "inline-flex min-w-0 items-center gap-1.5 text-[11px] font-medium text-foreground", children: [advancedOpen ? (_jsx(IconChevronDown, { size: 12 })) : (_jsx(IconChevronRight, { size: 12, className: "rtl:-scale-x-100" })), "Advanced"] }), _jsx("span", { className: "truncate text-[10px] text-muted-foreground", children: "OpenAI-compatible endpoint" })] }), advancedOpen && (_jsxs("div", { className: "mt-1.5 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("p", { className: "text-[12px] font-medium text-foreground", children: "Endpoint URL" }), _jsx("span", { className: "text-[10px] text-muted-foreground", children: baseUrlConfigured ? "Configured" : "Optional" })] }), _jsx("input", { type: "url", value: baseUrl, onChange: (e) => {
+                                        } }), _jsxs("div", { className: "space-y-1.5", children: [_jsx("p", { className: fieldLabelClass(isPage), children: "Model" }), _jsx("input", { type: "text", list: `model-suggestions-${selectedEngine}`, value: selectedModel, onChange: (e) => setSelectedModel(e.target.value), placeholder: selectedEngineInfo?.defaultModel ?? "e.g. model-id", spellCheck: false, autoComplete: "off", className: textInputClass(isPage), style: isPage ? CONTROL_STYLE_PAGE : CONTROL_STYLE }), modelOptions.length > 0 && (_jsx("datalist", { id: `model-suggestions-${selectedEngine}`, children: modelOptions.map((opt) => (_jsx("option", { value: opt.value, label: opt.label }, opt.value))) }))] }), isEndpointProvider && (_jsxs("div", { className: "border-t border-border/70 pt-2", children: [_jsxs(Button, { type: "button", onClick: () => setAdvancedOpen((v) => !v), className: "flex w-full cursor-pointer items-center justify-between gap-2 rounded px-0.5 py-1 text-left hover:text-foreground", children: [_jsxs("span", { className: "inline-flex min-w-0 items-center gap-1.5 text-[11px] font-medium text-foreground", children: [advancedOpen ? (_jsx(IconChevronDown, { size: 12 })) : (_jsx(IconChevronRight, { size: 12, className: "rtl:-scale-x-100" })), "Advanced"] }), _jsx("span", { className: "truncate text-[10px] text-muted-foreground", children: selectedProvider === "ollama"
+                                                            ? "Local Ollama endpoint"
+                                                            : "OpenAI-compatible endpoint" })] }), advancedOpen && (_jsxs("div", { className: "mt-1.5 space-y-1.5", children: [_jsxs("div", { className: "flex items-center justify-between gap-2", children: [_jsx("p", { className: "text-[12px] font-medium text-foreground", children: "Endpoint URL" }), _jsx("span", { className: "text-[10px] text-muted-foreground", children: baseUrlConfigured ? "Configured" : "Optional" })] }), _jsx("input", { type: "url", value: baseUrl, onChange: (e) => {
                                                             setBaseUrl(e.target.value);
                                                             if (e.target.value.trim())
                                                                 setClearBaseUrl(false);
@@ -569,14 +571,16 @@ function LLMSectionInner({ builderFlow, builderLoading, connectUrl, connected, o
                                                                 handleSave();
                                                         }, placeholder: baseUrlConfigured
                                                             ? "Leave blank to keep current endpoint"
-                                                            : "https://gateway.example/v1", disabled: clearBaseUrl, spellCheck: false, autoComplete: "off", className: "flex h-9 w-full rounded-md border border-border bg-background px-3 text-[12px] text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-accent disabled:opacity-50 placeholder:text-muted-foreground/50", style: CONTROL_STYLE }), _jsx("p", { className: "text-[10px] leading-relaxed text-muted-foreground", children: "Use for LiteLLM or another OpenAI-compatible chat gateway. Leave blank for OpenAI." }), baseUrlConfigured && (_jsxs("label", { className: "flex items-center gap-1.5 text-[10px] text-muted-foreground", children: [_jsx(Checkbox, { checked: clearBaseUrl, onChange: (checked) => {
+                                                            : selectedProvider === "ollama"
+                                                                ? "http://localhost:11434"
+                                                                : "https://gateway.example/v1", disabled: clearBaseUrl, spellCheck: false, autoComplete: "off", className: "flex h-9 w-full rounded-md border border-border bg-background px-3 text-[12px] text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-accent disabled:opacity-50 placeholder:text-muted-foreground/50", style: CONTROL_STYLE }), baseUrlConfigured && (_jsxs("label", { className: "flex items-center gap-1.5 text-[10px] text-muted-foreground", children: [_jsx(Checkbox, { checked: clearBaseUrl, onChange: (checked) => {
                                                                     setClearBaseUrl(checked);
                                                                     if (checked)
                                                                         setBaseUrl("");
-                                                                }, "aria-label": "Clear saved endpoint override", className: "shrink-0" }), "Clear saved endpoint override"] })), envVar && envConfigured && endpointChanged && (_jsx(Button, { type: "button", intent: "neutral", emphasis: "solid", onClick: handleSave, disabled: saving, className: "rounded bg-accent px-2.5 py-1 text-[10px] font-medium text-foreground hover:bg-accent/80 disabled:opacity-40", children: saving ? (_jsx(IconLoader2, { size: 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: 10 })) : ("Save endpoint") }))] }))] })), envVar && envConfigured ? (_jsxs("div", { className: cn("flex items-center gap-1.5 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), envVar, " configured"] })) : envVar ? (_jsxs("div", { className: "flex gap-1.5", children: [_jsx("input", { type: "password", value: apiKey, onChange: (e) => setApiKey(e.target.value), onKeyDown: (e) => {
+                                                                }, "aria-label": "Clear saved endpoint override", className: "shrink-0" }), "Clear saved endpoint override"] })), endpointChanged && (_jsx(Button, { type: "button", intent: "neutral", emphasis: "solid", onClick: handleSave, disabled: saving, className: "rounded bg-accent px-2.5 py-1 text-[10px] font-medium text-foreground hover:bg-accent/80 disabled:opacity-40", children: saving ? (_jsx(IconLoader2, { size: 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: 10 })) : ("Save endpoint") }))] }))] })), envVar && envConfigured ? (_jsxs("div", { className: cn("flex items-center gap-1.5 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), envVar, " configured"] })) : envVar ? (_jsxs("div", { className: "flex gap-1.5", children: [_jsx("input", { type: "password", value: apiKey, onChange: (e) => setApiKey(e.target.value), onKeyDown: (e) => {
                                                     if (e.key === "Enter")
                                                         handleSave();
-                                                }, placeholder: PROVIDER_ENV_PLACEHOLDERS[envVar] ?? "...", className: cn(textInputClass(isPage), "flex-1"), style: isPage ? CONTROL_STYLE_PAGE : undefined }), _jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleSave, disabled: !providerSettingsChanged || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") })] })) : null, _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Button, { intent: "neutral", emphasis: "outline", onClick: handleTest, disabled: testing, className: pillButtonClass(isPage, "outline"), children: testing ? (_jsxs("span", { className: "flex items-center gap-1", children: [_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" }), "Testing\u2026"] })) : ("Test") }), PROVIDER_DOCS[selectedEngine] ? (_jsxs("a", { href: PROVIDER_DOCS[selectedEngine], target: "_blank", rel: "noopener noreferrer", className: cn(pillButtonClass(isPage, "outline"), "no-underline"), children: ["Get an API key", _jsx(IconExternalLink, { size: isPage ? 14 : 10 })] })) : null, engineChanged && (_jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleApply, className: pillButtonClass(isPage, "solid"), children: "Apply" })), settingsStatus != null && (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { intent: "danger", emphasis: "outline", onClick: handleDisconnect, className: cn(pillButtonClass(isPage, "outline"), "ms-auto text-muted-foreground hover:bg-destructive/10 hover:text-destructive hover:border-destructive/40"), children: "Disconnect" }) }), _jsx(TooltipContent, { children: "Clear the saved engine \u2014 the app will fall back to the default until you re-apply." })] }))] }), testResult && testResult.ok && (_jsxs("p", { className: cn("flex items-center gap-1 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), "Test passed \u2014 ", testResult.latencyMs, "ms"] })), testResult && testResult.ok === false && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Test failed: ", testResult.error] })), disconnectError && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Disconnect failed: ", disconnectError] })), applyNote && (_jsx("p", { className: cn("text-muted-foreground", isPage ? "text-xs" : "text-[10px]"), children: "Changes take effect on next conversation" }))] }) }))] })] })) }));
+                                                }, placeholder: PROVIDER_ENV_PLACEHOLDERS[envVar] ?? "...", className: cn(textInputClass(isPage), "flex-1"), style: isPage ? CONTROL_STYLE_PAGE : undefined }), _jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleSave, disabled: !providerSettingsChanged || saving, className: pillButtonClass(isPage, "solid"), children: saving ? (_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" })) : saved ? (_jsx(IconCheck, { size: isPage ? 14 : 10 })) : ("Save") })] })) : null, _jsxs("div", { className: "flex items-center gap-2", children: [_jsx(Button, { intent: "neutral", emphasis: "outline", onClick: handleTest, disabled: testing, className: pillButtonClass(isPage, "outline"), children: testing ? (_jsxs("span", { className: "flex items-center gap-1", children: [_jsx(IconLoader2, { size: isPage ? 14 : 10, className: "animate-spin" }), "Testing\u2026"] })) : ("Test") }), PROVIDER_DOCS[selectedEngine] ? (_jsxs("a", { href: PROVIDER_DOCS[selectedEngine], target: "_blank", rel: "noopener noreferrer", className: cn(pillButtonClass(isPage, "outline"), "no-underline"), children: ["Get an API key", _jsx(IconExternalLink, { size: isPage ? 14 : 10 })] })) : null, engineChanged && (_jsx(Button, { intent: "primary", emphasis: "solid", onClick: handleApply, className: pillButtonClass(isPage, "solid"), children: "Apply" })), settingsStatus != null && (_jsxs(Tooltip, { children: [_jsx(TooltipTrigger, { asChild: true, children: _jsx(Button, { intent: "danger", emphasis: "outline", onClick: handleDisconnect, className: cn(pillButtonClass(isPage, "outline"), "ms-auto text-muted-foreground hover:bg-destructive/10 hover:text-destructive hover:border-destructive/40"), children: "Disconnect" }) }), _jsx(TooltipContent, { children: "Clear the saved engine \u2014 the app will fall back to the default until you re-apply." })] }))] }), testResult && testResult.ok && (_jsxs("p", { className: cn("flex items-center gap-1 text-primary", isPage ? "text-xs" : "text-[10px]"), children: [_jsx(IconCheck, { size: isPage ? 14 : 10 }), "Test passed \u2014 ", testResult.latencyMs, "ms"] })), testResult && testResult.ok === false && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Test failed: ", testResult.error] })), disconnectError && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Disconnect failed: ", disconnectError] })), applyError && (_jsxs("p", { className: cn("text-destructive", isPage ? "text-xs" : "text-[10px]"), children: ["Apply failed: ", applyError] })), applyNote && (_jsx("p", { className: cn("text-muted-foreground", isPage ? "text-xs" : "text-[10px]"), children: "Changes take effect on next conversation" }))] }) })] })] })) }));
 }
 function friendlyAppName(appId) {
     return appId
@@ -587,7 +591,7 @@ function friendlyAppName(appId) {
 }
 function AppDefaultModelPicker({ engines, value, disabled, onChange, }) {
     const [open, setOpen] = useState(false);
-    const visibleEngines = engines.filter((engine) => engine.name !== "ai-sdk:anthropic" && engine.name !== "ai-sdk:ollama");
+    const visibleEngines = engines.filter((engine) => engine.name !== "ai-sdk:anthropic");
     const selectedModel = value.includes("::")
         ? value.slice(value.indexOf("::") + 2)
         : null;
@@ -664,8 +668,7 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
     useEffect(() => load(), [load]);
     const selectedEngineInfo = settings?.engines.find((engine) => engine.name === selectedEngine) ?? null;
     const engineOptions = (settings?.engines ?? [])
-        .filter((engine) => engine.name === selectedEngine ||
-        (engine.name !== "ai-sdk:anthropic" && engine.name !== "ai-sdk:ollama"))
+        .filter((engine) => engine.name === selectedEngine || engine.name !== "ai-sdk:anthropic")
         .map((engine) => ({
         value: engine.name,
         label: engine.name === "builder"

package/dist/client/settings/index.d.ts

@@ -8,3 +8,5 @@ export { SettingsGroup, SettingsRow, type SettingsGroupProps, type SettingsRowPr
 export { SettingsSection, SettingsSurfaceProvider, useSettingsSurface, type SettingsSurface, } from "./SettingsSection.js";
 export { SettingsLoadingRow, SettingsSkeleton, type SettingsLoadingRowProps, type SettingsSkeletonProps, } from "./SettingsSkeleton.js";
 export { normalizeSettingsSection, settingsSectionDomId, useSettingsPanelController, type SettingsPanelController, type SettingsPanelControllerOptions, } from "./useSettingsPanelController.js";
+export { AGENT_PROVIDER_CATALOG, getAgentProviderOption, providerIdForEngine, type AgentProviderId, type AgentProviderOption, } from "../agent-provider-catalog.js";
+export { AgentProviderPicker, AgentProviderSetupForm, type AgentProviderPickerProps, type AgentProviderSetupFormProps, } from "./ProviderSetupForm.js";

package/dist/client/settings/index.js

@@ -8,3 +8,5 @@ export { SettingsGroup, SettingsRow, } from "./SettingsRow.js";
 export { SettingsSection, SettingsSurfaceProvider, useSettingsSurface, } from "./SettingsSection.js";
 export { SettingsLoadingRow, SettingsSkeleton, } from "./SettingsSkeleton.js";
 export { normalizeSettingsSection, settingsSectionDomId, useSettingsPanelController, } from "./useSettingsPanelController.js";
+export { AGENT_PROVIDER_CATALOG, getAgentProviderOption, providerIdForEngine, } from "../agent-provider-catalog.js";
+export { AgentProviderPicker, AgentProviderSetupForm, } from "./ProviderSetupForm.js";

package/dist/coding-tools/run-code.d.ts

@@ -30,6 +30,7 @@
  */
 import type { ActionRunContext } from "../action.js";
 import type { ActionEntry } from "../agent/production-agent.js";
+export type SandboxCodeMode = "run-code" | "tool-orchestration";
 export interface RunCodeOptions {
     /**
      * Extra tool names (beyond the default set) that the sandbox bridge will
@@ -54,6 +55,10 @@ export interface ExecuteSandboxCodeOptions {
     getActions: () => Record<string, ActionEntry>;
     /** Extra bridge tool names beyond the defaults. */
     extraBridgeTools?: Set<string>;
+    /** Host policy and helper surface to use inside the sandbox. */
+    mode?: SandboxCodeMode;
+    /** Maximum number of bridged child-tool calls for orchestration mode. */
+    maxToolCalls?: number;
     /** Request context (owner/org) applied to bridged tool calls. */
     context?: ActionRunContext;
 }

package/dist/coding-tools/run-code.js

@@ -37,6 +37,9 @@ const DEFAULT_TIMEOUT_MS = 120_000;
 const MAX_TIMEOUT_MS = 600_000;
 const DEFAULT_MAX_OUTPUT_CHARS = 50_000;
 const MAX_OUTPUT_CHARS = 200_000;
+const TOOL_ORCHESTRATION_DEFAULT_MAX_CALLS = 32;
+const TOOL_ORCHESTRATION_MAX_CALLS = 128;
+const TOOL_ORCHESTRATION_MAX_PROVIDER_PAGES = 20;
 /** Hard cap on bridge request bodies so sandboxed code can't exhaust parent memory. */
 const BRIDGE_MAX_BODY_BYTES = 10 * 1024 * 1024;
 /** Tools callable via the sandbox bridge by default. */
@@ -203,8 +206,9 @@ export function createRunCodeEntry(getActions, opts = {}) {
 export async function executeSandboxCode(options) {
     const actions = options.getActions();
     const bridgeToken = crypto.randomBytes(32).toString("hex");
+    const mode = options.mode ?? "run-code";
     // Start bridge server — resolves once the server is listening.
-    const { bridgePort, getUsedTools, cleanup: cleanupBridge, } = await startBridgeServer(bridgeToken, actions, options.context, DEFAULT_BRIDGE_TOOLS, options.extraBridgeTools ?? new Set());
+    const { bridgePort, getUsedTools, cleanup: cleanupBridge, } = await startBridgeServer(bridgeToken, actions, options.context, DEFAULT_BRIDGE_TOOLS, options.extraBridgeTools ?? new Set(), mode, options.maxToolCalls);
     try {
         // Build scrubbed env — only safe POSIX vars, no secrets. The adapter
         // points TMPDIR/TEMP/TMP at the sandbox's own temp dir.
@@ -228,7 +232,7 @@ export async function executeSandboxCode(options) {
         // bridge, env scrub, module, and output formatting stay in the parent
         // regardless of adapter.
         const { stdout, stderr, exitCode, timedOut } = await resolveExecutionSandboxAdapter().run({
-            moduleSource: buildSandboxModule(options.code, bridgePort, bridgeToken),
+            moduleSource: buildSandboxModule(options.code, bridgePort, bridgeToken, mode),
             env: safeEnv,
             timeoutMs: options.timeoutMs,
             bridgePort,
@@ -457,8 +461,14 @@ export function createGetCodeExecutionEntry() {
         },
     };
 }
-async function startBridgeServer(token, actions, context, defaultTools, extraTools) {
+async function startBridgeServer(token, actions, context, defaultTools, extraTools, mode, maxToolCalls) {
     const usedTools = new Set();
+    const callBudget = mode === "tool-orchestration"
+        ? {
+            count: 0,
+            max: normalizeToolCallBudget(maxToolCalls),
+        }
+        : undefined;
     const server = http.createServer((req, res) => {
         if (req.method !== "POST" || req.url !== "/tool") {
             res.writeHead(404);
@@ -489,7 +499,7 @@ async function startBridgeServer(token, actions, context, defaultTools, extraToo
         req.on("end", () => {
             if (rejected)
                 return;
-            handleBridgeRequest(body, actions, context, defaultTools, extraTools, usedTools, res);
+            handleBridgeRequest(body, actions, context, defaultTools, extraTools, usedTools, mode, callBudget, res);
         });
         req.on("error", () => {
             res.writeHead(500);
@@ -515,7 +525,7 @@ async function startBridgeServer(token, actions, context, defaultTools, extraToo
         cleanup,
     };
 }
-function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools, usedTools, res) {
+function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools, usedTools, mode, callBudget, res) {
     let parsed;
     try {
         parsed = JSON.parse(rawBody);
@@ -546,7 +556,27 @@ function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools
     const isReadOnlyAction = entry.readOnly === true &&
         entry.agentTool !== false &&
         entry.toolCallable !== false;
-    if (!defaultTools.has(toolName) &&
+    const toolArgs = parsed.args ?? {};
+    const childArgs = mode === "tool-orchestration"
+        ? boundToolOrchestrationArgs(toolName, toolArgs)
+        : toolArgs;
+    if (mode === "tool-orchestration") {
+        if (callBudget && callBudget.count >= callBudget.max) {
+            res.writeHead(429, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+                error: `Tool-orchestration child-call budget exceeded (${callBudget.max}). Aggregate the current results or increase maxToolCalls within its limit.`,
+            }));
+            return;
+        }
+        if (!isAllowedToolOrchestrationCall(toolName, childArgs, entry)) {
+            res.writeHead(403, { "Content-Type": "application/json" });
+            res.end(JSON.stringify({
+                error: `Tool "${toolName}" is not permitted by tool-orchestration. Only read-only tools and GET/HEAD provider or web reads without staging or saving files are allowed; call mutating tools directly.`,
+            }));
+            return;
+        }
+    }
+    else if (!defaultTools.has(toolName) &&
         !extraTools.has(toolName) &&
         !isReadOnlyAction) {
         // A registered, agent-exposed action that isn't read-only is a mutation.
@@ -563,12 +593,13 @@ function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools
         }));
         return;
     }
-    const toolArgs = parsed.args ?? {};
+    if (callBudget)
+        callBudget.count += 1;
     usedTools.add(toolName);
     // Run the tool with the parent request context so auth/org/owner resolution
     // works exactly as it does in the normal agent loop.
     entry
-        .run(toolArgs, context)
+        .run(childArgs, context)
         .then((result) => {
         const body = typeof result === "string" ? result : JSON.stringify(result, null, 2);
         res.writeHead(200, { "Content-Type": "application/json" });
@@ -580,6 +611,105 @@ function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools
         res.end(JSON.stringify({ error: message }));
     });
 }
+function normalizeToolCallBudget(value) {
+    if (!Number.isFinite(value) || !value || value <= 0) {
+        return TOOL_ORCHESTRATION_DEFAULT_MAX_CALLS;
+    }
+    return Math.min(Math.floor(value), TOOL_ORCHESTRATION_MAX_CALLS);
+}
+function isAllowedToolOrchestrationCall(toolName, args, entry) {
+    if (toolName === "workspace-files") {
+        // This is an internal bridge action by design, so agentTool/toolCallable
+        // are intentionally not required here. Its operation enum is the policy
+        // boundary for the read-only workspace surface.
+        return isCallableWithoutApproval(entry) && isReadOnlyWorkspaceRequest(args);
+    }
+    if (toolName === "provider-api-request") {
+        return isReadOnlyProviderApiRequest(args, entry);
+    }
+    return isReadOnlyOrchestrationAction(args, entry);
+}
+function isCallableWithoutApproval(entry) {
+    // The bridge calls ActionEntry.run directly for child reads. A predicate
+    // approval gate must therefore fail closed rather than being silently
+    // bypassed by this bounded path.
+    return entry.needsApproval === undefined || entry.needsApproval === false;
+}
+function isReadOnlyWorkspaceRequest(args) {
+    const action = typeof args.action === "string" ? args.action : "";
+    return action === "read" || action === "list" || action === "grep";
+}
+function isReadOnlyProviderApiRequest(args, entry) {
+    if (!entry.tool ||
+        !isCallableWithoutApproval(entry) ||
+        entry.agentTool === false ||
+        entry.allowInPlanMode === false) {
+        return false;
+    }
+    const method = String(args.method ?? "GET").toUpperCase();
+    return ((method === "GET" || method === "HEAD") &&
+        args.stageAs == null &&
+        args.saveToFile == null);
+}
+function isReadOnlyOrchestrationAction(args, entry) {
+    if (!entry.tool ||
+        !isCallableWithoutApproval(entry) ||
+        entry.agentTool === false ||
+        entry.toolCallable === false ||
+        entry.allowInPlanMode === false) {
+        return false;
+    }
+    const planMode = entry.planMode;
+    if (!planMode)
+        return entry.readOnly === true;
+    const input = args;
+    if (planMode.allowedProperties &&
+        Object.keys(args).some((key) => !planMode.allowedProperties.includes(key))) {
+        return false;
+    }
+    if (planMode.omittedProperties?.some((key) => Object.prototype.hasOwnProperty.call(args, key))) {
+        return false;
+    }
+    if (Object.entries(planMode.allowedValues ?? {}).some(([key, allowed]) => {
+        const value = args[key];
+        return (value !== null &&
+            value !== undefined &&
+            (typeof value !== "string" || !allowed.includes(value)));
+    })) {
+        return false;
+    }
+    try {
+        const effect = typeof planMode.effect === "function"
+            ? planMode.effect(input)
+            : planMode.effect;
+        return effect === "read";
+    }
+    catch (error) {
+        console.warn("[run-code] tool-orchestration read-only policy classifier failed closed:", error instanceof Error ? error.message : String(error));
+        return false;
+    }
+}
+function boundToolOrchestrationArgs(toolName, args) {
+    if (toolName !== "provider-api-request")
+        return args;
+    const fetchAllPages = args.fetchAllPages;
+    if (!fetchAllPages ||
+        typeof fetchAllPages !== "object" ||
+        Array.isArray(fetchAllPages)) {
+        return args;
+    }
+    const requestedMaxPages = Number(fetchAllPages.maxPages);
+    const maxPages = Number.isInteger(requestedMaxPages) && requestedMaxPages > 0
+        ? Math.min(Math.floor(requestedMaxPages), TOOL_ORCHESTRATION_MAX_PROVIDER_PAGES)
+        : TOOL_ORCHESTRATION_MAX_PROVIDER_PAGES;
+    return {
+        ...args,
+        fetchAllPages: {
+            ...fetchAllPages,
+            maxPages,
+        },
+    };
+}
 // ---------------------------------------------------------------------------
 // Sandbox module template
 // ---------------------------------------------------------------------------
@@ -589,7 +719,61 @@ function handleBridgeRequest(rawBody, actions, context, defaultTools, extraTools
  *     `providerSearchAll`, and `webFetch` helpers via the bridge.
  *  2. Runs the user's code as top-level await in an async IIFE.
  */
-function buildSandboxModule(userCode, bridgePort, bridgeToken) {
+function buildSandboxModule(userCode, bridgePort, bridgeToken, mode = "run-code") {
+    const orchestrationHelpers = mode === "tool-orchestration"
+        ? `
+/**
+ * Search the live registry for read-only or conditionally read-only tools, then call one
+ * of the returned names with toolCall(). The parent host enforces the same
+ * policy again, so this is discovery guidance rather than an authorization
+ * boundary.
+ */
+async function toolSearch(query = "", options = {}) {
+  const rawResult = await _bridgeCall("tool-search", {
+    ...(query ? { query } : {}),
+    ...(options.limit !== undefined ? { limit: options.limit } : {}),
+    includeSchemas: true,
+    readOnlyOnly: true,
+  });
+  return _parseBridgeResult(rawResult);
+}
+
+async function toolCall(name, args = {}) {
+  return _parseBridgeResult(await _bridgeCall(name, args));
+}
+`
+        : "";
+    const workspaceMutationHelpers = mode === "run-code"
+        ? `
+/**
+ * Write (create or overwrite) a workspace file. Use \`scratch/...\` for
+ * temporary staging files.
+ * \`content\` must be a string. Returns metadata
+ * { resourceId, path, contentType, sizeBytes, updatedAt }.
+ */
+async function workspaceWrite(path, content, contentType = "text/plain") {
+  const rawResult = await _bridgeCall("workspace-files", {
+    action: "write",
+    path,
+    content: typeof content === "string" ? content : JSON.stringify(content),
+    contentType,
+  });
+  try { return typeof rawResult === "string" ? JSON.parse(rawResult) : rawResult; } catch { return rawResult; }
+}
+
+/**
+ * Append text to a workspace file (creates if absent).
+ */
+async function workspaceAppend(path, content) {
+  const rawResult = await _bridgeCall("workspace-files", {
+    action: "append",
+    path,
+    content: typeof content === "string" ? content : JSON.stringify(content),
+  });
+  try { return typeof rawResult === "string" ? JSON.parse(rawResult) : rawResult; } catch { return rawResult; }
+}
+`
+        : "";
     return `
 import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
@@ -646,6 +830,8 @@ async function appAction(name, args = {}) {
   return _parseBridgeResult(await _bridgeCall(name, args));
 }
 
+${orchestrationHelpers}
+
 async function providerRequest(provider, apiPath, init = {}) {
   const method = (init.method || "GET").toUpperCase();
   const rawResult = await _bridgeCall("provider-api-request", {
@@ -1388,33 +1574,7 @@ async function workspaceReadMeta(path, opts = {}) {
   return _parseBridgeResult(rawResult);
 }
 
-/**
- * Write (create or overwrite) a workspace file. Use \`scratch/...\` for
- * temporary staging files.
- * \`content\` must be a string. Returns metadata
- * { resourceId, path, contentType, sizeBytes, updatedAt }.
- */
-async function workspaceWrite(path, content, contentType = "text/plain") {
-  const rawResult = await _bridgeCall("workspace-files", {
-    action: "write",
-    path,
-    content: typeof content === "string" ? content : JSON.stringify(content),
-    contentType,
-  });
-  try { return typeof rawResult === "string" ? JSON.parse(rawResult) : rawResult; } catch { return rawResult; }
-}
-
-/**
- * Append text to a workspace file (creates if absent).
- */
-async function workspaceAppend(path, content) {
-  const rawResult = await _bridgeCall("workspace-files", {
-    action: "append",
-    path,
-    content: typeof content === "string" ? content : JSON.stringify(content),
-  });
-  try { return typeof rawResult === "string" ? JSON.parse(rawResult) : rawResult; } catch { return rawResult; }
-}
+${workspaceMutationHelpers}
 
 /**
  * List workspace files, optionally filtered by path prefix.

package/dist/coding-tools/tool-orchestration.d.ts

@@ -0,0 +1,10 @@
+import type { ActionEntry } from "../agent/production-agent.js";
+/**
+ * Create the bounded read-only orchestration tool.
+ *
+ * This deliberately has a separate registry entry from run-code. The latter
+ * retains its existing workspace staging and background-execution contract;
+ * this entry is for short fan-out, reduction, and aggregation over tools that
+ * the host can prove are read-only for the supplied arguments.
+ */
+export declare function createToolOrchestrationEntry(getActions: () => Record<string, ActionEntry>): ActionEntry;