xonecas.io
64875
Mc

mini-coder / commit 831be22

feat: custom providers support

xonecas2026-04-29 831be2213c11bc195b4f813c2e9293ad175a8a54 parent ce84616

5 files changed

src/args.ts+60−19
@@ -2,7 +2,7 @@ import { mkdir } from "node:fs/promises";
22 import {
33 type Api,
44 getModels,
5- type KnownProvider,
5+ getProviders,
66 type Model,
77 type ThinkingLevel,
88 } from "@mariozechner/pi-ai";
@@ -16,7 +16,7 @@ import {
1616 SettingsSchema,
1717 } from "./types.ts";
1818
19-const DEFAULT_PROVIDER: KnownProvider = "openai-codex";
19+const DEFAULT_PROVIDER = "openai-codex";
2020 const DEFAULT_MODEL_ID = "gpt-5.5";
2121 const DEFAULT_EFFORT: ThinkingLevel = "xhigh";
2222
@@ -84,24 +84,41 @@ function requireValue(argv: string[], index: number, flag: string) {
8484 return value;
8585 }
8686
87-function findModelConfig(modelId: string, provider: KnownProvider) {
88- const models = getModels(provider);
89- if (models.length === 0) throw new Error("Provider has no models");
90-
91- return models.find((m) => m.id === modelId);
87+function findModelConfig(
88+ modelId: string,
89+ provider: string,
90+ customProviders?: Model<Api>[],
91+) {
92+ const knownProviders = getProviders() as string[];
93+ if (knownProviders.includes(provider)) {
94+ const models = getModels(provider as any);
95+ if (models.length === 0) throw new Error("Provider has no models");
96+ return models.find((m) => m.id === modelId);
97+ }
98+ return customProviders?.find(
99+ (m) => m.provider === provider && m.id === modelId,
100+ );
92101 }
93102
94-function getFirstModelConfig(provider: KnownProvider): Model<Api> {
95- const model = getModels(provider)[0];
96- if (!model) throw new Error("Provider has no models");
97-
98- return model;
103+function getFirstModelConfig(
104+ provider: string,
105+ customProviders?: Model<Api>[],
106+): Model<Api> {
107+ const knownProviders = getProviders() as string[];
108+ if (knownProviders.includes(provider)) {
109+ const models = getModels(provider as any);
110+ if (models.length > 0) return models[0];
111+ }
112+ const custom = customProviders?.find((m) => m.provider === provider);
113+ if (custom) return custom;
114+ throw new Error("Provider has no models");
99115 }
100116
101117 function getFallbackModel(
102- provider: KnownProvider,
118+ provider: string,
103119 explicitModel: boolean,
104120 providerChanged: boolean,
121+ customProviders?: Model<Api>[],
105122 ): Model<Api> {
106123 if (explicitModel) {
107124 throw new Error("Model not found");
@@ -111,19 +128,26 @@ function getFallbackModel(
111128 throw new Error("Model not found");
112129 }
113130
114- return getFirstModelConfig(provider);
131+ return getFirstModelConfig(provider, customProviders);
115132 }
116133
117134 export async function handleArgv(argv: string[]): Promise<CliOptions> {
118135 const settings = await getSettings();
119- let availableProviders = await getAvailableProviders();
136+ const customProviders = settings?.customProviders ?? [];
137+ const builtInProviders = await getAvailableProviders();
138+ const availableProviders = [
139+ ...new Set([
140+ ...builtInProviders,
141+ ...customProviders.map((cp) => cp.provider),
142+ ]),
143+ ];
120144 const defaultProvider = availableProviders[0] ?? DEFAULT_PROVIDER;
121145 const settingsProvider = settings?.provider ?? defaultProvider;
122146 const settingsModelId =
123147 settings?.model ??
124148 (settingsProvider === DEFAULT_PROVIDER
125149 ? DEFAULT_MODEL_ID
126- : getFirstModelConfig(settingsProvider).id);
150+ : getFirstModelConfig(settingsProvider, customProviders).id);
127151 const settingsEffort = settings?.effort ?? DEFAULT_EFFORT;
128152 let provider: string = settingsProvider;
129153 let modelId = settingsModelId;
@@ -181,7 +205,16 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
181205
182206 if (flag === "--login" || flag === "-l") {
183207 await loginOAuth(requireValue(argv, i, flag));
184- availableProviders = await getAvailableProviders();
208+ // Rebuild available providers after login
209+ const refreshedProviders = await getAvailableProviders();
210+ availableProviders.splice(
211+ 0,
212+ availableProviders.length,
213+ ...new Set([
214+ ...refreshedProviders,
215+ ...customProviders.map((cp) => cp.provider),
216+ ]),
217+ );
185218 i++;
186219 }
187220 }
@@ -207,7 +240,7 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
207240 provider = fallbackProvider;
208241 providerChanged = provider !== settingsProvider;
209242 if (!explicitModel) {
210- modelId = getFirstModelConfig(fallbackProvider).id;
243+ modelId = getFirstModelConfig(fallbackProvider, customProviders).id;
211244 }
212245
213246 cliSettings = parseSettings(
@@ -223,22 +256,30 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
223256 const selectedModel = findModelConfig(
224257 cliSettings.model,
225258 cliSettings.provider,
259+ customProviders,
226260 );
227261 const model =
228262 selectedModel ??
229- getFallbackModel(cliSettings.provider, explicitModel, providerChanged);
263+ getFallbackModel(
264+ cliSettings.provider,
265+ explicitModel,
266+ providerChanged,
267+ customProviders,
268+ );
230269
231270 const options = parseCliOptions({
232271 provider: cliSettings.provider,
233272 model,
234273 effort: cliSettings.effort,
235274 prompt,
275+ customProviders,
236276 });
237277 const nextSettings = parseSettings(
238278 {
239279 provider: options.provider,
240280 model: options.model.id,
241281 effort: options.effort,
282+ customProviders,
242283 },
243284 "settings",
244285 );
src/oauth.ts+14−8
@@ -1,10 +1,6 @@
11 import readline from "node:readline";
22
3-import {
4- getEnvApiKey,
5- getProviders,
6- type KnownProvider,
7-} from "@mariozechner/pi-ai";
3+import { getEnvApiKey, getProviders } from "@mariozechner/pi-ai";
84 import {
95 getOAuthApiKey,
106 getOAuthProvider,
@@ -20,15 +16,15 @@ export function isOAuthProvider(provider: string): boolean {
2016 );
2117 }
2218
23-export async function getAvailableProviders(): Promise<KnownProvider[]> {
19+export async function getAvailableProviders(): Promise<string[]> {
2420 const auth = await readCreds();
2521 const loggedInOAuthProviders = getOAuthProviders()
26- .map((provider) => provider.id as KnownProvider)
22+ .map((provider) => provider.id)
2723 .filter((provider) => auth[provider]);
2824 const envKeyProviders = getProviders().filter(
2925 (provider) => !!getEnvApiKey(provider),
3026 );
31- const providers: KnownProvider[] = [];
27+ const providers: string[] = [];
3228 const providerIds = new Set<string>();
3329
3430 for (const provider of [...loggedInOAuthProviders, ...envKeyProviders]) {
@@ -89,6 +85,16 @@ export async function getApiKey(options: CliOptions) {
8985 const envApiKey = getEnvApiKey(provider);
9086 if (envApiKey) return envApiKey;
9187
88+ const knownProviders = getProviders() as string[];
89+ if (!knownProviders.includes(provider)) {
90+ if (options.model.api === "openai-completions") {
91+ // pi-ai requires a truthy apiKey for OpenAI-compatible local providers like Ollama.
92+ return "dummy";
93+ }
94+
95+ return undefined;
96+ }
97+
9298 throw new Error("Not logged in");
9399 }
94100
src/tui-components.ts+1−1
@@ -111,7 +111,7 @@ export function ContextPill(state: TUIState) {
111111 const max = state.options.model.contextWindow;
112112 const smartMax = 80000;
113113 const percent = Math.floor((state.contextSize / max) * 100);
114- const smartPercent = Math.floor((state.contextSize / smartMax) * 100)
114+ const smartPercent = Math.floor((state.contextSize / smartMax) * 100);
115115 if (smartPercent > 90) {
116116 bg = theme.bred;
117117 } else if (smartPercent > 80) {
src/tui-overlay.ts+26−12
@@ -1,9 +1,5 @@
11 import { HStack, Text, TextInput, VStack } from "@cel-tui/core";
2-import {
3- getModels,
4- type KnownProvider,
5- type ThinkingLevel,
6-} from "@mariozechner/pi-ai";
2+import { getModels, type ThinkingLevel } from "@mariozechner/pi-ai";
73 import { getOAuthProviders } from "@mariozechner/pi-ai/oauth";
84 import { saveSettings } from "./args";
95 import { getAvailableProviders } from "./oauth";
@@ -208,7 +204,7 @@ export function mainMenu(state: TUIState) {
208204 type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
209205
210206 const oauthProviders = getOAuthProviders();
211- const getProviderLabel = (provider: KnownProvider) =>
207+ const getProviderLabel = (provider: string) =>
212208 oauthProviders.find((oauthProvider) => oauthProvider.id === provider)
213209 ?.name ?? provider;
214210 const reasoningEfforts: ThinkingLevel[] = [
@@ -219,17 +215,29 @@ export function mainMenu(state: TUIState) {
219215 "xhigh",
220216 ];
221217 const efforts = reasoningEfforts.map((v) => ({ label: v, value: v }));
222- const getProviderModels = (provider: KnownProvider) =>
223- getModels(provider).map((v) => ({
218+ const getProviderModels = (provider: string) => {
219+ const builtIn = getModels(provider as any).map((v) => ({
224220 label: v.name,
225221 value: v.id,
226222 }));
223+ const custom =
224+ state.options.customProviders
225+ ?.filter((m) => m.provider === provider)
226+ .map((v) => ({
227+ label: v.name,
228+ value: v.id,
229+ })) ?? [];
230+ return [...builtIn, ...custom];
231+ };
227232
228- let currentProviders: KnownProvider[] = [];
233+ let currentProviders: string[] = [];
229234 let currentSessions: Session[] = [];
230235
231236 const providersPane = async (): Promise<MenuPane> => {
232- currentProviders = await getAvailableProviders();
237+ const builtIn = await getAvailableProviders();
238+ const custom =
239+ state.options.customProviders?.map((cp) => cp.provider) ?? [];
240+ currentProviders = [...new Set([...builtIn, ...custom])];
233241 return {
234242 label: "providers",
235243 filter: "",
@@ -268,7 +276,7 @@ export function mainMenu(state: TUIState) {
268276 };
269277 const panes: MenuPane[] = [effortPane];
270278 let currentPane = mainPane;
271- let selectedProvider: KnownProvider | undefined;
279+ let selectedProvider: string | undefined;
272280
273281 const openPane = (s: SelectState, pane: MenuPane) => {
274282 currentPane = pane;
@@ -347,9 +355,13 @@ export function mainMenu(state: TUIState) {
347355 if (currentPane.label === "models") {
348356 if (!selectedProvider) return;
349357
350- const model = getModels(selectedProvider).find(
358+ const builtIn = getModels(selectedProvider as any).find(
351359 (v) => v.id === s.selected,
352360 );
361+ const custom = state.options.customProviders?.find(
362+ (v) => v.provider === selectedProvider && v.id === s.selected,
363+ );
364+ const model = builtIn ?? custom;
353365 if (!model) return;
354366
355367 state.options.provider = selectedProvider;
@@ -358,6 +370,7 @@ export function mainMenu(state: TUIState) {
358370 provider: selectedProvider,
359371 model: model.id,
360372 effort: state.options.effort,
373+ customProviders: state.options.customProviders,
361374 });
362375 closeMenu(s);
363376 return;
@@ -372,6 +385,7 @@ export function mainMenu(state: TUIState) {
372385 provider: state.options.provider,
373386 model: state.options.model.id,
374387 effort: effort,
388+ customProviders: state.options.customProviders,
375389 });
376390 closeMenu(s);
377391 }
src/types.ts+4−8
@@ -1,8 +1,6 @@
11 import {
22 type Api,
33 type AssistantMessage,
4- getProviders,
5- type KnownProvider,
64 type Message,
75 type Model,
86 type Static,
@@ -13,10 +11,6 @@ import {
1311 } from "@mariozechner/pi-ai";
1412 import type { OAuthCredentials } from "@mariozechner/pi-ai/oauth";
1513
16-const KnownProviderSchema = Type.Unsafe<KnownProvider>(
17- Type.Union(getProviders().map((provider) => Type.Literal(provider))),
18-);
19-
2014 const ThinkingLevelSchema = Type.Unsafe<ThinkingLevel>(
2115 Type.Union([
2216 Type.Literal("minimal"),
@@ -52,17 +46,19 @@ const ModelSchema = Type.Unsafe<Model<Api>>(
5246 );
5347
5448 export const SettingsSchema = Type.Object({
55- provider: KnownProviderSchema,
49+ provider: Type.String(),
5650 model: Type.String(),
5751 effort: ThinkingLevelSchema,
52+ customProviders: Type.Optional(Type.Array(ModelSchema)),
5853 });
5954 export type Settings = Static<typeof SettingsSchema>;
6055
6156 export const CliOptionsSchema = Type.Object({
62- provider: KnownProviderSchema,
57+ provider: Type.String(),
6358 model: ModelSchema,
6459 effort: ThinkingLevelSchema,
6560 prompt: Type.Optional(Type.String()),
61+ customProviders: Type.Optional(Type.Array(ModelSchema)),
6662 });
6763 export type CliOptions = Static<typeof CliOptionsSchema>;