pi-free 2.0.1 → 2.0.2

package/config.ts

@@ -254,10 +254,30 @@ export function getOpenrouterApiKey(): string | undefined {
 // Hidden models (re-reads config on every call)
 // =============================================================================
 
-export function applyHidden<T extends { id: string }>(models: T[]): T[] {
+/**
+ * Apply hidden models filter with provider scoping.
+ * Hidden models can be specified as:
+ *   - "model-id" (global, applies to all providers - deprecated)
+ *   - "provider/model-id" (provider-specific, preferred)
+ */
+export function applyHidden<T extends { id: string }>(
+	models: T[],
+	providerId?: string,
+): T[] {
 	const hidden = new Set(loadConfigFile().hidden_models ?? []);
 	if (hidden.size === 0) return models;
-	return models.filter((m) => !hidden.has(m.id));
+
+	return models.filter((m) => {
+		// Check provider-scoped ID (preferred format: "provider/model-id")
+		if (providerId && hidden.has(`${providerId}/${m.id}`)) {
+			return false;
+		}
+		// Check global ID (legacy format, still supported for backward compat)
+		if (hidden.has(m.id)) {
+			return false;
+		}
+		return true;
+	});
 }
 
 // =============================================================================

package/index.ts

@@ -1,148 +1,148 @@
-/**
- * Pi-Free Providers Index
- *
- * Provides free model filtering for ALL providers (built-in + extension)
- * plus unique free/paid providers not covered by pi's built-in providers.
- *
- * Unique providers:
- * - Kilo: OAuth-based free models
- * - Cline: Cline bot integration
- * - NVIDIA: NVIDIA NIM hosting (free tier available)
- * - Ollama Cloud: Ollama's cloud-hosted models with usage-based free tier
- * - Qwen: OAuth-based Qwen access (deprecated)
- * - Modal: Modal Labs hosting
- */
-
-import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { setupBuiltInProviderToggles } from "./lib/built-in-toggle.ts";
-import { createLogger } from "./lib/logger.ts";
-import {
-	applyGlobalFilter,
-	getGlobalFreeOnly,
-	getProviderRegistry,
-	isFreeModel,
-	registerWithGlobalToggle,
-} from "./lib/registry.ts";
-// Import unique provider extensions (only providers NOT built into pi)
-import cline from "./providers/cline/cline.ts";
-import cloudflare from "./providers/cloudflare/cloudflare.ts";
-import kilo from "./providers/kilo/kilo.ts";
-import modal from "./providers/modal/modal.ts";
-import nvidia from "./providers/nvidia/nvidia.ts";
-import ollama from "./providers/ollama/ollama.ts";
-import qwen from "./providers/qwen/qwen.ts";
-
-const _logger = createLogger("pi-free");
-
-// =============================================================================
-// Global Commands
-// =============================================================================
-
-function setupGlobalCommands(pi: ExtensionAPI) {
-	// /free-providers - Show free model counts by provider
-	pi.registerCommand("free-providers", {
-		description: "Show free/paid model counts for all pi-free providers",
-		handler: async (_args, ctx) => {
-			const lines = ["📊 Pi-Free Providers:", ""];
-			const registry = getProviderRegistry();
-
-			// Providers known to not expose pricing via API (all models show as "free")
-			// OpenRouter and OpenCode expose actual pricing
-			const noPricingApi = new Set([
-				"mistral",
-				"xai",
-				"huggingface",
-				"groq",
-				"cerebras",
-			]);
-			// Freemium providers - all models share a free tier quota
-			const freemiumProviders = new Set(["nvidia"]);
-
-			for (const [id, entry] of registry) {
-				const free = entry.stored.free.length;
-				const all = entry.stored.all.length || free;
-				const indicator = entry.hasKey ? "🔑" : "🆓";
-				const paid = all - free;
-
-				if (freemiumProviders.has(id)) {
-					// Freemium: all models share a free tier (e.g., 1,000 reqs/month)
-					lines.push(`${indicator} ${id}: ${all} models (freemium)`);
-				} else if (noPricingApi.has(id)) {
-					// Provider doesn't expose pricing - can't determine free vs paid
-					lines.push(
-						`${indicator} ${id}: ${all} models (pricing not exposed by API)`,
-					);
-				} else if (paid === 0 && free > 0) {
-					// All models are actually free
-					lines.push(`${indicator} ${id}: ${free} free models`);
-				} else {
-					// Mix of free and paid
-					lines.push(
-						`${indicator} ${id}: ${free} free / ${paid} paid (${all} total)`,
-					);
-				}
-			}
-
-			if (registry.size === 0) {
-				lines.push("(No providers registered yet)");
-			}
-
-			ctx.ui.notify(lines.join("\n"), "info");
-		},
-	});
-}
-
-// =============================================================================
-// Main Entry Point
-// =============================================================================
-
-export default async function (pi: ExtensionAPI) {
-	const globalFreeOnly = getGlobalFreeOnly();
-	_logger.info(`[pi-free] Initializing (global free-only: ${globalFreeOnly})`);
-
-	// Setup global commands first
-	setupGlobalCommands(pi);
-
-	// Load all unique providers
-	// Each provider will register itself with the global toggle system
-	await Promise.allSettled([
-		cloudflare(pi),
-		modal(pi),
-		nvidia(pi),
-		kilo(pi),
-		ollama(pi),
-		// Qwen is deprecated
-		qwen(pi).catch((err) => {
-			_logger.warn("[pi-free] Qwen provider failed to load (deprecated)", err);
-		}),
-		cline(pi),
-	]);
-
-	// Setup dynamic built-in providers (Mistral, Groq, Cerebras, xAI, Hugging Face, OpenRouter)
-	// These only activate if the user has configured API keys (OpenRouter works without key too)
-	const { setupDynamicBuiltInProviders } = await import(
-		"./providers/dynamic-built-in/index.ts"
-	);
-	await setupDynamicBuiltInProviders(pi);
-
-	// Setup toggles for pi's built-in providers (e.g., OpenCode)
-	setupBuiltInProviderToggles(pi);
-
-	// Apply initial global filter if free-only mode is enabled
-	if (globalFreeOnly) {
-		_logger.info("[pi-free] Applying initial free-only filter");
-		await applyGlobalFilter(pi, true);
-	}
-
-	const registry = getProviderRegistry();
-	_logger.info(`[pi-free] Loaded with ${registry.size} providers`);
-}
-
-// Re-export registry helpers so consumers don't need deep imports
-export {
-	applyGlobalFilter,
-	getGlobalFreeOnly,
-	getProviderRegistry,
-	isFreeModel,
-	registerWithGlobalToggle,
-};
+/**
+ * Pi-Free Providers Index
+ *
+ * Provides free model filtering for ALL providers (built-in + extension)
+ * plus unique free/paid providers not covered by pi's built-in providers.
+ *
+ * Unique providers:
+ * - Kilo: OAuth-based free models
+ * - Cline: Cline bot integration
+ * - NVIDIA: NVIDIA NIM hosting (free tier available)
+ * - Ollama Cloud: Ollama's cloud-hosted models with usage-based free tier
+ * - Qwen: OAuth-based Qwen access (deprecated)
+ * - Modal: Modal Labs hosting
+ */
+
+import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
+import { setupBuiltInProviderToggles } from "./lib/built-in-toggle.ts";
+import { createLogger } from "./lib/logger.ts";
+import {
+	applyGlobalFilter,
+	getGlobalFreeOnly,
+	getProviderRegistry,
+	isFreeModel,
+	registerWithGlobalToggle,
+} from "./lib/registry.ts";
+// Import unique provider extensions (only providers NOT built into pi)
+import cline from "./providers/cline/cline.ts";
+import cloudflare from "./providers/cloudflare/cloudflare.ts";
+import kilo from "./providers/kilo/kilo.ts";
+import modal from "./providers/modal/modal.ts";
+import nvidia from "./providers/nvidia/nvidia.ts";
+import ollama from "./providers/ollama/ollama.ts";
+import qwen from "./providers/qwen/qwen.ts";
+
+const _logger = createLogger("pi-free");
+
+// =============================================================================
+// Global Commands
+// =============================================================================
+
+function setupGlobalCommands(pi: ExtensionAPI) {
+	// /free-providers - Show free model counts by provider
+	pi.registerCommand("free-providers", {
+		description: "Show free/paid model counts for all pi-free providers",
+		handler: async (_args, ctx) => {
+			const lines = ["📊 Pi-Free Providers:", ""];
+			const registry = getProviderRegistry();
+
+			// Providers known to not expose pricing via API (all models show as "free")
+			// OpenRouter and OpenCode expose actual pricing
+			const noPricingApi = new Set([
+				"mistral",
+				"xai",
+				"huggingface",
+				"groq",
+				"cerebras",
+			]);
+			// Freemium providers - all models share a free tier quota
+			const freemiumProviders = new Set(["nvidia"]);
+
+			for (const [id, entry] of registry) {
+				const free = entry.stored.free.length;
+				const all = entry.stored.all.length || free;
+				const indicator = entry.hasKey ? "🔑" : "🆓";
+				const paid = all - free;
+
+				if (freemiumProviders.has(id)) {
+					// Freemium: all models share a free tier (e.g., 1,000 reqs/month)
+					lines.push(`${indicator} ${id}: ${all} models (freemium)`);
+				} else if (noPricingApi.has(id)) {
+					// Provider doesn't expose pricing - can't determine free vs paid
+					lines.push(
+						`${indicator} ${id}: ${all} models (pricing not exposed by API)`,
+					);
+				} else if (paid === 0 && free > 0) {
+					// All models are actually free
+					lines.push(`${indicator} ${id}: ${free} free models`);
+				} else {
+					// Mix of free and paid
+					lines.push(
+						`${indicator} ${id}: ${free} free / ${paid} paid (${all} total)`,
+					);
+				}
+			}
+
+			if (registry.size === 0) {
+				lines.push("(No providers registered yet)");
+			}
+
+			ctx.ui.notify(lines.join("\n"), "info");
+		},
+	});
+}
+
+// =============================================================================
+// Main Entry Point
+// =============================================================================
+
+export default async function (pi: ExtensionAPI) {
+	const globalFreeOnly = getGlobalFreeOnly();
+	_logger.info(`[pi-free] Initializing (global free-only: ${globalFreeOnly})`);
+
+	// Setup global commands first
+	setupGlobalCommands(pi);
+
+	// Load all unique providers
+	// Each provider will register itself with the global toggle system
+	await Promise.allSettled([
+		cloudflare(pi),
+		modal(pi),
+		nvidia(pi),
+		kilo(pi),
+		ollama(pi),
+		// Qwen is deprecated
+		qwen(pi).catch((err) => {
+			_logger.warn("[pi-free] Qwen provider failed to load (deprecated)", err);
+		}),
+		cline(pi),
+	]);
+
+	// Setup dynamic built-in providers (Mistral, Groq, Cerebras, xAI, Hugging Face, OpenRouter)
+	// These only activate if the user has configured API keys (OpenRouter works without key too)
+	const { setupDynamicBuiltInProviders } = await import(
+		"./providers/dynamic-built-in/index.ts"
+	);
+	await setupDynamicBuiltInProviders(pi);
+
+	// Setup toggles for pi's built-in providers (e.g., OpenCode)
+	setupBuiltInProviderToggles(pi);
+
+	// Apply initial global filter if free-only mode is enabled
+	if (globalFreeOnly) {
+		_logger.info("[pi-free] Applying initial free-only filter");
+		await applyGlobalFilter(pi, true);
+	}
+
+	const registry = getProviderRegistry();
+	_logger.info(`[pi-free] Loaded with ${registry.size} providers`);
+}
+
+// Re-export registry helpers so consumers don't need deep imports
+export {
+	applyGlobalFilter,
+	getGlobalFreeOnly,
+	getProviderRegistry,
+	isFreeModel,
+	registerWithGlobalToggle,
+};

package/lib/built-in-toggle.ts

@@ -16,17 +16,10 @@ import type {
 	ExtensionAPI,
 	ProviderModelConfig,
 } from "@mariozechner/pi-coding-agent";
-import {
-	getOpencodeShowPaid,
-	getOpenrouterShowPaid,
-	saveConfig,
-} from "../config.ts";
+import { getOpencodeShowPaid, getOpenrouterShowPaid } from "../config.ts";
 import { createLogger } from "./logger.ts";
-import {
-	getGlobalFreeOnly,
-	isFreeModel,
-	registerWithGlobalToggle,
-} from "./registry.ts";
+import { isFreeModel, registerWithGlobalToggle } from "./registry.ts";
+import { createToggleState } from "./toggle-state.ts";
 
 const _logger = createLogger("built-in-toggle");
 
@@ -49,10 +42,9 @@ const BUILT_IN_TOGGLE_PROVIDERS: BuiltInToggleConfig[] = [
 // =============================================================================
 
 interface BuiltInProviderState {
-	free: ProviderModelConfig[];
-	all: ProviderModelConfig[];
+	stored: { free: ProviderModelConfig[]; all: ProviderModelConfig[] };
 	reRegister: (models: ProviderModelConfig[]) => void;
-	showPaid: boolean;
+	toggleState: ReturnType<typeof createToggleState<ProviderModelConfig>>;
 }
 
 const providerStates = new Map<string, BuiltInProviderState>();
@@ -102,35 +94,29 @@ export function setupBuiltInProviderToggles(pi: ExtensionAPI): void {
 				});
 			};
 
+			const stored = { free: freeModels, all: allModels };
+			const toggleState = createToggleState<ProviderModelConfig>({
+				providerId: config.id,
+				initialShowPaid: config.getShowPaid(),
+				initialModels: stored,
+			});
+
 			providerStates.set(config.id, {
-				free: freeModels,
-				all: allModels,
+				stored,
 				reRegister,
-				showPaid: config.getShowPaid(),
+				toggleState,
 			});
 
-			// Register with global free-only filter
-			registerWithGlobalToggle(
-				config.id,
-				{ free: freeModels, all: allModels },
-				reRegister,
-				true,
-			);
+			registerWithGlobalToggle(config.id, stored, reRegister, true);
 
 			_logger.info(
 				`[built-in-toggle] ${config.id}: captured ${allModels.length} models (${freeModels.length} free)`,
 			);
 
-			// Respect global free-only setting at capture time
-			if (!getGlobalFreeOnly() && !config.getShowPaid()) {
-				// Default: show free only (same as other pi-free providers)
-				if (freeModels.length > 0) {
-					reRegister(freeModels);
-					_logger.info(
-						`[built-in-toggle] ${config.id}: applied free-only filter`,
-					);
-				}
-			}
+			const applied = toggleState.applyCurrent(reRegister);
+			_logger.info(
+				`[built-in-toggle] ${config.id}: applied ${applied.mode} mode with ${applied.models.length} models`,
+			);
 		}
 	});
 }
