v0.7.12: Custom models/providers support via models.json

- Add ~/.pi/agent/models.json config for custom providers (Ollama, vLLM, etc.)
- Support all 4 API types (openai-completions, openai-responses, anthropic-messages, google-generative-ai)
- Live reload models.json on /model selector open
- Smart model defaults per provider (claude-sonnet-4-5, gpt-5.1-codex, etc.)
- Graceful session fallback when saved model missing or no API key
- Validation errors show precise file/field info in CLI and TUI
- Agent knows its own README.md path for self-documentation
- Added gpt-5.1-codex (400k context, 128k output, reasoning)

Fixes #21
This commit is contained in:
Mario Zechner 2025-11-16 22:56:24 +01:00
parent 112ce6e5d1
commit 0c5cbd0068
15 changed files with 793 additions and 114 deletions

View file

@ -1,6 +1,8 @@
import { getApiKey, getModels, getProviders, type Model } from "@mariozechner/pi-ai";
import type { Model } from "@mariozechner/pi-ai";
import { Container, Input, Spacer, Text } from "@mariozechner/pi-tui";
import chalk from "chalk";
import { getAvailableModels } from "../model-config.js";
import type { SettingsManager } from "../settings-manager.js";
interface ModelItem {
provider: string;
@ -17,18 +19,26 @@ export class ModelSelectorComponent extends Container {
private allModels: ModelItem[] = [];
private filteredModels: ModelItem[] = [];
private selectedIndex: number = 0;
private currentModel: Model<any>;
private currentModel: Model<any> | null;
private settingsManager: SettingsManager;
private onSelectCallback: (model: Model<any>) => void;
private onCancelCallback: () => void;
private errorMessage: string | null = null;
constructor(currentModel: Model<any>, onSelect: (model: Model<any>) => void, onCancel: () => void) {
constructor(
currentModel: Model<any> | null,
settingsManager: SettingsManager,
onSelect: (model: Model<any>) => void,
onCancel: () => void,
) {
super();
this.currentModel = currentModel;
this.settingsManager = settingsManager;
this.onSelectCallback = onSelect;
this.onCancelCallback = onCancel;
// Load all models
// Load all models (fresh every time)
this.loadModels();
// Add top border
@ -67,30 +77,35 @@ export class ModelSelectorComponent extends Container {
}
private loadModels(): void {
const models: ModelItem[] = [];
const providers = getProviders();
// Load available models fresh (includes custom models from ~/.pi/agent/models.json)
const { models: availableModels, error } = getAvailableModels();
for (const provider of providers) {
const providerModels = getModels(provider as any);
for (const model of providerModels) {
models.push({ provider, id: model.id, model });
}
// If there's an error loading models.json, we'll show it via the "no models" path
// The error will be displayed to the user
if (error) {
this.allModels = [];
this.filteredModels = [];
this.errorMessage = error;
return;
}
// Filter out models from providers without API keys
const filteredModels = models.filter((item) => getApiKey(item.provider as any) !== undefined);
const models: ModelItem[] = availableModels.map((model) => ({
provider: model.provider,
id: model.id,
model,
}));
// Sort: current model first, then by provider
filteredModels.sort((a, b) => {
const aIsCurrent = this.currentModel?.id === a.model.id;
const bIsCurrent = this.currentModel?.id === b.model.id;
models.sort((a, b) => {
const aIsCurrent = this.currentModel?.id === a.model.id && this.currentModel?.provider === a.provider;
const bIsCurrent = this.currentModel?.id === b.model.id && this.currentModel?.provider === b.provider;
if (aIsCurrent && !bIsCurrent) return -1;
if (!aIsCurrent && bIsCurrent) return 1;
return a.provider.localeCompare(b.provider);
});
this.allModels = filteredModels;
this.filteredModels = filteredModels;
this.allModels = models;
this.filteredModels = models;
}
private filterModels(query: string): void {
@ -152,8 +167,14 @@ export class ModelSelectorComponent extends Container {
this.listContainer.addChild(new Text(scrollInfo, 0, 0));
}
// Show "no results" if empty
if (this.filteredModels.length === 0) {
// Show error message or "no results" if empty
if (this.errorMessage) {
// Show error in red
const errorLines = this.errorMessage.split("\n");
for (const line of errorLines) {
this.listContainer.addChild(new Text(chalk.red(line), 0, 0));
}
} else if (this.filteredModels.length === 0) {
this.listContainer.addChild(new Text(chalk.gray(" No matching models"), 0, 0));
}
}
@ -188,6 +209,8 @@ export class ModelSelectorComponent extends Container {
}
private handleSelect(model: Model<any>): void {
// Save as new default
this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
this.onSelectCallback(model);
}

View file

@ -14,7 +14,9 @@ import {
import chalk from "chalk";
import { getChangelogPath, parseChangelog } from "../changelog.js";
import { exportSessionToHtml } from "../export-html.js";
import { getApiKeyForModel } from "../model-config.js";
import type { SessionManager } from "../session-manager.js";
import type { SettingsManager } from "../settings-manager.js";
import { AssistantMessageComponent } from "./assistant-message.js";
import { CustomEditor } from "./custom-editor.js";
import { DynamicBorder } from "./dynamic-border.js";
@ -37,6 +39,7 @@ export class TuiRenderer {
private footer: FooterComponent;
private agent: Agent;
private sessionManager: SessionManager;
private settingsManager: SettingsManager;
private version: string;
private isInitialized = false;
private onInputCallback?: (text: string) => void;
@ -63,9 +66,16 @@ export class TuiRenderer {
// Track if this is the first user message (to skip spacer)
private isFirstUserMessage = true;
constructor(agent: Agent, sessionManager: SessionManager, version: string, changelogMarkdown: string | null = null) {
constructor(
agent: Agent,
sessionManager: SessionManager,
settingsManager: SettingsManager,
version: string,
changelogMarkdown: string | null = null,
) {
this.agent = agent;
this.sessionManager = sessionManager;
this.settingsManager = settingsManager;
this.version = version;
this.changelogMarkdown = changelogMarkdown;
this.ui = new TUI(new ProcessTerminal());
@ -223,6 +233,28 @@ export class TuiRenderer {
return;
}
// Normal message submission - validate model and API key first
const currentModel = this.agent.state.model;
if (!currentModel) {
this.showError(
"No model selected.\n\n" +
"Set an API key (ANTHROPIC_API_KEY, OPENAI_API_KEY, etc.)\n" +
"or create ~/.pi/agent/models.json\n\n" +
"Then use /model to select a model.",
);
return;
}
const apiKey = getApiKeyForModel(currentModel);
if (!apiKey) {
this.showError(
`No API key found for ${currentModel.provider}.\n\n` +
`Set the appropriate environment variable or update ~/.pi/agent/models.json`,
);
return;
}
// All good, proceed with submission
if (this.onInputCallback) {
this.onInputCallback(text);
}
@ -498,6 +530,13 @@ export class TuiRenderer {
this.ui.requestRender();
}
showWarning(warningMessage: string): void {
// Show warning message in the chat
this.chatContainer.addChild(new Spacer(1));
this.chatContainer.addChild(new Text(chalk.yellow(`Warning: ${warningMessage}`), 1, 0));
this.ui.requestRender();
}
private showThinkingSelector(): void {
// Create thinking selector with current level
this.thinkingSelector = new ThinkingSelectorComponent(
@ -544,6 +583,7 @@ export class TuiRenderer {
// Create model selector with current model
this.modelSelector = new ModelSelectorComponent(
this.agent.state.model,
this.settingsManager,
(model) => {
// Apply the selected model
this.agent.setModel(model);