xonecas.io
64875
Mc

mini-coder / commit 5db070b

feat: adopt the latest pi-ai model api.

Sean2026-07-01 5db070ba91358684de07208bbd5a72a3503cbc6f parent 847ecb1

7 files changed

bun.lock+7−3
@@ -7,7 +7,7 @@
77 "dependencies": {
88 "@cel-tui/components": "^0.8.3",
99 "@cel-tui/core": "^0.8.3",
10- "@earendil-works/pi-ai": "^0.75.5",
10+ "@earendil-works/pi-ai": "^0.80.3",
1111 "diff": "^9.0.0",
1212 "simple-git": "^3.36.0",
1313 "yaml": "^2.9.0",
@@ -101,7 +101,7 @@
101101
102102 "@cel-tui/types": ["@cel-tui/types@0.8.3", "", { "peerDependencies": { "typescript": ">=5.0.0" } }, "sha512-yEKXCY16U/W4A4JaVysv2/x/IBEHQAfb93CzL6HugN+N15ETB3Vn8tZrQwdyrOT/9WdlCQkeBH8Vj7BJHs4Hkw=="],
103103
104- "@earendil-works/pi-ai": ["@earendil-works/pi-ai@0.75.5", "", { "dependencies": { "@anthropic-ai/sdk": "0.91.1", "@aws-sdk/client-bedrock-runtime": "3.1048.0", "@google/genai": "1.52.0", "@mistralai/mistralai": "2.2.1", "@smithy/node-http-handler": "4.7.3", "http-proxy-agent": "7.0.2", "https-proxy-agent": "7.0.6", "openai": "6.26.0", "partial-json": "0.1.7", "typebox": "1.1.38" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-zf1F5kXk1pqZeFShXOqq9ibUk8QdtRoLCDPAjO+hj44e3EUs9/GFO2qnhTC5+JA2uw …
104+ "@earendil-works/pi-ai": ["@earendil-works/pi-ai@0.80.3", "", { "dependencies": { "@anthropic-ai/sdk": "0.91.1", "@aws-sdk/client-bedrock-runtime": "3.1048.0", "@google/genai": "1.52.0", "@mistralai/mistralai": "2.2.6", "@opentelemetry/api": "1.9.0", "@smithy/node-http-handler": "4.7.3", "http-proxy-agent": "7.0.2", "https-proxy-agent": "7.0.6", "openai": "6.26.0", "partial-json": "0.1.7", "typebox": "1.1.38" }, "bin": { "pi-ai": "dist/cli.js" } }, "sha512-jPZLMeGL5kkMSEAwAklfXTMHqZvfhsJtCCp …
105105
106106 "@google/genai": ["@google/genai@1.52.0", "", { "dependencies": { "google-auth-library": "^10.3.0", "p-retry": "^4.6.2", "protobufjs": "^7.5.4", "ws": "^8.18.0" }, "peerDependencies": { "@modelcontextprotocol/sdk": "^1.25.2" }, "optionalPeers": ["@modelcontextprotocol/sdk"] }, "sha512-gwSvbpiN/17O9TbsqSsE/OzZcpv5Fo4RQjdngGgogtuB9RsyJ8ZHhX5KjHj1bp5N9snN2eK8LDGXSaWW2hof8Q=="],
107107
@@ -109,10 +109,14 @@
109109
110110 "@kwsites/promise-deferred": ["@kwsites/promise-deferred@1.1.1", "", {}, "sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="],
111111
112- "@mistralai/mistralai": ["@mistralai/mistralai@2.2.1", "", { "dependencies": { "ws": "^8.18.0", "zod": "^3.25.0 || ^4.0.0", "zod-to-json-schema": "^3.25.0" } }, "sha512-uKU8CZmL2RzYKmplsU01hii4p3pe4HqJefpWNRWXm1Tcm0Sm4xXfwSLIy4k7ZCPlbETCGcp69E7hZs+WOJ5itQ=="],
112+ "@mistralai/mistralai": ["@mistralai/mistralai@2.2.6", "", { "dependencies": { "@opentelemetry/semantic-conventions": "^1.40.0", "ws": "^8.18.0", "zod": "^3.25.0 || ^4.0.0", "zod-to-json-schema": "^3.25.0" }, "peerDependencies": { "@opentelemetry/api": "^1.9.0" }, "optionalPeers": ["@opentelemetry/api"] }, "sha512-W8pX7zHxjJvMIpw8JMxeJEleapXX0Q9NPszdNzqkM3MIEoIGPObdodujj+WHteXEvGfaP/AMwlNyRfEzSY6dQQ=="],
113113
114114 "@nodable/entities": ["@nodable/entities@2.1.0", "", {}, "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA=="],
115115
116+ "@opentelemetry/api": ["@opentelemetry/api@1.9.0", "", {}, "sha512-3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg=="],
117+
118+ "@opentelemetry/semantic-conventions": ["@opentelemetry/semantic-conventions@1.41.1", "", {}, "sha512-/UhIkaZgPutTFmQ7RnIJGgDXZmtEJ7Dvi86xNTFWcnRxVRNk/aotsqDJYeEvDP+FSMB2SdW+pQzNMcWP0rwuNA=="],
119+
116120 "@protobufjs/aspromise": ["@protobufjs/aspromise@1.1.2", "", {}, "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="],
117121
118122 "@protobufjs/base64": ["@protobufjs/base64@1.1.2", "", {}, "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="],
package.json+1−1
@@ -22,7 +22,7 @@
2222 "dependencies": {
2323 "@cel-tui/components": "^0.8.3",
2424 "@cel-tui/core": "^0.8.3",
25- "@earendil-works/pi-ai": "^0.75.5",
25+ "@earendil-works/pi-ai": "^0.80.3",
2626 "diff": "^9.0.0",
2727 "simple-git": "^3.36.0",
2828 "yaml": "^2.9.0"
src/agent.ts+18−15
@@ -1,14 +1,13 @@
1-import {
2- type AssistantMessage,
3- type Context,
4- type ImageContent,
5- type Message,
6- streamSimple,
7- type TextContent,
8- type ToolCall,
9- type ToolResultMessage,
1+import type {
2+ AssistantMessage,
3+ Context,
4+ ImageContent,
5+ Message,
6+ TextContent,
7+ ToolCall,
8+ ToolResultMessage,
109 } from "@earendil-works/pi-ai";
11-import { getApiKey } from "./oauth";
10+import { createAppModels } from "./models.ts";
1211 import { estimateTokens } from "./shared";
1312 import type {
1413 AgentContex,
@@ -73,8 +72,7 @@ export async function* streamAgent(
7372 messages: agentCtx.messages,
7473 };
7574
76- // Important for refreshing tokens.
77- const apiKey = await getApiKey(agentCtx.options);
75+ const models = createAppModels(agentCtx.options.customProviders);
7876
7977 // Main agent loop, continues until llm sends a response other than toolCall or has no tool calls.
8078 while (true) {
@@ -82,10 +80,9 @@ export async function* streamAgent(
8280 // 80k is the agreed uppon threshold to the DUMB ZONE
8381 if (estimate > 80000) compactContext(llmCtx.messages);
8482
85- const s = streamSimple(agentCtx.options.model, llmCtx, {
83+ const s = models.streamSimple(agentCtx.options.model, llmCtx, {
8684 reasoning: agentCtx.options.effort,
8785 signal: agentCtx.signal,
88- apiKey,
8986 });
9087
9188 let partial: AssistantMessage | null = null;
@@ -123,6 +120,8 @@ export async function* streamAgent(
123120
124121 case "error": {
125122 const finalMessage = await s.result();
123+ if (!finalMessage) throw new Error(e.error.errorMessage);
124+
126125 if (added) {
127126 llmCtx.messages[llmCtx.messages.length - 1] = finalMessage;
128127 } else {
@@ -137,6 +136,8 @@ export async function* streamAgent(
137136 }
138137
139138 const message = await s.result();
139+ if (!message) throw new Error("Stream finished without a message");
140+
140141 if (added) {
141142 llmCtx.messages[llmCtx.messages.length - 1] = message;
142143 } else {
@@ -145,7 +146,9 @@ export async function* streamAgent(
145146 }
146147 yield { type: "message_end", message };
147148
148- const toolCalls = message.content.filter((c) => c.type === "toolCall");
149+ const toolCalls = message.content.filter(
150+ (c): c is ToolCall => c.type === "toolCall",
151+ );
149152
150153 // Stop on errors or no tools to call.
151154 if (message.stopReason !== "toolUse" || toolCalls.length === 0) {
src/args.ts+6−54
@@ -1,12 +1,11 @@
11 import { mkdir } from "node:fs/promises";
2-import {
3- type Api,
4- getModels,
5- getProviders,
6- type Model,
7- type ThinkingLevel,
8-} from "@earendil-works/pi-ai";
2+import type { ThinkingLevel } from "@earendil-works/pi-ai";
93 import { Value } from "typebox/value";
4+import {
5+ findModelConfig,
6+ getFallbackModel,
7+ getFirstModelConfig,
8+} from "./models.ts";
109 import { getAvailableProviders, isOAuthProvider, loginOAuth } from "./oauth";
1110 import { DATA_DIR, SETTINGS_PATH } from "./shared.ts";
1211 import {
@@ -84,53 +83,6 @@ function requireValue(argv: string[], index: number, flag: string) {
8483 return value;
8584 }
8685
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- );
101-}
102-
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");
115-}
116-
117-function getFallbackModel(
118- provider: string,
119- explicitModel: boolean,
120- providerChanged: boolean,
121- customProviders?: Model<Api>[],
122-): Model<Api> {
123- if (explicitModel) {
124- throw new Error("Model not found");
125- }
126-
127- if (!providerChanged) {
128- throw new Error("Model not found");
129- }
130-
131- return getFirstModelConfig(provider, customProviders);
132-}
133-
13486 export async function handleArgv(argv: string[]): Promise<CliOptions> {
13587 const settings = await getSettings();
13688 const customProviders = settings?.customProviders ?? [];
src/models.ts+191−0
@@ -0,0 +1,191 @@
1+import type {
2+ Api,
3+ Credential,
4+ CredentialStore,
5+ KnownApi,
6+ KnownProvider,
7+ Model,
8+ ProviderStreams,
9+} from "@earendil-works/pi-ai";
10+import { createProvider } from "@earendil-works/pi-ai";
11+import { anthropicMessagesApi } from "@earendil-works/pi-ai/api/anthropic-messages.lazy";
12+import { azureOpenAIResponsesApi } from "@earendil-works/pi-ai/api/azure-openai-responses.lazy";
13+import { bedrockConverseStreamApi } from "@earendil-works/pi-ai/api/bedrock-converse-stream.lazy";
14+import { googleGenerativeAIApi } from "@earendil-works/pi-ai/api/google-generative-ai.lazy";
15+import { googleVertexApi } from "@earendil-works/pi-ai/api/google-vertex.lazy";
16+import { mistralConversationsApi } from "@earendil-works/pi-ai/api/mistral-conversations.lazy";
17+import { openAICodexResponsesApi } from "@earendil-works/pi-ai/api/openai-codex-responses.lazy";
18+import { openAICompletionsApi } from "@earendil-works/pi-ai/api/openai-completions.lazy";
19+import { openAIResponsesApi } from "@earendil-works/pi-ai/api/openai-responses.lazy";
20+import {
21+ builtinModels,
22+ getBuiltinModels,
23+ getBuiltinProviders,
24+} from "@earendil-works/pi-ai/providers/all";
25+import { AUTH_PATH } from "./shared.ts";
26+
27+const API_STREAMS: Record<KnownApi, () => ProviderStreams> = {
28+ "anthropic-messages": anthropicMessagesApi,
29+ "azure-openai-responses": azureOpenAIResponsesApi,
30+ "bedrock-converse-stream": bedrockConverseStreamApi,
31+ "google-generative-ai": googleGenerativeAIApi,
32+ "google-vertex": googleVertexApi,
33+ "mistral-conversations": mistralConversationsApi,
34+ "openai-codex-responses": openAICodexResponsesApi,
35+ "openai-completions": openAICompletionsApi,
36+ "openai-responses": openAIResponsesApi,
37+};
38+
39+type SavedCredentials = Record<string, Credential>;
40+
41+async function readCredentials(): Promise<SavedCredentials> {
42+ const file = Bun.file(AUTH_PATH);
43+ if (await file.exists()) {
44+ return JSON.parse(await file.text()) as SavedCredentials;
45+ }
46+
47+ return {};
48+}
49+
50+async function writeCredentials(credentials: SavedCredentials) {
51+ await Bun.write(AUTH_PATH, JSON.stringify(credentials));
52+}
53+
54+export function createCredentialStore(): CredentialStore {
55+ return {
56+ async read(providerId) {
57+ const credentials = await readCredentials();
58+ return credentials[providerId];
59+ },
60+
61+ async modify(providerId, fn) {
62+ const credentials = await readCredentials();
63+ const next = await fn(credentials[providerId]);
64+
65+ if (next) {
66+ credentials[providerId] = next;
67+ await writeCredentials(credentials);
68+ }
69+
70+ return credentials[providerId];
71+ },
72+
73+ async delete(providerId) {
74+ const credentials = await readCredentials();
75+ delete credentials[providerId];
76+ await writeCredentials(credentials);
77+ },
78+ };
79+}
80+
81+export function isBuiltinProvider(provider: string): provider is KnownProvider {
82+ return getBuiltinProviders().includes(provider as KnownProvider);
83+}
84+
85+export function findModelConfig(
86+ modelId: string,
87+ provider: string,
88+ customProviders?: Model<Api>[],
89+) {
90+ if (isBuiltinProvider(provider)) {
91+ const models = getBuiltinModels(provider);
92+ if (models.length === 0) throw new Error("Provider has no models");
93+ return models.find((m) => m.id === modelId);
94+ }
95+ return customProviders?.find(
96+ (m) => m.provider === provider && m.id === modelId,
97+ );
98+}
99+
100+export function getFirstModelConfig(
101+ provider: string,
102+ customProviders?: Model<Api>[],
103+): Model<Api> {
104+ if (isBuiltinProvider(provider)) {
105+ const models = getBuiltinModels(provider);
106+ if (models.length > 0) return models[0];
107+ }
108+ const custom = customProviders?.find((m) => m.provider === provider);
109+ if (custom) return custom;
110+ throw new Error("Provider has no models");
111+}
112+
113+export function getFallbackModel(
114+ provider: string,
115+ explicitModel: boolean,
116+ providerChanged: boolean,
117+ customProviders?: Model<Api>[],
118+): Model<Api> {
119+ if (explicitModel) {
120+ throw new Error("Model not found");
121+ }
122+
123+ if (!providerChanged) {
124+ throw new Error("Model not found");
125+ }
126+
127+ return getFirstModelConfig(provider, customProviders);
128+}
129+
130+export function getProviderModels(
131+ provider: string,
132+ customProviders?: Model<Api>[],
133+): Model<Api>[] {
134+ const builtIn = isBuiltinProvider(provider) ? getBuiltinModels(provider) : [];
135+ const custom = customProviders?.filter((m) => m.provider === provider) ?? [];
136+
137+ return [...builtIn, ...custom];
138+}
139+
140+export function createAppModels(customProviders?: Model<Api>[]) {
141+ const models = builtinModels({ credentials: createCredentialStore() });
142+ const customProviderGroups = new Map<string, Model<Api>[]>();
143+
144+ for (const model of customProviders ?? []) {
145+ const group = customProviderGroups.get(model.provider) ?? [];
146+ group.push(model);
147+ customProviderGroups.set(model.provider, group);
148+ }
149+
150+ for (const [provider, providerModels] of customProviderGroups) {
151+ models.setProvider(
152+ createProvider({
153+ id: provider,
154+ name: provider,
155+ models: providerModels,
156+ auth: {
157+ apiKey: {
158+ name: provider,
159+ resolve: async () => ({ auth: { apiKey: "dummy" } }),
160+ },
161+ },
162+ api: Object.fromEntries(
163+ Object.entries(API_STREAMS)
164+ .filter(([api]) =>
165+ providerModels.some((model) => model.api === api),
166+ )
167+ .map(([api, createStreams]) => [api, createStreams()]),
168+ ),
169+ }),
170+ );
171+ }
172+
173+ return models;
174+}
175+
176+export async function getConfiguredBuiltinProviders(): Promise<string[]> {
177+ const models = builtinModels({ credentials: createCredentialStore() });
178+ const providers: string[] = [];
179+
180+ for (const provider of models.getProviders()) {
181+ const model = provider.getModels()[0];
182+ if (!model) continue;
183+
184+ try {
185+ const auth = await models.getAuth(model);
186+ if (auth) providers.push(provider.id);
187+ } catch {}
188+ }
189+
190+ return providers;
191+}
src/oauth.ts+10−20
@@ -1,8 +1,6 @@
11 import readline from "node:readline";
22
3-import { getEnvApiKey, getProviders } from "@earendil-works/pi-ai";
43 import {
5- getOAuthApiKey,
64 getOAuthProvider,
75 getOAuthProviders,
86 type OAuthLoginCallbacks,
@@ -10,6 +8,11 @@ import {
108 type OAuthProviderId,
119 type OAuthSelectPrompt,
1210 } from "@earendil-works/pi-ai/oauth";
11+import {
12+ createAppModels,
13+ getConfiguredBuiltinProviders,
14+ isBuiltinProvider,
15+} from "./models.ts";
1316 import { AUTH_PATH as AUTH_FILE } from "./shared";
1417 import type { CliOptions, SavedOAuthCreds } from "./types";
1518
@@ -65,9 +68,7 @@ export async function getAvailableProviders(): Promise<string[]> {
6568 const loggedInOAuthProviders = getOAuthProviders()
6669 .map((provider) => provider.id)
6770 .filter((provider) => auth[provider]);
68- const envKeyProviders = getProviders().filter(
69- (provider) => !!getEnvApiKey(provider),
70- );
71+ const envKeyProviders = await getConfiguredBuiltinProviders();
7172 const providers: string[] = [];
7273 const providerIds = new Set<string>();
7374
@@ -103,23 +104,12 @@ export async function loginOAuth(provider: OAuthProviderId) {
103104
104105 export async function getApiKey(options: CliOptions) {
105106 const provider = options.model.provider;
106- const auth = await readCreds();
107-
108- if (isOAuthProvider(provider)) {
109- const result = await getOAuthApiKey(provider, auth);
110- if (result) {
111- auth[provider] = { type: "oauth", ...result.newCredentials };
112- await writeCreds(auth);
113-
114- return result.apiKey;
115- }
116- }
107+ const models = createAppModels(options.customProviders);
108+ const auth = await models.getAuth(options.model);
117109
118- const envApiKey = getEnvApiKey(provider);
119- if (envApiKey) return envApiKey;
110+ if (auth?.auth.apiKey) return auth.auth.apiKey;
120111
121- const knownProviders = getProviders() as string[];
122- if (!knownProviders.includes(provider)) {
112+ if (!isBuiltinProvider(provider)) {
123113 if (options.model.api === "openai-completions") {
124114 // pi-ai requires a truthy apiKey for OpenAI-compatible local providers like Ollama.
125115 return "dummy";
src/tui-overlay.ts+9−23
@@ -1,11 +1,8 @@
11 import { HStack, Text, TextInput, VStack } from "@cel-tui/core";
2-import {
3- getModels,
4- type Message,
5- type ThinkingLevel,
6-} from "@earendil-works/pi-ai";
2+import type { Message, ThinkingLevel } from "@earendil-works/pi-ai";
73 import { getOAuthProviders } from "@earendil-works/pi-ai/oauth";
84 import { saveSettings } from "./args";
5+import { findModelConfig, getProviderModels } from "./models.ts";
96 import { getAvailableProviders } from "./oauth";
107 import { listSessionsForCwd } from "./session";
118 import { estimateTokens, formatTimestamp } from "./shared";
@@ -290,20 +287,11 @@ export function mainMenu(state: TUIState, initialPane = "main") {
290287 "xhigh",
291288 ];
292289 const efforts = reasoningEfforts.map((v) => ({ label: v, value: v }));
293- const getProviderModels = (provider: string) => {
294- const builtIn = getModels(provider as any).map((v) => ({
290+ const getProviderModelOptions = (provider: string) =>
291+ getProviderModels(provider, state.options.customProviders).map((v) => ({
295292 label: v.name,
296293 value: v.id,
297294 }));
298- const custom =
299- state.options.customProviders
300- ?.filter((m) => m.provider === provider)
301- .map((v) => ({
302- label: v.name,
303- value: v.id,
304- })) ?? [];
305- return [...builtIn, ...custom];
306- };
307295
308296 let currentProviders: string[] = [];
309297 let currentSessions: Session[] = [];
@@ -517,7 +505,7 @@ export function mainMenu(state: TUIState, initialPane = "main") {
517505 openPane(s, {
518506 label: "models",
519507 filter: "",
520- list: getProviderModels(selectedProvider),
508+ list: getProviderModelOptions(selectedProvider),
521509 });
522510 return;
523511 }
@@ -525,13 +513,11 @@ export function mainMenu(state: TUIState, initialPane = "main") {
525513 if (currentPane.label === "models") {
526514 if (!selectedProvider) return;
527515
528- const builtIn = getModels(selectedProvider as any).find(
529- (v) => v.id === s.selected,
530- );
531- const custom = state.options.customProviders?.find(
532- (v) => v.provider === selectedProvider && v.id === s.selected,
516+ const model = findModelConfig(
517+ s.selected,
518+ selectedProvider,
519+ state.options.customProviders,
533520 );
534- const model = builtIn ?? custom;
535521 if (!model) return;
536522
537523 state.options.provider = selectedProvider;