@@ -156,21 +142,16 @@ function registerToggleCommand(
 				return;
 			}
 
-			state.showPaid = !state.showPaid;
-
-			// Persist preference
-			saveConfig({ [`${config.id}_show_paid`]: state.showPaid });
+			const applied = state.toggleState.toggle(state.reRegister);
 
-			if (state.showPaid) {
-				state.reRegister(state.all);
+			if (applied.mode === "all") {
 				ctx.ui.notify(
-					`${config.id}: showing all ${state.all.length} models`,
+					`${config.id}: showing all ${state.stored.all.length} models`,
 					"info",
 				);
 			} else {
-				state.reRegister(state.free);
 				ctx.ui.notify(
-					`${config.id}: showing ${state.free.length} free models`,
+					`${config.id}: showing ${state.stored.free.length} free models`,
 					"info",
 				);
 			}

package/lib/toggle-state.ts

@@ -0,0 +1,86 @@
+import { saveConfig } from "../config.ts";
+
+export type ToggleMode = "free" | "all";
+
+export interface ToggleModelStore<T> {
+	free: T[];
+	all: T[];
+}
+
+interface CreateToggleStateOptions<T> {
+	providerId: string;
+	initialShowPaid: boolean;
+	save?: typeof saveConfig;
+	initialModels?: ToggleModelStore<T>;
+}
+
+interface ToggleResult<T> {
+	mode: ToggleMode;
+	models: T[];
+}
+
+export function createToggleState<T>({
+	providerId,
+	initialShowPaid,
+	save = saveConfig,
+	initialModels,
+}: CreateToggleStateOptions<T>) {
+	let stored: ToggleModelStore<T> = initialModels ?? { free: [], all: [] };
+	let currentMode: ToggleMode = initialShowPaid ? "all" : "free";
+
+	function resolveMode(mode: ToggleMode): ToggleResult<T> {
+		if (mode === "all") {
+			if (stored.all.length > 0) {
+				return { mode: "all", models: stored.all };
+			}
+			return { mode: "free", models: stored.free };
+		}
+
+		if (stored.free.length > 0) {
+			return { mode: "free", models: stored.free };
+		}
+		return { mode: "all", models: stored.all };
+	}
+
+	function persist(mode: ToggleMode): void {
+		save({ [`${providerId}_show_paid`]: mode === "all" });
+	}
+
+	function applyMode(
+		mode: ToggleMode,
+		apply?: (models: T[]) => void,
+	): ToggleResult<T> {
+		const resolved = resolveMode(mode);
+		currentMode = resolved.mode;
+		if (apply) apply(resolved.models);
+		return resolved;
+	}
+
+	return {
+		setModels(next: ToggleModelStore<T>): ToggleModelStore<T> {
+			stored = next;
+			const resolved = resolveMode(currentMode);
+			currentMode = resolved.mode;
+			return stored;
+		},
+		getStored(): ToggleModelStore<T> {
+			return stored;
+		},
+		getCurrentMode(): ToggleMode {
+			return currentMode;
+		},
+		getCurrentModels(): T[] {
+			return resolveMode(currentMode).models;
+		},
+		applyCurrent(apply?: (models: T[]) => void): ToggleResult<T> {
+			return applyMode(currentMode, apply);
+		},
+		applyMode,
+		toggle(apply?: (models: T[]) => void): ToggleResult<T> {
+			const nextMode = currentMode === "all" ? "free" : "all";
+			const resolved = applyMode(nextMode, apply);
+			persist(resolved.mode);
+			return resolved;
+		},
+	};
+}