@ottocode/server 0.1.248 → 0.1.249

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ottocode/server",
-	"version": "0.1.248",
+	"version": "0.1.249",
 	"description": "HTTP API server for ottocode",
 	"type": "module",
 	"main": "./src/index.ts",
@@ -49,8 +49,8 @@
 		"typecheck": "tsc --noEmit"
 	},
 	"dependencies": {
-		"@ottocode/database": "0.1.248",
-		"@ottocode/sdk": "0.1.248",
+		"@ottocode/database": "0.1.249",
+		"@ottocode/sdk": "0.1.249",
 		"ai-sdk-ollama": "^3.8.3",
 		"drizzle-orm": "^0.44.5",
 		"hono": "^4.9.9",

package/src/routes/auth.ts

@@ -25,6 +25,7 @@ import {
 import { execFileSync, spawnSync } from 'node:child_process';
 import { logger } from '@ottocode/sdk';
 import { serializeError } from '../runtime/errors/api-error.ts';
+import { getProviderDetails } from './config/utils.ts';
 
 const oauthVerifiers = new Map<
 	string,
@@ -235,6 +236,7 @@ export function registerAuthRoutes(app: Hono) {
 					supportsOAuth: boolean;
 					supportsToken?: boolean;
 					supportsGhImport?: boolean;
+					custom?: boolean;
 					modelCount: number;
 					costRange?: { min: number; max: number };
 				}
@@ -267,6 +269,19 @@ export function registerAuthRoutes(app: Hono) {
 				};
 			}
 
+			const providerDetails = await getProviderDetails(undefined, cfg);
+			for (const detail of providerDetails) {
+				if (!detail.custom || providers[detail.id]) continue;
+				providers[detail.id] = {
+					configured: detail.authorized,
+					type: detail.authType,
+					label: detail.label,
+					supportsOAuth: false,
+					custom: true,
+					modelCount: detail.modelCount,
+				};
+			}
+
 			return c.json({
 				onboardingComplete,
 				ottorouter: ottorouterWallet

package/src/routes/config/models.ts

@@ -27,7 +27,7 @@ import {
 } from './utils.ts';
 
 const COPILOT_MODELS_URL = 'https://api.githubcopilot.com/models';
-const REMOTE_CATALOG_REFRESH_TTL_MS = 6 * 60 * 60 * 1000;
+const REMOTE_CATALOG_REFRESH_TTL_MS = 5 * 60 * 1000;
 const PROVIDER_MODEL_REFRESH_TTL_MS = 60 * 1000;
 
 type UiModel = {
@@ -38,6 +38,8 @@ type UiModel = {
 	vision?: boolean;
 	attachment?: boolean;
 	free?: boolean;
+	contextWindow?: number;
+	maxOutputTokens?: number;
 };
 
 type UiProviderModels = {
@@ -62,6 +64,8 @@ function toUiModel(model: ModelInfo): UiModel {
 		vision: model.modalities?.input?.includes('image') ?? false,
 		attachment: model.attachment ?? false,
 		free: model.cost?.input === 0 && model.cost?.output === 0,
+		contextWindow: model.limit?.context,
+		maxOutputTokens: model.limit?.output,
 	};
 }
 
@@ -93,6 +97,10 @@ async function refreshRemoteCatalogInBackground(): Promise<void> {
 		const providers = normalizeModelCatalogPayload(await response.json());
 		if (Object.keys(providers).length > 0) {
 			await mergeCachedModelCatalog(providers);
+			logger.debug('Refreshed remote model catalog', {
+				url,
+				providers: Object.keys(providers).length,
+			});
 		}
 	} catch (error) {
 		logger.debug('Failed to refresh remote model catalog', {
@@ -210,6 +218,7 @@ async function discoverProviderModels(args: {
 }): Promise<ModelInfo[] | undefined> {
 	const { provider, providerDefinition, projectRoot } = args;
 	if (
+		providerDefinition.source !== 'custom' ||
 		providerDefinition.compatibility !== 'ollama' ||
 		!providerDefinition.baseURL
 	) {
@@ -225,7 +234,7 @@ async function discoverProviderModels(args: {
 		const discovered = await discoverOllamaModels({
 			baseURL: providerDefinition.baseURL,
 			apiKey,
-			includeDetails: false,
+			includeDetails: true,
 		});
 		return discovered.models;
 	} catch (error) {
@@ -241,8 +250,8 @@ function shouldLazyLoadProviderModels(
 	providerDefinition: NonNullable<ReturnType<typeof getProviderDefinition>>,
 ): boolean {
 	return (
-		providerDefinition.compatibility === 'ollama' ||
-		providerDefinition.source === 'custom'
+		providerDefinition.source === 'custom' &&
+		providerDefinition.compatibility === 'ollama'
 	);
 }
 
@@ -313,20 +322,15 @@ export function registerModelsRoutes(app: Hono) {
 					projectRoot,
 				});
 			}
-			const filteredModels =
-				providerDefinition.compatibility === 'ollama'
-					? getCachedOrConfiguredModels({
-							models: providerCatalog?.models,
-							cfg,
-							provider,
-						})
-					: providerCatalog
-						? filterModelsForAuthType(
-								provider,
-								providerCatalog.models,
-								authType,
-							)
-						: getConfiguredProviderModels(cfg, provider);
+			const filteredModels = shouldLazyLoadProviderModels(providerDefinition)
+				? getCachedOrConfiguredModels({
+						models: providerCatalog?.models,
+						cfg,
+						provider,
+					})
+				: providerCatalog
+					? filterModelsForAuthType(provider, providerCatalog.models, authType)
+					: getConfiguredProviderModels(cfg, provider);
 			const copilotAllowedModels =
 				provider === 'copilot'
 					? await getAuthorizedCopilotModels(projectRoot)
@@ -375,7 +379,6 @@ export function registerModelsRoutes(app: Hono) {
 			void refreshRemoteCatalogInBackground();
 
 			const modelsMap: Record<string, UiProviderModels> = {};
-			const cacheUpdates: Parameters<typeof mergeCachedModelCatalog>[0] = {};
 
 			for (const provider of authorizedProviders) {
 				const providerCatalog =
@@ -417,18 +420,9 @@ export function registerModelsRoutes(app: Hono) {
 						dynamicModels,
 						models: filteredModels.map(toUiModel),
 					};
-					cacheUpdates[provider] = {
-						id: provider,
-						label: providerDefinition.label,
-						models: filteredModels,
-					};
 				}
 			}
 
-			if (Object.keys(cacheUpdates).length > 0) {
-				void mergeCachedModelCatalog(cacheUpdates);
-			}
-
 			return c.json(modelsMap);
 		} catch (error) {
 			logger.error('Failed to get all models', error);

package/src/routes/config/providers.ts

@@ -3,7 +3,9 @@ import {
 	loadConfig,
 	removeProviderSettings,
 	writeProviderSettings,
+	discoverOllamaModels,
 	isBuiltInProviderId,
+	type ModelInfo,
 	type ProviderCompatibility,
 	type ProviderPromptFamily,
 	type ProviderId,
@@ -32,6 +34,25 @@ type ProviderMutationBody = {
 	scope?: 'global' | 'local';
 };
 
+type ProviderDiscoveryBody = {
+	compatibility?: ProviderCompatibility;
+	baseURL?: string;
+	apiKey?: string;
+};
+
+function toDiscoveredModel(model: ModelInfo) {
+	return {
+		id: model.id,
+		label: model.label || model.id,
+		toolCall: model.toolCall,
+		reasoningText: model.reasoningText,
+		vision: model.modalities?.input?.includes('image') ?? false,
+		attachment: model.attachment ?? false,
+		contextWindow: model.limit?.context,
+		maxOutputTokens: model.limit?.output,
+	};
+}
+
 export function registerProvidersRoute(app: Hono) {
 	app.get('/v1/config/providers', async (c) => {
 		try {
@@ -87,6 +108,49 @@ export function registerProvidersRoute(app: Hono) {
 		}
 	});
 
+	app.post('/v1/config/providers/discover-models', async (c) => {
+		try {
+			const embeddedConfig = (
+				c as unknown as {
+					get: (key: 'embeddedConfig') => EmbeddedAppConfig | undefined;
+				}
+			).get('embeddedConfig');
+			if (embeddedConfig && Object.keys(embeddedConfig).length > 0) {
+				return c.json({ error: 'Embedded config cannot be modified' }, 400);
+			}
+
+			const body = await c.req.json<ProviderDiscoveryBody>();
+			const compatibility = body.compatibility || 'openai-compatible';
+			const baseURL = body.baseURL?.trim();
+			const apiKey = body.apiKey?.trim() || undefined;
+			if (!baseURL) return c.json({ error: 'Base URL is required' }, 400);
+
+			if (compatibility !== 'ollama') {
+				return c.json({
+					models: [],
+					unsupported: true,
+					message:
+						'Model discovery is currently available for Ollama providers.',
+				});
+			}
+
+			const discovered = await discoverOllamaModels({
+				baseURL,
+				apiKey,
+				includeDetails: true,
+			});
+
+			return c.json({
+				baseURL: discovered.baseURL,
+				models: discovered.models.map(toDiscoveredModel),
+			});
+		} catch (error) {
+			logger.error('Failed to discover provider models', error);
+			const errorResponse = serializeError(error);
+			return c.json(errorResponse, errorResponse.error.status || 500);
+		}
+	});
+
 	app.put('/v1/config/providers/:provider', async (c) => {
 		try {
 			const embeddedConfig = (