pi-free 2.2.5 → 2.2.7

package/providers/opencode-session.ts

@@ -10,6 +10,7 @@ import type {
 	AssistantMessageEventStream,
 	Context,
 	Model,
+	ProviderHeaders,
 	SimpleStreamOptions,
 } from "@earendil-works/pi-ai";
 import type { ProviderConfig } from "@earendil-works/pi-coding-agent";
@@ -83,8 +84,8 @@ export type OpenCodeSessionTracker = ReturnType<
 
 export function createOpenCodeHeaders(
 	tracker: OpenCodeSessionTracker,
-	existingHeaders?: Record<string, string>,
-): Record<string, string> {
+	existingHeaders?: ProviderHeaders,
+): ProviderHeaders {
 	return {
 		...existingHeaders,
 		...OPENCODE_STATIC_HEADERS,
@@ -115,17 +116,30 @@ type StreamSimpleFn<TApi extends Api> = (
 	options?: SimpleStreamOptions,
 ) => AssistantMessageEventStream;
 
-type AnthropicStreamModule = {
-	streamSimpleAnthropic: StreamSimpleFn<"anthropic-messages">;
+type StreamSimpleModule<TApi extends Api> = {
+	streamSimple?: StreamSimpleFn<TApi>;
+	[key: string]: unknown;
 };
 
-type OpenAICompletionsStreamModule = {
-	streamSimpleOpenAICompletions: StreamSimpleFn<"openai-completions">;
-};
+type AnthropicStreamModule = StreamSimpleModule<"anthropic-messages">;
+type OpenAICompletionsStreamModule = StreamSimpleModule<"openai-completions">;
+
+function getStreamSimple<TApi extends Api>(
+	module: StreamSimpleModule<TApi>,
+	legacyExport: string,
+): StreamSimpleFn<TApi> {
+	const streamSimple = module.streamSimple ?? module[legacyExport];
+	if (typeof streamSimple !== "function") {
+		throw new Error(
+			`Pi AI module does not export ${legacyExport} or streamSimple`,
+		);
+	}
+	return streamSimple as StreamSimpleFn<TApi>;
+}
 
 const piAiSubpathCache = new Map<string, Promise<unknown>>();
 
-async function importPiAiSubpath<T>(subpath: string): Promise<T> {
+function importPiAiSubpath<T>(subpath: string): Promise<T> {
 	const specifier = `@earendil-works/pi-ai/${subpath}`;
 	const cached = piAiSubpathCache.get(specifier) as Promise<T> | undefined;
 	if (cached) return cached;
@@ -157,6 +171,9 @@ async function importPiAiRootFallback<T>(
 ): Promise<T | undefined> {
 	const subpath = specifier.replace("@earendil-works/pi-ai/", "");
 	const requiredExport: Record<string, string> = {
+		"api/anthropic-messages": "streamSimpleAnthropic",
+		"api/openai-completions": "streamSimpleOpenAICompletions",
+		// Keep compatibility with pre-0.80 Pi AI packages.
 		anthropic: "streamSimpleAnthropic",
 		"openai-completions": "streamSimpleOpenAICompletions",
 	};
@@ -199,6 +216,37 @@ function findPiAiPackageDir(requireBase: string): string | undefined {
 	return undefined;
 }
 
+function resolvePiAiExportTarget(
+	exportsMap: Record<string, unknown> | undefined,
+	subpath: string,
+): string | undefined {
+	if (!exportsMap) return undefined;
+
+	const getTarget = (entry: unknown): string | undefined => {
+		if (typeof entry === "string") return entry;
+		if (!entry || typeof entry !== "object") return undefined;
+		const conditions = entry as Record<string, unknown>;
+		const target = conditions.import ?? conditions.default;
+		return typeof target === "string" ? target : undefined;
+	};
+
+	const exactTarget = getTarget(exportsMap[`./${subpath}`]);
+	if (exactTarget) return exactTarget;
+
+	for (const [pattern, entry] of Object.entries(exportsMap)) {
+		if (!pattern.endsWith("/*")) continue;
+		const prefix = pattern.slice(2, -1);
+		if (subpath.startsWith(prefix)) {
+			const target = getTarget(entry);
+			if (target) {
+				return target.replaceAll("*", subpath.slice(prefix.length));
+			}
+		}
+	}
+
+	return undefined;
+}
+
 function resolvePiAiSubpathFromPackage(specifier: string): string | undefined {
 	const subpath = specifier.replace("@earendil-works/pi-ai/", "");
 	const candidates = [process.argv[1], import.meta.url].filter(
@@ -212,11 +260,8 @@ function resolvePiAiSubpathFromPackage(specifier: string): string | undefined {
 			const pkg = JSON.parse(
 				readFileSync(join(pkgDir, "package.json"), "utf-8"),
 			);
-			const exportEntry = pkg.exports?.[`./${subpath}`];
-			const targetPath = exportEntry?.import ?? exportEntry?.default;
-			if (typeof targetPath === "string") {
-				return join(pkgDir, targetPath);
-			}
+			const targetPath = resolvePiAiExportTarget(pkg.exports, subpath);
+			if (targetPath) return join(pkgDir, targetPath);
 		} catch {
 			// Try the next resolution base.
 		}
@@ -367,8 +412,12 @@ export function createOpenCodeStreamSimple(
 		void (async () => {
 			try {
 				if (isAnthropicOpenCodeEndpoint(model)) {
-					const { streamSimpleAnthropic } =
-						await importPiAiSubpath<AnthropicStreamModule>("anthropic");
+					const streamSimpleAnthropic = getStreamSimple(
+						await importPiAiSubpath<AnthropicStreamModule>(
+							"api/anthropic-messages",
+						),
+						"streamSimpleAnthropic",
+					);
 					await pipeStream(
 						stream,
 						streamSimpleAnthropic(
@@ -383,10 +432,12 @@ export function createOpenCodeStreamSimple(
 					return;
 				}
 
-				const { streamSimpleOpenAICompletions } =
+				const streamSimpleOpenAICompletions = getStreamSimple(
 					await importPiAiSubpath<OpenAICompletionsStreamModule>(
-						"openai-completions",
-					);
+						"api/openai-completions",
+					),
+					"streamSimpleOpenAICompletions",
+				);
 				await pipeStream(
 					stream,
 					streamSimpleOpenAICompletions(

package/providers/openmodel/openmodel.ts

@@ -45,7 +45,11 @@ import { safeEnrichModelsWithModelsDev } from "../../lib/model-metadata.ts";
 import { isLikelyReasoningModel } from "../../lib/provider-compat.ts";
 import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
 import { fetchWithRetry } from "../../lib/util.ts";
-import { createReRegister, setupProvider } from "../../provider-helper.ts";
+import {
+	createReRegister,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("openmodel");
 
@@ -465,7 +469,9 @@ export default async function openmodelProvider(pi: ExtensionAPI) {
 		return;
 	}
 
-	const allModels = await fetchOpenModelModels(apiKey);
+	const allModels = await loadCachedOrFetchModels(PROVIDER_OPENMODEL, () =>
+		fetchOpenModelModels(apiKey),
+	);
 
 	if (allModels.length === 0) {
 		_logger.warn(

package/providers/routeway/routeway.ts

@@ -45,7 +45,11 @@ import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
 import { wrapSessionStartHandler } from "../../lib/session-start-metrics.ts";
 import { cleanModelName, fetchWithRetry } from "../../lib/util.ts";
 import { fetchWithTimeout } from "../../lib/util.ts";
-import { createReRegister, setupProvider } from "../../provider-helper.ts";
+import {
+	createReRegister,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("routeway");
 
@@ -303,7 +307,9 @@ export default async function routewayProvider(pi: ExtensionAPI) {
 		return;
 	}
 
-	const allModels = await fetchRoutewayModels(apiKey);
+	const allModels = await loadCachedOrFetchModels(PROVIDER_ROUTEWAY, () =>
+		fetchRoutewayModels(apiKey),
+	);
 
 	if (allModels.length === 0) {
 		_logger.warn("[routeway] No chat models available");

package/providers/sambanova/sambanova.ts

@@ -38,7 +38,11 @@ import {
 	fetchOpenAICompatibleModels,
 	fetchWithTimeout,
 } from "../../lib/util.ts";
-import { createReRegister, setupProvider } from "../../provider-helper.ts";
+import {
+	createReRegister,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("sambanova");
 
@@ -57,11 +61,13 @@ export default async function sambanovaProvider(pi: ExtensionAPI) {
 	}
 
 	// Fetch models via shared OpenAI-compatible helper
-	const allModels = await fetchOpenAICompatibleModels(
-		"sambanova",
-		BASE_URL_SAMBANOVA,
-		apiKey,
-		{ maxTokens: 8_192 },
+	const allModels = await loadCachedOrFetchModels(PROVIDER_SAMBANOVA, () =>
+		fetchOpenAICompatibleModels(
+			"sambanova",
+			BASE_URL_SAMBANOVA,
+			apiKey,
+			{ maxTokens: 8_192 },
+		),
 	);
 
 	if (allModels.length === 0) {

package/providers/together/together.ts

@@ -50,7 +50,11 @@ import { createProviderProbe } from "../../lib/provider-probe.ts";
 import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
 import { wrapSessionStartHandler } from "../../lib/session-start-metrics.ts";
 import { fetchWithRetry, fetchWithTimeout } from "../../lib/util.ts";
-import { createReRegister, setupProvider } from "../../provider-helper.ts";
+import {
+	createReRegister,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("together");
 
@@ -150,7 +154,9 @@ export default async function togetherProvider(pi: ExtensionAPI) {
 	}
 
 	// Fetch models
-	const allModels = await fetchTogetherModels(apiKey);
+	const allModels = await loadCachedOrFetchModels(PROVIDER_TOGETHER, () =>
+		fetchTogetherModels(apiKey),
+	);
 
 	if (allModels.length === 0) {
 		_logger.warn("[together] No chat models available");

package/providers/tokenrouter/tokenrouter.ts

@@ -26,10 +26,8 @@ import type {
 	SimpleStreamOptions,
 	ThinkingContent,
 } from "@earendil-works/pi-ai";
-import {
-	createAssistantMessageEventStream,
-	streamSimpleOpenAICompletions,
-} from "@earendil-works/pi-ai";
+import { createAssistantMessageEventStream } from "@earendil-works/pi-ai";
+import { openAICompletionsApi } from "@earendil-works/pi-ai/compat";
 import {
 	getTokenrouterApiKey,
 	getTokenrouterShowPaid,
@@ -49,9 +47,14 @@ import {
 } from "../../lib/provider-compat.ts";
 import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
 import { cleanModelName, fetchWithRetry } from "../../lib/util.ts";
-import { enhanceWithCI, setupProvider } from "../../provider-helper.ts";
+import {
+	enhanceWithCI,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("tokenrouter");
+const streamSimpleOpenAICompletions = openAICompletionsApi().streamSimple;
 
 // =============================================================================
 // Reasoning cleanup
@@ -331,7 +334,7 @@ function createTokenRouterOpenAIStream(
 ): AssistantMessageEventStream {
 	const forcePatch = isTokenRouterMinimaxModel(model.id);
 	return streamSimpleOpenAICompletions(
-		{ ...model, api: "openai-completions" },
+		{ ...model, api: "openai-completions" } as Model<"openai-completions">,
 		context,
 		{
 			...options,
@@ -564,7 +567,9 @@ export default async function tokenRouterProvider(pi: ExtensionAPI) {
 		return;
 	}
 
-	const allModels = await fetchTokenRouterModels(apiKey);
+	const allModels = await loadCachedOrFetchModels(PROVIDER_TOKENROUTER, () =>
+		fetchTokenRouterModels(apiKey),
+	);
 
 	if (allModels.length === 0) {
 		_logger.warn("[tokenrouter] No text chat models available");

package/providers/zenmux/zenmux.ts

@@ -31,7 +31,11 @@ import { safeEnrichModelsWithModelsDev } from "../../lib/model-metadata.ts";
 import { getProxyModelCompat } from "../../lib/provider-compat.ts";
 import { isFreeModel, registerWithGlobalToggle } from "../../lib/registry.ts";
 import { fetchWithRetry } from "../../lib/util.ts";
-import { createReRegister, setupProvider } from "../../provider-helper.ts";
+import {
+	createReRegister,
+	loadCachedOrFetchModels,
+	setupProvider,
+} from "../../provider-helper.ts";
 
 const _logger = createLogger("zenmux");
 
@@ -146,7 +150,9 @@ export default async function zenmuxProvider(pi: ExtensionAPI) {
 	}
 
 	// Fetch models
-	const allModels = await fetchZenmuxModels(apiKey);
+	const allModels = await loadCachedOrFetchModels(PROVIDER_ZENMUX, () =>
+		fetchZenmuxModels(apiKey),
+	);
 
 	if (allModels.length === 0) {
 		_logger.warn("[zenmux] No models available");

package/providers/codestral/codestral.ts

@@ -1,128 +0,0 @@
-/**
- * Codestral Provider Extension
- *
- * Codestral is Mistral AI's code-focused model. This provider registers it
- * through the Codestral-specific endpoint (codestral.mistral.ai) using
- * the Mistral SDK (api: "mistral-conversations") — separate from the built-in
- * "mistral" provider which uses api.mistral.ai.
- *
- * NOTE: Do NOT use api: "openai-completions" here. Codestral's API is
- * Mistral-format (camelCase fields, maxTokens, no stream_options/store).
- * The OpenAI completions adapter sends OpenAI-specific fields that Mistral
- * rejects with HTTP 422 "Extra inputs are not permitted".
- *
- * Free tier (Experiment plan):
- *   - 2 req/min, 500K tokens/min, 1B tokens/month
- *   - No credit card — phone verification only
- *   - Sign up at https://console.mistral.ai/codestral
- *
- * Endpoints:
- *   Chat:  https://codestral.mistral.ai/v1/chat/completions
- *   FIM:   https://codestral.mistral.ai/v1/fim/completions (not used by pi)
- *
- * Setup:
- *   1. Get API key from https://console.mistral.ai/codestral
- *   2. Set CODESTRAL_API_KEY env var (or MISTRAL_API_KEY as fallback)
- *
- * Usage:
- *   pi install git:github.com/apmantza/pi-free
- *   # Set CODESTRAL_API_KEY env var
- *   # Models appear in /model selector as "codestral/codestral-latest"
- */
-
-import type {
-	ExtensionAPI,
-	ProviderModelConfig,
-} from "@earendil-works/pi-coding-agent";
-import {
-	getCodestralApiKey,
-	getCodestralShowPaid,
-	getMistralApiKey,
-} from "../../config.ts";
-import { BASE_URL_CODESTRAL, PROVIDER_CODESTRAL } from "../../constants.ts";
-import { createLogger } from "../../lib/logger.ts";
-import { registerWithGlobalToggle } from "../../lib/registry.ts";
-import { enhanceWithCI, setupProvider } from "../../provider-helper.ts";
-
-const _logger = createLogger("codestral");
-
-// =============================================================================
-// Model Definition
-// =============================================================================
-
-const CODESTRAL_MODEL: ProviderModelConfig = {
-	id: "codestral-latest",
-	name: "Codestral",
-	reasoning: false,
-	input: ["text"],
-	cost: {
-		input: 0.3,
-		output: 0.9,
-		cacheRead: 0,
-		cacheWrite: 0,
-	},
-	contextWindow: 256_000,
-	maxTokens: 4_096,
-};
-
-// =============================================================================
-// Extension Entry Point
-// =============================================================================
-
-export default async function codestralProvider(pi: ExtensionAPI) {
-	// Try CODESTRAL_API_KEY first, fall back to MISTRAL_API_KEY
-	const apiKey = getCodestralApiKey() || getMistralApiKey();
-
-	if (!apiKey) {
-		_logger.info(
-			"[codestral] Skipping — neither CODESTRAL_API_KEY nor MISTRAL_API_KEY set",
-		);
-		return;
-	}
-
-	const keySource = getCodestralApiKey()
-		? "CODESTRAL_API_KEY"
-		: "MISTRAL_API_KEY";
-	_logger.info(`[codestral] Using key from ${keySource}`);
-
-	const allModels = [CODESTRAL_MODEL];
-	const freeModels = allModels; // All $0.30/$0.90 — still accessible via Experiment free tier
-	const stored = { free: freeModels, all: allModels };
-
-	// Re-register function — uses mistral-conversations API (Mistral SDK)
-	// NOT openai-completions: Codestral uses the same API format as Mistral
-	// and rejects OpenAI-specific fields (stream_options, store, max_completion_tokens) with 422.
-	const reRegister = (models: typeof freeModels) => {
-		pi.registerProvider(PROVIDER_CODESTRAL, {
-			baseUrl: BASE_URL_CODESTRAL,
-			apiKey,
-			api: "mistral-conversations" as const,
-			models: enhanceWithCI(models, PROVIDER_CODESTRAL),
-		});
-	};
-
-	// Register with global toggle
-	registerWithGlobalToggle(PROVIDER_CODESTRAL, stored, reRegister, true);
-
-	// Setup provider (toggle command, status bar, error handling)
-	setupProvider(
-		pi,
-		{
-			providerId: PROVIDER_CODESTRAL,
-			initialShowPaid: getCodestralShowPaid(),
-			skipToggle: true, // Only one model, no toggle needed
-			reRegister: (models) => {
-				stored.free = models;
-				stored.all = models;
-				reRegister(models);
-			},
-		},
-		stored,
-	);
-
-	// Initial registration — uses mistral-conversations API (Mistral SDK)
-	reRegister(freeModels);
-
-	_logger.info(`[codestral] Registered codestral-latest via ${keySource}`);
-
-}