pi-free 2.0.0 → 2.0.2

package/provider-helper.ts

@@ -1,7 +1,7 @@
 /**
  * Shared provider setup helpers for pi-free-providers.
  * Extracts the common boilerplate pattern repeated across providers:
- *   - /{provider}-toggle command to switch between free/paid models
+ *   - toggle-{provider} command to switch between free/paid models
  *   - model_select handler (clear status for other providers)
  *   - turn_end handler (provider-specific error hook)
  *   - before_agent_start handler (one-time ToS notice)
@@ -31,7 +31,7 @@ export interface ProviderSetupConfig {
 	/** Initial mode - auto-detected from config at startup. */
 	initialShowPaid?: boolean;
 	/**
-	 * Called by /{provider}-toggle command to re-register
+	 * Called by toggle-{provider} command to re-register
 	 * the provider with the given model set.
 	 */
 	reRegister: (models: ProviderModelConfig[], stored: StoredModels) => void;
@@ -42,7 +42,7 @@ export interface ProviderSetupConfig {
 			ui: { notify: (m: string, t: "info" | "warning" | "error") => void };
 		},
 	) => Promise<boolean>;
-	/** When true, skips creating the /{provider}-toggle command. Useful for providers with only one model. */
+	/** When true, skips creating the toggle-{provider} command. Useful for providers with only one model. */
 	skipToggle?: boolean;
 }
 
@@ -79,10 +79,11 @@ export interface OpenAICompatibleConfig {
  */
 export function enhanceWithCI(
 	models: ProviderModelConfig[],
+	providerId?: string,
 ): ProviderModelConfig[] {
 	return models.map((m) => ({
 		...m,
-		name: enhanceModelNameWithCodingIndex(m.name, m.id),
+		name: enhanceModelNameWithCodingIndex(m.name, m.id, providerId),
 	}));
 }
 
@@ -105,7 +106,7 @@ export function registerOpenAICompatible(
 			"User-Agent": "pi-free-providers",
 			...headers,
 		},
-		models: enhanceWithCI(models),
+		models: enhanceWithCI(models, providerId),
 		...(oauth && { oauth: oauth as any }),
 	});
 }
@@ -144,7 +145,7 @@ export function createCtxReRegister(
 				"User-Agent": "pi-free-providers",
 				...headers,
 			},
-			models: enhanceWithCI(models),
+			models: enhanceWithCI(models, providerId),
 			...(oauth && { oauth: oauth as any }),
 		});
 	};
