xonecas.io
64875
Mc

mini-coder / commit f3af852

feat: env key providers support

xonecas2026-04-29 f3af852f02b5980f1f30ebd12b60e4237060d096 parent 5a94d8c

4 files changed

TODO.md+9−0
@@ -4,6 +4,15 @@
44
55 ## TODO: Better prompts, tools descriptions and reminder prompt engineering.
66
7+Raw notes, references:
8+
9+> good lessons from claude and general advice, seems good and grounded on real experience. Matches with learnings.
10+https://www.indiehackers.com/post/the-complete-guide-to-writing-agent-system-prompts-lessons-from-reverse-engineering-claude-code-6e18d54294
11+
12+> How pi coding agent does it, minimal and structured, a good approach, but we can be even more focused and minimal.
13+https://raw.githubusercontent.com/badlogic/pi-mono/refs/heads/main/packages/coding-agent/src/core/system-prompt.ts
14+
15+> Key sentence to add:
716 ```
817 Prioritize technical accuracy and truthfulness over validating the user's beliefs.
918 Focus on facts and problem-solving, providing direct, objective technical info
src/args.ts+39−4
@@ -7,7 +7,7 @@ import {
77 type ThinkingLevel,
88 } from "@mariozechner/pi-ai";
99 import { Value } from "typebox/value";
10-import { loginOAuth } from "./oauth";
10+import { getAvailableProviders, isOAuthProvider, loginOAuth } from "./oauth";
1111 import { DATA_DIR, SETTINGS_PATH } from "./shared.ts";
1212 import {
1313 type CliOptions,
@@ -116,14 +116,21 @@ function getFallbackModel(
116116
117117 export async function handleArgv(argv: string[]): Promise<CliOptions> {
118118 const settings = await getSettings();
119- const settingsProvider = settings?.provider ?? DEFAULT_PROVIDER;
120- const settingsModelId = settings?.model ?? DEFAULT_MODEL_ID;
119+ let availableProviders = await getAvailableProviders();
120+ const defaultProvider = availableProviders[0] ?? DEFAULT_PROVIDER;
121+ const settingsProvider = settings?.provider ?? defaultProvider;
122+ const settingsModelId =
123+ settings?.model ??
124+ (settingsProvider === DEFAULT_PROVIDER
125+ ? DEFAULT_MODEL_ID
126+ : getFirstModelConfig(settingsProvider).id);
121127 const settingsEffort = settings?.effort ?? DEFAULT_EFFORT;
122128 let provider: string = settingsProvider;
123129 let modelId = settingsModelId;
124130 let effort: string = settingsEffort;
125131 let prompt: string | undefined;
126132 let providerChanged = false;
133+ let explicitProvider = false;
127134 let explicitModel = false;
128135
129136 for (let i = 0; i < argv.length; i++) {
@@ -140,6 +147,7 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
140147 "CLI settings",
141148 ).provider;
142149 providerChanged = provider !== settingsProvider;
150+ explicitProvider = true;
143151 i++;
144152 continue;
145153 }
@@ -173,11 +181,12 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
173181
174182 if (flag === "--login" || flag === "-l") {
175183 await loginOAuth(requireValue(argv, i, flag));
184+ availableProviders = await getAvailableProviders();
176185 i++;
177186 }
178187 }
179188
180- const cliSettings = parseSettings(
189+ let cliSettings = parseSettings(
181190 {
182191 provider,
183192 model: modelId,
@@ -185,6 +194,32 @@ export async function handleArgv(argv: string[]): Promise<CliOptions> {
185194 },
186195 "CLI settings",
187196 );
197+ const providerAvailable = availableProviders.includes(cliSettings.provider);
198+
199+ if (explicitProvider) {
200+ if (!providerAvailable && !isOAuthProvider(cliSettings.provider)) {
201+ throw new Error(
202+ `Provider "${cliSettings.provider}" is not logged in and no API key was found`,
203+ );
204+ }
205+ } else if (!providerAvailable && availableProviders.length) {
206+ const fallbackProvider = availableProviders[0];
207+ provider = fallbackProvider;
208+ providerChanged = provider !== settingsProvider;
209+ if (!explicitModel) {
210+ modelId = getFirstModelConfig(fallbackProvider).id;
211+ }
212+
213+ cliSettings = parseSettings(
214+ {
215+ provider,
216+ model: modelId,
217+ effort,
218+ },
219+ "CLI settings",
220+ );
221+ }
222+
188223 const selectedModel = findModelConfig(
189224 cliSettings.model,
190225 cliSettings.provider,
src/oauth.ts+47−6
@@ -1,7 +1,13 @@
11 import readline from "node:readline";
22
3+import {
4+ getEnvApiKey,
5+ getProviders,
6+ type KnownProvider,
7+} from "@mariozechner/pi-ai";
38 import {
49 getOAuthApiKey,
10+ getOAuthProviders,
511 loginOpenAICodex,
612 type OAuthProviderId,
713 } from "@mariozechner/pi-ai/oauth";
@@ -10,6 +16,33 @@ import type { CliOptions, SavedOAuthCreds } from "./types";
1016
1117 // const AUTH_FILE = "./.auth.json";
1218
19+export function isOAuthProvider(provider: string): boolean {
20+ return getOAuthProviders().some(
21+ (oauthProvider) => oauthProvider.id === provider,
22+ );
23+}
24+
25+export async function getAvailableProviders(): Promise<KnownProvider[]> {
26+ const auth = await readCreds();
27+ const loggedInOAuthProviders = getOAuthProviders()
28+ .map((provider) => provider.id as KnownProvider)
29+ .filter((provider) => auth[provider]);
30+ const envKeyProviders = getProviders().filter(
31+ (provider) => !!getEnvApiKey(provider),
32+ );
33+ const providers: KnownProvider[] = [];
34+ const providerIds = new Set<string>();
35+
36+ for (const provider of [...loggedInOAuthProviders, ...envKeyProviders]) {
37+ if (providerIds.has(provider)) continue;
38+
39+ providers.push(provider);
40+ providerIds.add(provider);
41+ }
42+
43+ return providers;
44+}
45+
1346 export async function loginOAuth(provider: OAuthProviderId) {
1447 const rl = readline.createInterface({
1548 input: process.stdin,
@@ -46,16 +79,24 @@ export async function loginOAuth(provider: OAuthProviderId) {
4679 export async function getApiKey(options: CliOptions) {
4780 const provider = options.model.provider;
4881 const auth = await readCreds();
49- const result = await getOAuthApiKey(provider, auth);
50- if (!result) throw new Error("Not logged in");
5182
52- auth[provider] = { type: "oauth", ...result.newCredentials };
53- await writeCreds(auth);
83+ if (isOAuthProvider(provider)) {
84+ const result = await getOAuthApiKey(provider, auth);
85+ if (result) {
86+ auth[provider] = { type: "oauth", ...result.newCredentials };
87+ await writeCreds(auth);
88+
89+ return result.apiKey;
90+ }
91+ }
92+
93+ const envApiKey = getEnvApiKey(provider);
94+ if (envApiKey) return envApiKey;
5495
55- return result.apiKey;
96+ throw new Error("Not logged in");
5697 }
5798
58-export async function readCreds() {
99+export async function readCreds(): Promise<SavedOAuthCreds> {
59100 const file = Bun.file(AUTH_FILE);
60101 if (await file.exists()) {
61102 return JSON.parse(await file.text());
src/tui-overlay.ts+28−12
@@ -5,6 +5,7 @@ import {
55 type ThinkingLevel,
66 } from "@mariozechner/pi-ai";
77 import { getOAuthProviders } from "@mariozechner/pi-ai/oauth";
8+import { getAvailableProviders } from "./oauth";
89 import { listSessionsForCwd } from "./session";
910 import { TextPill, theme } from "./tui-components";
1011 import type { SelectOptions, SelectState, Session, TUIState } from "./types";
@@ -201,10 +202,9 @@ export function mainMenu(state: TUIState) {
201202 type MenuPane = Omit<SelectOptions, "onCancel" | "onSelect">;
202203
203204 const oauthProviders = getOAuthProviders();
204- const providers = oauthProviders.map((v) => ({
205- label: v.name,
206- value: v.id,
207- }));
205+ const getProviderLabel = (provider: KnownProvider) =>
206+ oauthProviders.find((oauthProvider) => oauthProvider.id === provider)
207+ ?.name ?? provider;
208208 const reasoningEfforts: ThinkingLevel[] = [
209209 "minimal",
210210 "low",
@@ -219,8 +219,21 @@ export function mainMenu(state: TUIState) {
219219 value: v.id,
220220 }));
221221
222+ let currentProviders: KnownProvider[] = [];
222223 let currentSessions: Session[] = [];
223224
225+ const providersPane = async (): Promise<MenuPane> => {
226+ currentProviders = await getAvailableProviders();
227+ return {
228+ label: "providers",
229+ filter: "",
230+ list: currentProviders.map((provider) => ({
231+ label: getProviderLabel(provider),
232+ value: provider,
233+ })),
234+ };
235+ };
236+
224237 const sessionsPane = async (): Promise<MenuPane> => {
225238 currentSessions = await listSessionsForCwd();
226239 return {
@@ -242,17 +255,12 @@ export function mainMenu(state: TUIState) {
242255 { label: "sessions", value: "sessions" },
243256 ],
244257 };
245- const providersPane: MenuPane = {
246- label: "providers",
247- filter: "",
248- list: providers,
249- };
250258 const effortPane: MenuPane = {
251259 label: "effort",
252260 filter: "",
253261 list: efforts,
254262 };
255- const panes: MenuPane[] = [mainPane, providersPane, effortPane];
263+ const panes: MenuPane[] = [effortPane];
256264 let currentPane = mainPane;
257265 let selectedProvider: KnownProvider | undefined;
258266
@@ -267,6 +275,7 @@ export function mainMenu(state: TUIState) {
267275 const resetMenu = (s: SelectState) => {
268276 currentPane = mainPane;
269277 selectedProvider = undefined;
278+ currentProviders = [];
270279 currentSessions = [];
271280 s.value = "";
272281 s.label = mainPane.label ? mainPane.label.toUpperCase() : "SELECT";
@@ -285,6 +294,12 @@ export function mainMenu(state: TUIState) {
285294 if (!s.selected) return;
286295
287296 if (currentPane.label === "main") {
297+ if (s.selected === "providers") {
298+ return providersPane().then((pane) => {
299+ openPane(s, pane);
300+ });
301+ }
302+
288303 if (s.selected === "sessions") {
289304 return sessionsPane().then((pane) => {
290305 openPane(s, pane);
@@ -310,10 +325,10 @@ export function mainMenu(state: TUIState) {
310325 }
311326
312327 if (currentPane.label === "providers") {
313- const provider = oauthProviders.find((v) => v.id === s.selected);
328+ const provider = currentProviders.find((v) => v === s.selected);
314329 if (!provider) return;
315330
316- selectedProvider = provider.id as KnownProvider;
331+ selectedProvider = provider;
317332 openPane(s, {
318333 label: "models",
319334 filter: "",
@@ -347,6 +362,7 @@ export function mainMenu(state: TUIState) {
347362 onCancel: () => {
348363 currentPane = mainPane;
349364 selectedProvider = undefined;
365+ currentProviders = [];
350366 currentSessions = [];
351367 state.overlay = false;
352368 },