pi-free 2.0.10 → 2.0.12

package/lib/built-in-toggle.ts

@@ -18,7 +18,11 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { getOpencodeShowPaid, getOpenrouterShowPaid } from "../config.ts";
 import { createLogger } from "./logger.ts";
-import { isFreeModel, registerWithGlobalToggle } from "./registry.ts";
+import {
+	getProviderRegistry,
+	isFreeModel,
+	registerWithGlobalToggle,
+} from "./registry.ts";
 import { createToggleState } from "./toggle-state.ts";
 
 const _logger = createLogger("built-in-toggle");
@@ -55,68 +59,38 @@ let commandsRegistered = false;
 // =============================================================================
 
 export function setupBuiltInProviderToggles(pi: ExtensionAPI): void {
+	const activeConfigs = BUILT_IN_TOGGLE_PROVIDERS.filter(
+		(config) => !getProviderRegistry().has(config.id),
+	);
+
+	if (activeConfigs.length === 0) {
+		_logger.info(
+			"[built-in-toggle] OpenCode/OpenRouter already registered dynamically; skipping fallback capture",
+		);
+		return;
+	}
+
 	// Register toggle commands once (available even before models load)
 	if (!commandsRegistered) {
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		for (const config of activeConfigs) {
 			registerToggleCommand(pi, config);
 		}
-		setupStatusBar(pi);
+		setupStatusBar(pi, activeConfigs);
 		commandsRegistered = true;
 	}
 
 	// Capture built-in models on session start and apply initial filter
 	pi.on("session_start", async (_event, ctx) => {
-		const available = ctx.modelRegistry.getAvailable();
-
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		for (const config of activeConfigs) {
 			if (providerStates.has(config.id)) {
-				// Already captured this session — skip to avoid re-registering
+				// Already captured — skip to avoid re-registering
 				continue;
 			}
 
-			const providerModels = available.filter(
-				(m: Model<Api>) => m.provider === config.id,
-			);
-			if (providerModels.length === 0) continue;
-
-			const allModels = providerModels.map(modelToProviderConfig);
-			const freeModels = allModels.filter((m) =>
-				isFreeModel({ ...m, provider: config.id }, allModels),
-			);
-
-			const baseUrl = providerModels[0].baseUrl;
-			const api = providerModels[0].api;
-			const apiKeyEnv = getApiKeyEnvForProvider(config.id);
-
-			const reRegister = (models: ProviderModelConfig[]) => {
-				pi.registerProvider(config.id, {
-					baseUrl,
-					apiKey: apiKeyEnv,
-					api,
-					models,
-				});
-			};
-
-			const stored = { free: freeModels, all: allModels };
-			const toggleState = createToggleState<ProviderModelConfig>({
-				providerId: config.id,
-				initialShowPaid: config.getShowPaid(),
-				initialModels: stored,
-			});
-
-			providerStates.set(config.id, {
-				stored,
-				reRegister,
-				toggleState,
-			});
-
-			registerWithGlobalToggle(config.id, stored, reRegister, true);
+			const state = tryCaptureProvider(pi, config, ctx);
+			if (!state) continue;
 
-			_logger.info(
-				`[built-in-toggle] ${config.id}: captured ${allModels.length} models (${freeModels.length} free)`,
-			);
-
-			const applied = toggleState.applyCurrent(reRegister);
+			const applied = state.toggleState.applyCurrent(state.reRegister);
 			_logger.info(
 				`[built-in-toggle] ${config.id}: applied ${applied.mode} mode with ${applied.models.length} models`,
 			);
@@ -124,6 +98,58 @@ export function setupBuiltInProviderToggles(pi: ExtensionAPI): void {
 	});
 }
 
+// =============================================================================
+// On-demand model capture (called by toggle command when state is missing)
+// =============================================================================
+
+function tryCaptureProvider(
+	pi: ExtensionAPI,
+	config: BuiltInToggleConfig,
+	ctx: any,
+): BuiltInProviderState | undefined {
+	const available = ctx.modelRegistry.getAvailable();
+	const providerModels = available.filter(
+		(m: Model<Api>) => m.provider === config.id,
+	);
+	if (providerModels.length === 0) return undefined;
+
+	const allModels = providerModels.map(modelToProviderConfig);
+	const freeModels = allModels.filter((m: ProviderModelConfig) =>
+		isFreeModel({ ...m, provider: config.id }, allModels),
+	);
+
+	const baseUrl = providerModels[0].baseUrl;
+	const api = providerModels[0].api;
+	const apiKeyEnv = getApiKeyEnvForProvider(config.id);
+
+	const reRegister = (models: ProviderModelConfig[]) => {
+		pi.registerProvider(config.id, {
+			baseUrl,
+			apiKey: apiKeyEnv,
+			api,
+			models,
+		});
+	};
+
+	const stored = { free: freeModels, all: allModels };
+	const toggleState = createToggleState<ProviderModelConfig>({
+		providerId: config.id,
+		initialShowPaid: config.getShowPaid(),
+		initialModels: stored,
+	});
+
+	const state: BuiltInProviderState = { stored, reRegister, toggleState };
+	providerStates.set(config.id, state);
+
+	registerWithGlobalToggle(config.id, stored, reRegister, true);
+
+	_logger.info(
+		`[built-in-toggle] ${config.id}: captured ${allModels.length} models (${freeModels.length} free)`,
+	);
+
+	return state;
+}
+
 // =============================================================================
 // Per-provider toggle command
 // =============================================================================
@@ -136,13 +162,17 @@ function registerToggleCommand(
 	pi.registerCommand(commandName, {
 		description: `Toggle free/paid ${config.id} models`,
 		handler: async (_args, ctx) => {
-			const state = providerStates.get(config.id);
+			let state = providerStates.get(config.id);
 			if (!state) {
-				ctx.ui.notify(
-					`${config.id}: models not loaded yet. Start a session first.`,
-					"warning",
-				);
-				return;
+				// Models may have loaded after session_start — try on-demand capture
+				state = tryCaptureProvider(pi, config, ctx);
+				if (!state) {
+					ctx.ui.notify(
+						`${config.id}: models not loaded yet. Start a session first.`,
+						"warning",
+					);
+					return;
+				}
 			}
 
 			const applied = state.toggleState.toggle(state.reRegister);
@@ -185,12 +215,15 @@ function modelToProviderConfig(m: Model<Api>): ProviderModelConfig {
 // Status bar for provider selection
 // =============================================================================
 
-function setupStatusBar(pi: ExtensionAPI): void {
+function setupStatusBar(
+	pi: ExtensionAPI,
+	configs: BuiltInToggleConfig[],
+): void {
 	pi.on("model_select", (_event, ctx) => {
 		const selected = _event.model?.provider;
 
-		// Clear status for all built-in toggle providers
-		for (const config of BUILT_IN_TOGGLE_PROVIDERS) {
+		// Clear status for all fallback-captured built-in providers
+		for (const config of configs) {
 			if (selected !== config.id) {
 				ctx.ui.setStatus(`${config.id}-status`, undefined);
 			}

package/lib/registry.ts

@@ -9,7 +9,7 @@ import type {
 	ExtensionAPI,
 	ProviderModelConfig,
 } from "@earendil-works/pi-coding-agent";
-import { getFreeOnly, saveConfig } from "../config.ts";
+import { getFreeOnly, getProviderShowPaid, saveConfig } from "../config.ts";
 import { createLogger } from "./logger.ts";
 
 const _logger = createLogger("pi-free");
@@ -82,7 +82,7 @@ function detectPricingExposed(allModels: ProviderModelConfig[]): boolean {
  * @returns true if the model is definitively free per the provider's API
  */
 export function isFreeModel(
-	model: ProviderModelConfig & { provider?: string },
+	model: ProviderModelConfig & { provider?: string; _pricingKnown?: boolean },
 	allModels?: ProviderModelConfig[],
 ): boolean {
 	return isFreeModelInternal(model, allModels);
@@ -90,7 +90,7 @@ export function isFreeModel(
 
 // Internal implementation to work around TypeScript filter callback issues
 function isFreeModelInternal(
-	model: ProviderModelConfig & { provider?: string },
+	model: ProviderModelConfig & { provider?: string; _pricingKnown?: boolean },
 	allModels: ProviderModelConfig[] | undefined,
 ): boolean {
 	// Determine if pricing is exposed
@@ -106,12 +106,20 @@ function isFreeModelInternal(
 		pricingExposed = true;
 	}
 
-	// Route A: Pricing-exposed providers - use OR logic
-	// Model is free if EITHER cost is zero OR name contains "free"
+	// Route A: Pricing-exposed providers
+	// Model is free if EITHER cost is zero OR name contains "free".
+	// BUT: when _pricingKnown is explicitly false (API returned no pricing data),
+	// cost values are untrustworthy defaults — fall back to name-only detection.
 	if (pricingExposed) {
 		const isZeroCost =
 			(model.cost?.input ?? 0) === 0 && (model.cost?.output ?? 0) === 0;
 		const hasFreeInName = model.name.toLowerCase().includes("free");
+
+		// Pricing missing for this specific model — only trust name-based signal
+		if (model._pricingKnown === false) {
+			return hasFreeInName;
+		}
+
 		return isZeroCost || hasFreeInName;
 	}
 
@@ -156,12 +164,32 @@ export function getProviderRegistry(): ReadonlyMap<string, ProviderEntry> {
 // Global filter application
 // =============================================================================
 
+function showAllForProvider(providerId: string, entry: ProviderEntry): void {
+	const allModels =
+		entry.stored.all.length > 0 ? entry.stored.all : entry.stored.free;
+	if (allModels.length > 0) {
+		entry.reRegister(allModels);
+		_logger.info(
+			`[pi-free] ${providerId}: showing all ${allModels.length} models`,
+		);
+	}
+}
+
 function applyFilterToProvider(
 	providerId: string,
 	entry: ProviderEntry,
 	freeOnly: boolean,
+	force: boolean,
 ): void {
 	if (freeOnly) {
+		if (!force && getProviderShowPaid(providerId)) {
+			showAllForProvider(providerId, entry);
+			_logger.info(
+				`[pi-free] ${providerId}: preserved persisted all-models toggle`,
+			);
+			return;
+		}
+
 		if (entry.stored.free.length > 0) {
 			entry.reRegister(entry.stored.free);
 			_logger.info(
@@ -171,25 +199,21 @@ function applyFilterToProvider(
 			_logger.warn(`[pi-free] ${providerId}: no free models available`);
 		}
 	} else {
-		// Show all models (paid + free)
-		const allModels =
-			entry.stored.all.length > 0 ? entry.stored.all : entry.stored.free;
-		if (allModels.length > 0) {
-			entry.reRegister(allModels);
-			_logger.info(
-				`[pi-free] ${providerId}: showing all ${allModels.length} models`,
-			);
-		}
+		showAllForProvider(providerId, entry);
 	}
 }
 
-export function applyGlobalFilter(_pi: ExtensionAPI, freeOnly: boolean): void {
+export function applyGlobalFilter(
+	_pi: ExtensionAPI,
+	freeOnly: boolean,
+	options: { force?: boolean } = {},
+): void {
 	globalFreeOnly = freeOnly;
 	saveConfig({ free_only: freeOnly });
 
 	for (const [providerId, entry] of providerRegistry) {
 		try {
-			applyFilterToProvider(providerId, entry, freeOnly);
+			applyFilterToProvider(providerId, entry, freeOnly, options.force === true);
 		} catch (err) {
 			_logger.error(
 				`[pi-free] Failed to apply filter to ${providerId}`,