@@ -169,14 +170,14 @@ export function setupProvider(
 
 	// Wrap reRegister to automatically add CI scores to all models
 	const reRegister = (models: ProviderModelConfig[], _s: StoredModels) => {
-		const enhanced = enhanceWithCI(models);
+		const enhanced = enhanceWithCI(models, providerId);
 		config.reRegister(enhanced, _s);
 	};
 
 	// ── Single toggle command (skip if requested) ──────────────────────
 
 	if (!config.skipToggle) {
-		pi.registerCommand(`${providerId}-toggle`, {
+		pi.registerCommand(`toggle-${providerId}`, {
 			description: `Toggle between free and all ${providerId} models`,
 			handler: async (_args, ctx) => {
 				// Toggle the mode

package/providers/cline/cline-models.ts

@@ -1,128 +1,129 @@
-/**
- * Cline model fetching.
- *
- * Fetches ALL models from OpenRouter (Cline's gateway).
- * Free/paid filtering is handled by the global /free toggle.
- */
-
-import { applyHidden } from "../../config.ts";
-import {
-	BASE_URL_OPENROUTER,
-	DEFAULT_FETCH_TIMEOUT_MS,
-	DEFAULT_MIN_SIZE_B,
-} from "../../constants.ts";
-import type { ProviderModelConfig } from "../../lib/types.ts";
-import {
-	cleanModelName,
-	fetchWithRetry,
-	isUsableModel,
-} from "../../lib/util.ts";
-
-interface OpenRouterRaw {
-	id: string;
-	name: string;
-	context_length?: number;
-	supported_parameters?: string[];
-	architecture?: { input_modalities?: string[]; output_modalities?: string[] };
-	top_provider?: { max_completion_tokens?: number | null };
-	pricing?: { prompt?: string; completion?: string };
-}
-
-function extractNameFromId(id: string): string {
-	const part = id.split("/")[1] ?? id;
-	return part
-		.split(/[-_]/)
-		.map((w) => w.charAt(0).toUpperCase() + w.slice(1))
-		.join(" ");
-}
-
-/**
- * Parse pricing string to cost per million tokens.
- * OpenRouter returns pricing as string (e.g., "0.0001" or "0").
- */
-function parsePricing(pricingStr: string | undefined): number {
-	if (!pricingStr || pricingStr === "0") return 0;
-	const parsed = parseFloat(pricingStr);
-	return isNaN(parsed) ? 0 : parsed * 1_000_000; // Convert to per-million
-}
-
-/**
- * Check if a model is free (both prompt and completion pricing is 0).
- */
-function isFreeModel(info: OpenRouterRaw): boolean {
-	return info.pricing?.prompt === "0" && info.pricing?.completion === "0";
-}
-
-/**
- * Fetch ALL models from OpenRouter.
- * @param freeOnly - If true, return only free models
- */
-export async function fetchClineModels(
-	freeOnly = false,
-): Promise<ProviderModelConfig[]> {
-	const response = await fetchWithRetry(
-		`${BASE_URL_OPENROUTER}/models`,
-		{},
-		3,
-		1000,
-		DEFAULT_FETCH_TIMEOUT_MS,
-	);
-
-	if (!response.ok)
-		throw new Error(`Failed to fetch OpenRouter models: ${response.status}`);
-
-	const json = (await response.json()) as { data?: OpenRouterRaw[] };
-
-	// Filter to usable models (chat-capable, size threshold)
-	let usableModels = (json.data ?? []).filter((m) =>
-		isUsableModel(m.id, DEFAULT_MIN_SIZE_B),
-	);
-
-	// If freeOnly, filter to free models
-	if (freeOnly) {
-		usableModels = usableModels.filter(isFreeModel);
-	}
-
-	const models: ProviderModelConfig[] = [];
-	for (const info of usableModels) {
-		const isReasoning = !!(
-			info.supported_parameters?.includes("include_reasoning") ||
-			info.supported_parameters?.includes("reasoning")
-		);
-		const hasImage =
-			info.architecture?.input_modalities?.includes("image") ?? false;
-
-		// Calculate cost per million tokens
-		const inputCost = parsePricing(info.pricing?.prompt);
-		const outputCost = parsePricing(info.pricing?.completion);
-		const isFree = inputCost === 0 && outputCost === 0;
-
-		const cleanName = info.name
-			? cleanModelName(info.name)
-			: extractNameFromId(info.id);
-
-		models.push({
-			id: info.id,
-			name: `${cleanName} (Cline)${isFree ? "" : " 💰"}`,
-			reasoning: isReasoning,
-			input: hasImage ? ["text", "image"] : ["text"],
-			cost: {
-				input: inputCost,
-				output: outputCost,
-				cacheRead: 0,
-				cacheWrite: 0,
-			},
-			contextWindow: info.context_length ?? 128_000,
-			maxTokens: info.top_provider?.max_completion_tokens ?? 8_192,
-		});
-	}
-
-	return applyHidden(models);
-}
-
-/**
- * Fetch only free models (backward compatibility).
- */
-export async function fetchClineFreeModels(): Promise<ProviderModelConfig[]> {
-	return fetchClineModels(true);
-}
+/**
+ * Cline model fetching.
+ *
+ * Fetches ALL models from OpenRouter (Cline's gateway).
+ * Free/paid filtering is handled by the global free-only filter.
+ */
+
+import { applyHidden } from "../../config.ts";
+import {
+	BASE_URL_OPENROUTER,
+	DEFAULT_FETCH_TIMEOUT_MS,
+	DEFAULT_MIN_SIZE_B,
+	PROVIDER_CLINE,
+} from "../../constants.ts";
+import type { ProviderModelConfig } from "../../lib/types.ts";
+import {
+	cleanModelName,
+	fetchWithRetry,
+	isUsableModel,
+} from "../../lib/util.ts";
+
+interface OpenRouterRaw {
+	id: string;
+	name: string;
+	context_length?: number;
+	supported_parameters?: string[];
+	architecture?: { input_modalities?: string[]; output_modalities?: string[] };
+	top_provider?: { max_completion_tokens?: number | null };
+	pricing?: { prompt?: string; completion?: string };
+}
+
+function extractNameFromId(id: string): string {
+	const part = id.split("/")[1] ?? id;
+	return part
+		.split(/[-_]/)
+		.map((w) => w.charAt(0).toUpperCase() + w.slice(1))
+		.join(" ");
+}
+
+/**
+ * Parse pricing string to cost per million tokens.
+ * OpenRouter returns pricing as string (e.g., "0.0001" or "0").
+ */
+function parsePricing(pricingStr: string | undefined): number {
+	if (!pricingStr || pricingStr === "0") return 0;
+	const parsed = parseFloat(pricingStr);
+	return isNaN(parsed) ? 0 : parsed * 1_000_000; // Convert to per-million
+}
+
+/**
+ * Check if a model is free (both prompt and completion pricing is 0).
+ */
+function isFreeModel(info: OpenRouterRaw): boolean {
+	return info.pricing?.prompt === "0" && info.pricing?.completion === "0";
+}
+
+/**
+ * Fetch ALL models from OpenRouter.
+ * @param freeOnly - If true, return only free models
+ */
+export async function fetchClineModels(
+	freeOnly = false,
+): Promise<ProviderModelConfig[]> {
+	const response = await fetchWithRetry(
+		`${BASE_URL_OPENROUTER}/models`,
+		{},
+		3,
+		1000,
+		DEFAULT_FETCH_TIMEOUT_MS,
+	);
+
+	if (!response.ok)
+		throw new Error(`Failed to fetch OpenRouter models: ${response.status}`);
+
+	const json = (await response.json()) as { data?: OpenRouterRaw[] };
+
+	// Filter to usable models (chat-capable, size threshold)
+	let usableModels = (json.data ?? []).filter((m) =>
+		isUsableModel(m.id, DEFAULT_MIN_SIZE_B),
+	);
+
+	// If freeOnly, filter to free models
+	if (freeOnly) {
+		usableModels = usableModels.filter(isFreeModel);
+	}
+
+	const models: ProviderModelConfig[] = [];
+	for (const info of usableModels) {
+		const isReasoning = !!(
+			info.supported_parameters?.includes("include_reasoning") ||
+			info.supported_parameters?.includes("reasoning")
+		);
+		const hasImage =
+			info.architecture?.input_modalities?.includes("image") ?? false;
+
+		// Calculate cost per million tokens
+		const inputCost = parsePricing(info.pricing?.prompt);
+		const outputCost = parsePricing(info.pricing?.completion);
+		const isFree = inputCost === 0 && outputCost === 0;
+
+		const cleanName = info.name
+			? cleanModelName(info.name)
+			: extractNameFromId(info.id);
+
+		models.push({
+			id: info.id,
+			name: `${cleanName} (Cline)${isFree ? "" : " 💰"}`,
+			reasoning: isReasoning,
+			input: hasImage ? ["text", "image"] : ["text"],
+			cost: {
+				input: inputCost,
+				output: outputCost,
+				cacheRead: 0,
+				cacheWrite: 0,
+			},
+			contextWindow: info.context_length ?? 128_000,
+			maxTokens: info.top_provider?.max_completion_tokens ?? 8_192,
+		});
+	}
+
+	return applyHidden(models, PROVIDER_CLINE);
+}
+
+/**
+ * Fetch only free models (backward compatibility).
+ */
+export async function fetchClineFreeModels(): Promise<ProviderModelConfig[]> {
+	return fetchClineModels(true);
+}