@agent-native/core 0.185.0 → 0.186.0-nightly-20260923163746

package/dist/client/settings/ProviderSetupForm.js

@@ -1,7 +1,7 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { IconBolt, IconCheck, IconChevronDown, IconDeviceDesktop, IconExternalLink, IconKey, IconLoader2, IconRoute, IconServer2, } from "@tabler/icons-react";
+import { IconBolt, IconCheck, IconChevronDown, IconDeviceDesktop, IconExternalLink, IconKey, IconLoader2, IconRoute, IconSearch, IconServer2, } from "@tabler/icons-react";
 import { useEffect, useState } from "react";
-import { deleteAgentEnginePersonalProviderSettings, getAgentEngineProviderKeyStatus, saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
+import { deleteAgentEnginePersonalProviderSettings, fetchOllamaModels, getAgentEngineProviderKeyStatus, saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
 import { getAgentProviderOption, } from "../agent-provider-catalog.js";
 import { useT } from "../i18n.js";
 import { cn } from "../utils.js";
@@ -14,13 +14,16 @@ export function AgentProviderSetupForm({ initialProvider = "anthropic", configur
     const [apiKey, setApiKey] = useState("");
     const [model, setModel] = useState("");
     const [endpoint, setEndpoint] = useState("");
-    const [endpointOpen, setEndpointOpen] = useState(initialProvider === "ollama");
+    const [endpointOpen, setEndpointOpen] = useState(false);
     const [saving, setSaving] = useState(false);
     const [removingPersonalKey, setRemovingPersonalKey] = useState(false);
     const [saved, setSaved] = useState(false);
     const [error, setError] = useState(null);
     const [providerKeyStatus, setProviderKeyStatus] = useState(null);
     const [statusError, setStatusError] = useState(false);
+    const [ollamaModels, setOllamaModels] = useState(null);
+    const [ollamaModelsError, setOllamaModelsError] = useState(null);
+    const [ollamaModelsLoading, setOllamaModelsLoading] = useState(false);
     const active = getAgentProviderOption(provider);
     const refreshProviderKeyStatus = async () => {
         if (!active.key) {
@@ -66,10 +69,54 @@ export function AgentProviderSetupForm({ initialProvider = "anthropic", configur
         setModel(active.defaultModel);
         setApiKey("");
         setEndpoint("");
-        setEndpointOpen(provider === "ollama");
+        setEndpointOpen(false);
         setError(null);
         setSaved(false);
+        setOllamaModels(null);
+        setOllamaModelsError(null);
     }, [active.defaultModel, provider]);
+    // Ask the Ollama server itself which models it has pulled, instead of only
+    // offering the static suggestion list. Triggered explicitly by the "Find
+    // models" button rather than on every keystroke, so the request always
+    // uses the address the user actually meant to check.
+    const handleFindOllamaModels = () => {
+        setOllamaModelsLoading(true);
+        setOllamaModelsError(null);
+        const typedEndpoint = endpoint.trim();
+        void fetchOllamaModels(typedEndpoint || undefined)
+            .then(async (models) => {
+            setOllamaModels(models);
+            setOllamaModelsError(null);
+            // A successful check is the only signal this address actually works.
+            // Persist it as soon as it's confirmed — other surfaces that read
+            // the saved Ollama endpoint (like the chat composer's model picker)
+            // have no address field of their own, so without this they keep
+            // falling back to the http://localhost:11434 default until the main
+            // "Use Ollama" button below is also clicked.
+            if (typedEndpoint && active.endpointKey) {
+                try {
+                    await saveAgentEngineProviderSettings({
+                        provider,
+                        key: active.endpointKey,
+                        baseUrl: typedEndpoint,
+                    });
+                    void refreshProviderKeyStatus();
+                }
+                catch {
+                    // coercion-ok: the connectivity check itself still succeeded and
+                    // the found models are shown; the address just wasn't persisted
+                    // (e.g. a dropped session). The main submit button below retries
+                    // the save, so this is never reported to the user as a clean
+                    // success — it's a silent retry opportunity, not a lost error.
+                }
+            }
+        })
+            .catch((err) => {
+            setOllamaModels(null);
+            setOllamaModelsError(err instanceof Error ? err.message : String(err));
+        })
+            .finally(() => setOllamaModelsLoading(false));
+    };
     const handleProviderChange = (nextProvider) => {
         setProvider(nextProvider);
     };
@@ -142,6 +189,7 @@ export function AgentProviderSetupForm({ initialProvider = "anthropic", configur
     // newly released provider models usable before the catalog is refreshed.
     const modelInputVisible = Boolean(active.key) || active.supportsCustomModel;
     const endpointVisible = active.supportsEndpoint;
+    const isOllama = provider === "ollama";
     return (_jsxs("form", { className: cn("space-y-3", className), onSubmit: (event) => {
             event.preventDefault();
             void handleSave();
@@ -159,9 +207,34 @@ export function AgentProviderSetupForm({ initialProvider = "anthropic", configur
                                         setError(null);
                                 }, className: cn("w-full rounded-md border border-input bg-background text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-ring focus:ring-offset-1 focus:ring-offset-background placeholder:text-muted-foreground/50", isPage ? "h-10 px-3 text-sm" : "h-8 px-2.5 text-[12px]") })] })) : (_jsxs("div", { className: "flex items-start gap-2 rounded-md border border-border/70 bg-background/60 px-2.5 py-2", children: [_jsx(IconServer2, { size: isPage ? 15 : 13, className: "mt-0.5 shrink-0 text-muted-foreground" }), _jsx("p", { className: "text-[11px] leading-relaxed text-muted-foreground", children: t("agentPanel.noApiKeyNeeded", {
                                     defaultValue: "No API key required.",
-                                }) })] })), modelInputVisible ? (_jsxs("label", { className: "block space-y-1.5", children: [_jsx("span", { className: cn("font-medium text-foreground", isPage ? "text-xs" : "text-[11px]"), children: t("agentPanel.modelId", { defaultValue: "Model ID" }) }), _jsx("input", { type: "text", value: model, list: `agent-provider-models-${provider}`, disabled: saving, spellCheck: false, autoComplete: "off", placeholder: active.defaultModel, onChange: (event) => setModel(event.target.value), className: cn("w-full rounded-md border border-input bg-background text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-ring focus:ring-offset-1 focus:ring-offset-background placeholder:text-muted-foreground/50", isPage ? "h-10 px-3 text-sm" : "h-8 px-2.5 text-[12px]") }), _jsx("datalist", { id: `agent-provider-models-${provider}`, children: active.supportedModels.map((modelOption) => (_jsx("option", { value: modelOption }, modelOption))) })] })) : null, endpointVisible ? (_jsxs("div", { className: "border-t border-border/70 pt-2", children: [_jsxs("button", { type: "button", onClick: () => setEndpointOpen((open) => !open), className: "flex w-full items-center justify-between gap-2 text-start text-[11px] font-medium text-foreground", "aria-expanded": endpointOpen, title: provider === "ollama"
-                                    ? "Defaults to Ollama at http://localhost:11434."
-                                    : "Use for LiteLLM or another OpenAI-compatible gateway.", children: [_jsxs("span", { className: "inline-flex items-center gap-1.5", children: [_jsx(IconChevronDown, { size: 13, className: cn("text-muted-foreground transition-transform", !endpointOpen && "-rotate-90") }), t("agentPanel.endpointUrl", {
+                                }) })] })), isOllama && endpointVisible ? (_jsxs("div", { className: "space-y-1.5", children: [_jsx("span", { className: cn("font-medium text-foreground", isPage ? "text-xs" : "text-[11px]"), children: t("agentPanel.endpointUrl", { defaultValue: "Endpoint URL" }) }), _jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx("input", { type: "url", value: endpoint, disabled: saving, spellCheck: false, autoComplete: "off", placeholder: active.endpointPlaceholder, onChange: (event) => {
+                                            setEndpoint(event.target.value);
+                                            setOllamaModels(null);
+                                            setOllamaModelsError(null);
+                                        }, className: cn("min-w-0 flex-1 rounded-md border border-input bg-background text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-ring focus:ring-offset-1 focus:ring-offset-background placeholder:text-muted-foreground/50", isPage ? "h-10 px-3 text-sm" : "h-8 px-2.5 text-[12px]") }), _jsxs("button", { type: "button", disabled: saving || ollamaModelsLoading, onClick: handleFindOllamaModels, className: cn("inline-flex shrink-0 items-center gap-1.5 rounded-md border border-input bg-background font-medium text-foreground transition-colors hover:bg-accent/40 disabled:cursor-not-allowed disabled:opacity-50", isPage ? "h-10 px-3 text-xs" : "h-8 px-2.5 text-[11px]"), children: [ollamaModelsLoading ? (_jsx(IconLoader2, { size: 13, className: "animate-spin" })) : (_jsx(IconSearch, { size: 13 })), t("agentPanel.findModels", { defaultValue: "Find models" })] })] })] })) : null, modelInputVisible ? (_jsxs("label", { className: "block space-y-1.5", children: [_jsx("span", { className: cn("font-medium text-foreground", isPage ? "text-xs" : "text-[11px]"), children: t("agentPanel.modelId", { defaultValue: "Model ID" }) }), _jsx("input", { type: "text", value: model, list: isOllama ? undefined : `agent-provider-models-${provider}`, disabled: saving, spellCheck: false, autoComplete: "off", placeholder: active.defaultModel, onChange: (event) => setModel(event.target.value), className: cn("w-full rounded-md border border-input bg-background text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-ring focus:ring-offset-1 focus:ring-offset-background placeholder:text-muted-foreground/50", isPage ? "h-10 px-3 text-sm" : "h-8 px-2.5 text-[12px]") }), isOllama ? null : (_jsx("datalist", { id: `agent-provider-models-${provider}`, children: active.supportedModels.map((modelOption) => (_jsx("option", { value: modelOption }, modelOption))) })), isOllama ? (_jsxs("div", { className: "space-y-1.5", children: [ollamaModels && ollamaModels.length > 0 ? (_jsx("div", { className: "flex flex-wrap gap-1.5", children: ollamaModels.map((modelOption) => (_jsx("button", { type: "button", disabled: saving, onClick: () => setModel(modelOption), "aria-pressed": model === modelOption, className: cn("rounded-md border px-2 py-1 text-[11px] font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50", model === modelOption
+                                                ? "border-primary bg-primary/10 text-primary"
+                                                : "border-border bg-background text-foreground hover:bg-accent/40"), children: modelOption }, modelOption))) })) : null, _jsx("p", { className: "text-[10px] leading-relaxed text-muted-foreground", children: ollamaModelsLoading
+                                            ? t("agentPanel.ollamaModelsChecking", {
+                                                defaultValue: "Checking installed models…",
+                                            })
+                                            : ollamaModels && ollamaModels.length > 0
+                                                ? t("agentPanel.ollamaModelsFound", {
+                                                    count: ollamaModels.length,
+                                                })
+                                                : ollamaModels
+                                                    ? t("agentPanel.ollamaModelsNone", {
+                                                        defaultValue: "Connected, but no models are pulled yet — run `ollama pull llama3.1`.",
+                                                    })
+                                                    : ollamaModelsError
+                                                        ? t("agentPanel.ollamaModelsError", {
+                                                            error: ollamaModelsError,
+                                                            defaultValue: `${ollamaModelsError} Showing example model names below.`,
+                                                        })
+                                                        : t("agentPanel.ollamaModelsPrompt", {
+                                                            defaultValue: 'Click "Find models" above to list what your Ollama server actually has installed.',
+                                                        }) })] })) : null] })) : null, !isOllama && endpointVisible ? (_jsxs("div", { className: "border-t border-border/70 pt-2", children: [_jsxs("button", { type: "button", onClick: () => setEndpointOpen((open) => !open), className: "flex w-full items-center justify-between gap-2 text-start text-[11px] font-medium text-foreground", "aria-expanded": endpointOpen, title: t("agentPanel.compatibleEndpointHint", {
+                                    defaultValue: "Use this for LiteLLM or another OpenAI-compatible gateway.",
+                                }), children: [_jsxs("span", { className: "inline-flex items-center gap-1.5", children: [_jsx(IconChevronDown, { size: 13, className: cn("text-muted-foreground transition-transform", !endpointOpen && "-rotate-90") }), t("agentPanel.endpointUrl", {
                                                 defaultValue: "Endpoint URL",
                                             })] }), _jsx("span", { className: "text-[10px] font-normal text-muted-foreground", children: t("agentPanel.optional", { defaultValue: "Optional" }) })] }), endpointOpen ? (_jsx("div", { className: "mt-2 space-y-1.5", children: _jsx("input", { type: "url", value: endpoint, disabled: saving, spellCheck: false, autoComplete: "off", placeholder: active.endpointPlaceholder, onChange: (event) => setEndpoint(event.target.value), className: cn("w-full rounded-md border border-input bg-background text-foreground outline-none transition-colors hover:bg-accent/40 focus:ring-1 focus:ring-ring focus:ring-offset-1 focus:ring-offset-background placeholder:text-muted-foreground/50", isPage ? "h-10 px-3 text-sm" : "h-8 px-2.5 text-[12px]") }) })) : null] })) : null, _jsxs("div", { className: "flex flex-wrap items-center gap-2 pt-0.5", children: [_jsx("button", { type: "submit", disabled: saving || Boolean(active.key && !apiKey.trim()), className: cn("inline-flex items-center justify-center gap-1.5 rounded-md bg-foreground font-medium text-background transition-opacity hover:opacity-90 disabled:cursor-not-allowed disabled:opacity-50", isPage ? "h-9 px-3 text-xs" : "h-8 px-3 text-[11px]"), children: saving ? (_jsxs(_Fragment, { children: [_jsx(IconLoader2, { size: isPage ? 14 : 11, className: "animate-spin" }), t("agentPanel.savingProvider", {
                                             defaultValue: "Saving...",

package/dist/client/settings/SettingsPanel.js

@@ -2,13 +2,13 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
 import { Checkbox, Picker, Skeleton, TextField, } from "@agent-native/toolkit/design-system";
 import { Button as ToolkitButton } from "@agent-native/toolkit/ui/button";
 import { Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, CommandSeparator, } from "@agent-native/toolkit/ui/command";
-import { IconChevronDown, IconChevronRight, IconCheck, IconExternalLink, IconBrain, IconHierarchy2, IconBrowser, IconGitBranch, IconCloud, IconDatabase, IconFolder, IconShield, IconPlugConnected, IconTopologyRing2, IconLoader2, IconUpload, IconCoin, IconMail, IconKey, IconMicrophone, IconEyeOff, IconBolt, IconGauge, IconApps, IconUsersGroup, IconTool, IconAlertCircle, } from "@tabler/icons-react";
+import { IconChevronDown, IconChevronRight, IconCheck, IconExternalLink, IconBrain, IconHierarchy2, IconBrowser, IconGitBranch, IconCloud, IconDatabase, IconFolder, IconShield, IconPlugConnected, IconTopologyRing2, IconLoader2, IconUpload, IconCoin, IconMail, IconKey, IconMicrophone, IconEyeOff, IconBolt, IconGauge, IconApps, IconUsersGroup, IconTool, IconAlertCircle, IconSearch, } from "@tabler/icons-react";
 import React, { Suspense, lazy, useState, useEffect, useCallback, useMemo, useRef, } from "react";
 import { CHATGPT_SUBSCRIPTION_DEFAULT_MODEL, CHATGPT_SUBSCRIPTION_ENGINE_NAME, CHATGPT_SUBSCRIPTION_LAB_KEY, } from "../../agent/chatgpt-subscription-contract.js";
 import { PROVIDER_ENV_PLACEHOLDERS } from "../../agent/engine/provider-env-vars.js";
 import { buildSettingsRoute, STANDARD_APP_ROUTES, } from "../../navigation/index.js";
 import { docsUrl } from "../../shared/docs-url.js";
-import { saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
+import { fetchOllamaModels, saveAgentEngineProviderSettings, setAgentEngineProvider, } from "../agent-engine-key.js";
 import { AgentWorkspaceContent } from "../agent-page/AgentWorkspaceContent.js";
 import { AGENT_PROVIDER_CATALOG, getAgentProviderOption, providerIdForEngine, } from "../agent-provider-catalog.js";
 import { agentNativePath, appMountedPath } from "../api-path.js";
@@ -393,6 +393,9 @@ function LLMSectionInner({ builderFlow, builderLoading, builderStatusAvailable,
     const [engineCatalogAvailable, setEngineCatalogAvailable] = useState(false);
     const [statusProbeAvailable, setStatusProbeAvailable] = useState(false);
     const probeGenerationRef = useRef({ env: 0, status: 0 });
+    const [ollamaModels, setOllamaModels] = useState(null);
+    const [ollamaModelsError, setOllamaModelsError] = useState(null);
+    const [ollamaModelsLoading, setOllamaModelsLoading] = useState(false);
     const initialLoading = !enginesLoaded || !!builderLoading;
     const refreshEnvKeys = useCallback(() => {
         const generation = ++probeGenerationRef.current.env;
@@ -576,8 +579,47 @@ function LLMSectionInner({ builderFlow, builderLoading, builderStatusAvailable,
     const manualSetupHint = "Select a provider.";
     const engineChanged = selectedEngine !== currentEngine || selectedModel !== currentModel;
     const isEndpointProvider = selectedProviderOption.supportsEndpoint === true;
+    const isOllama = selectedProvider === "ollama";
     const endpointChanged = isEndpointProvider && (!!baseUrl.trim() || clearBaseUrl);
     const providerSettingsChanged = !!apiKey.trim() || endpointChanged;
+    // Ask the Ollama server itself which models it has pulled, instead of only
+    // offering the static suggestion list. Triggered explicitly by the "Find
+    // models" button, mirroring the same flow in `AgentProviderSetupForm`.
+    const handleFindOllamaModels = () => {
+        setOllamaModelsLoading(true);
+        setOllamaModelsError(null);
+        const typedEndpoint = baseUrl.trim();
+        void fetchOllamaModels(typedEndpoint || undefined)
+            .then(async (models) => {
+            setOllamaModels(models);
+            setOllamaModelsError(null);
+            // A successful check is the only signal this address actually works;
+            // persist it immediately so other surfaces reading the saved Ollama
+            // endpoint (the chat composer's model picker) don't keep falling back
+            // to the localhost default until "Save" is also clicked.
+            if (typedEndpoint) {
+                try {
+                    await saveAgentEngineProviderSettings({
+                        provider: selectedProvider,
+                        ...(envVar ? { key: envVar } : {}),
+                        baseUrl: typedEndpoint,
+                    });
+                    setBaseUrlConfigured(true);
+                }
+                catch {
+                    // coercion-ok: the connectivity check itself still succeeded and
+                    // the found models are shown; the address just wasn't persisted
+                    // (e.g. a dropped session). The "Save endpoint" button below
+                    // retries it, so this is never reported as a clean success.
+                }
+            }
+        })
+            .catch((err) => {
+            setOllamaModels(null);
+            setOllamaModelsError(err instanceof Error ? err.message : String(err));
+        })
+            .finally(() => setOllamaModelsLoading(false));
+    };
     const modelOptions = (selectedEngineInfo?.supportedModels ?? []).map((m) => ({ value: m, label: friendlyModelName(m) }));
     const handleSave = async () => {
         if (!providerSettingsChanged || (!envVar && !isEndpointProvider))
@@ -735,7 +777,33 @@ function LLMSectionInner({ builderFlow, builderLoading, builderStatusAvailable,
                                                     setApplyError(null);
                                                     setApplyNote(false);
                                                     setTestResult(null);
-                                                } }), _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) => {
+                                                    setOllamaModels(null);
+                                                    setOllamaModelsError(null);
+                                                } }), isOllama && isEndpointProvider ? (_jsxs("div", { className: "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" })] }), _jsxs("div", { className: "flex items-center gap-1.5", children: [_jsx("input", { type: "url", value: baseUrl, onChange: (e) => {
+                                                                    const baseUrl = e.target.value;
+                                                                    setSelectionState((previous) => ({
+                                                                        ...previous,
+                                                                        baseUrl,
+                                                                        clearBaseUrl: baseUrl.trim()
+                                                                            ? false
+                                                                            : previous.clearBaseUrl,
+                                                                    }));
+                                                                    setOllamaModels(null);
+                                                                    setOllamaModelsError(null);
+                                                                }, onKeyDown: (e) => {
+                                                                    if (e.key === "Enter")
+                                                                        void handleSave();
+                                                                }, placeholder: baseUrlConfigured
+                                                                    ? "Leave blank to keep current endpoint"
+                                                                    : "http://localhost:11434 or local network address like http://192.168.1.123:11434", disabled: clearBaseUrl, spellCheck: false, autoComplete: "off", className: "flex h-9 min-w-0 flex-1 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 }), _jsxs(Button, { type: "button", intent: "neutral", emphasis: "outline", disabled: saving || ollamaModelsLoading || clearBaseUrl, onClick: handleFindOllamaModels, className: "inline-flex h-9 shrink-0 items-center gap-1.5 rounded-md border border-border bg-background px-2.5 text-[11px] font-medium text-foreground hover:bg-accent/40 disabled:cursor-not-allowed disabled:opacity-50", children: [ollamaModelsLoading ? (_jsx(IconLoader2, { size: 12, className: "animate-spin" })) : (_jsx(IconSearch, { size: 12 })), "Find models"] })] }), baseUrlConfigured && (_jsxs("label", { className: "flex items-center gap-1.5 text-[10px] text-muted-foreground", children: [_jsx(Checkbox, { checked: clearBaseUrl, onChange: (checked) => {
+                                                                    setSelectionState((previous) => ({
+                                                                        ...previous,
+                                                                        clearBaseUrl: checked,
+                                                                        baseUrl: checked ? "" : previous.baseUrl,
+                                                                    }));
+                                                                }, "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") }))] })) : null, _jsxs("div", { className: "space-y-1.5", children: [_jsx("p", { className: fieldLabelClass(isPage), children: "Model" }), _jsx("input", { type: "text", list: isOllama
+                                                            ? undefined
+                                                            : `model-suggestions-${selectedEngine}`, value: selectedModel, onChange: (e) => {
                                                             const model = e.target.value;
                                                             setSelectionState((previous) => ({
                                                                 ...previous,
@@ -744,9 +812,25 @@ function LLMSectionInner({ builderFlow, builderLoading, builderStatusAvailable,
                                                             setApplyError(null);
                                                             setApplyNote(false);
                                                             setTestResult(null);
-                                                        }, 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) => {
+                                                        }, placeholder: selectedEngineInfo?.defaultModel ?? "e.g. model-id", spellCheck: false, autoComplete: "off", className: textInputClass(isPage), style: isPage ? CONTROL_STYLE_PAGE : CONTROL_STYLE }), !isOllama && modelOptions.length > 0 && (_jsx("datalist", { id: `model-suggestions-${selectedEngine}`, children: modelOptions.map((opt) => (_jsx("option", { value: opt.value, label: opt.label }, opt.value))) })), isOllama ? (_jsxs("div", { className: "space-y-1.5", children: [ollamaModels && ollamaModels.length > 0 ? (_jsx("div", { className: "flex flex-wrap gap-1.5", children: ollamaModels.map((modelOption) => (_jsx(Button, { type: "button", disabled: saving, onClick: () => {
+                                                                        setSelectionState((previous) => ({
+                                                                            ...previous,
+                                                                            selectedModel: modelOption,
+                                                                        }));
+                                                                        setApplyError(null);
+                                                                        setApplyNote(false);
+                                                                        setTestResult(null);
+                                                                    }, "aria-pressed": selectedModel === modelOption, className: cn("rounded-md border px-2 py-1 text-[11px] font-medium transition-colors disabled:cursor-not-allowed disabled:opacity-50", selectedModel === modelOption
+                                                                        ? "border-primary bg-primary/10 text-primary"
+                                                                        : "border-border bg-background text-foreground hover:bg-accent/40"), children: modelOption }, modelOption))) })) : null, _jsx("p", { className: "text-[10px] leading-relaxed text-muted-foreground", children: ollamaModelsLoading
+                                                                    ? "Checking installed models…"
+                                                                    : ollamaModels && ollamaModels.length > 0
+                                                                        ? `Found ${ollamaModels.length} installed model${ollamaModels.length === 1 ? "" : "s"}.`
+                                                                        : ollamaModels
+                                                                            ? "Connected, but no models are pulled yet — run `ollama pull llama3.1`."
+                                                                            : ollamaModelsError
+                                                                                ? `${ollamaModelsError} Showing example model names below.`
+                                                                                : 'Click "Find models" above to list what your Ollama server actually has installed.' })] })) : null] }), !isOllama && 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: "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) => {
                                                                     const baseUrl = e.target.value;
                                                                     setSelectionState((previous) => ({
                                                                         ...previous,
@@ -760,9 +844,7 @@ function LLMSectionInner({ builderFlow, builderLoading, builderStatusAvailable,
                                                                         void handleSave();
                                                                 }, placeholder: baseUrlConfigured
                                                                     ? "Leave blank to keep current endpoint"
-                                                                    : 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) => {
+                                                                    : "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) => {
                                                                             setSelectionState((previous) => ({
                                                                                 ...previous,
                                                                                 clearBaseUrl: checked,
@@ -793,7 +875,34 @@ function friendlyAppName(appId) {
 }
 function AppDefaultModelPicker({ engines, value, disabled, onChange, }) {
     const [open, setOpen] = useState(false);
+    const [ollamaModels, setOllamaModels] = useState(null);
     const visibleEngines = engines.filter((engine) => engine.name !== "ai-sdk:anthropic");
+    // The static catalog only has the curated suggestion models for Ollama.
+    // Ask the configured Ollama server what it actually has installed and
+    // swap those in — a second, later render, so it never blocks this
+    // picker's first paint on a local network round trip. Gated on the
+    // popover actually being opened (a deliberate user action), not merely
+    // Ollama's presence in the catalog, which it always has by default —
+    // an unconditional probe would 502 for the vast majority of setups that
+    // never touched Ollama and never even open this picker.
+    useEffect(() => {
+        if (!open)
+            return;
+        if (!engines.some((engine) => engine.name === "ai-sdk:ollama"))
+            return;
+        let cancelled = false;
+        void fetchOllamaModels()
+            .then((models) => {
+            if (!cancelled && models.length > 0)
+                setOllamaModels(models);
+        })
+            .catch(() => {
+            // No local Ollama server reachable — keep the static suggestions.
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [open, engines]);
     const selectedModel = value.includes("::")
         ? value.slice(value.indexOf("::") + 2)
         : null;
@@ -817,7 +926,9 @@ function AppDefaultModelPicker({ engines, value, disabled, onChange, }) {
                                     const providerLabel = engine.name === "builder"
                                         ? "Builder.io"
                                         : engine.label || engine.name;
-                                    const modelIds = latestModelsOnly(engine.supportedModels);
+                                    const modelIds = engine.name === "ai-sdk:ollama" && ollamaModels?.length
+                                        ? ollamaModels
+                                        : latestModelsOnly(engine.supportedModels);
                                     const models = modelIds.length
                                         ? modelIds
                                         : engine.defaultModel
@@ -842,6 +953,7 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
     const [saving, setSaving] = useState(false);
     const [saved, setSaved] = useState(false);
     const [error, setError] = useState(null);
+    const [ollamaModels, setOllamaModels] = useState(null);
     const load = useCallback(() => {
         let cancelled = false;
         setLoading(true);
@@ -868,9 +980,35 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
         };
     }, []);
     useEffect(() => load(), [load]);
+    // The static catalog only has the curated suggestion models for Ollama.
+    // Ask the configured Ollama server what it actually has installed and
+    // swap those in — a second, later render, so it never blocks this
+    // section's first paint on a local network round trip. Gated on Ollama
+    // actually being the selected engine here (not merely present in the
+    // catalog, which it always is by default) — an unconditional probe would
+    // 502 for the vast majority of setups that never touched Ollama.
+    useEffect(() => {
+        if (selectedEngine !== "ai-sdk:ollama")
+            return;
+        let cancelled = false;
+        void fetchOllamaModels()
+            .then((models) => {
+            if (!cancelled && models.length > 0)
+                setOllamaModels(models);
+        })
+            .catch(() => {
+            // No local Ollama server reachable — keep the static suggestions.
+        });
+        return () => {
+            cancelled = true;
+        };
+    }, [selectedEngine]);
     if (!loading && !settings)
         return null;
     const selectedEngineInfo = settings?.engines.find((engine) => engine.name === selectedEngine) ?? null;
+    const selectedEngineModels = selectedEngine === "ai-sdk:ollama" && ollamaModels?.length
+        ? ollamaModels
+        : (selectedEngineInfo?.supportedModels ?? []);
     const engineOptions = (settings?.engines ?? [])
         .filter((engine) => engine.name === selectedEngine || engine.name !== "ai-sdk:anthropic")
         .map((engine) => ({
@@ -990,7 +1128,7 @@ function AppModelDefaultsSectionInner({ grouped = false, open, onToggle, }) {
                                     const info = settings.engines.find((engine) => engine.name === value);
                                     setSelectedModel(info?.defaultModel ?? "");
                                     setError(null);
-                                } }), _jsx(AppDefaultModelField, { engine: selectedEngine, models: selectedEngineInfo?.supportedModels ?? [], value: selectedModel, defaultModel: selectedEngineInfo?.defaultModel, disabled: !settings.canUpdate || saving, onValueChange: (value) => {
+                                } }), _jsx(AppDefaultModelField, { engine: selectedEngine, models: selectedEngineModels, value: selectedModel, defaultModel: selectedEngineInfo?.defaultModel, disabled: !settings.canUpdate || saving, onValueChange: (value) => {
                                     setSelectedModel(value);
                                     setError(null);
                                 }, onEnter: () => {

package/dist/client/use-chat-models.js

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useRef, useState } from "react";
 import { DEFAULT_MODEL } from "../agent/default-model.js";
 import { DEFAULT_REASONING_EFFORT, getReasoningEffortOptionsForModel, resolveReasoningEffortSelection, } from "../shared/reasoning-effort.js";
+import { fetchOllamaModels } from "./agent-engine-key.js";
 import { buildChatModelGroups, } from "./chat-model-groups.js";
 import { fetchBuilderStatus, fetchEnvironmentStatus, } from "./client-status-requests.js";
 import { callAction } from "./use-action.js";
@@ -201,6 +202,36 @@ export function useChatModels({ storageKey = DEFAULT_STORAGE_KEY, enabled = true
                 const nextDefaultModel = currentModel ?? DEFAULT_MODEL;
                 setAvailableModels(groups);
                 setDefaultModel(nextDefaultModel);
+                // The static catalog only has the curated suggestion models for
+                // Ollama. Once the engine list is in, ask the configured Ollama
+                // server what it actually has installed and swap those in — a
+                // second, later render, so it never blocks the picker's first
+                // paint on a local network round trip. Gated on Ollama actually
+                // being the current engine (not merely present in the catalog,
+                // which it always is): every app registers it by default, so an
+                // unconditional probe would 502 on every chat load for the vast
+                // majority of setups that never touched Ollama.
+                if (currentEngineName === "ai-sdk:ollama") {
+                    void fetchOllamaModels()
+                        .then((liveModels) => {
+                        if (!isCurrentRefresh() || liveModels.length === 0)
+                            return;
+                        const liveEngines = enginesData.engines.map((engine) => engine.name === "ai-sdk:ollama"
+                            ? { ...engine, supportedModels: liveModels }
+                            : engine);
+                        setAvailableModels(buildChatModelGroups({
+                            engines: liveEngines,
+                            configuredKeys,
+                            builderConnected,
+                            currentEngineName,
+                            currentModel,
+                        }));
+                    })
+                        .catch(() => {
+                        // No local Ollama server reachable — keep the static
+                        // suggestion list already rendered above.
+                    });
+                }
                 const selection = selectionRef.current;
                 // Default only to a CONFIGURED group, and to nothing when there is
                 // none. `DEFAULT_MODEL` is a builder-gateway id that no group carries

package/dist/collab/routes.d.ts

@@ -26,8 +26,8 @@ export declare const getCollabState: import("h3").EventHandlerWithFetch<import("
  * Body: { update: string (base64), requestSource?: string }
  */
 export declare const postCollabUpdate: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/collab/struct-routes.d.ts

@@ -13,8 +13,8 @@
  * Body: { json: any, fieldName?: string, type?: "map"|"array", requestSource?: string }
  */
 export declare const postCollabJson: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
-    ok?: undefined;
     error: string;
+    ok?: undefined;
 } | {
     error?: undefined;
     ok: boolean;

package/dist/file-upload/actions/upload-image.d.ts

@@ -44,9 +44,9 @@ declare const _default: import("../../action.js").ActionDefinition<{
     url: string;
     id: string;
     provider: string;
+    error?: undefined;
     configured?: undefined;
     connectPath?: undefined;
-    error?: undefined;
 } | {
     url?: undefined;
     id?: undefined;

package/dist/localization/default-messages.d.ts

@@ -643,8 +643,14 @@ declare const messages: {
         modelId: string;
         endpointUrl: string;
         optional: string;
-        ollamaEndpointHint: string;
         compatibleEndpointHint: string;
+        findModels: string;
+        ollamaModelsChecking: string;
+        ollamaModelsFound_one: string;
+        ollamaModelsFound_other: string;
+        ollamaModelsNone: string;
+        ollamaModelsError: string;
+        ollamaModelsPrompt: string;
         savingProvider: string;
         providerSaved: string;
         useProvider: string;

package/dist/localization/default-messages.js

@@ -650,8 +650,14 @@ const messages = {
         modelId: "Model ID",
         endpointUrl: "Endpoint URL",
         optional: "Optional",
-        ollamaEndpointHint: "Defaults to Ollama at http://localhost:11434.",
         compatibleEndpointHint: "Use this for LiteLLM or another OpenAI-compatible gateway.",
+        findModels: "Find models",
+        ollamaModelsChecking: "Checking installed models…",
+        ollamaModelsFound_one: "Found {{count}} installed model.",
+        ollamaModelsFound_other: "Found {{count}} installed models.",
+        ollamaModelsNone: "Connected, but no models are pulled yet — run `ollama pull llama3.1`.",
+        ollamaModelsError: "{{error}} Showing example model names below.",
+        ollamaModelsPrompt: 'Click "Find models" above to list what your Ollama server actually has installed.',
         savingProvider: "Saving...",
         providerSaved: "Connected",
         useProvider: "Use {{provider}}",

package/dist/notifications/routes.d.ts

@@ -16,18 +16,18 @@ export declare function createNotificationsHandler(): import("h3").EventHandlerW
     error?: undefined;
     ok?: undefined;
 } | {
-    count?: undefined;
     updated: number;
     error?: undefined;
     ok?: undefined;
-} | {
     count?: undefined;
+} | {
     updated?: undefined;
     error: string;
     ok?: undefined;
-} | {
     count?: undefined;
+} | {
     updated?: undefined;
-    error?: undefined;
     ok: boolean;
+    error?: undefined;
+    count?: undefined;
 }>>;

package/dist/observability/routes.d.ts

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

package/dist/org/index.d.ts

@@ -136,8 +136,8 @@ export declare const getMyOrgHandler: import("h3").EventHandlerWithFetch<import(
 export declare const createOrgHandler: import("h3").EventHandlerWithFetch<import("h3").EventHandlerRequest, Promise<{
     name?: undefined;
     success: boolean;
-    id?: undefined;
     role?: undefined;
+    id?: undefined;
 } | {
     success?: undefined;
     id: string;