@@ -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 );