@@ -201,33 +306,106 @@ const AI = () => {
Providers
- {providerIds.map((id) => {
- const provider = status.providers[id];
- const providerEnabled = get(formik.values, `providers.${id}.enabled`, false);
+ {providerIds
+ .filter((id) => !isCompatProviderId(id))
+ .map((id) => {
+ const provider = status.providers[id];
+ const providerEnabled = get(formik.values, `providers.${id}.enabled`, false);
- const providerToggle = (
-
- formik.setFieldValue(`providers.${id}.enabled`, !providerEnabled)}
- />
- );
+ const providerToggle = (
+
+ formik.setFieldValue(`providers.${id}.enabled`, !providerEnabled)}
+ />
+ );
- return (
- setStatus(next)}
- />
- );
- })}
+ return (
+ setStatus(next)}
+ />
+ );
+ })}
+ OpenAI-Compatible Endpoints
+
+
+
+ {endpoints.length === 0 && (
+
+ Point Bruno at any OpenAI-compatible API — Ollama, LM Studio, Together, Groq, OpenRouter, vLLM, and more.
+
+ )}
+
+ {endpoints.length > 0 && (
+
+ {endpoints.map((endpoint) => {
+ const providerId = `${OPENAI_COMPATIBLE_PREFIX}${endpoint.id}`;
+ const pending = !status.providers[providerId];
+ const provider = status.providers[providerId] || {
+ id: providerId,
+ label: endpoint.name,
+ configured: false,
+ isCustom: true
+ };
+ const providerEnabled = get(formik.values, `providers.${providerId}.enabled`, false);
+
+ const providerToggle = (
+
+ formik.setFieldValue(`providers.${providerId}.enabled`, !providerEnabled)}
+ />
+ );
+
+ return (
+ updateEndpoint(endpoint.id, { name })}
+ onChangeBaseURL={(baseURL) => updateEndpoint(endpoint.id, { baseURL })}
+ onAddModel={(model) =>
+ updateEndpointModels(endpoint.id, (models) => [...models, model])}
+ onRemoveModel={(modelId) =>
+ updateEndpointModels(endpoint.id, (models) =>
+ models.filter((m) => m.id !== modelId)
+ )}
+ onUpdateModel={(modelId, patch) =>
+ updateEndpointModels(endpoint.id, (models) =>
+ models.map((m) => (m.id === modelId ? { ...m, ...patch } : m))
+ )}
+ onRemoveEndpoint={handleRemoveEndpoint}
+ onStatusChange={(next) => setStatus(next)}
+ />
+ );
+ })}
+
+ )}
)}
diff --git a/packages/bruno-electron/src/ipc/ai/index.js b/packages/bruno-electron/src/ipc/ai/index.js
index 0cdc7ae37..75c6a5c19 100644
--- a/packages/bruno-electron/src/ipc/ai/index.js
+++ b/packages/bruno-electron/src/ipc/ai/index.js
@@ -8,7 +8,10 @@ const {
listModels,
getModel,
getAvailableModels,
- clearSdkCache
+ clearSdkCache,
+ isKnownProviderId,
+ validateApiKeyForProvider,
+ providerLabel
} = require('./providers');
const { SCRIPT_PROMPTS, SCRIPT_TYPES, buildScriptUserPrompt, stripCodeFences } = require('./script-prompts');
@@ -23,7 +26,7 @@ const buildStatus = () => {
const hasApiKey = (providerId) => aiKeyStore.hasKey(providerId);
const providers = {};
- for (const provider of listProviders()) {
+ for (const provider of listProviders(aiPreferences)) {
providers[provider.id] = {
...provider,
enabled: Boolean(aiPreferences?.providers?.[provider.id]?.enabled),
@@ -34,7 +37,7 @@ const buildStatus = () => {
return {
enabled: Boolean(aiPreferences.enabled),
providers,
- models: listModels(),
+ models: listModels(aiPreferences),
availableModels: getAvailableModels({ aiPreferences, hasApiKey })
};
};
@@ -59,13 +62,17 @@ const pickDefaultModelId = () => {
return available[0].id;
};
+const assertKnownProvider = (providerId) => {
+ if (!isKnownProviderId(providerId, getAiPrefs())) {
+ throw new Error(`Unknown AI provider: ${providerId}`);
+ }
+};
+
const registerAiIpc = (mainWindow) => {
ipcMain.handle('renderer:get-ai-status', async () => buildStatus());
ipcMain.handle('renderer:set-ai-api-key', async (_event, { providerId, apiKey }) => {
- if (!PROVIDERS[providerId]) {
- throw new Error(`Unknown AI provider: ${providerId}`);
- }
+ assertKnownProvider(providerId);
const trimmed = typeof apiKey === 'string' ? apiKey.trim() : '';
if (!trimmed) {
throw new Error('API key cannot be empty');
@@ -76,23 +83,20 @@ const registerAiIpc = (mainWindow) => {
});
ipcMain.handle('renderer:clear-ai-api-key', async (_event, { providerId }) => {
- if (!PROVIDERS[providerId]) {
- throw new Error(`Unknown AI provider: ${providerId}`);
- }
+ assertKnownProvider(providerId);
aiKeyStore.clearKey(providerId);
clearSdkCache();
return buildStatus();
});
ipcMain.handle('renderer:get-ai-api-key', async (_event, { providerId }) => {
- if (!PROVIDERS[providerId]) {
- throw new Error(`Unknown AI provider: ${providerId}`);
- }
+ assertKnownProvider(providerId);
return aiKeyStore.getKey(providerId) || '';
});
ipcMain.handle('renderer:ai-test-provider', async (_event, { providerId }) => {
- if (!PROVIDERS[providerId]) {
+ const aiPrefs = getAiPrefs();
+ if (!isKnownProviderId(providerId, aiPrefs)) {
return { ok: false, error: `Unknown provider: ${providerId}` };
}
const apiKey = aiKeyStore.getKey(providerId);
@@ -100,14 +104,13 @@ const registerAiIpc = (mainWindow) => {
return { ok: false, error: 'No API key configured' };
}
- const aiPrefs = getAiPrefs();
const providerEnabled = aiPrefs?.providers?.[providerId]?.enabled;
if (!providerEnabled) {
- return { ok: false, error: `${PROVIDERS[providerId].label} is disabled` };
+ return { ok: false, error: `${providerLabel(providerId, aiPrefs)} is disabled` };
}
try {
- const res = await PROVIDERS[providerId].validateApiKey({ apiKey });
+ const res = await validateApiKeyForProvider({ providerId, apiKey, aiPreferences: aiPrefs });
if (res.ok) {
return { ok: true };
}
@@ -119,7 +122,7 @@ const registerAiIpc = (mainWindow) => {
}
return { ok: false, error: `Could not verify key (HTTP ${res.status})` };
} catch (err) {
- return { ok: false, error: 'Could not reach provider. Check your network connection.' };
+ return { ok: false, error: err.message || 'Could not reach provider. Check your network connection.' };
}
});
diff --git a/packages/bruno-electron/src/ipc/ai/providers.js b/packages/bruno-electron/src/ipc/ai/providers.js
index 5fe945ec8..dc88db88b 100644
--- a/packages/bruno-electron/src/ipc/ai/providers.js
+++ b/packages/bruno-electron/src/ipc/ai/providers.js
@@ -1,6 +1,16 @@
const { createOpenAI } = require('@ai-sdk/openai');
const { createAnthropic } = require('@ai-sdk/anthropic');
+const OPENAI_COMPATIBLE_PREFIX = 'openai-compatible:';
+
+const isOpenAiCompatibleProviderId = (id) =>
+ typeof id === 'string' && id.startsWith(OPENAI_COMPATIBLE_PREFIX);
+
+const endpointIdFromProviderId = (providerId) =>
+ isOpenAiCompatibleProviderId(providerId) ? providerId.slice(OPENAI_COMPATIBLE_PREFIX.length) : null;
+
+const providerIdFromEndpointId = (endpointId) => `${OPENAI_COMPATIBLE_PREFIX}${endpointId}`;
+
const PROVIDERS = {
openai: {
id: 'openai',
@@ -27,8 +37,8 @@ const PROVIDERS = {
};
/**
- * Model catalog. Each entry is keyed by a stable id used in preferences and IPC.
- * `modelId` is the value passed to the provider SDK; `id` is the Bruno-internal id.
+ * Static model catalog for built-in providers. User-defined custom models for
+ * OpenAI-compatible endpoints are layered on top at lookup time.
*/
const MODEL_DEFINITIONS = {
// OpenAI
@@ -42,18 +52,46 @@ const MODEL_DEFINITIONS = {
'claude-haiku-4-5': { provider: 'anthropic', modelId: 'claude-haiku-4-5-20251001', label: 'Claude Haiku 4.5' }
};
-// Cache SDK instances. Keyed by `${providerId}:${apiKey}` so changing keys rebuilds the SDK.
+// Cache SDK instances. Built-in keyed by `${providerId}:${apiKey}`; compat
+// also folds baseURL in so editing the URL rebuilds the SDK.
const sdkCache = new Map();
-const getSdk = (providerId, apiKey) => {
- const cacheKey = `${providerId}:${apiKey}`;
- let sdk = sdkCache.get(cacheKey);
- if (!sdk) {
+// JSON-stringified tuple so values containing ":" (provider ids, URLs) can't
+// collide and reuse an SDK configured for a different endpoint/key.
+const sdkCacheKey = ({ providerId, apiKey, baseURL }) =>
+ JSON.stringify([providerId, baseURL || '', apiKey]);
+
+const getCompatEndpoint = (aiPreferences, endpointId) => {
+ const list = Array.isArray(aiPreferences?.openaiCompatibleEndpoints)
+ ? aiPreferences.openaiCompatibleEndpoints
+ : [];
+ return list.find((e) => e?.id === endpointId) || null;
+};
+
+const compatProviderEntry = (endpoint) => ({
+ id: providerIdFromEndpointId(endpoint.id),
+ label: endpoint.name || 'OpenAI-compatible',
+ apiKeyPlaceholder: 'sk-...',
+ apiKeyHelpUrl: null,
+ isCustom: true,
+ endpointId: endpoint.id,
+ baseURL: endpoint.baseURL || ''
+});
+
+const getSdk = ({ providerId, apiKey, baseURL }) => {
+ const key = sdkCacheKey({ providerId, apiKey, baseURL });
+ let sdk = sdkCache.get(key);
+ if (sdk) return sdk;
+
+ if (isOpenAiCompatibleProviderId(providerId)) {
+ sdk = createOpenAI({ apiKey, baseURL });
+ } else {
const provider = PROVIDERS[providerId];
if (!provider) throw new Error(`Unknown AI provider: ${providerId}`);
sdk = provider.createSdk({ apiKey });
- sdkCache.set(cacheKey, sdk);
}
+
+ sdkCache.set(key, sdk);
return sdk;
};
@@ -61,38 +99,114 @@ const clearSdkCache = () => {
sdkCache.clear();
};
-const listProviders = () => Object.values(PROVIDERS).map((p) => ({
- id: p.id,
- label: p.label,
- apiKeyPlaceholder: p.apiKeyPlaceholder,
- apiKeyHelpUrl: p.apiKeyHelpUrl
-}));
+const listProviders = (aiPreferences) => {
+ const builtIn = Object.values(PROVIDERS).map((p) => ({
+ id: p.id,
+ label: p.label,
+ apiKeyPlaceholder: p.apiKeyPlaceholder,
+ apiKeyHelpUrl: p.apiKeyHelpUrl,
+ isCustom: false
+ }));
-const listModels = () => Object.entries(MODEL_DEFINITIONS).map(([id, def]) => ({
- id,
- label: def.label,
- provider: def.provider
-}));
+ const endpoints = Array.isArray(aiPreferences?.openaiCompatibleEndpoints)
+ ? aiPreferences.openaiCompatibleEndpoints
+ : [];
+
+ return [...builtIn, ...endpoints.map(compatProviderEntry)];
+};
+
+const listModels = (aiPreferences) => {
+ const builtIn = Object.entries(MODEL_DEFINITIONS).map(([id, def]) => ({
+ id,
+ label: def.label,
+ provider: def.provider,
+ isCustom: false
+ }));
+
+ const endpoints = Array.isArray(aiPreferences?.openaiCompatibleEndpoints)
+ ? aiPreferences.openaiCompatibleEndpoints
+ : [];
+
+ const custom = [];
+ for (const endpoint of endpoints) {
+ if (!endpoint?.id || !Array.isArray(endpoint.models)) continue;
+ for (const model of endpoint.models) {
+ if (!model?.id || !model?.modelId) continue;
+ custom.push({
+ id: model.id,
+ label: model.label || model.modelId,
+ provider: providerIdFromEndpointId(endpoint.id),
+ isCustom: true
+ });
+ }
+ }
+
+ return [...builtIn, ...custom];
+};
+
+/** Resolve a Bruno model id (built-in or custom) into its provider config. */
+const resolveModelDefinition = (modelId, aiPreferences) => {
+ if (MODEL_DEFINITIONS[modelId]) {
+ const def = MODEL_DEFINITIONS[modelId];
+ return {
+ providerId: def.provider,
+ sdkModelId: def.modelId,
+ label: def.label,
+ baseURL: null
+ };
+ }
+
+ const endpoints = Array.isArray(aiPreferences?.openaiCompatibleEndpoints)
+ ? aiPreferences.openaiCompatibleEndpoints
+ : [];
+ for (const endpoint of endpoints) {
+ if (!endpoint?.id || !Array.isArray(endpoint.models)) continue;
+ const match = endpoint.models.find((m) => m?.id === modelId);
+ if (match) {
+ return {
+ providerId: providerIdFromEndpointId(endpoint.id),
+ sdkModelId: match.modelId,
+ label: match.label || match.modelId,
+ baseURL: endpoint.baseURL || ''
+ };
+ }
+ }
+ return null;
+};
+
+const providerLabel = (providerId, aiPreferences) => {
+ if (PROVIDERS[providerId]) return PROVIDERS[providerId].label;
+ const endpointId = endpointIdFromProviderId(providerId);
+ if (endpointId) {
+ const endpoint = getCompatEndpoint(aiPreferences, endpointId);
+ if (endpoint) return endpoint.name || 'OpenAI-compatible';
+ }
+ return providerId;
+};
/**
* Resolve a Bruno model id to a vercel-ai SDK model instance.
* Throws if the provider isn't configured (no key) or the model is unknown.
*/
const getModel = (modelId, { aiPreferences, getApiKey }) => {
- const def = MODEL_DEFINITIONS[modelId];
+ const def = resolveModelDefinition(modelId, aiPreferences);
if (!def) throw new Error(`Unknown model: ${modelId}`);
- const providerConfig = aiPreferences?.providers?.[def.provider];
+ const providerConfig = aiPreferences?.providers?.[def.providerId];
if (!providerConfig?.enabled) {
- throw new Error(`${PROVIDERS[def.provider].label} is not enabled. Enable it in Preferences > AI.`);
+ throw new Error(`${providerLabel(def.providerId, aiPreferences)} is not enabled. Enable it in Preferences > AI.`);
}
- const apiKey = getApiKey(def.provider);
+ const apiKey = getApiKey(def.providerId);
if (!apiKey) {
- throw new Error(`${PROVIDERS[def.provider].label} API key is not configured. Add it in Preferences > AI.`);
+ throw new Error(`${providerLabel(def.providerId, aiPreferences)} API key is not configured. Add it in Preferences > AI.`);
}
- return getSdk(def.provider, apiKey)(def.modelId);
+ if (isOpenAiCompatibleProviderId(def.providerId) && !def.baseURL) {
+ throw new Error(`${providerLabel(def.providerId, aiPreferences)} is missing a Base URL. Set one in Preferences > AI.`);
+ }
+
+ return getSdk({ providerId: def.providerId, apiKey, baseURL: def.baseURL })(def.sdkModelId);
};
/**
@@ -100,25 +214,62 @@ const getModel = (modelId, { aiPreferences, getApiKey }) => {
*/
const getAvailableModels = ({ aiPreferences, hasApiKey }) => {
const out = [];
- for (const [id, def] of Object.entries(MODEL_DEFINITIONS)) {
- const providerConfig = aiPreferences?.providers?.[def.provider];
+ for (const model of listModels(aiPreferences)) {
+ const providerConfig = aiPreferences?.providers?.[model.provider];
if (!providerConfig?.enabled) continue;
- if (!hasApiKey(def.provider)) continue;
+ if (!hasApiKey(model.provider)) continue;
- const modelConfig = aiPreferences?.models?.[id];
+ const modelConfig = aiPreferences?.models?.[model.id];
if (modelConfig?.enabled === false) continue;
- out.push({ id, label: def.label, provider: def.provider });
+ if (isOpenAiCompatibleProviderId(model.provider)) {
+ const endpointId = endpointIdFromProviderId(model.provider);
+ const endpoint = getCompatEndpoint(aiPreferences, endpointId);
+ if (!endpoint?.baseURL) continue;
+ }
+
+ out.push({ id: model.id, label: model.label, provider: model.provider });
}
return out;
};
+const isKnownProviderId = (providerId, aiPreferences) => {
+ if (PROVIDERS[providerId]) return true;
+ const endpointId = endpointIdFromProviderId(providerId);
+ if (!endpointId) return false;
+ return Boolean(getCompatEndpoint(aiPreferences, endpointId));
+};
+
+const validateApiKeyForProvider = async ({ providerId, apiKey, aiPreferences }) => {
+ if (PROVIDERS[providerId]) {
+ return PROVIDERS[providerId].validateApiKey({ apiKey });
+ }
+ const endpointId = endpointIdFromProviderId(providerId);
+ const endpoint = endpointId ? getCompatEndpoint(aiPreferences, endpointId) : null;
+ if (!endpoint?.baseURL) {
+ throw new Error('Endpoint Base URL is not configured');
+ }
+ const url = `${endpoint.baseURL.replace(/\/$/, '')}/models`;
+ return fetch(url, {
+ headers: { Authorization: `Bearer ${apiKey}` },
+ signal: AbortSignal.timeout(10000)
+ });
+};
+
module.exports = {
PROVIDERS,
MODEL_DEFINITIONS,
+ OPENAI_COMPATIBLE_PREFIX,
listProviders,
listModels,
getModel,
getAvailableModels,
- clearSdkCache
+ clearSdkCache,
+ isOpenAiCompatibleProviderId,
+ endpointIdFromProviderId,
+ providerIdFromEndpointId,
+ getCompatEndpoint,
+ isKnownProviderId,
+ validateApiKeyForProvider,
+ providerLabel
};
diff --git a/packages/bruno-electron/src/store/preferences.js b/packages/bruno-electron/src/store/preferences.js
index de0bb3a5f..bb3b59c9b 100644
--- a/packages/bruno-electron/src/store/preferences.js
+++ b/packages/bruno-electron/src/store/preferences.js
@@ -81,6 +81,7 @@ const defaultPreferences = {
},
models: {},
defaultModel: '',
+ openaiCompatibleEndpoints: [],
autocomplete: {
enabled: true,
model: '',
@@ -163,6 +164,20 @@ const preferencesSchema = Yup.object().shape({
providers: Yup.object().optional(),
models: Yup.object().optional(),
defaultModel: Yup.string().max(200).nullable(),
+ openaiCompatibleEndpoints: Yup.array().of(
+ Yup.object({
+ id: Yup.string().required(),
+ name: Yup.string().max(120).nullable(),
+ baseURL: Yup.string().max(2048).nullable(),
+ models: Yup.array().of(
+ Yup.object({
+ id: Yup.string().required(),
+ label: Yup.string().max(120).nullable(),
+ modelId: Yup.string().max(200).nullable()
+ })
+ )
+ })
+ ).optional(),
autocomplete: Yup.object({
enabled: Yup.boolean(),
model: Yup.string().max(200).nullable(),