From 2cac1c057089e379296a41e4b1819cc04394ee2d Mon Sep 17 00:00:00 2001 From: PSA-Team-source <155616440+PSA-Team-source@users.noreply.github.com> Date: Tue, 10 Nov 2026 21:06:41 +0700 Subject: [PATCH 1/2] feat: add UberLLM as a named AI provider --- README.md | 14 +++++- out/cli.cjs | 55 ++++++++++++++++++++-- src/commands/config.ts | 17 +++++-- src/commands/setup.ts | 6 +++ src/engine/uberllm.ts | 16 +++++++ src/utils/engine.ts | 4 ++ src/utils/errors.ts | 3 ++ src/utils/modelCache.ts | 19 ++++++++ src/utils/provider.ts | 4 +- test/unit/modelCache.test.ts | 21 ++++++++- test/unit/setup.test.ts | 4 +- test/unit/uberllm.test.ts | 89 ++++++++++++++++++++++++++++++++++++ 12 files changed, 239 insertions(+), 13 deletions(-) create mode 100644 src/engine/uberllm.ts create mode 100644 test/unit/uberllm.test.ts diff --git a/README.md b/README.md index 6f952877..b58455cb 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ Create a `.env` file and add OpenCommit config variables there like this: ```env ... -OCO_AI_PROVIDER= +OCO_AI_PROVIDER= OCO_API_KEY= // or other LLM provider API token OCO_API_URL= OCO_API_CUSTOM_HEADERS= @@ -294,6 +294,18 @@ oco config set OCO_AI_PROVIDER=orcarouter OCO_API_KEY= The default model is `orcarouter/auto`, which lets OrcaRouter pick the best model for your request automatically. +### Use UberLLM as the model gateway + +[UberLLM](https://uberllm.dev) is an OpenAI-compatible gateway with one key for about 260 chat models (DeepSeek, Claude, GPT, Gemini, Qwen, GLM and others). Prices are per model, usually below list price, and listed at [uberllm.dev/models](https://uberllm.dev/models). `oco models` lists the same catalog. + +```sh +oco config set OCO_AI_PROVIDER=uberllm OCO_API_KEY= + +oco config set OCO_AI_PROVIDER=uberllm OCO_API_KEY= OCO_MODEL=anthropic/claude-haiku-4.5 +``` + +The default model is `deepseek/deepseek-v3.2`. + ### Use with Proxy If you are behind a proxy, you can set it in the config: diff --git a/out/cli.cjs b/out/cli.cjs index 55870316..15a6f8c7 100755 --- a/out/cli.cjs +++ b/out/cli.cjs @@ -70268,6 +70268,7 @@ var OCO_AI_PROVIDER_ENUM = /* @__PURE__ */ ((OCO_AI_PROVIDER_ENUM2) => { OCO_AI_PROVIDER_ENUM2["AIMLAPI"] = "aimlapi"; OCO_AI_PROVIDER_ENUM2["OPENROUTER"] = "openrouter"; OCO_AI_PROVIDER_ENUM2["ORCAROUTER"] = "orcarouter"; + OCO_AI_PROVIDER_ENUM2["UBERLLM"] = "uberllm"; return OCO_AI_PROVIDER_ENUM2; })(OCO_AI_PROVIDER_ENUM || {}); var PROVIDER_CONFIG_REQUIREMENTS = { @@ -70281,6 +70282,7 @@ var PROVIDER_CONFIG_REQUIREMENTS = { ["deepseek" /* DEEPSEEK */]: "apiKey", ["openrouter" /* OPENROUTER */]: "apiKey", ["orcarouter" /* ORCAROUTER */]: "apiKey", + ["uberllm" /* UBERLLM */]: "apiKey", ["aimlapi" /* AIMLAPI */]: "apiKey", ["azure" /* AZURE */]: "apiKey", ["mlx" /* MLX */]: "model", @@ -70854,7 +70856,10 @@ var MODEL_LIST = { ], // OrcaRouter available models // https://api.orcarouter.ai/v1/models - orcarouter: ["orcarouter/auto"] + orcarouter: ["orcarouter/auto"], + // UberLLM available models + // https://api.uberllm.dev/v1/models + uberllm: ["deepseek/deepseek-v3.2"] }; var getDefaultModel = (provider) => { switch (provider) { @@ -70880,6 +70885,8 @@ var getDefaultModel = (provider) => { return MODEL_LIST.openrouter[0]; case "orcarouter": return MODEL_LIST.orcarouter[0]; + case "uberllm": + return MODEL_LIST.uberllm[0]; default: return MODEL_LIST.openai[0]; } @@ -70914,7 +70921,7 @@ var configValidators = { validateConfig( "OCO_API_KEY", value, - 'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`' + 'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter" or "uberllm". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`' ); return value; }, @@ -71062,9 +71069,10 @@ var configValidators = { "deepseek", "aimlapi", "openrouter", - "orcarouter" + "orcarouter", + "uberllm" ].includes(value) || value.startsWith("ollama") || value.startsWith("llamacpp"), - `${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter' or 'openai' (default)` + `${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter', 'uberllm' or 'openai' (default)` ); return value; }, @@ -71135,6 +71143,7 @@ var PROVIDER_API_KEY_URLS = { ["deepseek" /* DEEPSEEK */]: "https://platform.deepseek.com/api_keys", ["openrouter" /* OPENROUTER */]: "https://openrouter.ai/keys", ["orcarouter" /* ORCAROUTER */]: "https://www.orcarouter.ai", + ["uberllm" /* UBERLLM */]: "https://uberllm.dev/dashboard/keys", ["aimlapi" /* AIMLAPI */]: "https://aimlapi.com/app/keys", ["azure" /* AZURE */]: "https://portal.azure.com/", ["ollama" /* OLLAMA */]: null, @@ -71152,6 +71161,7 @@ var RECOMMENDED_MODELS = { ["deepseek" /* DEEPSEEK */]: "deepseek-v4-flash", ["openrouter" /* OPENROUTER */]: "openai/gpt-4o-mini", ["orcarouter" /* ORCAROUTER */]: "orcarouter/auto", + ["uberllm" /* UBERLLM */]: "deepseek/deepseek-v3.2", ["aimlapi" /* AIMLAPI */]: "gpt-4o-mini" }; var defaultConfigPath = (0, import_path.join)((0, import_os.homedir)(), ".opencommit"); @@ -79694,6 +79704,7 @@ var PROVIDER_BILLING_URLS = { ["deepseek" /* DEEPSEEK */]: "https://platform.deepseek.com/usage", ["openrouter" /* OPENROUTER */]: "https://openrouter.ai/credits", ["orcarouter" /* ORCAROUTER */]: "https://www.orcarouter.ai", + ["uberllm" /* UBERLLM */]: "https://uberllm.dev/dashboard/credits", ["aimlapi" /* AIMLAPI */]: "https://aimlapi.com/app/billing", ["azure" /* AZURE */]: "https://portal.azure.com/#view/Microsoft_Azure_CostManagement", ["ollama" /* OLLAMA */]: null, @@ -90283,6 +90294,18 @@ var OrcaRouterEngine = class extends OpenAiEngine { } }; +// src/engine/uberllm.ts +var DEFAULT_UBERLLM_BASE_URL = "https://api.uberllm.dev/v1"; +var UberLLMEngine = class extends OpenAiEngine { + constructor(config7) { + super({ + ...config7, + baseURL: config7.baseURL ?? DEFAULT_UBERLLM_BASE_URL + }); + this.providerName = "uberllm"; + } +}; + // src/utils/proxy.ts var import_undici = __toESM(require_undici(), 1); function resolveProxy(proxySetting) { @@ -90370,6 +90393,8 @@ function getEngine(config7 = getConfig()) { return new OpenRouterEngine(DEFAULT_CONFIG2); case "orcarouter" /* ORCAROUTER */: return new OrcaRouterEngine(DEFAULT_CONFIG2); + case "uberllm" /* UBERLLM */: + return new UberLLMEngine(DEFAULT_CONFIG2); default: return new OpenAiEngine(DEFAULT_CONFIG2); } @@ -91899,6 +91924,15 @@ async function fetchOrcaRouterModels(apiKey) { })?.map((model) => model.id).sort() }); } +async function fetchUberLLMModels(apiKey) { + return fetchModelList({ + // Without `?type=`, this endpoint lists chat (text-output) models only. + url: "https://api.uberllm.dev/v1/models", + headers: { Authorization: `Bearer ${apiKey}` }, + fallback: MODEL_LIST.uberllm, + mapModels: (data) => data.data?.map((model) => model.id).sort() + }); +} async function fetchModelsForProvider(provider, apiKey, baseUrl, forceRefresh = false) { const cache = readCache(); if (!forceRefresh && isCacheValid(cache) && cache.models[provider]) { @@ -91967,6 +92001,13 @@ async function fetchModelsForProvider(provider, apiKey, baseUrl, forceRefresh = models = MODEL_LIST.orcarouter; } break; + case "uberllm" /* UBERLLM */: + if (apiKey) { + models = await fetchUberLLMModels(apiKey); + } else { + models = MODEL_LIST.uberllm; + } + break; default: models = MODEL_LIST.openai; } @@ -92054,6 +92095,12 @@ var SETUP_PROVIDERS = [ selectionGroup: "other", firstRunRequirement: "apiKey" }, + { + provider: "uberllm" /* UBERLLM */, + displayName: "UberLLM (OpenAI-compatible gateway)", + selectionGroup: "other", + firstRunRequirement: "apiKey" + }, { provider: "aimlapi" /* AIMLAPI */, displayName: "AI/ML API", diff --git a/src/commands/config.ts b/src/commands/config.ts index f4033864..3a37a9e9 100644 --- a/src/commands/config.ts +++ b/src/commands/config.ts @@ -582,7 +582,11 @@ export const MODEL_LIST = { // OrcaRouter available models // https://api.orcarouter.ai/v1/models - orcarouter: ['orcarouter/auto'] + orcarouter: ['orcarouter/auto'], + + // UberLLM available models + // https://api.uberllm.dev/v1/models + uberllm: ['deepseek/deepseek-v3.2'] }; const getDefaultModel = (provider: string | undefined): string => { @@ -609,6 +613,8 @@ const getDefaultModel = (provider: string | undefined): string => { return MODEL_LIST.openrouter[0]; case 'orcarouter': return MODEL_LIST.orcarouter[0]; + case 'uberllm': + return MODEL_LIST.uberllm[0]; default: return MODEL_LIST.openai[0]; } @@ -662,7 +668,7 @@ export const configValidators = { validateConfig( 'OCO_API_KEY', value, - 'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`' + 'You need to provide the OCO_API_KEY when OCO_AI_PROVIDER set to "openai" (default) or "ollama" or "mlx" or "azure" or "gemini" or "flowise" or "anthropic" or "deepseek" or "orcarouter" or "uberllm". Run `oco config set OCO_API_KEY=your_key OCO_AI_PROVIDER=openai`' ); return value; @@ -835,11 +841,12 @@ export const configValidators = { 'deepseek', 'aimlapi', 'openrouter', - 'orcarouter' + 'orcarouter', + 'uberllm' ].includes(value) || value.startsWith('ollama') || value.startsWith('llamacpp'), - `${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter' or 'openai' (default)` + `${value} is not supported yet, use 'ollama', 'llamacpp', 'mlx', 'anthropic', 'azure', 'gemini', 'flowise', 'mistral', 'deepseek', 'aimlapi', 'orcarouter', 'uberllm' or 'openai' (default)` ); return value; @@ -919,6 +926,7 @@ export const PROVIDER_API_KEY_URLS: Record = { [OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'https://platform.deepseek.com/api_keys', [OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'https://openrouter.ai/keys', [OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'https://www.orcarouter.ai', + [OCO_AI_PROVIDER_ENUM.UBERLLM]: 'https://uberllm.dev/dashboard/keys', [OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'https://aimlapi.com/app/keys', [OCO_AI_PROVIDER_ENUM.AZURE]: 'https://portal.azure.com/', [OCO_AI_PROVIDER_ENUM.OLLAMA]: null, @@ -937,6 +945,7 @@ export const RECOMMENDED_MODELS: Record = { [OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'deepseek-v4-flash', [OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'openai/gpt-4o-mini', [OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'orcarouter/auto', + [OCO_AI_PROVIDER_ENUM.UBERLLM]: 'deepseek/deepseek-v3.2', [OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'gpt-4o-mini' }; diff --git a/src/commands/setup.ts b/src/commands/setup.ts index c898bed0..d750ed09 100644 --- a/src/commands/setup.ts +++ b/src/commands/setup.ts @@ -81,6 +81,12 @@ const SETUP_PROVIDERS: SetupProviderDefinition[] = [ selectionGroup: 'other', firstRunRequirement: 'apiKey' }, + { + provider: OCO_AI_PROVIDER_ENUM.UBERLLM, + displayName: 'UberLLM (OpenAI-compatible gateway)', + selectionGroup: 'other', + firstRunRequirement: 'apiKey' + }, { provider: OCO_AI_PROVIDER_ENUM.AIMLAPI, displayName: 'AI/ML API', diff --git a/src/engine/uberllm.ts b/src/engine/uberllm.ts new file mode 100644 index 00000000..d66b5b9c --- /dev/null +++ b/src/engine/uberllm.ts @@ -0,0 +1,16 @@ +import { OpenAiEngine, OpenAiConfig } from './openAi'; + +export interface UberLLMConfig extends OpenAiConfig {} + +const DEFAULT_UBERLLM_BASE_URL = 'https://api.uberllm.dev/v1'; + +export class UberLLMEngine extends OpenAiEngine { + protected providerName = 'uberllm'; + + constructor(config: UberLLMConfig) { + super({ + ...config, + baseURL: config.baseURL ?? DEFAULT_UBERLLM_BASE_URL + }); + } +} diff --git a/src/utils/engine.ts b/src/utils/engine.ts index d54571e3..acbb236a 100644 --- a/src/utils/engine.ts +++ b/src/utils/engine.ts @@ -15,6 +15,7 @@ import { DeepseekEngine } from '../engine/deepseek'; import { AimlApiEngine } from '../engine/aimlapi'; import { OpenRouterEngine } from '../engine/openrouter'; import { OrcaRouterEngine } from '../engine/orcarouter'; +import { UberLLMEngine } from '../engine/uberllm'; import { parseCustomHeaders } from './customHeaders'; import { resolveProxy } from './proxy'; @@ -82,6 +83,9 @@ export function getEngine(config = getConfig()): AiEngine { case OCO_AI_PROVIDER_ENUM.ORCAROUTER: return new OrcaRouterEngine(DEFAULT_CONFIG); + case OCO_AI_PROVIDER_ENUM.UBERLLM: + return new UberLLMEngine(DEFAULT_CONFIG); + default: return new OpenAiEngine(DEFAULT_CONFIG); } diff --git a/src/utils/errors.ts b/src/utils/errors.ts index 40925cd4..1ab81c4e 100644 --- a/src/utils/errors.ts +++ b/src/utils/errors.ts @@ -13,6 +13,7 @@ export const PROVIDER_BILLING_URLS: Record = { [OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'https://platform.deepseek.com/usage', [OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'https://openrouter.ai/credits', [OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'https://www.orcarouter.ai', + [OCO_AI_PROVIDER_ENUM.UBERLLM]: 'https://uberllm.dev/dashboard/credits', [OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'https://aimlapi.com/app/billing', [OCO_AI_PROVIDER_ENUM.AZURE]: 'https://portal.azure.com/#view/Microsoft_Azure_CostManagement', @@ -208,6 +209,8 @@ export function getRecommendedModel(provider: string): string | null { return 'openai/gpt-4o-mini'; case OCO_AI_PROVIDER_ENUM.ORCAROUTER: return 'orcarouter/auto'; + case OCO_AI_PROVIDER_ENUM.UBERLLM: + return 'deepseek/deepseek-v3.2'; case OCO_AI_PROVIDER_ENUM.AIMLAPI: return 'gpt-4o-mini'; default: diff --git a/src/utils/modelCache.ts b/src/utils/modelCache.ts index 7d7f388b..44438d2c 100644 --- a/src/utils/modelCache.ts +++ b/src/utils/modelCache.ts @@ -206,6 +206,17 @@ export async function fetchOrcaRouterModels(apiKey: string): Promise { }); } +export async function fetchUberLLMModels(apiKey: string): Promise { + return fetchModelList({ + // Without `?type=`, this endpoint lists chat (text-output) models only. + url: 'https://api.uberllm.dev/v1/models', + headers: { Authorization: `Bearer ${apiKey}` }, + fallback: MODEL_LIST.uberllm, + mapModels: (data) => + (data as ModelListResponse).data?.map((model) => model.id).sort() + }); +} + export async function fetchModelsForProvider( provider: string, apiKey?: string, @@ -295,6 +306,14 @@ export async function fetchModelsForProvider( } break; + case OCO_AI_PROVIDER_ENUM.UBERLLM: + if (apiKey) { + models = await fetchUberLLMModels(apiKey); + } else { + models = MODEL_LIST.uberllm; + } + break; + default: models = MODEL_LIST.openai; } diff --git a/src/utils/provider.ts b/src/utils/provider.ts index 710ea798..9e242ab3 100644 --- a/src/utils/provider.ts +++ b/src/utils/provider.ts @@ -13,7 +13,8 @@ export enum OCO_AI_PROVIDER_ENUM { DEEPSEEK = 'deepseek', AIMLAPI = 'aimlapi', OPENROUTER = 'openrouter', - ORCAROUTER = 'orcarouter' + ORCAROUTER = 'orcarouter', + UBERLLM = 'uberllm' } export type ProviderConfigRequirement = 'apiKey' | 'model' | 'none'; @@ -32,6 +33,7 @@ const PROVIDER_CONFIG_REQUIREMENTS: Record< [OCO_AI_PROVIDER_ENUM.DEEPSEEK]: 'apiKey', [OCO_AI_PROVIDER_ENUM.OPENROUTER]: 'apiKey', [OCO_AI_PROVIDER_ENUM.ORCAROUTER]: 'apiKey', + [OCO_AI_PROVIDER_ENUM.UBERLLM]: 'apiKey', [OCO_AI_PROVIDER_ENUM.AIMLAPI]: 'apiKey', [OCO_AI_PROVIDER_ENUM.AZURE]: 'apiKey', [OCO_AI_PROVIDER_ENUM.MLX]: 'model', diff --git a/test/unit/modelCache.test.ts b/test/unit/modelCache.test.ts index bdd7f64a..7cc80e93 100644 --- a/test/unit/modelCache.test.ts +++ b/test/unit/modelCache.test.ts @@ -8,7 +8,8 @@ import { fetchOllamaModels, fetchOpenAIModels, fetchOpenRouterModels, - fetchOrcaRouterModels + fetchOrcaRouterModels, + fetchUberLLMModels } from '../../src/utils/modelCache'; const originalFetch = global.fetch; @@ -164,6 +165,21 @@ describe('provider model fetchers', () => { 'orcarouter/auto', 'orcarouter/fusion' ] + }, + { + provider: 'UberLLM', + fetchModels: () => fetchUberLLMModels('uberllm-key'), + request: [ + 'https://api.uberllm.dev/v1/models', + { headers: { Authorization: 'Bearer uberllm-key' } } + ], + payload: { + data: [ + { id: 'deepseek/deepseek-v3.2' }, + { id: 'anthropic/claude-haiku-4.5' } + ] + }, + expected: ['anthropic/claude-haiku-4.5', 'deepseek/deepseek-v3.2'] } ])( 'preserves the $provider request and response mapping', @@ -214,7 +230,8 @@ describe('provider model fetchers', () => { ['Groq', () => fetchGroqModels('key'), MODEL_LIST.groq], ['OpenRouter', () => fetchOpenRouterModels('key'), MODEL_LIST.openrouter], ['DeepSeek', () => fetchDeepSeekModels('key'), MODEL_LIST.deepseek], - ['OrcaRouter', () => fetchOrcaRouterModels('key'), MODEL_LIST.orcarouter] + ['OrcaRouter', () => fetchOrcaRouterModels('key'), MODEL_LIST.orcarouter], + ['UberLLM', () => fetchUberLLMModels('key'), MODEL_LIST.uberllm] ])( 'returns the existing %s fallback for a non-OK response', async (_, fetchModels, fallback) => { diff --git a/test/unit/setup.test.ts b/test/unit/setup.test.ts index 407dab3d..53d5a941 100644 --- a/test/unit/setup.test.ts +++ b/test/unit/setup.test.ts @@ -36,7 +36,8 @@ const OCO_AI_PROVIDER_ENUM = { DEEPSEEK: 'deepseek', AIMLAPI: 'aimlapi', OPENROUTER: 'openrouter', - ORCAROUTER: 'orcarouter' + ORCAROUTER: 'orcarouter', + UBERLLM: 'uberllm' } as const; jest.unstable_mockModule('@clack/prompts', () => ({ @@ -89,6 +90,7 @@ const OTHER_OPTIONS = [ { value: 'deepseek', label: 'DeepSeek' }, { value: 'openrouter', label: 'OpenRouter (Multiple providers)' }, { value: 'orcarouter', label: 'OrcaRouter (Smart routing gateway)' }, + { value: 'uberllm', label: 'UberLLM (OpenAI-compatible gateway)' }, { value: 'aimlapi', label: 'AI/ML API' }, { value: 'azure', label: 'Azure OpenAI' }, { value: 'mlx', label: 'MLX (Apple Silicon, local)' } diff --git a/test/unit/uberllm.test.ts b/test/unit/uberllm.test.ts new file mode 100644 index 00000000..f22c94fb --- /dev/null +++ b/test/unit/uberllm.test.ts @@ -0,0 +1,89 @@ +import { OpenAI } from 'openai'; +import { + DEFAULT_CONFIG, + OCO_AI_PROVIDER_ENUM +} from '../../src/commands/config'; +import { UberLLMEngine } from '../../src/engine/uberllm'; +import { getEngine } from '../../src/utils/engine'; + +describe('UberLLMEngine', () => { + const baseConfig = { + apiKey: 'test-uberllm-key', + maxTokensInput: 4096, + maxTokensOutput: 256 + }; + + const messages: Array = [ + { role: 'system', content: 'system message' }, + { role: 'user', content: 'diff --git a/file b/file' } + ]; + + it('uses the UberLLM base URL and sends the model and messages', async () => { + const engine = new UberLLMEngine({ + ...baseConfig, + model: 'deepseek/deepseek-v3.2' + }); + + const create = jest + .spyOn(engine.client.chat.completions, 'create') + .mockResolvedValue({ + choices: [{ message: { content: 'feat(uberllm): standard path' } }] + } as any); + + await engine.generateCommitMessage(messages); + + expect(engine.config.baseURL).toBe('https://api.uberllm.dev/v1'); + expect(create).toHaveBeenCalledWith( + expect.objectContaining({ + model: 'deepseek/deepseek-v3.2', + temperature: 0, + top_p: 0.1, + max_tokens: 256 + }) + ); + }); + + it('allows a custom base URL to override the default', async () => { + const engine = new UberLLMEngine({ + ...baseConfig, + model: 'deepseek/deepseek-v3.2', + baseURL: 'https://custom.example.com/v1' + }); + + expect(engine.config.baseURL).toBe('https://custom.example.com/v1'); + }); + + it('preserves the default base URL through the real engine factory', () => { + const engine = getEngine({ + ...DEFAULT_CONFIG, + OCO_AI_PROVIDER: OCO_AI_PROVIDER_ENUM.UBERLLM, + OCO_MODEL: 'deepseek/deepseek-v3.2', + OCO_API_KEY: 'test-uberllm-key', + OCO_API_URL: undefined + } as any) as UberLLMEngine; + + expect(engine.config.baseURL).toBe('https://api.uberllm.dev/v1'); + expect(engine.client.baseURL).toBe('https://api.uberllm.dev/v1'); + }); + + it('strips tags from response content', async () => { + const engine = new UberLLMEngine({ + ...baseConfig, + model: 'deepseek/deepseek-v3.2' + }); + + jest.spyOn(engine.client.chat.completions, 'create').mockResolvedValue({ + choices: [ + { + message: { + content: 'reasoning herefeat: add uberllm provider' + } + } + ] + } as any); + + const result = await engine.generateCommitMessage(messages); + + expect(result).toBe('feat: add uberllm provider'); + }); +}); From 426614285b93c6c8d2d618881b28e1a4b61fd634 Mon Sep 17 00:00:00 2001 From: PSA-Team-source <155616440+PSA-Team-source@users.noreply.github.com> Date: Thu, 12 Nov 2026 19:05:25 +0700 Subject: [PATCH 2/2] fix(migrations): skip migration 00 for uberllm and orcarouter A fresh setup that picks uberllm (or orcarouter) writes a global config with no completed migrations. The next run then hit migration 00, which throws for providers that never had legacy per-provider keys, and exited 1. Add both providers to the skip list in _run.ts and add a CLI test that runs oco against a fresh uberllm config with no migrations file. --- out/cli.cjs | 4 +++- src/migrations/_run.ts | 4 +++- test/e2e/cliBehavior.test.ts | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) diff --git a/out/cli.cjs b/out/cli.cjs index 15a6f8c7..03dee530 100755 --- a/out/cli.cjs +++ b/out/cli.cjs @@ -92783,7 +92783,9 @@ var runMigrations = async () => { "mlx" /* MLX */, "openrouter" /* OPENROUTER */, "llamacpp" /* LLAMACPP */, - "aimlapi" /* AIMLAPI */ + "aimlapi" /* AIMLAPI */, + "orcarouter" /* ORCAROUTER */, + "uberllm" /* UBERLLM */ ].includes(config7.OCO_AI_PROVIDER)) { return; } diff --git a/src/migrations/_run.ts b/src/migrations/_run.ts index 7ceb3c92..823584ec 100644 --- a/src/migrations/_run.ts +++ b/src/migrations/_run.ts @@ -45,7 +45,9 @@ export const runMigrations = async () => { OCO_AI_PROVIDER_ENUM.MLX, OCO_AI_PROVIDER_ENUM.OPENROUTER, OCO_AI_PROVIDER_ENUM.LLAMACPP, - OCO_AI_PROVIDER_ENUM.AIMLAPI + OCO_AI_PROVIDER_ENUM.AIMLAPI, + OCO_AI_PROVIDER_ENUM.ORCAROUTER, + OCO_AI_PROVIDER_ENUM.UBERLLM ].includes(config.OCO_AI_PROVIDER) ) { return; diff --git a/test/e2e/cliBehavior.test.ts b/test/e2e/cliBehavior.test.ts index 5488fa74..49c50574 100644 --- a/test/e2e/cliBehavior.test.ts +++ b/test/e2e/cliBehavior.test.ts @@ -764,6 +764,49 @@ it('cli flow prompts for a missing API key, saves it, and completes the commit', } }); +it('cli commits after a fresh uberllm setup without failing migration 00', async () => { + const { gitDir, cleanup } = await prepareEnvironment(); + const homeDir = await prepareTempDir(); + const server = await startMockOpenAiServer('feat(uberllm): first commit'); + + try { + // The global config the setup wizard writes, with no migrations recorded yet. + writeGlobalConfig(homeDir, [ + 'OCO_AI_PROVIDER=uberllm', + 'OCO_API_KEY=test-uberllm-key', + 'OCO_MODEL=deepseek/deepseek-v3.2', + `OCO_API_URL=${server.baseUrl}`, + 'OCO_GITPUSH=false' + ]); + + await prepareRepo( + gitDir, + { + 'index.ts': 'console.log("Hello World");\n' + }, + { stage: true } + ); + + const oco = await runCli(['--yes'], { + cwd: gitDir, + env: { + HOME: homeDir + } + }); + + expect(await waitForExit(oco)).toBe(0); + expect( + await oco.queryByText('Failed to apply migration') + ).not.toBeInTheConsole(); + await assertHeadCommit(gitDir, 'feat(uberllm): first commit'); + expect(server.authHeaders).toContain('Bearer test-uberllm-key'); + } finally { + await server.cleanup(); + rmSync(homeDir, { force: true, recursive: true }); + await cleanup(); + } +}); + it('cli ignores files listed in .opencommitignore when they are the only staged changes', async () => { const { gitDir, cleanup } = await prepareEnvironment();