pi-free 2.2.3 → 2.2.4

package/lib/telemetry.ts

@@ -105,67 +105,59 @@ const _store = createJSONStore<TelemetryStore>(TELEMETRY_FILE, {
 // =============================================================================
 
 function deriveModelTelemetry(
-	_modelKey: string,
 	entries: TelemetryEntry[],
 ): ModelTelemetry {
 	const recent = entries.slice(-MAX_RECENT_CALLS);
+
+	let successCalls = 0;
+	let totalTokensFromSuccessful = 0;
+	let totalLatencyFromSuccessful = 0;
+	let totalTokens = 0;
+	let totalPromptTokens = 0;
+	let totalCompletionTokens = 0;
+	let totalLatencyMs = 0;
+	let totalCost = 0;
+
+	for (const e of entries) {
+		totalTokens += e.totalTokens;
+		totalPromptTokens += e.promptTokens;
+		totalCompletionTokens += e.completionTokens;
+		totalLatencyMs += e.latencyMs;
+		totalCost += e.cost;
+		if (e.success) {
+			successCalls++;
+			totalTokensFromSuccessful += e.totalTokens;
+			totalLatencyFromSuccessful += e.latencyMs;
+		}
+	}
+
 	const totalCalls = entries.length;
-	const successCalls = entries.filter((e) => e.success).length;
-	const errorCalls = totalCalls - successCalls;
-
-	const stats = entries.reduce(
-		(acc, e) => {
-			acc.totalTokens += e.totalTokens;
-			acc.totalPromptTokens += e.promptTokens;
-			acc.totalCompletionTokens += e.completionTokens;
-			acc.totalLatencyMs += e.latencyMs;
-			acc.totalCost += e.cost;
-			return acc;
-		},
-		{
-			totalTokens: 0,
-			totalPromptTokens: 0,
-			totalCompletionTokens: 0,
-			totalLatencyMs: 0,
-			totalCost: 0,
-		},
-	);
-
-	const totalSuccessEntries = entries.filter((e) => e.success);
-	const totalTokensFromSuccessful = totalSuccessEntries.reduce(
-		(s, e) => s + e.totalTokens,
-		0,
-	);
-	const totalLatencyFromSuccessful = totalSuccessEntries.reduce(
-		(s, e) => s + e.latencyMs,
-		0,
-	);
 
 	return {
 		totalCalls,
 		successCalls,
-		errorCalls,
-		totalTokens: stats.totalTokens,
-		totalPromptTokens: stats.totalPromptTokens,
-		totalCompletionTokens: stats.totalCompletionTokens,
-		totalLatencyMs: stats.totalLatencyMs,
-		totalCost: stats.totalCost,
+		errorCalls: totalCalls - successCalls,
+		totalTokens,
+		totalPromptTokens,
+		totalCompletionTokens,
+		totalLatencyMs,
+		totalCost,
 		avgLatencyMs:
-			totalSuccessEntries.length > 0
-				? Math.round(totalLatencyFromSuccessful / totalSuccessEntries.length)
+			successCalls > 0
+				? Math.round(totalLatencyFromSuccessful / successCalls)
 				: 0,
 		avgTokensPerSecond:
 			totalLatencyFromSuccessful > 0
-				? parseFloat(
+				? Number.parseFloat(
 						(
 							totalTokensFromSuccessful /
 							(totalLatencyFromSuccessful / 1000)
 						).toFixed(1),
-					)
+				)
 				: 0,
 		successRate:
 			totalCalls > 0
-				? parseFloat(((successCalls / totalCalls) * 100).toFixed(1))
+				? Number.parseFloat(((successCalls / totalCalls) * 100).toFixed(1))
 				: 0,
 		recentCalls: recent,
 	};
@@ -186,7 +178,7 @@ async function addEntry(entry: TelemetryEntry): Promise<void> {
 			...store,
 			models: {
 				...store.models,
-				[modelKey]: deriveModelTelemetry(modelKey, pruned),
+				[modelKey]: deriveModelTelemetry(pruned),
 			},
 			lastUpdated: Date.now(),
 		};
@@ -310,7 +302,7 @@ export async function recordModelCall(
 	const totalTokens = usage.totalTokens || usage.input + usage.output;
 	const tokensPerSecond =
 		latencyMs > 0
-			? parseFloat((totalTokens / (latencyMs / 1000)).toFixed(1))
+			? Number.parseFloat((totalTokens / (latencyMs / 1000)).toFixed(1))
 			: 0;
 
 	const entry: TelemetryEntry = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "pi-free",
-	"version": "2.2.3",
+	"version": "2.2.4",
 	"type": "module",
 	"description": "AI model providers for Pi with free model filtering and dynamic model fetching",
 	"keywords": [
@@ -52,7 +52,8 @@
 		"test": "vitest",
 		"test:ui": "vitest --ui",
 		"test:run": "vitest run",
-		"smoke:cline": "tsx scripts/smoke-cline-xml-bridge.ts"
+		"smoke:cline": "tsx scripts/smoke-cline-xml-bridge.ts",
+		"smoke:openmodel": "tsx scripts/smoke-openmodel-wire-format.ts"
 	},
 	"peerDependencies": {
 		"@earendil-works/pi-ai": "^0.79.8",

package/provider-failover/benchmark-lookup.ts

@@ -551,23 +551,35 @@ function tryDirectSubstringMatch(
 	modelId: string,
 	modelName: string,
 ): HardcodedBenchmark | null {
+	// Collect ALL substring matches, then return the LONGEST key. This
+	// prevents short general keys (e.g. "mistral-medium-3") from shadowing
+	// longer specific keys (e.g. "mistral-medium-3.5") when a provider
+	// uses a different separator convention in the model ID.
+	let bestKey: string | null = null;
+	let bestData: HardcodedBenchmark | null = null;
 	for (const [key, data] of Object.entries(HARDCODED_BENCHMARKS) as [
 		string,
 		HardcodedBenchmark,
 	][]) {
 		if (search.includes(key.toLowerCase())) {
-			logDebug({
-				provider,
-				modelId,
-				modelName,
-				action: "match",
-				strategy: "direct-substring",
-				matchKey: key,
-				codingIndex: data.codingIndex,
-			});
-			return data;
+			if (bestKey === null || key.length > bestKey.length) {
+				bestKey = key;
+				bestData = data;
+			}
 		}
 	}
+	if (bestKey !== null && bestData !== null) {
+		logDebug({
+			provider,
+			modelId,
+			modelName,
+			action: "match",
+			strategy: "direct-substring",
+			matchKey: bestKey,
+			codingIndex: bestData.codingIndex,
+		});
+		return bestData;
+	}
 	return null;
 }
 
@@ -685,14 +697,17 @@ export function findHardcodedBenchmark(
 
 	logDebug({ provider, modelId, modelName, action: "attempt" });
 
-	// 1. Direct substring match
-	const direct = tryDirectSubstringMatch(search, provider, modelId, modelName);
-	if (direct) return direct;
-
-	// 2. Variant alias matching
+	// 1. Variant alias matching (human-curated, runs first so deliberate
+	// aliases for separator/suffix mismatches can override generic substring
+	// matches).
 	const variant = tryVariantAliasMatch(search, provider, modelId, modelName);
 	if (variant) return variant;
 
+	// 2. Direct substring match (longest-key wins, so "minimax-m2.5" beats
+	// "minimax-m2" when both could match).
+	const direct = tryDirectSubstringMatch(search, provider, modelId, modelName);
+	if (direct) return direct;
+
 	// 3. Provider-specific normalization
 	const { result: normalizedResult, normalized } = tryProviderNormalizedMatch(
 		modelId,

package/provider-helper.ts

@@ -13,14 +13,11 @@ import type {
 } from "@earendil-works/pi-coding-agent";
 import { saveConfig } from "./config.ts";
 import { createLogger } from "./lib/logger.ts";
+import type { ModelsDevEnrichedMetadata } from "./lib/types.ts";
 import { enhanceModelNameWithCodingIndex } from "./provider-failover/benchmark-lookup.ts";
 
 const _logger = createLogger("provider-helper");
 
-type ModelsDevEnrichedMetadata = {
-	modelsDev?: Parameters<typeof enhanceModelNameWithCodingIndex>[3];
-};
-
 // =============================================================================
 // Types
 // =============================================================================
@@ -66,6 +63,14 @@ export interface OpenAICompatibleConfig {
 	baseUrl: string;
 	/** Environment variable name for the API key */
 	apiKey: string;
+	/**
+	 * Wire API to use. Defaults to `"openai-completions"` for backward
+	 * compatibility with the 17 existing providers that pass through
+	 * this helper without setting it. Set to `"anthropic-messages"`
+	 * for Anthropic-protocol gateways (e.g. OpenModel). The pi-ai
+	 * runtime dispatches to the right client based on this value.
+	 */
+	api?: "openai-completions" | "anthropic-messages";
 	/** Additional headers to include */
 	headers?: Record<string, string>;
 	/** OAuth configuration (optional) */
@@ -105,12 +110,19 @@ export function registerOpenAICompatible(
 	config: OpenAICompatibleConfig,
 	models: ProviderModelConfig[],
 ): void {
-	const { providerId, baseUrl, apiKey, headers, oauth } = config;
+	const {
+		providerId,
+		baseUrl,
+		apiKey,
+		api = "openai-completions",
+		headers,
+		oauth,
+	} = config;
 
 	pi.registerProvider(providerId, {
 		baseUrl,
 		apiKey,
-		api: "openai-completions" as const,
+		api,
 		headers: {
 			"User-Agent": "pi-free-providers",
 			...headers,
@@ -143,13 +155,20 @@ export function createCtxReRegister(
 	},
 	config: OpenAICompatibleConfig,
 ): (models: ProviderModelConfig[]) => void {
-	const { providerId, baseUrl, apiKey, headers, oauth } = config;
+	const {
+		providerId,
+		baseUrl,
+		apiKey,
+		api = "openai-completions",
+		headers,
+		oauth,
+	} = config;
 
 	return (models: ProviderModelConfig[]) => {
 		ctx.modelRegistry.registerProvider(providerId, {
 			baseUrl,
 			apiKey,
-			api: "openai-completions" as const,
+			api,
 			headers: {
 				"User-Agent": "pi-free-providers",
 				...headers,

package/providers/bai/bai.ts

@@ -47,16 +47,11 @@ const _logger = createLogger("bai");
 // =============================================================================
 // Known Free Models
 // B.AI doesn't expose pricing via /v1/models, so known-free models are
-// hardcoded. The site currently advertises `MiniMax-M3` as a limited-time
-// free promotional model; we hardcode that alias and any future `:free`
-// suffixed IDs (catches dynamic promotional additions).
+// detected by name suffix. Catches `:free`-tagged models the gateway
+// advertises as promotional.
 // =============================================================================
 
-const BAI_KNOWN_FREE_MODELS = new Set(["minimax-m3", "MiniMax-M3"]);
-
 function isBaiKnownFree(modelId: string): boolean {
-	if (BAI_KNOWN_FREE_MODELS.has(modelId)) return true;
-	// Catch any future `:free` suffixed model the gateway advertises
 	return modelId.toLowerCase().endsWith(":free");
 }
 

package/providers/cline/cline-xml-bridge.ts

@@ -170,7 +170,9 @@ const CORE_CLINE_TOOL_NAMES = [
 
 function stringArg(args: Record<string, unknown>, key: string): string {
 	const value = args[key];
-	return typeof value === "string" ? value : value == null ? "" : String(value);
+	if (typeof value === "string") return value;
+	if (value == null) return "";
+	return String(value);
 }
 
 function booleanArg(args: Record<string, unknown>, key: string): boolean {
@@ -178,7 +180,8 @@ function booleanArg(args: Record<string, unknown>, key: string): boolean {
 }
 
 function shellQuote(value: string): string {
-	return `'${value.replaceAll("'", `'"'"'`)}'`;
+	const escaped = value.replaceAll("'", `'"'"'`);
+	return `'${escaped}'`;
 }
 
 function buildListFilesCommand(args: Record<string, unknown>): string {
@@ -639,23 +642,25 @@ function buildToolInstructions(tools: Tool[] | undefined): string {
 	if (bridges.length === 0) return "";
 
 	const sections = bridges.map((bridge) => {
-		const params =
-			bridge.remoteName === "replace_in_file"
-				? [
-						"  <path>path/to/file</path>",
-						"  <diff>",
-						"------- SEARCH",
-						"exact text to replace",
-						"=======",
-						"new text",
-						"+++++++ REPLACE",
-						"  </diff>",
-					].join("\n")
-				: bridge.parameters.length
-					? bridge.parameters
-							.map((name) => `  <${name}>value</${name}>`)
-							.join("\n")
-					: "  <arguments>{}</arguments>";
+		let params: string;
+		if (bridge.remoteName === "replace_in_file") {
+			params = [
+				"  <path>path/to/file</path>",
+				"  <diff>",
+				"------- SEARCH",
+				"exact text to replace",
+				"=======",
+				"new text",
+				"+++++++ REPLACE",
+				"  </diff>",
+			].join("\n");
+		} else if (bridge.parameters.length) {
+			params = bridge.parameters
+				.map((name) => `  <${name}>value</${name}>`)
+				.join("\n");
+		} else {
+			params = "  <arguments>{}</arguments>";
+		}
 		return [
 			`Tool: ${bridge.remoteName}`,
 			`Description: ${bridge.description ?? bridge.runtimeName}`,
@@ -1461,12 +1466,13 @@ export function streamClineXml(
 				pushToolCall(assistant, toolCall, stream);
 			}
 
-			assistant.stopReason =
-				toolCalls.length > 0
-					? "toolUse"
-					: finishReason === "length"
-						? "length"
-						: "stop";
+			if (toolCalls.length > 0) {
+				assistant.stopReason = "toolUse";
+			} else if (finishReason === "length") {
+				assistant.stopReason = "length";
+			} else {
+				assistant.stopReason = "stop";
+			}
 			stream.push({
 				type: "done",
 				reason: assistant.stopReason as "stop" | "length" | "toolUse",

package/providers/cline/cline.ts

@@ -19,7 +19,7 @@ import type {
 	ExtensionAPI,
 	ProviderModelConfig,
 } from "@earendil-works/pi-coding-agent";
-import { getClineShowPaid } from "../../config.ts";
+import { getClineApiKey, getClineShowPaid } from "../../config.ts";
 import { BASE_URL_CLINE, PROVIDER_CLINE } from "../../constants.ts";
 import {
 	DEFAULT_PROVIDER_CACHE_TTL_MS,
@@ -84,6 +84,9 @@ function toApiKey(credentials: OAuthCredentials): string {
 // =============================================================================
 
 export default async function clineProvider(pi: ExtensionAPI) {
+	const clineApiKey = getClineApiKey();
+	const useApiKeyAuth = !!clineApiKey;
+
 	let allModels: ProviderModelConfig[];
 	const cachedModels = loadProviderCache(PROVIDER_CLINE);
 	if (cachedModels && cachedModels.length > 0) {
@@ -114,16 +117,21 @@ export default async function clineProvider(pi: ExtensionAPI) {
 			baseUrl: BASE_URL_CLINE,
 			api: "cline-xml-tools" as const,
 			authHeader: false,
+			apiKey: clineApiKey,
 			headers: buildClineHeaders(),
 			streamSimple: (model, context, options) =>
 				streamClineXml(model as any, context, options, buildClineHeaders()),
 			models: enhanceWithCI(m),
-			oauth: {
-				name: "Cline",
-				login: loginCline,
-				refreshToken: refreshClineToken,
-				getApiKey: toApiKey,
-			},
+			...(useApiKeyAuth
+				? {}
+				: {
+					oauth: {
+						name: "Cline",
+						login: loginCline,
+						refreshToken: refreshClineToken,
+						getApiKey: toApiKey,
+					},
+				}),
 		});
 	};
 
@@ -138,7 +146,8 @@ export default async function clineProvider(pi: ExtensionAPI) {
 		toggleState.applyCurrent(reRegister);
 	};
 
-	registerWithGlobalToggle(PROVIDER_CLINE, stored, (m) => reRegister(m), false);
+	// Register with global toggle system (hasKey=true if API key auth configured)
+	registerWithGlobalToggle(PROVIDER_CLINE, stored, (m) => reRegister(m), useApiKeyAuth);
 	toggleState.applyCurrent(reRegister);
 
 	pi.registerCommand("toggle-cline", {

package/providers/kilo/kilo.ts

@@ -18,6 +18,7 @@ import type {
 	ProviderModelConfig,
 } from "@earendil-works/pi-coding-agent";
 import {
+	getKiloApiKey,
 	getKiloFreeOnly,
 	getKiloShowPaid,
 	PROVIDER_KILO,
@@ -152,7 +153,7 @@ function parseXmlToolCalls(
 const KILO_PROVIDER_CONFIG = {
 	providerId: PROVIDER_KILO,
 	baseUrl: KILO_GATEWAY_BASE,
-	apiKey: "$KILO_API_KEY",
+	apiKey: getKiloApiKey() || "$KILO_API_KEY",
 	headers: {
 		"X-KILOCODE-EDITORNAME": "Pi",
 	},
@@ -172,14 +173,17 @@ function applyKiloCompat<T extends { compat?: ProviderModelConfig["compat"] }>(
 }
 
 export default async function kiloProvider(pi: ExtensionAPI) {
+	// Resolve API key (env var or ~/.pi/free.json)
+	const kiloApiKey = getKiloApiKey();
+
 	// Try to fetch ALL models at startup (like Cline/OpenRouter)
-	// If no API key, this will return free models only
+	// With API key: returns all models; without: returns free-only
 	let allModels: ProviderModelConfig[] = [];
 	let freeModels: ProviderModelConfig[] = [];
 
 	try {
 		// Fetch all models (returns free-only if no auth, all if auth available)
-		allModels = await fetchKiloModels({ freeOnly: false });
+		allModels = await fetchKiloModels({ token: kiloApiKey, freeOnly: false });
 		// Derive free list using isFreeModel with allModels for detection
 		freeModels = allModels.filter((m) =>
 			isFreeModel({ ...m, provider: PROVIDER_KILO }, allModels),
@@ -211,11 +215,12 @@ export default async function kiloProvider(pi: ExtensionAPI) {
 		baseReRegister(applyKiloCompat(models));
 
 	// Register with global toggle system
+	const hasKiloKey = !!kiloApiKey;
 	registerWithGlobalToggle(
 		PROVIDER_KILO,
 		stored,
 		reRegister,
-		!!process.env.KILO_API_KEY,
+		hasKiloKey,
 	);
 
 	// OAuth config for Kilo
@@ -283,14 +288,14 @@ export default async function kiloProvider(pi: ExtensionAPI) {
 	const modelsWithCompat = applyKiloCompat(currentModels);
 	pi.registerProvider(PROVIDER_KILO, {
 		baseUrl: KILO_GATEWAY_BASE,
-		apiKey: "$KILO_API_KEY",
+		apiKey: kiloApiKey || "$KILO_API_KEY",
 		api: "openai-completions" as const,
 		headers: {
 			"X-KILOCODE-EDITORNAME": "Pi",
 			"User-Agent": "pi-free-providers",
 		},
 		models: enhanceWithCI(modelsWithCompat),
-		oauth: oauthConfig,
+		...(!!kiloApiKey ? {} : { oauth: oauthConfig }),
 	});
 
 	// Registration complete - models registered silently (use LOG_LEVEL=info to see details)

package/providers/model-fetcher.ts

@@ -138,7 +138,7 @@ export async function fetchOpenRouterModelsWithFree(
 
 	const free = all.filter((m) => {
 		const cost = m.cost;
-		return cost && cost.input === 0 && cost.output === 0;
+		return cost != null && cost.input === 0 && cost.output === 0;
 	});
 
 	return { free, all };

package/providers/opencode-session.ts

@@ -226,8 +226,8 @@ function resolvePiAiSubpathFromPackage(specifier: string): string | undefined {
 }
 
 class DeferredAssistantMessageEventStream {
-	private queue: AssistantMessageEvent[] = [];
-	private waiting: Array<
+	private readonly queue: AssistantMessageEvent[] = [];
+	private readonly waiting: Array<
 		(result: IteratorResult<AssistantMessageEvent>) => void
 	> = [];
 	private done = false;